安全指数代码提交

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

@@ -622,7 +622,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public List<CoreSafetyExceptionData> selectMonitorExceptionData(DateTime time) {
-        SysRole role = roleService.getRoleByName("网点安全员", SecurityConstants.INNER);
+        SysRole role = roleService.getRoleByName("网点负责人", SecurityConstants.INNER);
         //扩展字段1：任务状态 扩展字段2 计划id
         List<CoreSafetyExceptionData> exceptionData = baseMapper.selectMonitorExceptionData(time.year(), time.quarter(), time.month() + 1, role.getId());
         exceptionData.removeIf(item -> ObjectUtil.isNull(item.getDataId()));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/ICoreSafetyExceptionDataService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
 import com.xunmei.common.core.domain.safetyindex.dto.CoreSafetyIndexReCalculateDto;
-import com.xunmei.common.core.domain.safetyindex.dto.SafeScoreSourceDto;
 
 import java.util.Date;
 import java.util.List;
@@ -35,5 +34,4 @@ public interface ICoreSafetyExceptionDataService extends IService<CoreSafetyExce
 
     void deleteAndUpdateByOrgIdAndDataTime(List<Long> orgIds, DateTime startTime, DateTime endTime, CoreSafetyIndexReCalculateDto request);
 
-    Object findSource(SafeScoreSourceDto request);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafeMonthScoreServiceImpl.java

@@ -17,10 +17,10 @@ import com.xunmei.common.core.domain.safetyindex.vo.*;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.resumption.service.ResumptionService;
 import com.xunmei.core.safetyindex.mapper.CoreSafeLevelMapper;
 import com.xunmei.core.safetyindex.mapper.CoreSafeMonthScoreMapper;
 import com.xunmei.core.safetyindex.service.ICoreSafeMonthScoreService;
-import com.xunmei.core.safetyindex.service.ICoreSafetyExceptionDataService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
@@ -33,6 +33,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.xunmei.core.safetyindex.service.impl.CoreSafetyExceptionDataServiceImpl.RESUMPTION_DICT_CODE;
+
 /**
  * 安全指数机构月度得分Service业务层处理
  *
@@ -44,7 +46,7 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
     @Autowired
     private CoreSafeMonthScoreMapper coreSafeMonthScoreMapper;
     @Autowired
-    private ICoreSafetyExceptionDataService exceptionDataService;
+    private ResumptionService resumptionService;
     @Autowired
     private RemoteOrgService orgService;
     @Autowired
@@ -78,10 +80,9 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
             wrapper.eq(CoreSafeMonthScore::getDataMonth, request.getDataMonth())
                     .eq(CoreSafeMonthScore::getDataYear, request.getDataYear());
         }
-        Long levelId = request.getLevelId();
-        if (null != levelId) {
-            wrapper.eq(CoreSafeMonthScore::getLevelId, levelId);
-        }
+
+        wrapper.eq(ObjectUtil.isNull(request.getLevelId()),CoreSafeMonthScore::getLevelId, request.getLevelId());
+
         Page<CoreSafeMonthScore> pageRequest = request.getPageRequest();
         Page<CoreSafeMonthScore> page = baseMapper.selectPage(pageRequest, wrapper);
         if (page.getRecords().size() > 0) {
@@ -142,7 +143,16 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
     @Override
     public Object findSource(SafeScoreSourceDto request) {
 
-        return exceptionDataService.findSource(request);
+        switch (request.getTypeCode()) {
+            case RESUMPTION_DICT_CODE:
+                List<SafeScoreResumptionDataVo> source = resumptionService.findSource(request);
+                return source;
+           /* case MONITORING_DICT_CODE:
+                return monitoringRetrievalTaskService.findSource(request);
+            case QUESTION_DICT_CODE:
+                return questionService.findSource(request);*/
+        }
+        return null;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyExceptionDataServiceImpl.java

@@ -13,9 +13,7 @@ import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.safetyindex.domain.*;
 import com.xunmei.common.core.domain.safetyindex.dto.CoreSafetyIndexReCalculateDto;
-import com.xunmei.common.core.domain.safetyindex.dto.SafeScoreSourceDto;
 import com.xunmei.common.core.domain.safetyindex.vo.SafeIndexRuleCountVo;
-import com.xunmei.common.core.domain.safetyindex.vo.SafeScoreResumptionDataVo;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.core.question.service.IQuestionService;
@@ -23,10 +21,13 @@ import com.xunmei.core.resumption.service.ResumptionService;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import com.xunmei.core.safetyindex.mapper.CoreSafetyExceptionDataMapper;
 import com.xunmei.core.safetyindex.service.*;
+import com.xunmei.core.thread.ThreadPoolConfig;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.vo.SysOrgVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -84,7 +86,9 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     private ICoreSafeLevelService safeLevelService;
     @Autowired
     private RemoteOrgService orgService;
-
+    @Autowired
+    @Qualifier(ThreadPoolConfig.SOC_EXECUTOR)
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void countExceptionData(String date) {
@@ -92,13 +96,21 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
 
         //清空本月的异常数据
         this.deleteExceptionData(time);
-        //获取安保履职的数据
-        doResumptionExceptionData(time);
-        //获取问题整改的异常数据
-        doQuestionExceptionData(null, time);
-        //获取监控调阅的异常数据
-        doMonitorExceptionData(time);
 
+        CompletableFuture.runAsync(() -> {
+            //获取安保履职的数据
+            doResumptionExceptionData(time);
+        },threadPoolTaskExecutor);
+
+        CompletableFuture.runAsync(() -> {
+            //获取问题整改的异常数据
+            doQuestionExceptionData(null, time);
+        },threadPoolTaskExecutor);
+
+        CompletableFuture.runAsync(() -> {
+            //获取监控调阅的异常数据
+            doMonitorExceptionData(time);
+        },threadPoolTaskExecutor);
     }
 
 
@@ -809,17 +821,5 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         this.deleteAndUpdateByOrgIdAndDataTime(idList, startTime, endTime, request);
     }
 
-    @Override
-    public Object findSource(SafeScoreSourceDto request) {
-        switch (request.getTypeCode()) {
-            case RESUMPTION_DICT_CODE:
-                List<SafeScoreResumptionDataVo> source = resumptionService.findSource(request);
-                return source;
-           /* case MONITORING_DICT_CODE:
-                return monitoringRetrievalTaskService.findSource(request);
-            case QUESTION_DICT_CODE:
-                return questionService.findSource(request);*/
-        }
-        return null;
-    }
+
 }