代码漏洞修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/config/InjectFilter.java

@@ -28,9 +28,7 @@ public class InjectFilter implements Filter {
         //判断是否有注入攻击字符
         HttpServletRequest req = (HttpServletRequest) request;
         boolean flag = injectInput(req, response);
-        if (!flag) {
-            return;
-        } else {
+        if (flag) {
             filterchain.doFilter(request, response);
         }
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -1264,11 +1264,6 @@ public class LabSubjectManagerService {
         List<LabSubjectControllerVO> list = null;
         if (CollUtil.isNotEmpty(labSubjects)) {
             Long[] longs = labSubjects.stream().map(a -> a.getId()).toArray(Long[]::new);
-            //0.获取危险等级
-//            List<LabSubClassVO> labSubClassVOS = null;
-//            if (iflabSubClassVOS) {
-//                labSubClassVOS = subjectService.querySubClassesByIds(longs);
-//            }
             List<LabHardware> labHardwares = null;
             if (iflabHardwares) {
                 //1.可控设备
@@ -1317,11 +1312,6 @@ public class LabSubjectManagerService {
                 SenseValVO senseValVO = getSenseValVO(a);
                 return senseValVO;
             }).collect(Collectors.groupingBy(SenseValVO::getSubId));
-//            //映射危险等级 需求变更
-//            Map<Long, LabSubClassVO> subClassMap = Optional.ofNullable(labSubClassVOS)
-//                    .orElse(Arrays.asList())
-//                    .stream()
-//                    .collect(Collectors.toMap(a -> a.getSubjectId(), Function.identity()));
             //5.转为实验室vo 数据 ,组装设备和权限到实验室
             list = labSubjects.stream().map(a -> {
                 a.setQrCodeUrl(a.getId() + "-" + Optional.ofNullable(a.getRoom()).orElse(""));
@@ -1387,11 +1377,6 @@ public class LabSubjectManagerService {
         List<LabSubjectControllerVO> list = null;
         if (CollUtil.isNotEmpty(labSubjects)) {
             Long[] longs = labSubjects.stream().map(a -> a.getId()).toArray(Long[]::new);
-            //0.获取危险等级
-//            List<LabSubClassVO> labSubClassVOS = null;
-//            if (iflabSubClassVOS) {
-//                labSubClassVOS = subjectService.querySubClassesByIds(longs);
-//            }
             List<LabHardware> labHardwares = null;
             if (iflabHardwares) {
                 //1.可控设备
@@ -1445,11 +1430,6 @@ public class LabSubjectManagerService {
                 SenseValVO senseValVO = getSenseValVO(a);
                 return senseValVO;
             }).collect(Collectors.groupingBy(SenseValVO::getSubId));
-//            //映射危险等级 需求变更
-//            Map<Long, LabSubClassVO> subClassMap = Optional.ofNullable(labSubClassVOS)
-//                    .orElse(Arrays.asList())
-//                    .stream()
-//                    .collect(Collectors.toMap(a -> a.getSubjectId(), Function.identity()));
             //5.转为实验室vo 数据 ,组装设备和权限到实验室
             list = labSubjects.stream().map(a -> {
                 a.setQrCodeUrl(a.getId() + "-" + Optional.ofNullable(a.getRoom()).orElse(""));
@@ -1696,19 +1676,6 @@ public class LabSubjectManagerService {
                 hardware.setSwitchEnums(ControlEntity.SwitchEnums.OFF);
             }
         }
-
-//        //初始化一体机&视频状态
-//        else if(HardwareTypeEnum.ONE_MACHINE.equals(a.getType())&&StrUtil.isNotBlank(a.getHardwareNum()))
-//        {
-//            Object cacheObject = redisService.getCacheObject(CacheConstants.HEARTBEAT + a.getHardwareNum());
-//            if(cacheObject!=null)
-//            {
-//                hardware.setSwitchEnums(Control.SwitchEnums.ON);
-//            }
-//        }
-        //不再使用
-//        hardware.setFunctionStatus(hardwareFunctionStatusConfig.conversionByCode(a.getType(), a.getFunctionStatus()));
-//        hardware.setFunctionStatusList(hardwareFunctionStatusConfig.getFunctionStatus(a.getType()));
         return hardware;
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectServiceImpl.java

@@ -71,9 +71,6 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
     private RemoteDeptService remoteDeptService;
 
     @Autowired
-    private ILabMoldService labMoldService;
-
-    @Autowired
     private ILabSafeClasstypeService labSafeClasstypeService;
 
     @Autowired