yumeng 3 лет назад
Родитель
Сommit
bc19377422

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/MaterialUploadTaskMapper.java

@@ -27,4 +27,6 @@ public interface MaterialUploadTaskMapper extends BaseMapper<MaterialUploadTask>
     List<JSONObject> uploadDetail(@Param("signature") String signature);
 
     Integer getCount(String signature);
+
+    Integer getCountByaccountIdAndMd5(@Param("userId") Long userId, @Param("accountId") Long accountId,@Param("signature") String signature);
 }

+ 8 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/MaterialUploadTaskMapper.xml

@@ -43,6 +43,14 @@
         select  count(1)  from  ctop_material_upload_task where signature = #{signature}
 
     </select>
+    <select id="getCountByaccountIdAndMd5" resultType="java.lang.Integer">
+        select  count(1)  from  ctop_material_upload_task
+        where kuaishou_user_id = #{userId}
+        and signature = #{signature}
+        and account_id = #{accountId}
+        and task_status != 4
+
+    </select>
     <insert id="replaceBatch">
         insert into ctop_material_upload_task(
         media_id,

+ 20 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MaterialUploadTaskServiceImpl.java

@@ -39,6 +39,7 @@ public class MaterialUploadTaskServiceImpl extends ServiceImpl<MaterialUploadTas
 
     @Override
     public JSONObject submitTask(JSONObject json) {
+        System.err.println(json);
         JSONObject returnJson = new JSONObject();
         try {
             if (Check.isNull(json)) {
@@ -64,6 +65,12 @@ public class MaterialUploadTaskServiceImpl extends ServiceImpl<MaterialUploadTas
             if (Check.isNull(userName)) {
                 throw new Exception("请传入登录人姓名");
             }
+            Integer isMultiagent = json.getInteger("isMultiagent");
+            if (Check.isNull(isMultiagent)) {
+                throw new Exception("请传入主体信息");
+
+            }
+
             Map<String, JSONObject> useMap = new HashMap<>();
             List<MaterialUploadTask> tasksList = new ArrayList<>();
             Integer shieldBackwardSwitch = null;
@@ -86,11 +93,20 @@ public class MaterialUploadTaskServiceImpl extends ServiceImpl<MaterialUploadTas
                         }
                         userId = accountJson.getLong("userId");
                         accountId = accountJson.getLong("accountId");
-                        Integer count = materialUploadTaskMapper.getCountByUserIdAndMd5(userId, signature);
-                        if (count > 0) {
-                            getUseMap(useMap, userId, materialName, signature);
-                            continue;
+                        if (isMultiagent == 1) {
+                            Integer count = materialUploadTaskMapper.getCountByUserIdAndMd5(userId, signature);
+                            if (count > 0) {
+                                getUseMap(useMap, userId, materialName, signature);
+                                continue;
+                            }
+                        } else if (isMultiagent == 2) {
+                            Integer count = materialUploadTaskMapper.getCountByaccountIdAndMd5(userId, accountId, signature);
+                            if (count > 0) {
+                                getUseMap(useMap, userId, materialName, signature);
+                                continue;
+                            }
                         }
+
                         shieldBackwardSwitch = json.getInteger("shieldBackwardSwitch");
                     } else if (mediaId == 1 || mediaId == 3) {
                         accountId = accountArray.getLong(i);