履职任务生成调试

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteWorkTimeService.java

@@ -30,7 +30,7 @@ public interface RemoteWorkTimeService {
 
 
     @PostMapping("/work/time/findWorkTimeByRange")
-    List<SysWorkTime> findWorkTimeByRange(@RequestBody WorkTimeDto workTimeDto, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<List<SysWorkTime>> findWorkTimeByRange(@RequestBody WorkTimeDto workTimeDto, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/work/time/checkWorkTime")
     Integer checkWorkTime(@RequestBody Map<String,Object> searchData,  @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteWorkTimesFallbackFactory.java

@@ -43,7 +43,7 @@ public class RemoteWorkTimesFallbackFactory implements FallbackFactory<RemoteWor
                 return null;
             }
             @Override
-            public List<SysWorkTime> findWorkTimeByRange(WorkTimeDto workTimeDto,String source) {
+            public R<List<SysWorkTime>> findWorkTimeByRange(WorkTimeDto workTimeDto,String source) {
                 return null;
             }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/TaskCreatingServiceImplBase.java

@@ -39,11 +39,15 @@ public abstract class TaskCreatingServiceImplBase<M extends BaseMapper<T>, T> ex
         workTimeDto.setOrgIdList(orgIds);
         workTimeDto.setStartTime(startTime);
         workTimeDto.setEndTime(endTime);
-        return workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE);
+//
+        return workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData();
     }
 
     public Map<Long, Boolean> orgWorkTimeStatusMap(Date now, CycleCommonEnum cycle, List<Long> orgIds) {
         List<SysWorkTime> times = selectWorkTimeList(now, cycle, orgIds);
+        if(CollectionUtil.isEmpty(times)){
+            return  new HashMap<>();
+        }
         Map<Long, List<SysWorkTime>> map = times.stream()
                 .filter(t -> ObjectUtil.equal(t.getIsEnable(), 1L))
                 .collect(Collectors.groupingBy(t -> t.getOrgId()));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -357,7 +357,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         workTimeDto.setStartTime(startTime);
         workTimeDto.setEndTime(endTime);
         List<SysWorkTime> workTimeList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE),
+                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData(),
                 ErrorMsgConstants.QUERY_ORG_WORK_TIME_ERROR);
         if (workTimeList.isEmpty()) {
             log.error("生成任务时，需要生成任务的机构均未营业,本次任务跳过!");

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -421,7 +421,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         workTimeDto.setStartTime(startTime);
         workTimeDto.setEndTime(endTime);
         List<SysWorkTime> workTimeList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE),
+                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData(),
                 ErrorMsgConstants.QUERY_ORG_WORK_TIME_ERROR);
         if (workTimeList.isEmpty()) {
             log.error("生成任务时，需要生成任务的机构均未营业,本次任务跳过!");
@@ -1116,7 +1116,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         workTimeDto.setOrgIdList(event.getOrgIds());
         workTimeDto.setStartTime(startTime);
         workTimeDto.setEndTime(endTime);
-        return workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE);
+        return workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData();
     }
 }
 

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

@@ -820,6 +820,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         workTimeDto.setOrgIdList(event.getOrgIds());
         workTimeDto.setStartTime(startTime);
         workTimeDto.setEndTime(endTime);
-        return workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE);
+        return workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData();
     }
 }

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

@@ -154,8 +154,8 @@ public class SysWorkTimeController extends BaseController {
 
     @ApiOperation(value = "查询机构范围内的作息配置")
     @PostMapping("/findWorkTimeByRange")
-    List<SysWorkTime>findWorkTimeByRange(@RequestBody WorkTimeDto workTimeDto) {
-        return sysWorkTimeService.findFutureWorkTime(workTimeDto);
+    R<List<SysWorkTime>> findWorkTimeByRange(@RequestBody WorkTimeDto workTimeDto) {
+        return  R.ok(sysWorkTimeService.findFutureWorkTime(workTimeDto));
     }
     @ApiOperation(value = "检查时间范围内有无作息")
     @InnerAuth

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

@@ -26,6 +26,6 @@ public class WorkTimeChangeEventListener implements ApplicationListener<WorkTime
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = false)
     public void onApplicationEvent(WorkTimeChangeEvent event) {
 
-//        remoteResumptionTaskService.rebuild(JSON.toJSONString(event), SecurityConstants.INNER);
+        remoteResumptionTaskService.rebuild(JSON.toJSONString(event), SecurityConstants.INNER);
     }
 }