Forráskód Böngészése

素材列表调整

yumeng 5 éve
szülő
commit
e8de658994

+ 26 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -7,6 +7,7 @@ import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.service.IMaterialParameterService;
 import cn.com.ctop.common.module.service.IMaterialTagService;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.JsonUtil;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -24,6 +25,10 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.ByteDanceCleanMaterialReport;
+import org.jeecg.modules.ctop.entity.KuaiShouCleanMaterialReport;
+import org.jeecg.modules.ctop.service.IByteDanceCleanMaterialReportService;
+import org.jeecg.modules.ctop.service.IKuaiShouCleanMaterialReportService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -67,6 +72,10 @@ public class MaterialInfoController {
     private IMaterialParameterService materialParameterService;
     @Autowired
     private IMaterialTagService materialTagService;
+    @Autowired
+    private IByteDanceCleanMaterialReportService byteDanceCleanMaterialReportService;
+    @Autowired
+    private IKuaiShouCleanMaterialReportService kuaiShouCleanMaterialReportService;
 
     @GetMapping(value = "/report")
     public JSONObject report(String userId) {
@@ -209,10 +218,24 @@ public class MaterialInfoController {
                 } else {
                     material.setToutiaoVideoIsUp(0);
                 }
-                JSONObject generalizationJson = materialInfoService.getGeneralizationInfo(material.getCode());
+
+
+                ByteDanceCleanMaterialReport byteDance = byteDanceCleanMaterialReportService.getById(material.getCode());
+                if (!Check.isNull(byteDance)) {
+                    String byteDanceString = JsonUtil.objectToJson(byteDance);
+                    material.setByteDance(JSONObject.parseObject(byteDanceString));
+                }
+
+                KuaiShouCleanMaterialReport kuaiShou = kuaiShouCleanMaterialReportService.getById(material.getCode());
+                if (!Check.isNull(kuaiShou)) {
+                    String kuaiShouString = JsonUtil.objectToJson(kuaiShou);
+                    material.setKuaiShou(JSONObject.parseObject(kuaiShouString));
+                }
+
+                /*JSONObject generalizationJson = materialInfoService.getGeneralizationInfo(material.getCode());
                 if (!Check.isNull(generalizationJson)) {
                     material.setGeneralization(generalizationJson);
-                }
+                }*/
 
             }
         }
@@ -222,6 +245,7 @@ public class MaterialInfoController {
         return result;
     }
 
+
     /**
      * 添加
      *

+ 4 - 1
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java

@@ -131,6 +131,9 @@ public class MaterialInfo {
     private Integer toutiaoVideoIsUp;  //判断是否已经同步到头条平台0否_1是
 
     @TableField(exist = false)
-    private JSONObject generalization;  //概括数据
+    private JSONObject byteDance;
+
+    @TableField(exist = false)
+    private JSONObject kuaiShou;
 
 }