修改公告通知bug

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/event/WorkTimeChangeEvent.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -12,15 +13,13 @@ public class WorkTimeChangeEvent extends ApplicationEvent {
 
     @ApiModelProperty(value = "机构id数组", notes = "受影响的机构")
     private final List<Long> orgIds;
+    private final Date ymdDate;
 
-   /* @ApiModelProperty(value = "作息时间列表", notes = "受影响的作息时间列表")
-    private final List<SysWorkTime> dataList;*/
-
-
-    public WorkTimeChangeEvent(Object source, List<Long> orgIds/*, List<SysWorkTime> dataList*/) {
+    public WorkTimeChangeEvent(Object source, List<Long> orgIds,Date ymdDate) {
         super(source);
         this.orgIds = orgIds;
       //  this.dataList = dataList;
+        this.ymdDate = ymdDate;
     }
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/listener/WorkTimeChangeEventListener.java

@@ -2,6 +2,7 @@ package com.xunmei.core.listener;
 
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.EventListener;
@@ -14,7 +15,8 @@ public class WorkTimeChangeEventListener implements ApplicationListener<WorkTime
 
     @Autowired
     private ICoreEduTrainingTaskService coreEduTrainingTaskService;
-
+    @Autowired
+    private ICoreMonitoringRetrievalTaskService coreMonitoringRetrievalTaskService;
     @Override
     @EventListener(WorkTimeChangeEvent.class)
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT,fallbackExecution = true)
@@ -22,6 +24,6 @@ public class WorkTimeChangeEventListener implements ApplicationListener<WorkTime
 
         coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
 
-
+        coreMonitoringRetrievalTaskService.taskChangeForTimeWorkChange(event);
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -8,6 +8,7 @@ import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTas
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
+import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
@@ -115,4 +116,6 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto);
 
     List<CoreSafetyExceptionData> selectMonitorExceptionData(DateTime time);
+
+    void taskChangeForTimeWorkChange(WorkTimeChangeEvent event);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -24,6 +24,7 @@ import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
 import com.xunmei.common.core.domain.retrieval.vo.TaskDataVo;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
+import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
@@ -583,6 +584,11 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         return Stream.of(overTimeExceptionData, numsExceptionData).flatMap(Collection::stream).collect(Collectors.toList());
     }
 
+    @Override
+    public void taskChangeForTimeWorkChange(WorkTimeChangeEvent event) {
+
+    }
+
     private boolean checkWorkTime(Date workstartTime, Date workendTime,Long orgId){
         Map<String,Object> map = new HashMap<>();
         map.put("workstartTime",DateUtil.format(workstartTime,"yyyy-MM-dd"));

soc-modules/soc-modules-core/src/test/java/com/test/TestController.java

@@ -21,7 +21,7 @@ public class TestController {
     @Test
     public void workTimeChangeEventTest () {
         List<Long> list = new ArrayList<>();
-        WorkTimeChangeEvent event = new WorkTimeChangeEvent(this, list);
-        coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
+        //WorkTimeChangeEvent event = new WorkTimeChangeEvent(this, list, ymdDate);
+        //coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeController.java

@@ -72,14 +72,12 @@ public class SysWorkTimeController extends BaseController {
 //    @RequiresPermissions("system:set:monthedit")
     @PostMapping("/month/edit")
     public AjaxResult monthedit(@RequestBody WorkTimeMonthEditNewDto sysWorkTimeSet) {
-        // Date today = DateUtil.beginOfDay(new Date());
+
         List<Long> orgIds = sysWorkTimeSet.getOrgIdList();
-        //List<SysWorkTime> exists = sysWorkTimeService.findByYmd(orgIds, today);
-        // List<SysWorkTime> workTimeLists = new ArrayList<>();
         for (Long orgId : orgIds) {
             sysWorkTimeService.batchnew(orgId, sysWorkTimeSet.getWorkTimeList());
         }
-        applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, orgIds));
+        //applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, orgIds, ymdDate));
 
         return AjaxResult.success();
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeServiceImpl.java

@@ -23,6 +23,7 @@ import com.xunmei.system.api.RemoteResumptionTaskService;
 import com.xunmei.system.api.domain.SysWorkTime;
 import com.xunmei.system.domain.SysWorkTimeSet;
 import com.xunmei.system.dto.SysWorkTimeDto;
+import com.xunmei.system.dto.WorkTimeMonthEditNewDto;
 import com.xunmei.system.mapper.SysWorkTimeMapper;
 import com.xunmei.system.mapper.SysWorkTimeSetMapper;
 import com.xunmei.system.service.ISysOrgService;
@@ -353,7 +354,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
                 AjaxResult result = remoteResumptionTaskService.dayTaskByWorkTime(param, SecurityConstants.INNER);
                 log.info("时间{}修改作息远程调用生成履职任务返回{}", new Date(), result.get("msg"));
             }
-
+            applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, ListUtil.list(true, s.getOrgId()), s.getYmdDate()));
         }
         return workTimeDtoList;
     }
@@ -403,6 +404,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor =  Exception.class)
     public void updateSysWorkTime(SysWorkTime sysWorkTime) {
 
         sysWorkTime.setUpdateTime(DateUtils.getNowDate());
@@ -422,7 +424,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
             log.info("时间{}修改作息远程调用生成履职任务返回{}", new Date(), result.get("msg"));
 
         }
-        applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, ListUtil.list(true, sysWorkTime.getOrgId())));
+        applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, ListUtil.list(true, sysWorkTime.getOrgId()), sysWorkTime.getYmdDate()));
     }
 
     /**