浏览代码

fix of 1000224、1000223 on 2021.1.15

jiequan.bi 4 年之前
父节点
当前提交
5016e7dd24

+ 48 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformMaterialCtrl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+import org.jeecg.modules.orderplatform.entity.PlatformScript;
 import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
 import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
 import org.jeecg.modules.orderplatform.util.DictHandler;
@@ -43,14 +44,14 @@ public class PlatformMaterialCtrl {
      */
     @GetMapping(value = "/listByOrderCode")
     public Result<PageInfo<PlatformMaterial>> listByOrderCode(PlatformMaterial platformMaterial,
-                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                         HttpServletRequest req) {
+                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                              HttpServletRequest req) {
         Result<PageInfo<PlatformMaterial>> result = new Result<>();
         QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
         queryWrapper.setEntity(platformMaterial);
-        PageHelper.startPage(pageNo,pageSize);
-        List<PlatformMaterial> platformMaterialList= platformMaterialService.list(queryWrapper);
+        PageHelper.startPage(pageNo, pageSize);
+        List<PlatformMaterial> platformMaterialList = platformMaterialService.list(queryWrapper);
         result.setSuccess(true);
         result.setResult(new PageInfo<>(dictHandler.dictHandlerMaterial(platformMaterialList)));
         return result;
@@ -87,6 +88,22 @@ public class PlatformMaterialCtrl {
         return result;
     }
 
+    /**
+     * 脚本是否可更新
+     */
+    @GetMapping(value = "/verifyScript")
+    public Result<Object> verifyScript(String materialCode, String scriptId) {
+        Result<Object> result = new Result<>();
+        QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("material_code", materialCode);
+        PlatformMaterial platformMaterial = platformMaterialService.getOne(queryWrapper);
+        if (platformMaterial.getScriptId().equals(scriptId)) {
+            result.setSuccess(true);
+        } else {
+            result.error500("脚本信息已被更改,请刷新后操作");
+        }
+        return result;
+    }
 
     /**
      * 运营审核脚本
@@ -100,7 +117,7 @@ public class PlatformMaterialCtrl {
         platformMaterial.setVideoStatus(0);
         boolean ok = platformMaterialService.updateById(platformMaterial);
         if (ok) {
-            operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"ACCEPT_SCRIPT");
+            operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "ACCEPT_SCRIPT");
             result.success("脚本审核通过!");
         } else {
             result.error500("脚本审核失败!请联系管理员");
@@ -117,7 +134,7 @@ public class PlatformMaterialCtrl {
         platformMaterial.setScriptStatus(2);
         boolean ok = platformMaterialService.updateById(platformMaterial);
         if (ok) {
-            operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"REJECT_SCRIPT");
+            operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "REJECT_SCRIPT");
             result.success("脚本已驳回!");
         } else {
             result.error500("脚本驳回失败!请联系管理员");
@@ -138,6 +155,23 @@ public class PlatformMaterialCtrl {
     }
 
     /**
+     * 视频是否可以更新
+     */
+    @GetMapping(value = "/verifyVideo")
+    public Result<Object> verifyVideo(String materialCode, String videoId) {
+        Result<Object> result = new Result<>();
+        QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("material_code", materialCode);
+        PlatformMaterial platformMaterial = platformMaterialService.getOne(queryWrapper);
+        if (platformMaterial.getVideoId().equals(videoId)) {
+            result.setSuccess(true);
+        } else {
+            result.error500("视频信息已被更改,请刷新后操作");
+        }
+        return result;
+    }
+
+    /**
      * 运营审核视频
      */
     @PostMapping(value = "/video/accept")
@@ -145,7 +179,7 @@ public class PlatformMaterialCtrl {
         Result<Object> result = new Result<>();
         //视频通过同步到素材库
         boolean sync = platformMaterialService.syncVideo2CTopMaterial(platformMaterial);
-        if(!sync){
+        if (!sync) {
             result.error500("视频同步素材库失败");
             return result;
         }
@@ -157,7 +191,7 @@ public class PlatformMaterialCtrl {
             //更新订单的素材完成数
             boolean order = platformOrderService.updateOrderFinishAmount(platformMaterial.getOrderCode());
             if (order) {
-                operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"ACCEPT_VIDEO");
+                operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "ACCEPT_VIDEO");
                 //修改素材库审核状态
                 //platformMaterialService.updateMaterialStatusById(platformMaterial.getVideoId());
                 result.success("视频审核通过!");
@@ -177,7 +211,7 @@ public class PlatformMaterialCtrl {
         platformMaterial.setVideoStatus(2);
         boolean ok = platformMaterialService.updateById(platformMaterial);
         if (ok) {
-            operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"REJECT_VIDEO");
+            operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "REJECT_VIDEO");
             result.success("视频已驳回!");
         } else {
             result.error500("视频驳回失败!请联系管理员");
@@ -198,12 +232,12 @@ public class PlatformMaterialCtrl {
     }
 
     /**
-     *  视频修改回显
+     * 视频修改回显
      */
     @GetMapping(value = "/videoEcho")
-    public Result<Map<String,Object>> videoEcho(String videoId) {
-        Result<Map<String,Object>> result = new Result<>();
-        Map<String,Object> scriptDetail = platformMaterialService.videoEcho(videoId);
+    public Result<Map<String, Object>> videoEcho(String videoId) {
+        Result<Map<String, Object>> result = new Result<>();
+        Map<String, Object> scriptDetail = platformMaterialService.videoEcho(videoId);
         result.setResult(scriptDetail);
         result.setSuccess(true);
         return result;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformMaterialMapper.xml

@@ -115,7 +115,7 @@
             t1.shot,
             (SELECT realname from sys_user where id=t1.shot) as shotName,
             t1.clip,
-            (SELECT realname from sys_user where id=t1.shot) as clipName,
+            (SELECT realname from sys_user where id=t1.clip) as clipName,
             t1.plan,
             (SELECT realname from sys_user where id=t1.plan) as planName
         FROM

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformMaterialService.java

@@ -50,6 +50,9 @@ public interface IPlatformMaterialService extends IService<PlatformMaterial> {
      */
     Map<String,Object> videoEcho(String videoId);
 
+    /**
+     *  根据
+     */
 
 
 }

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/ApprovalNodeNoticeHandler.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.orderplatform.util;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
 import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 3 - 19
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyImage.java

@@ -1,14 +1,10 @@
 package cn.com.ctop.kuaishou.modules.report.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -16,28 +12,16 @@ import java.util.Date;
 
 /**
  * 快手图片报表
- * @author jeecg-boot
- * @date   2020-09-28
- * @version V1.0
  */
 @Data
 @TableName("ctop_kuaishou_report_daily_image")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ctop_kuaishou_report_daily_image对象", description="快手图片报表")
 public class KuaishouReportDailyImage {
 
 	/**id*/
-	@TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
 	private Integer id;
 	/**账户ID*/
-	@Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
 	private Integer coverId;
 	/**计划ID*/
-	@Excel(name = "计划ID", width = 15)
-    @ApiModelProperty(value = "计划ID")
 	private Integer photoId;
 	/**channelType*/
 	@Excel(name = "channelType", width = 15)
@@ -55,8 +39,8 @@ public class KuaishouReportDailyImage {
 	@Excel(name = "封面url", width = 15)
     @ApiModelProperty(value = "封面url")
 	private String coverUrl;
-	/**视频uel*/
-	@Excel(name = "视频uel", width = 15)
+	/**视频url*/
+	@Excel(name = "视频url", width = 15)
     @ApiModelProperty(value = "视频uel")
 	private String photoUrl;
 	/**素材类型*/

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyImageService.java

@@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKuaishouReportDailyImageService extends IService<KuaishouReportDailyImage> {
 
+    void getMaterialImageReport(Long accountId, String accessToken, String startDate, String endDate, Integer page);
+
 }

+ 49 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyImageServiceImpl.java

@@ -1,18 +1,67 @@
 package cn.com.ctop.kuaishou.modules.report.service.impl;
 
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyImage;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyImageMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyImageService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 快手图片报表
  * @author jeecg-boot
  * @date   2020-09-28
  * @version V1.0
  */
+@Slf4j
 @Service
 public class KuaishouReportDailyImageServiceImpl extends ServiceImpl<KuaishouReportDailyImageMapper, KuaishouReportDailyImage> implements IKuaishouReportDailyImageService {
 
+    @Override
+    public void getMaterialImageReport(Long accountId, String accessToken, String startDate, String endDate, Integer page) {
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type", " application/json");
+        headers.put("Access-Token", accessToken);
+
+        JSONObject param = new JSONObject();
+        param.put("advertiser_id", accountId);
+        param.put("page_size", 2000);
+        param.put("page", page);
+
+        JSONObject resultJson = JSONObject.parseObject(HttpUtils.kuaiShouhttpPostRequest("https://ad.e.kuaishou.com/rest/openapi/v1/report/campaign_report", param.toJSONString(), headers));
+        if (Check.isNull(resultJson)) {
+            log.error("获取广告创意返回结果为空,advertiserId:{}", accountId);
+            return;
+        }
+        Integer code = resultJson.getInteger("code");
+        if (null == code || code != 0) {
+            log.error("获取广告创意返回结果异常,advertiserId:{},message:{}", accountId, resultJson.getString("message"));
+            return;
+        }
+        JSONArray details = resultJson.getJSONObject("data").getJSONArray("details");
+        if (null == details || details.size() <= 0) {
+            return;
+        }
+        List<KuaishouReportDailyImage> imageReports = new ArrayList<>();
+        details.forEach(detail->{
+            JSONObject detailJSON = (JSONObject) detail;
+            if (!Check.isNull(detailJSON)) {
+                KuaishouReportDailyImage kuaishouReportDailyImage =new KuaishouReportDailyImage();
+            }
+        });
+    }
+
 }