瀏覽代碼

素材同步详情

yumeng 3 年之前
父節點
當前提交
ab272670ac

+ 31 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialUploadController.java

@@ -1,12 +1,17 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.ctop.service.IMaterialUploadTaskService;
 import org.jeecg.modules.ctop.service.IMaterialUploadTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.util.List;
+
 /**
 /**
  * 素材归属标
  * 素材归属标
  *
  *
@@ -29,4 +34,30 @@ public class MaterialUploadController {
         return returnJson;
         return returnJson;
     }
     }
 
 
+
+    @GetMapping(value = "/uploadDetail")
+    public Result<PageInfo<List<JSONObject>>> uploadDetail(String signature, Integer pageNo, Integer pageSize) {
+        Result<PageInfo<List<JSONObject>>> result = new Result<>();
+        try {
+            if (Check.isNull(signature)) {
+                throw new Exception("请输入md5");
+            }
+            if (Check.isNull(pageNo)) {
+                throw new Exception("请输入页数");
+            }
+            if (Check.isNull(pageSize)) {
+                throw new Exception("请输入每页条数");
+            }
+            PageInfo<List<JSONObject>> listPageInfo = materialUploadTaskService.uploadDetail(signature, pageNo, pageSize);
+            result.setSuccess(true);
+            result.setResult(listPageInfo);
+        } catch (Exception e) {
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+
+        }
+        return result;
+
+    }
+
 }
 }

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

@@ -23,4 +23,8 @@ public interface MaterialUploadTaskMapper extends BaseMapper<MaterialUploadTask>
     Integer getCountByAccountIdAndMd5(@Param("accountId") Long accountId, @Param("signature") String signature);
     Integer getCountByAccountIdAndMd5(@Param("accountId") Long accountId, @Param("signature") String signature);
 
 
     void replaceBatch(@Param("addList") List<MaterialUploadTask> tasksList);
     void replaceBatch(@Param("addList") List<MaterialUploadTask> tasksList);
+
+    List<JSONObject> uploadDetail(@Param("signature") String signature);
+
+    Integer getCount(String signature);
 }
 }

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

@@ -19,6 +19,29 @@
         and signature = #{signature}
         and signature = #{signature}
         and task_status != 4
         and task_status != 4
     </select>
     </select>
+    <select id="uploadDetail" resultType="com.alibaba.fastjson.JSONObject">
+    SELECT
+	t1.media_id AS 'mediaId',
+	t1.account_id AS 'accountId',
+	t1.kuaishou_user_id AS 'userId',
+	t1.task_status AS 'taskStatus',
+	t1.user_name AS 'userName',
+	t1.remarks AS 'remarks',
+	t3.project_name AS 'projectName'
+    FROM
+	ctop_material_upload_task t1
+    LEFT JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
+    LEFT JOIN ctop_project t3 ON t2.project_id = t3.id
+    WHERE
+	t1.signature = #{signature}
+    ORDER BY
+	t3.id
+
+    </select>
+    <select id="getCount" resultType="java.lang.Integer">
+        select  count(1)  from  ctop_material_upload_task where signature = #{signature}
+
+    </select>
     <insert id="replaceBatch">
     <insert id="replaceBatch">
         insert into ctop_material_upload_task(
         insert into ctop_material_upload_task(
         media_id,
         media_id,

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IMaterialUploadTaskService.java

@@ -2,8 +2,11 @@ package org.jeecg.modules.ctop.service;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
 import org.jeecg.modules.ctop.entity.MaterialUploadTask;
 import org.jeecg.modules.ctop.entity.MaterialUploadTask;
 
 
+import java.util.List;
+
 /**
 /**
  * 同步素材任务
  * 同步素材任务
  *
  *
@@ -14,4 +17,6 @@ import org.jeecg.modules.ctop.entity.MaterialUploadTask;
 public interface IMaterialUploadTaskService extends IService<MaterialUploadTask> {
 public interface IMaterialUploadTaskService extends IService<MaterialUploadTask> {
 
 
     JSONObject submitTask(JSONObject json);
     JSONObject submitTask(JSONObject json);
+
+    PageInfo<List<JSONObject>> uploadDetail(String signature, Integer pageNo, Integer pageNum);
 }
 }

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

@@ -4,6 +4,8 @@ import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.jeecg.modules.ctop.entity.MaterialUploadTask;
 import org.jeecg.modules.ctop.entity.MaterialUploadTask;
 import org.jeecg.modules.ctop.mapper.MaterialUploadTaskMapper;
 import org.jeecg.modules.ctop.mapper.MaterialUploadTaskMapper;
 import org.jeecg.modules.ctop.service.IMaterialUploadTaskService;
 import org.jeecg.modules.ctop.service.IMaterialUploadTaskService;
@@ -139,6 +141,16 @@ public class MaterialUploadTaskServiceImpl extends ServiceImpl<MaterialUploadTas
         return returnJson;
         return returnJson;
     }
     }
 
 
+    @Override
+    public PageInfo<List<JSONObject>> uploadDetail(String signature, Integer pageNo, Integer pageSize) {
+        PageHelper.startPage(pageNo, pageSize, false);
+        List<JSONObject> details = materialUploadTaskMapper.uploadDetail(signature);
+        Integer total = materialUploadTaskMapper.getCount(signature);
+        PageInfo pageInfo = new PageInfo(details);
+        pageInfo.setTotal(total);
+        return pageInfo;
+    }
+
 
 
     private Map<String, JSONObject> getUseMap(Map<String, JSONObject> userMap, Long userId, String materialName, String signature) {
     private Map<String, JSONObject> getUseMap(Map<String, JSONObject> userMap, Long userId, String materialName, String signature) {
         JSONObject useJson = userMap.get(signature);
         JSONObject useJson = userMap.get(signature);