Browse Source

复制修改

yumeng 5 năm trước cách đây
mục cha
commit
3fbfddfbe1

+ 1 - 3
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialAscriptionMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectByMaterialId" resultType="com.alibaba.fastjson.JSONObject">
 
-select
+    select
       (case
         when clip_id != ""
         then (select realname from sys_user where id = clip_id)
@@ -13,8 +13,6 @@ select
         ) clipName, -- 剪辑人姓名
 
         clip_id clipId,
-
-
         (case
         when shot_id != ""
         then (select realname from sys_user where id = shot_id)

+ 4 - 7
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -257,24 +257,21 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             json.put("auditorName", "");
         }
 
-        List<String> tagList = materialTagMapper.selectByMaterialId(materialId);
+        List<String> tagList = materialTagMapper.selectByMaterialId(materialInfo.getCode());
         if (!Check.isNull(tagList)) {
             json.put("tag", tagList);
         }
         QueryWrapper<MaterialParameter> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("material_id", materialId);
+        queryWrapper.eq("material_id", materialInfo.getCode());
         queryWrapper.orderByDesc("create_time");
         queryWrapper.last("limit 1");
         MaterialParameter materialParameter = materialParameterMapper.selectOne(queryWrapper);
 
         if (!Check.isNull(materialParameter)) {
             json.put("parameter", materialParameter);
-        } else {
-            MaterialParameter materialParameter1 = new MaterialParameter();
-            materialParameter1.setMaterialId(materialId);
-            json.put("parameter", materialParameter1);
         }
-        JSONObject ascriptionJson = materialAscriptionMapper.selectByMaterialId(materialId);
+
+        JSONObject ascriptionJson = materialAscriptionMapper.selectByMaterialId(materialInfo.getCode());
         if (!Check.isNull(ascriptionJson)) {
             json.put("ascription", ascriptionJson);
         }

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -263,6 +263,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         param.put("page", page);
         String result = HttpUtils.httpPostRequest(url, param, headers);
         JSONObject resultJson = JSONObject.parseObject(result);
+        System.err.println(resultJson);
         Integer code = resultJson.getInteger("code");
         String message = resultJson.getString("message");
         if (null == code || code != 0) {