feat(promotion): WebSocket消息发送逻辑优化，去掉照片数量校验

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java

 package com.wangxiaolu.promotion.controller.activity.temporary;
 
-import com.wangxiaolu.promotion.common.enums.FlagType;
-import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
 import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus;
 import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.exception.ParamException;
@@ -140,9 +138,9 @@ public class TemporaryActivityCoreController {
         }else if (CollectionUtils.isEmpty(activityReportedDto.getTgcjPhotoInfos()) || activityReportedDto.getTgcjPhotoInfos().size() < 2){
             throw new DataException(RCode.NOT_TGCJ_PHOTO_ERROR);
         }
-        if(CollectionUtils.isEmpty(activityReportedDto.getRandTaskClockPhotoUrls())|| activityReportedDto.getRandTaskClockPhotoUrls().size() < 1){
-            throw new DataException(RCode.NOT_RAND_PHOTO_ERROR);
-        }
+//        if(CollectionUtils.isEmpty(activityReportedDto.getRandTaskClockPhotoUrls())|| activityReportedDto.getRandTaskClockPhotoUrls().size() < 1){
+//            throw new DataException(RCode.NOT_RAND_PHOTO_ERROR);
+//        }
 
 
         tempActivityCoreService.activityReportedSubmit(id);

src/main/java/com/wangxiaolu/promotion/enums/activity/TemporaryActivityTaskClockMessageType.java

@@ -2,7 +2,6 @@ package com.wangxiaolu.promotion.enums.activity;
 
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 @Getter
@@ -11,6 +10,8 @@ public enum TemporaryActivityTaskClockMessageType {
 
 
     RANDOM_TASK_START("randomTaskStart","随机任务开始通知"),
+    RANDOM_TASK_UNCOMPLETED("randomTaskUncompleted","随机任务未完成通知"),
+
     RANDOM_TASK_CLOCK("randomTaskClock","随机任务打卡"),
     POS_CLOCK("posClock","Pos机任务打卡"),
     TASK_CLOCK_QUERY("taskClockQuery","任务信息查询"),

src/main/java/com/wangxiaolu/promotion/xxljobtask/ActivityStautsHandler.java

@@ -46,15 +46,20 @@ public class ActivityStautsHandler {
     private TemporaryActivityTaskClockSocketHandler taskClockSocketHandler;
     @Autowired
     private EmployeeCoreTemporaryInfoService temporaryInfoService;
+
+    /**
+     * 测试发送websocket消息
+     */
     @XxlJob("testSubscribeMessage")
     public void TestSubscribeMessage() {
         List<TemporaryActivityTaskClockDO> list = taskClockService.list(new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
                  .eq(TemporaryActivityTaskClockDO::getTaskType, ActivityPhotoType.RANDOM_TASK.getType())
                 .eq(TemporaryActivityTaskClockDO::getIsDelete, FlagType.NO.getType())
-                .le(TemporaryActivityTaskClockDO::getCreateDate, new Date())
+                .eq(TemporaryActivityTaskClockDO::getCreateDate, DateUtil.format(new Date(), "yyyy-MM-dd"))
          );
         for (TemporaryActivityTaskClockDO taskClockDO : list) {
-            sendWebsocketMessage(taskClockDO);
+            String msgType = TemporaryActivityTaskClockMessageType.RANDOM_TASK_START.getType();
+            sendWebsocketMessage(taskClockDO,msgType);
         }
 
     }
@@ -74,6 +79,9 @@ public class ActivityStautsHandler {
             taskClockDO.setIsSendSubscribe(FlagType.NO.getType());
             taskClockDO.setTaskStatus(ActivityClockTaskStatus.UNCOMPLETED.getType());
             taskClockService.updateById(taskClockDO);
+            // 未完成的
+//            String msgType = TemporaryActivityTaskClockMessageType.RANDOM_TASK_UNCOMPLETED.getType();
+//            sendWebsocketMessage(taskClockDO,msgType);
         }
 
         // 待开始的 ->进行中
@@ -81,8 +89,7 @@ public class ActivityStautsHandler {
                 .eq(TemporaryActivityTaskClockDO::getTaskStatus, ActivityClockTaskStatus.TO_BE_START.getType())
                 .eq(TemporaryActivityTaskClockDO::getTaskType, ActivityPhotoType.RANDOM_TASK.getType())
                 .eq(TemporaryActivityTaskClockDO::getIsDelete, FlagType.NO.getType())
-                .le(TemporaryActivityTaskClockDO::getRequiredlockTime, new Date())
-                .ge(TemporaryActivityTaskClockDO::getRequiredlockTime, undoDateTime)
+                .between(TemporaryActivityTaskClockDO::getRequiredlockTime,  undoDateTime  ,new Date())
         );
 
         List<TemporaryActivityTaskClockDO> startingList = taskClockService.list(new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
@@ -96,7 +103,8 @@ public class ActivityStautsHandler {
 
         list.addAll(startingList);
         for (TemporaryActivityTaskClockDO taskClockDO : list) {
-            sendWebsocketMessage(taskClockDO);
+            String msgType = TemporaryActivityTaskClockMessageType.RANDOM_TASK_START.getType();
+            sendWebsocketMessage(taskClockDO,msgType);
             sendWxMessage(taskClockDO);
             //  修改状态 待开始 -> 进行中
             taskClockDO.setTaskStatus(ActivityClockTaskStatus.STARTING.getType());
@@ -105,10 +113,10 @@ public class ActivityStautsHandler {
 
     }
 
-    private void sendWebsocketMessage(TemporaryActivityTaskClockDO taskClockDO) {
+    private void sendWebsocketMessage(TemporaryActivityTaskClockDO taskClockDO, String msgType) {
         // 发送websocket 通知用户
         MessageBean msgBean = new MessageBean();
-        msgBean.setMsgType(TemporaryActivityTaskClockMessageType.RANDOM_TASK_START.getType());
+        msgBean.setMsgType(msgType);
         msgBean.setData(taskClockDO);
         Integer successFlag = taskClockSocketHandler.sendToUser(taskClockDO.getTemporaryId().toString(), msgBean);
         if(successFlag == 1){