Ver código fonte

Merge branch 'V2.0.1' into test

zhaoxian 2 anos atrás
pai
commit
4a9d5f9c5d

+ 14 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/controller/DuxiaomanMaterialInfoController.java

@@ -71,6 +71,9 @@ public class DuxiaomanMaterialInfoController {
         if (!Check.isNull(duxiaomanMaterialInfo.getStatus())) {
             queryWrapper.eq("status", duxiaomanMaterialInfo.getStatus());
         }
+        if (!Check.isNull(duxiaomanMaterialInfo.getMaterialName())) {
+            queryWrapper.like("material_name", duxiaomanMaterialInfo.getMaterialName());
+        }
         if (!Check.isNull(duxiaomanMaterialInfo.getProductId())) {
             queryWrapper.eq("product_id", duxiaomanMaterialInfo.getProductId());
         }
@@ -263,12 +266,18 @@ public class DuxiaomanMaterialInfoController {
     @GetMapping(value = "/materialDetail")
     public void materialDetail(String id) {
         DuxiaomanMaterialInfo materialInfo = duxiaomanMaterialInfoService.getById(id);
-        if ("VIDEO".equals(materialInfo.getType())) {
-            duxiaomanMaterialInfoService.materialDetail(materialInfo);
-        } else {
-            duxiaomanMaterialInfoService.materialDetail2(materialInfo);
-        }
+        duxiaomanMaterialInfoService.materialDetail(materialInfo);
     }
 
+    /**
+     * 将2-审批中状态的素材 进行 更新报备状态
+     */
+    @GetMapping(value = "/getMaterialChannelAndType")
+    public Result<Object> getMaterialChannelAndType(String id) {
+        JSONObject obj = new JSONObject();
+        obj.put("channel", duxiaomanMaterialInfoService.getMaterialChannel());
+        obj.put("type", duxiaomanMaterialInfoService.getMaterialType());
+       return Result.ok(obj);
+    }
 
 }

+ 8 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/entity/DuxiaomanMaterialInfo.java

@@ -130,8 +130,15 @@ public class DuxiaomanMaterialInfo {
     @Excel(name = "拒绝原因", width = 15)
     @ApiModelProperty(value = "拒绝原因")
     private String refuseReason;
+
+    /**
+     * 文案
+     */
+    @Excel(name = "文案", width = 15)
+    @ApiModelProperty(value = "文案")
+    private String creativeCopywriter;
     /**
-     * 素材类型
+     * 素材类型,VIDEO-视频,SCRIPT-脚本
      */
     @Excel(name = "素材类型", width = 15)
     @ApiModelProperty(value = "素材类型")

+ 2 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/service/IDuxiaomanMaterialInfoService.java

@@ -18,12 +18,12 @@ public interface IDuxiaomanMaterialInfoService extends IService<DuxiaomanMateria
     /**
      *查询渠道
      */
-    public void getMaterialChannel();
+    JSONObject getMaterialChannel();
 
     /**
      *查询渠道
      */
-    public void getmaterialType();
+     JSONObject getMaterialType();
 
     Result<Object> upload(DuxiaomanMaterialInfo materialInfo);
 
@@ -35,7 +35,5 @@ public interface IDuxiaomanMaterialInfoService extends IService<DuxiaomanMateria
 
     Result<Object> add(JSONObject json);
 
-    void materialDetail2(DuxiaomanMaterialInfo materialInfo);
-
     Result<Object> getPersonnelInfo(DuxiaomanMaterialInfo duxiaomanMaterialInfo);
 }

+ 8 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/service/impl/DuxiaomanMaterialInfoServiceImpl.java

@@ -10,7 +10,6 @@ import cn.com.ctop.common.module.entity.TagInfo;
 import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
 import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
-import cn.com.ctop.common.module.mapper.MaterialTagMapper;
 import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IMaterialImageInfoService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
@@ -131,7 +130,7 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
     private static ExecutorService uploadExecutorService = Executors.newFixedThreadPool(5);
 
     @Override
-    public void getMaterialChannel() {
+    public JSONObject getMaterialChannel() {
         String datetime = new Date().getTime() + "";
         TreeMap<String, Object> params = new TreeMap<>();
         params.put("app_id", duAppId);
@@ -144,13 +143,11 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
         String resultStr = HttpUtils.httpGetRequest(duUrl + KuaishouDuXiaoManAPIConstant.MATERIAL_CHANNEL, null, params);
         JSONObject resultJson = JSONObject.parseObject(resultStr);
         log.info("----------查询渠道:{}", resultJson);
-        if (!Check.isNull(resultJson) && resultJson.getInteger("retCode") == 0) {
-            JSONArray result = resultJson.getJSONArray("result");
-        }
+        return resultJson;
     }
 
     @Override
-    public void getmaterialType() {
+    public JSONObject getMaterialType() {
         String datetime = new Date().getTime() + "";
         TreeMap<String, Object> params = new TreeMap<>();
         params.put("app_id", duAppId);
@@ -163,9 +160,7 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
         String resultStr = HttpUtils.httpGetRequest(duUrl + KuaishouDuXiaoManAPIConstant.MATERIAL_TYPE, null, params);
         JSONObject resultJson = JSONObject.parseObject(resultStr);
         log.info("----------查询通用素材分类:{}", resultJson);
-        if (!Check.isNull(resultJson) && resultJson.getInteger("retCode") == 0) {
-            JSONArray result = resultJson.getJSONArray("result");
-        }
+        return resultJson;
     }
 
     @Override
@@ -211,11 +206,6 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
     }
 
 
-    @Override
-    public void materialDetail2(DuxiaomanMaterialInfo materialInfo) {
-
-    }
-
     /**
      * 素材报备
      */
@@ -252,7 +242,8 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
             String resultStr = HttpUtils.httpPostRequest(duUrl + KuaishouDuXiaoManAPIConstant.MATERIAL_REPORT, params, null);
             JSONObject resultJson = JSONObject.parseObject(resultStr);
             log.info("----------素材报备:{}", resultJson);
-            if (!Check.isNull(resultJson) && resultJson.getInteger("retCode") == 0) {
+            if ((!Check.isNull(resultJson) && resultJson.getInteger("retCode") == 0)
+                    || (!Check.isNull(resultJson) && resultJson.getInteger("retCode") == 1 && resultJson.getString("retMsg").contains("已送审"))) {
                 //2:审批中
                 materialInfo.setStatus(2);
                 materialInfo.setAuditTaskId(resultJson.getString("result"));
@@ -288,8 +279,10 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
             if (!Check.isNull(resultJson) && resultJson.getInteger("retCode") == 0) {
                 JSONObject result = resultJson.getJSONObject("result");
                 Integer auditStatus = result.getInteger("audit_status");
+
                 materialInfo.setStatus(auditStatus);
                 materialInfo.setConfirmTime(result.getString("audit_time"));
+                materialInfo.setRefuseReason(result.getString("audit_reason"));
                 //3 审核通过 同步到素材表
                 if (auditStatus == 3) {
                     syncMaterial(materialInfo);