Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

project_data/sql/0.0.5/quartz/quartz.sql

@@ -1,10 +1,15 @@
 UPDATE sys_job set `status`=0 WHERE job_name='生成每周履职任务';
 UPDATE sys_job set `status`=0 WHERE job_name='生成每月履职任务';
 UPDATE sys_job set `status`=0 WHERE job_name='调阅监控每日每周任务补救';
-UPDATE sys_job set `invoke_target`='RetrievalTask.retrieveDayTaskByDate' where id=118 and `job_name`= '调阅监控每日每周任务补救';
-UPDATE sys_job set `invoke_target`='RetrievalTask.retrieveMonthTaskByDate' where id=117 and `job_name`= '调阅监控每月季度半年年任务补救接口';
+UPDATE sys_job set `invoke_target`='RetrievalTask.retrieveDayTaskByDate' where job_id=118 and `job_name`= '调阅监控每日每周任务补救';
+UPDATE sys_job set `invoke_target`='RetrievalTask.retrieveMonthTaskByDate' where job_id=117 and `job_name`= '调阅监控每月季度半年年任务补救接口';
 -- UPDATE sys_job set `status`=0 WHERE job_name='调阅监控每月季度半年年任务补救接口';
 
 -- 预案演练逾期任务状态修改定时任务
 DELETE from sys_job where invoke_target='CoreDrillTask.updateDrillTaskStatus()';
 INSERT INTO `sys_job`(`job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ( '预案演练逾期任务状态修改', 'DEFAULT', 'CoreDrillTask.updateDrillTaskStatus()', '0 0 1 * * ?', '1', '1', '0', 'slsjyc', '2023-10-19 08:56:30', '', NULL);
+
+
+-- 修改安全指数定时任务cron(每月一号凌晨一点与每月一号凌晨二点)
+UPDATE  `sys_job` set cron_expression='0 0 1 1 * ?' where invoke_target like 'CoreSafetyIndexTask.collectExceptionData%';
+UPDATE  `sys_job` set cron_expression='0 0 2 1 * ?' where invoke_target like 'CoreSafetyIndexTask.calculateSafetyIndex%';

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/mapper/CoreIntroduceLetterApproveLogMapper.java

@@ -2,6 +2,7 @@ package com.xunmei.core.letter.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetterApproveLog;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * @author jingyuanchao

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/mapper/CoreIntroduceLetterMapper.java

@@ -114,4 +114,5 @@ public interface CoreIntroduceLetterMapper extends BaseMapper<CoreIntroduceLette
     void batchUpdateApproveLogStatus(@Param("requestList") List<CoreIntroduceLetterApproveLog> requestList);
     void updateApproveLogStatus(@Param("request") CoreIntroduceLetterApproveLog request);
 
+    int selectWebIndexNums(@Param("orgId") Long orgId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -318,10 +318,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
             result.setNums(0);
             return result;
         }
-        final int count = approveLogMapper.selectCount(new LambdaQueryWrapper<CoreIntroduceLetterApproveLog>()
-                        .eq(CoreIntroduceLetterApproveLog::getOrgId, req.getOrgId())
-                        .eq(CoreIntroduceLetterApproveLog::getApproveStatus, 0))
-                .intValue();
+        final int count = coreIntroduceLetterMapper.selectWebIndexNums(req.getOrgId());
         result.setNums(count);
         return result;
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -84,7 +84,6 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     }
 
     @ApiOperation(value = "手动初始化")
-    @RequiresPermissions("core:task:edit")
     @GetMapping(value = "initialization/{id}")
     public AjaxResult initialization(@PathVariable("id") Long id) {
         return success(coreMonitoringRetrievalTaskBuilderService.initializationTask(id));

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

@@ -167,7 +167,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
 
         DateTime time = DateUtil.parse(date, "yyyy-MM");
         int year = time.year();
-        int month = time.month()+1;
+        int month = time.month() + 1;
         //获取指标配置
         List<SafeIndexRuleCountVo> safeIndexConfigVoList = ruleService.findSafeIndexRuleVoList();
         //履职的指标配置
@@ -223,7 +223,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         Map<Long, List<CoreSafeMonthScore>> monthScoreMap = monthScores.stream().collect(Collectors.groupingBy(CoreSafeMonthScore::getOrgId));
         //遍历safeSourceDataMap
         //for (Long key : safetyDeDuctDataMap.keySet()) {
-        for(Map.Entry<Long, List<CoreSafetyDeductData>>smap:safetyDeDuctDataMap.entrySet()){
+        for (Map.Entry<Long, List<CoreSafetyDeductData>> smap : safetyDeDuctDataMap.entrySet()) {
             CoreSafeMonthScore monthScore = null;
             List<CoreSafeMonthScore> monthScoreOneList = monthScoreMap.get(smap.getKey());
             List<CoreSafetyDeductData> listOneList = smap.getValue();//safetyDeDuctDataMap.get(key);
@@ -440,6 +440,9 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     }
 
     private void extracted(List<SafeIndexRuleCountVo> questionIndexList, int year, int month, Long orgId, int dataSize, List<CoreSafetySourceData> sourceDataList) {
+        if (ObjectUtil.isEmpty(questionIndexList)) {
+            return;
+        }
         SafeIndexRuleCountVo indexConfigCountVo = questionIndexList.get(0);
         double deductScore = dataSize * indexConfigCountVo.getItemValue();
         //计算未确认的数据累计数
@@ -747,10 +750,8 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     }
 
     private DateTime dealTimeParam(String date) {
-        DateTime parse = DateUtil.beginOfMonth(DateUtil.parse(date));
-        parse.setField(DateField.MONTH, DateUtil.offsetMonth(parse, -1).month());
-
-        return parse;
+        final DateTime time = DateUtil.parse(date);
+        return DateUtil.offsetMonth(time, -1);
     }
 
     /**
@@ -809,8 +810,14 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     public void reCalculate(CoreSafetyIndexReCalculateDto request) {
         List<SysOrg> orgList = orgService.selectOrgByPath(request.getOrgId());
 
+        final Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.YEAR, request.getYear());
+        calendar.set(Calendar.MONTH, request.getMonth());
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        final Date date = calendar.getTime();
+
         //List<SysOrg> sysOrgList = orgService.selectSysOrgByParentId(request.getOrgId(), SecurityConstants.INNER);
-        DateTime time = DateUtil.offsetMonth(new Date(), -1);
+        DateTime time = DateUtil.offsetMonth(date, -1);
         DateTime startTime = DateUtil.beginOfMonth(time);
         DateTime endTime = DateUtil.endOfMonth(startTime);
         request.setQuarter(startTime.quarter());

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -396,4 +396,8 @@
         order by a.create_time
     </select>
 
+    <select id="selectWebIndexNums" resultType="int">
+        select count(1) from  core_introduce_letter_approve_log l inner join core_introduce_letter t on l.letter_id=t.id
+        where t.deleted=0 and l.org_id=#{orgId} and l.approve_status=0
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -486,13 +486,13 @@
 
         SELECT a.id as dataId,
         a.org_id as orgId,
-        a.src_task_id as extraField1,
-        a.confirm_status as extraField2,
-        a.submit_time as dataTime,
         a.org_name as orgName,
         a.org_path as orgPath,
         'core_question' as dataSource,
-        now() as createTime
+        a.submit_time as dataTime,
+        now() as createTime,
+        a.src_task_id as extraField1,
+        a.confirm_status as extraField2
         FROM core_question a
         where submit_time >= #{startTime}
         and submit_time <![CDATA[<=]]> #{endTime}

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

@@ -195,11 +195,12 @@ public class SysDeviceController extends BaseController {
                     SysDevice sysDevice = new SysDevice();
                     BeanUtils.copyProperties(d, sysDevice);
                     sysDevice.setDelFlag("0");
-                    SysOrg sysOrg = sysOrgService.selectByShortName(d.getOrgName());
+                    SysOrg sysOrg = sysOrgService.selectByOrgName(d.getOrgName());
                     if (null == d.getDeviceName() || null == d.getOrgName() || null == d.getAssetType() || null == d.getDeviceType()) {
                         throw new RuntimeException("请完善数据");
                     }
                     if (null != sysOrg) {
+                        sysDevice.setOrgName(sysOrg.getShortName());
                         SysDevice sysDevice1 = sysDeviceService.selectByHostNameAndOrgId(d.getHostName(), sysOrg.getId());
                         sysDevice.setOrgId(sysOrg.getId());
                         //查询资产类别

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgMapper.java

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 @Component
 public interface SysOrgMapper extends BaseMapper<SysOrg> {
-    List<SysOrg> selectByShortName(String name);
+    List<SysOrg> selectByOrgName(String name);
 
     /**
      * 查询【请填写功能名称】

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

@@ -164,7 +164,7 @@ public interface ISysOrgService extends IService<SysOrg> {
 
     List<SysOrg> selectChildrenFromDb(Long id);
 
-    SysOrg selectByShortName(String shortName);
+    SysOrg selectByOrgName(String shortName);
 
     String selectOrgNameByPath(Long orgId);
 

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

@@ -865,8 +865,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     @Override
-    public SysOrg selectByShortName(String shortName) {
-        List<SysOrg> sysOrgs = baseMapper.selectByShortName(shortName);
+    public SysOrg selectByOrgName(String orgName) {
+        List<SysOrg> sysOrgs = baseMapper.selectByOrgName(orgName);
         if (!CollectionUtil.isEmpty(sysOrgs)) {
             if (sysOrgs.size() > 1) {
                 throw new RuntimeException("机构名称重复，导入失败；请检查后重试");

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -686,8 +686,8 @@
         select c.* from sys_org c where c.type = #{orgType} and c.path like concat('%',#{path}, '%')  and deleted=0
 
     </select>
-    <select id="selectByShortName" resultType="com.xunmei.system.api.domain.SysOrg">
-            SELECT * FROM sys_org WHERE short_name=#{name}  AND deleted=0
+    <select id="selectByOrgName" resultType="com.xunmei.system.api.domain.SysOrg">
+            SELECT * FROM sys_org WHERE `name` =#{name}  AND deleted=0
     </select>
     <select id="findByOrgTypesAndParent" resultType="com.xunmei.system.api.domain.SysOrg">
         select c.* from sys_org c where c.path like concat('%',#{path}, '%')  and deleted=0