zh

src/main/java/com/zh/project0512/controller/UtilsController.java

@@ -94,7 +94,8 @@ public class UtilsController {
         try {
             String filePath = path + "/" + newFileName;
             File dest = new File(filePath);
-            if (compress != null && compress &&fileTypeNum ==2&& file.getSize() >= picSizeLimit) {
+//            if (compress != null && compress &&fileTypeNum ==2&& file.getSize() >= picSizeLimit) {
+            if (file.getSize() >= picSizeLimit) {
                 String filePathSmall = path + "/" + newFileNameSmall;
                 File beforeFile = new File(filePathSmall);
                 //生成目标图片

src/main/java/com/zh/project0512/controller/manage/TaskController.java

@@ -407,8 +407,8 @@ public class TaskController {
     @AdminCheckAuthorityAnnotation(jurisdictionId = "135")
     public Result dele(@Validated @RequestBody DelTaskParam param) {
         Task task = taskService.getById(param.getId());
-        if (task.getStatus() !=0){
-            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"只支持未上线的任务删除");
+        if (task.getStatus() != 0) {
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "只支持未上线的任务删除");
         }
         return MybatisPlusUtil.sqlResult(taskService.removeById(param.getId()), "删除");
     }
@@ -421,7 +421,7 @@ public class TaskController {
     public Result del(@Validated @RequestBody DetTaskParam param) {
         UpdateWrapper<Task> ew = new UpdateWrapper<>();
         ew.eq("status", 1).eq("id", param.getId())
-            .set("status", 2).set("end",LocalDateTime.now()).set("updateAt", LocalDateTime.now());
+            .set("status", 2).set("end", LocalDateTime.now()).set("updateAt", LocalDateTime.now());
         taskService.update(ew);
         videoService.updStatusByTaskId(param.getId(), LocalDateTime.now());
         return Result.success("", "终止任务完成");
@@ -433,16 +433,17 @@ public class TaskController {
     private IUserPointsRecordsService userPointsRecordsService;
     @Autowired
     private HttpUtil httpUtil;
+
     @PostMapping("/finish")
     @ResponseBody
-    public Result test(@Validated @RequestBody DelTaskParam param) {
+    public Result finish(@Validated @RequestBody DelTaskParam param) {
         // 任务结束7天时，自动结算积分
         QueryWrapper<Task> qw = new QueryWrapper<>();
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime weekAgo = now.minusWeeks(0);
         AppMessage appMessage = new AppMessage().setTitle("任务积分结算");
         String format = weekAgo.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        qw.eq("status",2).eq("id", param.getId());
+        qw.eq("status", 2).eq("id", param.getId());
         List<Task> taskList = taskService.list(qw);
         String qywxAccessToken = httpUtil.qywxGetToken();
         // 处理每个任务的传播值
@@ -479,12 +480,12 @@ public class TaskController {
                         httpUtil.qywxMessage(qywxAccessToken, touser, "任务积分结算", null, appMessage.getUrl(), content_item);
                     }
                     AppMessageUtil.sendMessage(appMessage);
-                    recordsList.add(new UserPointsRecords().setSettlementMethod(1).setPoints(point).setType(1).setRemarks("任务完成结算："+t.getTitle()).setCreateDate(now).setUserId(userId));
+                    recordsList.add(new UserPointsRecords().setSettlementMethod(1).setPoints(point).setType(1).setRemarks("任务完成结算：" + t.getTitle()).setCreateDate(now).setUserId(userId));
                 }
             }
             // 按任务生成积分流水记录
             userPointsRecordsService.saveBatch(recordsList);
-            taskService.update(new UpdateWrapper<Task>().eq("id",taskId).set("status",3));
+            taskService.update(new UpdateWrapper<Task>().eq("id", taskId).set("status", 3));
         }
         return Result.success();
     }
@@ -559,19 +560,50 @@ public class TaskController {
         return Result.success(res);
     }
 
+    @Data
+    static class TaskDataParam {
+        @NotNull(message = "id不能为空")
+        @Min(value = 1, message = "id最小值为1")
+        @Schema(title = "任务id")
+        private Integer id;
+        @Schema(title = "用户名称")
+        private String userName;
+        @Schema(title = "部门名称")
+        private String departmentName;
+    }
+
+
     @Operation(summary = "任务传播数据")
     @PostMapping("taskEffect")
     @AdminTokenValid
-    public Result taskEffect(@Validated @RequestBody DetTaskParam param) {
-        List<Map> maps = taskService.taskEffectData(new QueryWrapper<Task>().eq("t2.id", param.getId()));
-        JSONObject obj = new JSONObject();
-        obj.put("taskEffect", maps.get(0));
-        if (maps != null) {
-            QueryWrapper<Task> qw = new QueryWrapper<>();
-            qw.eq("t2.id", param.getId()).groupBy("t1.userId");
-            obj.put("userEffectList", taskService.taskEffectData(qw));
+    public Result taskEffect(@Validated @RequestBody DetTaskParam  param) {
+        Integer taskId = param.getId();
+        List<Map> maps = taskService.taskEffectData(new QueryWrapper<Task>().eq("t2.id", taskId));
+        Map map = maps.get(0);
+        if (map != null) {
+        map.remove("userId");
+        map.remove("userName");
+        Integer taskUserSum = 0;
+        if (taskDepartmentService.count(new QueryWrapper<TaskDepartment>().eq("taskId", taskId)) == 0) {
+            taskUserSum = userService.count();
+        }else{
+            taskUserSum = taskService.taskUserSum(taskId);
+        }
+        map.put("taskUserSum",taskUserSum);
+        map.put("taskUserNum",taskService.taskUserNum(taskId));
         }
-        return Result.success(obj);
+        return Result.success(map);
+    }
+
+    @Operation(summary = "任务传播数据")
+    @PostMapping("taskEffectData")
+    @AdminTokenValid
+    public Result taskEffectData(@Validated @RequestBody TaskDataParam param) {
+        QueryWrapper<Task> qw = new QueryWrapper<>();
+        qw.eq("t2.id", param.getId()).groupBy("t1.userId");
+        qw.like(param.getUserName() != null, "t3.name", param.getUserName());
+        qw.like(param.getDepartmentName() != null, "t4.name", param.getDepartmentName());
+        return Result.success( taskService.taskEffectData(qw));
     }
 
     @Data

src/main/java/com/zh/project0512/controller/manage/VideoController.java

@@ -75,6 +75,10 @@ public class VideoController {
         @Min(value = 1, message = "视频状态范围：1待审核；2审核通过；3审核拒绝")
         @Max(value = 3, message = "视频状态范围：1待审核；2审核通过；3审核拒绝")
         private Integer status;
+//        @Schema(title = "平台", description = "1抖音；2快手；3朋友圈；4视频号")
+//        @Min(value = 1, message = "视频平台：1抖音；2快手；3朋友圈；4视频号")
+//        @Max(value = 4, message = "视频平台：1抖音；2快手；3朋友圈；4视频号")
+//        private Integer type;
         @Schema(title = "申请人名称")
         private String providerName;
         @Schema(title = "部门id")
@@ -95,7 +99,7 @@ public class VideoController {
     public Result list(@Validated @RequestBody VParam param) {
         QueryWrapper<Video> qw = new QueryWrapper<>();
         qw.eq("t1.status", param.getStatus());
-        qw.like(param.providerName != null, "t2.name", param.getProviderName());
+        qw.like(param.getProviderName() != null, "t2.name", param.getProviderName());
         qw.eq(param.getDepartmentId() != null, "t3.departmentId", param.getDepartmentId());
         qw.like(param.getTaskTitle() != null, "t4.title", param.getTaskTitle());
         qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime());

src/main/java/com/zh/project0512/mapper/TaskMapper.java

@@ -63,6 +63,15 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     Task detailById(String openid, int id);
 
+    @Select("SELECT count(*) as taskUserSum from user as t1\n" +
+        "left join taskDepartment as t2 on t1.main_department = t2.departmentId\n" +
+        "WHERE t2.taskId = #{taskId}")
+    Integer taskUserSum(Integer taskId);
+    @Select("SELECT count(userId) as taskUserNum from (SELECT userId from task as t1\n" +
+        " INNER JOIN video as t2 on t1.id = t2.taskId\n" +
+        "WHERE t1.id = #{taskId}\n" +
+        "GROUP BY userId) as taskUser")
+    Integer taskUserNum(Integer taskId);
     @Select("SELECT SUM(t1.playNum) as playNumSum,SUM(t1.commendNum) as commendNumSum,\n" +
         "SUM(t1.collectionNum) as collectionNumSum,SUM(t1.commentNum) as commentNumSum,\n" +
         "SUM(t1.reSendNum) as reSendNumSum,SUM(t1.recommendNum) as recommendNumSum,SUM(t1.effectResult) as effectResultSum,t1.userId,\n" +

src/main/java/com/zh/project0512/mapper/VideoMapper.java

@@ -35,11 +35,12 @@ public interface VideoMapper extends BaseMapper<Video> {
     @Update("update video INNER JOIN task on task.id = video.taskId and taskId = #{taskId} set video.status = 1 WHERE video.status = 0 ")
     void updStatusByTaskId(int taskId, LocalDateTime endTime);
 
-    @Select("SELECT t1.*,t2.name as providerName,t3.name as departmentName,t4.title as taskTitle\n" +
+    @Select("SELECT t1.*,t2.name as providerName,t3.name as departmentName,t4.title as taskTitle,t5.account,t5.name as accountName,t5.tel as accountTel,t5.validImg as accountImg \n" +
         "  from video as t1\n" +
         "LEFT JOIN user as t2 on t2.id = t1.userId\n" +
         "LEFT JOIN qywxDepartment as t3 on t3.departmentId = t2.main_department\n" +
-        "LEFT JOIN task as t4 on t4.id = t1.taskId " +
+        "LEFT JOIN task as t4 on t4.id = t1.taskId\n" +
+        "LEFT JOIN userAccount as t5 on t1.userId = t5.userId and t1.type = t5.platform\n" +
         "${ew.customSqlSegment} " +
         "ORDER BY updateAt DESC,creatAt DESC")
     IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper);

src/main/java/com/zh/project0512/service/ITaskService.java

@@ -26,6 +26,8 @@ public interface ITaskService extends IService<Task> {
     IPage<Integer> idList(IPage iPage,String openid, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
     List<Map> list(String openid,List<Integer> list, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
     Task detailById(String openid,int id);
+    Integer taskUserSum(Integer taskId);
+    Integer taskUserNum(Integer taskId);
     JSONObject taskEffect(@Param("ew") Wrapper<Task> queryWrapper);
     List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper);
     List<Map> taskDepartment(int taskId);

src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java

@@ -59,7 +59,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
     public Task detailById(String openid, int id) {
         return taskMapper.detailById(openid, id);
     }
-
+    public Integer taskUserSum(Integer taskId){
+        return taskMapper.taskUserSum(taskId);
+    }
+    public Integer taskUserNum(Integer taskId){
+        return taskMapper.taskUserNum(taskId);
+    }
     public JSONObject taskEffect(@Param("ew") Wrapper<Task> queryWrapper) {
         return taskMapper.taskEffect(queryWrapper);
     }