代码漏洞修复

soc-auth/pom.xml

@@ -59,9 +59,10 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
+            <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <version>2.20.0</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/ip/IpUtils.java

@@ -118,6 +118,8 @@ public class IpUtils
                 {
                     case SECTION_6:
                         return true;
+                    default:
+                        return false;
                 }
             default:
                 return false;

soc-common/soc-common-datascope/src/main/java/com/xunmei/common/datascope/aspect/DataScopeAspect.java

@@ -15,7 +15,9 @@ import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 数据过滤处理
@@ -92,7 +94,7 @@ public class DataScopeAspect
     public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
     {
         StringBuilder sqlString = new StringBuilder();
-        List<String> conditions = new ArrayList<String>();
+        Set<String> conditions = new HashSet();
 
         for (SysRole role : user.getRoles())
         {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -318,12 +318,13 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             throw new RuntimeException("您没有该任务的评价权限");
         }
         List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(coreEvaluateTask.getPlanId());
+        Set<Long> rIds = new HashSet<>(roleByEvaluateId);
         List<SysRole> roleByUserId = remoteRoleService.getRoleByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
         List<Long> collect = roleByUserId.stream().map(SysRole::getId).collect(Collectors.toList());
         boolean admin = false;
         if (null != roleByUserId || null != collect) {
             for (Long l : collect) {
-                if (roleByEvaluateId.contains(l)) {
+                if (rIds.contains(l)) {
                     admin = true;
                     break;
                 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/TaskController.java

@@ -29,10 +29,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -391,12 +388,14 @@ public class TaskController {
         }
         //去掉传过来的机构id中不在计划关联机构中的数据,,得到要生成任务的机构id
         List<Long> orgIdsByPlanListNew = new ArrayList<>();
+        Set<Long> sOrgIds = new HashSet(orgIdsByPlanListNew);
         if (CollectionUtils.isNotEmpty(orgIds)) {
             for (Long orgId : orgIds) {
-                if (orgIdsByPlans.contains(orgId)) {
-                    orgIdsByPlanListNew.add(orgId);
+                if (sOrgIds.contains(orgId)) {
+                    sOrgIds.add(orgId);
                 }
             }
+            orgIdsByPlanListNew.addAll(sOrgIds);
         } else {
             orgIdsByPlanListNew = orgIdsByPlans;
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/ResumptionBusiness.java

@@ -61,137 +61,6 @@ public class ResumptionBusiness {
     private RemoteOrgService remoteOrgService;
     @Autowired
     private IQuestionService questionService;
-//    public Map<String, Object> tasktotal(ResumptionTaskDto request) throws ParseException {
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//        final DateHelper dateTime = new DateHelper(sdf.parse(request.getDateTime()));
-//        int year = dateTime.getYear();
-//        int month = dateTime.getMonth();
-//        int week = dateTime.getWeek();
-//        int quarter = dateTime.getQuarter();
-//        int halfyear = dateTime.getHalfyear();
-//        String time = request.getDateTime();
-//        Map<String, Object> tasktotal = new HashMap<>();
-//        if (request.getTypeCode().equals("day")) {//返回每日，没小时的数据
-//            //统计数据
-//            Map<String, Object> hourtotal = new HashMap<>();
-//            Map<String, Object> daytotal = new HashMap<>();
-//            //统计每日的所有任务数据
-//            //List<Resumption> dayList = resumptionService.findListByDay(time,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()));
-//            List<Map<String, Object>> dayList = resumptionService.findDayTaskList(year, quarter, time, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()));
-//            //List<Map<String,Object>> dayList = objectMapper.findDayTaskList(year,quarter,time,Long.valueOf(request.getRoleId()),Long.valueOf(request.getOrgid()));
-//            //统计每小时的任务数据
-//            int hourfinishnum = (int) dayList.stream().filter(r -> (int) r.get("type") == 6 && ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
-//            int hourundonenum = (int) dayList.stream().filter(r -> (int) r.get("type") == 6 && (int) r.get("status") == 3).count();
-//            int hourwaitenum = (int) dayList.stream().filter(r -> (int) r.get("type") == 6 && (int) r.get("status") == 0).count();
-//            int hourtotalall = (int) dayList.stream().filter(r -> (int) r.get("type") == 6).count();
-//            hourtotal.put("finishnum", hourfinishnum);
-//            hourtotal.put("undonenum", hourundonenum);
-//            hourtotal.put("waitenum", hourwaitenum);
-//            hourtotal.put("tasknum", hourtotalall);
-//            tasktotal.put("hourtotal", hourtotal);
-//            //统计每日的任务数据
-//            int dayfinishnum = (int) dayList.stream().filter(r -> (int) r.get("type") == 0 && ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
-//            int dayundonenum = (int) dayList.stream().filter(r -> (int) r.get("type") == 0 && (int) r.get("status") == 3).count();
-//            int daywaitnum = (int) dayList.stream().filter(r -> (int) r.get("type") == 0 && (int) r.get("status") == 0).count();
-//            int daytotalall = (int) dayList.stream().filter(r -> (int) r.get("type") == 0).count();
-//            daytotal.put("finishnum", dayfinishnum);
-//            daytotal.put("undonenum", dayundonenum);
-//            daytotal.put("waitenum", daywaitnum);
-//            daytotal.put("tasknum", daytotalall);
-//            tasktotal.put("daytotal", daytotal);
-//
-//            List<Map<String, Object>> hourlistMap = dayList.stream().filter(r -> (int) r.get("type") == 6).collect(Collectors.toList());
-//            List<ResumptionTaskListVo> hourlist = taskListVo(hourlistMap, 6);
-//            tasktotal.put("hourlist", hourlist);
-//            List<Map<String, Object>> daylistMap = dayList.stream().filter(r -> (int) r.get("type") == 0).collect(Collectors.toList());
-//            List<ResumptionTaskListVo> daylist = taskListVo(daylistMap, 0);
-//            tasktotal.put("daylist", daylist);
-//            //获取任务列表
-//        }
-//        if (request.getTypeCode().equals("month")) {//返回没月，每周的数据
-//            //统计数据
-//            Map<String, Object> weektotal = new HashMap<>();
-//            Map<String, Object> monthtotal = new HashMap<>();
-//            //统计每周的任务数据
-//            List<Map<String, Object>> weekList = resumptionService.findMonthTaskList(year, month, 1, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
-//            //统计每月的任务数据
-//            List<Map<String, Object>> monthList = resumptionService.findMonthTaskList(year, month, 2, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
-//            int weekfinishnum = (int) weekList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
-//            int weekundonenum = (int) weekList.stream().filter(r -> (int) r.get("status") == 3).count();
-//            int weekwaitnum = (int) weekList.stream().filter(r -> (int) r.get("status") == 0).count();
-//            int weektotall = weekList.size();
-//            weektotal.put("finishnum", weekfinishnum);
-//            weektotal.put("undonenum", weekundonenum);
-//            weektotal.put("waitenum", weekwaitnum);
-//            weektotal.put("tasknum", weektotall);
-//            tasktotal.put("weektotal", weektotal);
-//            int monthfinishnum = (int) monthList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
-//            int monthundonenum = (int) monthList.stream().filter(r -> (int) r.get("status") == 3).count();
-//            int monthwaitnum = (int) monthList.stream().filter(r -> (int) r.get("status") == 0).count();
-//            int monthtotall = monthList.size();
-//            monthtotal.put("finishnum", monthfinishnum);
-//            monthtotal.put("undonenum", monthundonenum);
-//            monthtotal.put("waitenum", monthwaitnum);
-//            monthtotal.put("tasknum", monthtotall);
-//            tasktotal.put("monthtotal", monthtotal);
-//            List<ResumptionTaskListVo> weeklist = taskListVo(weekList, 1);
-//            List<ResumptionTaskListVo> monthlist = taskListVo(monthList, 2);
-//            tasktotal.put("weeklist", weeklist);
-//            tasktotal.put("monthlist", monthlist);
-//            //获取任务列表
-//
-//        }
-//        if (request.getTypeCode().equals("year")) {//返回每季度，每半年，和每年的数据
-//            //统计数据
-//            Map<String, Object> quartertotal = new HashMap<>();
-//            Map<String, Object> halfyeartotal = new HashMap<>();
-//            Map<String, Object> yeartotal = new HashMap<>();
-//            //统计每季度的任务数据
-//            List<Map<String, Object>> quarterList = resumptionService.findYearTaskList(year, 3, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
-//            List<Map<String, Object>> halfyearList = resumptionService.findYearTaskList(year, 4, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), quarter);
-//            List<Map<String, Object>> yearList = resumptionService.findYearTaskList(year, 5, Long.valueOf(request.getRoleId()), Long.valueOf(request.getOrgid()), 1);
-//            int quarterfinishnum = (int) quarterList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
-//            int quarterundonenum = (int) quarterList.stream().filter(r -> (int) r.get("status") == 3).count();
-//            int quarterwaitnum = (int) quarterList.stream().filter(r -> (int) r.get("status") == 0).count();
-//            int quartertotall = quarterList.size();
-//            quartertotal.put("finishnum", quarterfinishnum);
-//            quartertotal.put("undonenum", quarterundonenum);
-//            quartertotal.put("waitenum", quarterwaitnum);
-//            quartertotal.put("tasknum", quartertotall);
-//            tasktotal.put("quartertotal", quartertotal);
-//            //统计每半年的任务数据
-//            int halfyearfinishnum = (int) halfyearList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
-//            int halfyearundonenum = (int) halfyearList.stream().filter(r -> (int) r.get("status") == 3).count();
-//            int halfyearwaitnum = (int) halfyearList.stream().filter(r -> (int) r.get("status") == 0).count();
-//            int halfyeartotalall = halfyearList.size();
-//            halfyeartotal.put("finishnum", halfyearfinishnum);
-//            halfyeartotal.put("undonenum", halfyearundonenum);
-//            halfyeartotal.put("waitenum", halfyearwaitnum);
-//            halfyeartotal.put("tasknum", halfyeartotalall);
-//            tasktotal.put("halfyeartotal", halfyeartotal);
-//            //统计每年的任务数据
-//            int yearfinishnum = (int) yearList.stream().filter(r -> ((int) r.get("status") == 1 || (int) r.get("status") == 2 || (int) r.get("status") == 5)).count();
-//            int yearundonenum = (int) yearList.stream().filter(r -> (int) r.get("status") == 3).count();
-//            int yearwaitnum = (int) yearList.stream().filter(r -> (int) r.get("status") == 0).count();
-//            int yeartotalall = yearList.size();
-//            yeartotal.put("finishnum", yearfinishnum);
-//            yeartotal.put("undonenum", yearundonenum);
-//            yeartotal.put("waitenum", yearwaitnum);
-//            yeartotal.put("tasknum", yeartotalall);
-//            tasktotal.put("yeartotal", yeartotal);
-//
-//            List<ResumptionTaskListVo> quarterlist = taskListVo(quarterList, 3);
-//            List<ResumptionTaskListVo> halfyearlist = taskListVo(halfyearList, 4);
-//            List<ResumptionTaskListVo> yearlist = taskListVo(yearList, 5);
-//
-//            tasktotal.put("quarterlist", quarterlist);
-//            tasktotal.put("halfyearlist", halfyearlist);
-//            tasktotal.put("yearlist", yearlist);
-//
-//
-//        }
-//        return tasktotal;
-//    }
 
     public Date LocalDateTimeToDate(LocalDateTime localDateTime) {
 //    LocalDateTime localDateTime = LocalDateTime.now();
@@ -236,6 +105,8 @@ public class ResumptionBusiness {
                     case 2:
                         strhalfyear = "下半年";
                         break;
+                    default:
+                        break;
                 }
             } else if (ObjectUtil.equal(type, 7)) {
                 currentFormat = sdfta;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -160,6 +160,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
             return;
         }
         List<Long> hsOrgIds = getHangsheOrgIds();
+        Set<Long> sOrgIds = new HashSet<>(hsOrgIds);
         List<AppPlan> appPlans = new ArrayList<>();
         for (Object plan : plans) {
             if (plan.getClass() != AppPlan.class) {
@@ -167,7 +168,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
             }
 
             AppPlan p = (AppPlan) plan;
-            if (!hsOrgIds.contains(p.getPlanOfOrgId())) {
+            if (!sOrgIds.contains(p.getPlanOfOrgId())) {
                 continue;
             }
             if (ObjectUtil.equal(p.getTaskHasCompleted(), 1)) {
@@ -508,12 +509,13 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         }
 
         short realOrder = 0;
+        Set<Short> ex = new HashSet<>(executedOrders);
         for (Short i = 1; i <= count; i++) {
             if (!rangeMap.containsKey(i)) {
                 continue;
             }
             realOrder++;
-            if (ObjectUtil.isNotEmpty(executedOrders) && executedOrders.contains(realOrder)) {
+            if (ObjectUtil.isNotEmpty(executedOrders) && ex.contains(realOrder)) {
                 continue;
             }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -242,11 +242,12 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
 
 //        execOrgs = execOrgs.stream().filter(o -> ObjectUtil.equal(o.getIsLock(), false)).collect(Collectors.toList());
         //此处循环所有执行检查的机构
+        Set<Integer> cts = new HashSet<>(checkOrgTypes);
         for (SysOrg org : execOrgs) {
             List<SysOrg> checkOrgs = new ArrayList<>();
             if (ObjectUtil.isEmpty(checkOrg)) {
                 //如果没有选择具体受检的机构，则根据受检机构类型查询
-                if (checkOrgTypes.contains(execOrgType)) {
+                if (cts.contains(execOrgType)) {
                     checkOrgs.add(org);
                 }
 
@@ -343,11 +344,12 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
         execOrgs = execOrgs.stream().filter(o -> o.getIsLock() < 1).collect(Collectors.toList());
 
         //此处循环所有执行检查的机构
+        Set<Integer> scots = new HashSet<>(checkOrgTypes);
         for (SysOrg org : execOrgs) {
             List<SysOrg> checkOrgs = new ArrayList<>();
             if (ObjectUtil.isEmpty(checkOrg)) {
                 //如果没有选择具体受检的机构，则根据受检机构类型查询
-                if (checkOrgTypes.contains(execOrgType)) {
+                if (scots.contains(execOrgType)) {
                     checkOrgs.add(org);
                 }
 
@@ -610,111 +612,6 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
         buildTask(safetyTaskBuildDto.getDate(), tasks, map.get("start"), map.get("end"), true, 0);
     }
 
-//    //检查参数
-//    public List<String> checkParam(SafetyTaskBuildDto safetyTaskBuildDto) {
-//        List<String> list = new ArrayList<>();
-//        DateHelper dateHelper = new DateHelper(safetyTaskBuildDto.getDate());
-//        Map<String, Date> map = null;
-//        List<CoreSafecheckPlan> plans = null;
-//        if (safetyTaskBuildDto.getPlanId() != null) {
-//            plans = new ArrayList<>();
-//            CoreSafecheckPlan coreSafecheckPlan = planMapper.selectById(safetyTaskBuildDto.getPlanId());
-//            if (coreSafecheckPlan.getPlanStatus() == 1) {
-//                list.add("当前计划:" + coreSafecheckPlan.getPlanName() + "已禁用!");
-//                return list;
-//            }
-//            plans.add(coreSafecheckPlan);
-//            map = DateHelper.getStartAndEnd(safetyTaskBuildDto.getDate(), Math.toIntExact(coreSafecheckPlan.getPlanCycle()));
-//        } else {
-//            LambdaUpdateWrapper<CoreSafecheckPlan> qw = new LambdaUpdateWrapper<>();
-//            qw.eq(CoreSafecheckPlan::getPlanCycle, safetyTaskBuildDto.getPlanCycle());
-//            qw.eq(CoreSafecheckPlan::getIsDeleted, 0);
-//            qw.eq(CoreSafecheckPlan::getPlanStatus, 0);
-//            plans = planMapper.selectList(qw);
-//            map = DateHelper.getStartAndEnd(safetyTaskBuildDto.getDate(), safetyTaskBuildDto.getPlanCycle());
-//        }
-//        if (CollectionUtil.isEmpty(plans)) {
-//            list.add("计划不存在");
-//        }
-//        for (CoreSafecheckPlan plan : plans) {
-//            if (ObjectUtil.notEqual(plan.getPlanCycle(), safetyTaskBuildDto.getPlanCycle())) {
-//                list.add("计划周期与计划不匹配");
-//                break;
-//            }
-//        }
-//        if (map.keySet().size() == 0) {
-//            list.add("计划周期不存在");
-//        }
-//        if (ObjectUtil.isNotEmpty(safetyTaskBuildDto.getExecOrgIdList())) {
-//            List<Long> execOrgIdList = safetyTaskBuildDto.getExecOrgIdList();
-//            for (CoreSafecheckPlan plan : plans) {
-//                List<CoreSafecheckPlanToExecOrg> coreSafecheckPlanToExecOrgs = planToExecOrgMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToExecOrg>().eq(CoreSafecheckPlanToExecOrg::getPlanId, plan.getId()));
-//                if (CollectionUtil.isEmpty(coreSafecheckPlanToExecOrgs)) {
-//                    //说明计划是根据机构类型配置的，获取所有的机构类型，如果参数中执行机构的机构类型存在不属于此计划的执行机构，则返回错误
-//                    List<Long> orgTypeList = orgService.selectOrgTypeByIdList(execOrgIdList, SecurityConstants.INNER);
-//                    for (Long orgType : orgTypeList) {
-//                        if (ObjectUtil.notEqual(orgType, plan.getExecOrgType())) {
-//                            list.add("参数中," + plan.getPlanName() + "计划下存在错误执行机构数据");
-//                            break;
-//                        }
-//                    }
-//                } else {
-//                    //获取当前计划的所有执行机构，如果参数中存在不属于此计划的执行机构，则返回错误
-//                    List<Long> collect = coreSafecheckPlanToExecOrgs.stream().map(CoreSafecheckPlanToExecOrg::getOrgId).collect(Collectors.toList());
-//                    for (Long execOrgId : execOrgIdList) {
-//                        if (!collect.contains(execOrgId)) {
-//                            list.add("参数中," + plan.getPlanName() + "计划下存在错误执行机构数据");
-//                            break;
-//                        }
-//                    }
-//                }
-//
-//
-//            }
-//
-//        }
-//        if (ObjectUtil.isNotEmpty(safetyTaskBuildDto.getCheckOrgIdList())) {
-//            List<Long> checkOrgIdList = safetyTaskBuildDto.getCheckOrgIdList();
-//            for (CoreSafecheckPlan plan : plans) {
-//                List<CoreSafecheckPlanToCheckOrg> coreSafecheckPlanToCheckOrgs = planToCheckOrgMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToCheckOrg>().eq(CoreSafecheckPlanToCheckOrg::getPlanId, plan.getId()));
-//                if (ObjectUtil.isEmpty(coreSafecheckPlanToCheckOrgs)) {
-//                    //说明计划是根据机构类型配置的，获取所有的机构类型，如果参数中受检机构的机构类型存在不属于此计划的受检机构，则返回错误
-//                    List<Long> orgTypeList = orgService.selectOrgTypeByIdList(checkOrgIdList, SecurityConstants.INNER);
-//                    for (Long orgType : orgTypeList) {
-//                        if (ObjectUtil.notEqual(orgType, plan.getCheckOrgType())) {
-//                            list.add("参数中," + plan.getPlanName() + "计划下存在错误检查机构数据");
-//                            break;
-//                        }
-//                    }
-//                } else {
-//                    //获取当前计划的所有受检机构，如果参数中存在不属于此计划的受检机构，则返回错误
-//                    List<Long> collect = coreSafecheckPlanToCheckOrgs.stream().map(CoreSafecheckPlanToCheckOrg::getOrgId).collect(Collectors.toList());
-//                    for (Long checkOrgId : checkOrgIdList) {
-//                        if (!collect.contains(checkOrgId)) {
-//                            list.add("参数中," + plan.getPlanName() + "计划下存在错误检查机构数据");
-//                            break;
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//        if (ObjectUtil.isNotEmpty(safetyTaskBuildDto.getRoleIdList())) {
-//            List<Long> roleIdList = safetyTaskBuildDto.getRoleIdList();
-//            for (CoreSafecheckPlan plan : plans) {
-//                List<CoreSafecheckPlanToRole> coreSafecheckPlanToRoles = planToRoleMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToRole>().eq(CoreSafecheckPlanToRole::getPlanId, plan.getId()));
-//                List<Long> collect = coreSafecheckPlanToRoles.stream().map(CoreSafecheckPlanToRole::getRoleId).collect(Collectors.toList());
-//                if (!new HashSet<>(collect).containsAll(roleIdList)) {
-//                    list.add("参数中," + plan.getPlanName() + "计划下存在错误角色数据");
-//                    break;
-//                }
-//            }
-//        }
-//        if (DateUtil.beginOfDay(map.get("end")).isBefore(DateUtil.beginOfDay(new Date()))) {
-//            list.add("计划周期已过");
-//        }
-//        return list;
-//
-//    }
 
     @Override
     public void rebuildDayTask(List<Long> orgIds, SysWorkTime workTime) {
@@ -744,6 +641,8 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             case NONE:
                 planCycle = 6;
                 break;
+            default:
+                break;
 
         }
         List<SysOrg> orgs = remoteOrgService.selectByOrgIdList(orgIds, SecurityConstants.INNER);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -101,8 +101,9 @@ public class SafetyCheckRuleItemServiceImpl
         final List<Long> pointIds = safetyCheckRulePointMapper.selectPointIds(item.getId());
         if (pointIds.size() > 0) {
             List<Long> idList2 = pointDtoList.stream().map(SafetyCheckRulePointDto::getId).collect(Collectors.toList());
+            Set<Long> ids2 = new HashSet<>(idList2);
             for (Long pointId : pointIds) {
-                if (!idList2.contains(pointId)) {
+                if (!ids2.contains(pointId)) {
                     Integer isUsed = safetyCheckRulePointMapper.checkIsUsed(pointId);
                     if (isUsed == null) {
                         safetyCheckRulePointMapper.deleteById(pointId);

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

@@ -161,10 +161,11 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
                 return source;
             case MONITORING_DICT_CODE:
                 return monitoringRetrievalTaskService.findSource(request);
+            default:
+                return null;
            /* 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

@@ -354,7 +354,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
                 .collect(Collectors.toList());
         //所有逾期的数据
         List<CoreSafetyExceptionData> overDueDataList = dataList.stream().filter(data -> ObjectUtil.equal(data.getExtraField1(), MONITORING_OVERDUE_STATUS)).collect(Collectors.toList());
-        List<SafeIndexRuleCountVo> usedConfigList = new ArrayList<>();
+        Set<SafeIndexRuleCountVo> usedConfigList = new HashSet<>();
         //循环配置的连续数
         for (SafeIndexRuleCountVo monitoringContinuousNum : monitoringContinuousNums) {
             if (usedConfigList.contains(monitoringContinuousNum)) {
@@ -533,7 +533,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
                 .sorted(Comparator.comparing(SafeIndexRuleCountVo::getIndicatorDays).reversed())
                 .collect(Collectors.toList());
         //使用过的连续数配置项
-        List<SafeIndexRuleCountVo> usedConfigList = new ArrayList<>();
+        Set<SafeIndexRuleCountVo> usedConfigList = new HashSet<>();
         for (SafeIndexRuleCountVo indexRuleCountVo : resumptionContinuousIndexList) {
             Integer indicatorDays = indexRuleCountVo.getIndicatorDays();
             if (usedConfigList.contains(indexRuleCountVo)) {
@@ -626,7 +626,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         if (CollectionUtil.isEmpty(days)) {
             return result;
         }
-        List<String> list = new ArrayList<>();
+        Set<String> list = new HashSet<>();
         LocalDate preDate = LocalDate.parse(days.get(0), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         for (int i = 1; i < days.size(); i++) {
             Map<Integer, List<String>> map = new HashMap<>();

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

@@ -2,10 +2,7 @@ package com.xunmei.system.controller;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.excel.EasyExcel;
@@ -214,7 +211,8 @@ public class SysDeviceController extends BaseController {
                         //根据资产类别和设备分类查询
                         List<SysDictData> deviceTypeByAssetType = dictTypeService.getDeviceTypeByAssetType(sys_asset_type);
                         List<String> collect = deviceTypeByAssetType.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
-                        if (collect.contains(d.getDeviceType())) {
+                        Set<String> sc = new HashSet<>();
+                        if (sc.contains(d.getDeviceType())) {
                             deviceTypeByAssetType.forEach(de -> {
                                 if (de.getDictLabel().equals(d.getDeviceType())) {
                                     sysDevice.setDeviceType(de.getDictValue());

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

@@ -498,9 +498,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public List<SysOrg> buildDeptTree(List<SysOrg> depts) {
         List<SysOrg> returnList = new ArrayList<SysOrg>();
         List<Long> tempList = depts.stream().map(SysOrg::getId).collect(Collectors.toList());
+        Set<Long> sts = new HashSet<>(tempList);
         for (SysOrg dept : depts) {
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(dept.getParentId())) {
+            if (!sts.contains(dept.getParentId())) {
                 recursionFn(depts, dept);
                 returnList.add(dept);
             }

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

@@ -200,10 +200,11 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
         List<Long> tempList = menus.stream().map(SysMenu::getId).collect(Collectors.toList());
+        Set<Long> sts = new HashSet<>(tempList);
         for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
             SysMenu menu = (SysMenu) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(menu.getParentId())) {
+            if (!sts.contains(menu.getParentId())) {
                 recursionFn(menus, menu);
                 returnList.add(menu);
             }

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

@@ -224,6 +224,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                     case 1:
                         workDay += ",周日";
                         break;
+                    default:
+                        break;
                 }
             }
         }