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

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskPageVo.java

@@ -31,6 +31,8 @@ public class CoreDrillTaskPageVo {
     @ApiModelProperty(value = "机构")
     private Long orgId;
 
+    private Integer orgType;
+
     @ApiModelProperty(value = "机构名称")
     private String orgName;
 
@@ -57,7 +59,6 @@ public class CoreDrillTaskPageVo {
     @ApiModelProperty(value = "演练地点")
     private String drillSite;
 
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "任务计划开始日期")
     private Date startDate;

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

@@ -39,6 +39,7 @@ import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.TaskCreatingServiceImplBase;
@@ -56,6 +57,7 @@ import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+import com.xunmei.system.api.vo.SysOrgVO;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -132,8 +134,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                     .in(CoreDrillTaskToRole::getDrillTaskId, idList));
             Map<Long, List<CoreDrillTaskToRole>> listMap = roleList.stream().collect(Collectors.groupingBy(CoreDrillTaskToRole::getDrillTaskId));*/
             final List<CoreDrillTaskPageVo> records = pageData.getRecords();
+            final List<SysOrgVO> cacheList = RedisUtils.getCacheList(CacheConstants.ORG_CACHE_LIST_KEY);
             for (CoreDrillTaskPageVo record : records) {
-                dealData(record, records, null);
+                dealData(record, records, cacheList);
             }
             // records.sort(getComparator());
         }
@@ -164,11 +167,12 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     }
 
 
-    private void dealData(CoreDrillTaskPageVo record, List<CoreDrillTaskPageVo> records, Map<Long, List<CoreDrillTaskToRole>> listMap) {
+    private void dealData(CoreDrillTaskPageVo record, List<CoreDrillTaskPageVo> records, List<SysOrgVO> cacheList) {
         record.setNo(records.indexOf(record) + 1);
         record.setTypeText(DrillType.getName(record.getType()));
         record.setStatusText(DrillDoStatus.getName(record.getStatus()));
         record.setCategoryText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, record.getCategory()));
+        cacheList.stream().filter(org -> ObjectUtil.equal(org.getId(), record.getOrgId())).findFirst().ifPresent(type -> record.setOrgType(type.getType()));
         /*List<CoreDrillTaskToRole> coreDrillTaskToRoles = listMap.get(record.getId());
         if (ObjectUtil.isNotEmpty(coreDrillTaskToRoles)) {
             record.setTaskRoleList(coreDrillTaskToRoles);
@@ -653,7 +657,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             planIdList = coreDrillPlanMapper.selectIdByParentId(plan.getId());
             planId = null;
         }
-        if (ObjectUtil.isAllEmpty(planId,planIdList)){
+        if (ObjectUtil.isAllEmpty(planId, planIdList)) {
             return new ArrayList<>();
         }
         request.setStartTime(DateUtil.beginOfMonth(request.getStartTime()));
@@ -727,6 +731,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer sign(CoreDrillTaskSignDto request) {
         CoreDrillTask DrillTask = getById(request.getId());
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -746,8 +751,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 .eq(CoreDrillTaskToUser::getType, 1)
                 .eq(CoreDrillTaskToUser::getSign, 0));
         if (null == unSignNums || unSignNums == 0) {
-            DrillTask.setStatus(DrillDoStatus.WAIT_COMMENT.getCode());
+            DrillTask.setStatus(DrillDoStatus.DONE.getCode());
             coreDrillTaskMapper.updateById(DrillTask);
+            buildDrillTaskPdf(request.getId());
         }
        /* final List<CoreDrillTaskToUser> taskToUserList = taskToUserMapper.selectList(new LambdaUpdateWrapper<CoreDrillTaskToUser>()
                 .eq(CoreDrillTaskToUser::getDrillTaskId, request.getId()));
@@ -900,7 +906,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         //drillTask.setComment(request.getComment());
         drillTask.setRecStatus(0);
         int i = baseMapper.updateById(drillTask);
-        buildDrillTaskPdf(request.getTaskId());
+        //buildDrillTaskPdf(request.getTaskId());
 
         return i;
     }

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

@@ -88,28 +88,28 @@ public class CoreSafeLevelServiceImpl extends ServiceImpl<CoreSafeLevelMapper, C
     @Override
     public int updateCoreSafeLevel(CoreSafeLevel coreSafeLevel) {
         final List<CoreSafeLevel> list = coreSafeLevelMapper.selectList(null);
-        list.removeIf(item-> ObjectUtil.equal(item.getId(),coreSafeLevel.getId()));
-        /*for (CoreSafeLevel level : list) {
-            if (level.getMinValue().intValue()<coreSafeLevel.getMinValue().intValue()&&coreSafeLevel.getMinValue().intValue()<level.getMaxValue().intValue()){
+        list.removeIf(item -> ObjectUtil.equal(item.getId(), coreSafeLevel.getId()));
+        for (CoreSafeLevel level : list) {
+            if (level.getMinValue().intValue() < coreSafeLevel.getMinValue().intValue() && coreSafeLevel.getMinValue().intValue() < level.getMaxValue().intValue()) {
                 throw new RuntimeException("最小值已存在其他等级区间,请重新设置!");
             }
-            if (level.getMinValue().intValue()<coreSafeLevel.getMaxValue().intValue()&&coreSafeLevel.getMaxValue().intValue()<level.getMaxValue().intValue()){
-                throw new RuntimeException("最小值已存在其他等级区间,请重新设置!");
+            if (level.getMinValue().intValue() < coreSafeLevel.getMaxValue().intValue() && coreSafeLevel.getMaxValue().intValue() < level.getMaxValue().intValue()) {
+                throw new RuntimeException("最大值已存在其他等级区间,请重新设置!");
             }
-        }*/
-        String desc= getDesc(coreSafeLevel);
+        }
+        String desc = getDesc(coreSafeLevel);
         coreSafeLevel.setDescription(desc);
         return coreSafeLevelMapper.updateById(coreSafeLevel);
     }
 
     private String getDesc(CoreSafeLevel coreSafeLevel) {
-        if (coreSafeLevel.getId() == 1){
-            return coreSafeLevel.getMinValue()+"分(不含)以上";
+        if (coreSafeLevel.getId() == 1) {
+            return coreSafeLevel.getMinValue() + "分(不含)以上";
         }
-        if (coreSafeLevel.getId() == 2||coreSafeLevel.getId() == 3){
-            return coreSafeLevel.getMinValue()+"分(不含)与"+coreSafeLevel.getMaxValue()+"分(含)之间 ";
+        if (coreSafeLevel.getId() == 2 || coreSafeLevel.getId() == 3) {
+            return coreSafeLevel.getMinValue() + "分(不含)与" + coreSafeLevel.getMaxValue() + "分(含)之间 ";
         }
-        return coreSafeLevel.getMaxValue()+"分及以下";
+        return coreSafeLevel.getMaxValue() + "分及以下";
     }