代码漏洞修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectController.java

@@ -102,8 +102,10 @@ public class LabSubjectController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
+    /****
      * 查询未关联负责人的实验室列表
+     * @param labSubject
+     * @return
      */
     @GetMapping("/list/noadmin")
     @Deprecated
@@ -114,8 +116,10 @@ public class LabSubjectController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
+    /****
      * 查询有权限的实验室列表（数据权限）
+     * @param labSubject
+     * @return
      */
     @Deprecated
     @GetMapping("/list/nopage")
@@ -124,8 +128,10 @@ public class LabSubjectController extends BaseController {
         return ResultData.success(list);
     }
 
-    /**
+    /****
      * 查询有权限的实验室列表
+     * @param labSubject
+     * @return
      */
     @Deprecated
     @GetMapping("/list/security")

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpCardInfoController.java

@@ -243,8 +243,7 @@ public class LabXxpCardInfoController extends BaseController {
         //判断是否当天值班
         for(Map<String,Object> dutyMap:list){
             String userObj=String.valueOf(dutyMap.get("userId"));
-            if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)
-                    && Long.parseLong(userObj)==userId){
+            if(StringUtils.isNotEmpty(userObj) && Long.parseLong(userObj)==userId){
                 isDutyUser=1;
                 break;
             }
@@ -288,8 +287,7 @@ public class LabXxpCardInfoController extends BaseController {
         //判断是否当天值班
         for(Map<String,Object> dutyMap:list){
             String userObj=String.valueOf(dutyMap.get("userId"));
-            if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)
-                    && Long.parseLong(userObj)==userId){
+            if(StringUtils.isNotEmpty(userObj) && Long.parseLong(userObj)==userId){
                 isDutyUser=1;
                 break;
             }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpClassifyController.java

@@ -67,7 +67,6 @@ public class LabXxpClassifyController extends BaseController
         //展示的数据
         cfy.setIsShow(1);
         List<XxpClassify> list = xxpClassifyService.selectXxpClassifyList(cfy);
-        XxpClassifyDetailVO  publicCd= new XxpClassifyDetailVO();
         XxpClassifyDetailVO  privateCd = new XxpClassifyDetailVO();
         XxpClassifyDetailVO  normalCd = new XxpClassifyDetailVO();
         for (XxpClassify classify:list) {
@@ -189,7 +188,6 @@ public class LabXxpClassifyController extends BaseController
             //查询所有有效类目配置
             XxpClassify classify = new XxpClassify();
             classify.setIsShow(1);
-            //classify.setIsSpecial(1);
             classify.setRemark("sort");
             List<XxpClassify> classifyList = xxpClassifyService.selectXxpClassifyList(classify);
             for (XxpClassify xcf:classifyList) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpDutyController.java

@@ -67,7 +67,6 @@ public class LabXxpDutyController extends BaseController
     @ApiOperation(value = "查询值班列表")
     public TableDataInfo<XxpDutyVO> listGroup(XxpDuty xxpDuty)
     {
-        //startPage();
         List<XxpDutyVO> list = xxpDutyService.selectDutyYmdById(xxpDuty);
         XxpDuty du  = new XxpDuty();
         for (XxpDutyVO duty:list) {
@@ -180,7 +179,6 @@ public class LabXxpDutyController extends BaseController
     }
 
 
-    /*--------------------------------------------------------------------------------*/
     @RequestMapping("/api/selectDutyUser")
     @ApiOperation(value = "查询值班列表")
     public ResultData<List<Map<String,Object>>> list(Long labId,String dateTime)

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -86,7 +86,6 @@ public class LabXxpInspectionController extends BaseController
     {
         Map<String,XxpInspectionVO> allMap = new LinkedHashMap<>();
         inspectionVO.setEndTime(DateUtils.getDate());
-        //startPage();
         //获取时间段内签到人员总数
         List<XxpInspectionVO> signinList = xxpInspectionService.selectListSigninCount(inspectionVO);
         Optional.ofNullable(signinList).orElseGet(Collections::emptyList)

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -206,7 +206,6 @@ public class WarningNoticeLogController extends AbstractController {
                 backList.add(noticeLogVO);
             }
             //排序
-            //backList.stream().sorted(Comparator.comparing(WarningNoticeLogVO::getTotalNum).reversed()).collect(Collectors.toList());
             backList.sort(Comparator.comparing(WarningNoticeLogVO::getTotalNum).reversed());
         }
         return ResultData.success(backList);
@@ -236,13 +235,6 @@ public class WarningNoticeLogController extends AbstractController {
     @GetMapping("/airCollect")
     @ApiOperation("数据大屏,定位预警统计")
     public ResultData airCollect(@Param("deptId") Integer deptId) {
-        /*LambdaQueryWrapper<WarningNoticeLog> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WarningNoticeLog::getWarningType,3);
-        //queryWrapper.gt(WarningNoticeLog::getCreateTime,LocalDateTime.now().minusMonths(1)).lt(WarningNoticeLog::getCreateTime,LocalDateTime.now()).orderByDesc(WarningNoticeLog::getCreateTime);
-        queryWrapper.between(WarningNoticeLog::getCreateTime,LocalDateTime.now().minusMonths(1),LocalDateTime.now()).orderByDesc(WarningNoticeLog::getCreateTime);
-        Page page = warningNoticeLogService.page(new Page(1, 20),queryWrapper);
-        List<WarningNoticeLog> records = page.getRecords();*/
-
         Map<String,Object> map = new HashMap<>();
         map.put("warningType",3);
         map.put("startTime",LocalDateTime.now().minusMonths(1));
@@ -259,7 +251,6 @@ public class WarningNoticeLogController extends AbstractController {
     public ResultData getDisposeCount() {
         LambdaQueryWrapper<WarningNoticeLog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(WarningNoticeLog::getWarningType, 3);
-//        queryWrapper.eq(WarningNoticeLog::getCollegeId, tokenService.getLoginUser().getSysUser().getDeptId());
         queryWrapper.eq(WarningNoticeLog::getDispose,0);
         queryWrapper.eq(WarningNoticeLog::getIsDeleted, Boolean.FALSE);
         queryWrapper.orderByDesc(WarningNoticeLog::getId);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/device/DeviceRemoteController.java

@@ -52,8 +52,6 @@ public class DeviceRemoteController {
     public ResultData cabinetV2OpenLock(@RequestBody CabinetV2Lock cabinetV2Lock){
         String instruct = CRCCHECK.getOpenLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
         String relayCode = cabinetV2Lock.getRelayCode();
-        OutputStream ops = TCPServer.cacheMap.get(relayCode);
-
         try {
 
             NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
@@ -76,7 +74,6 @@ public class DeviceRemoteController {
             }
 
         } catch (Exception e) {
-            //e.printStackTrace();
             logger.error("柜锁连接失败：" + e.getMessage());
             return ResultData.fail("柜锁连接失败！");
         }
@@ -89,15 +86,11 @@ public class DeviceRemoteController {
     @PostMapping("/V2/closeLock")
     public ResultData cabinetV2CloseLock(@RequestBody CabinetV2Lock cabinetV2Lock){
         String relayCode = cabinetV2Lock.getRelayCode();
-        OutputStream ops = TCPServer.cacheMap.get(relayCode);
 
         try {
             String instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-            int timer = lockTimer;
             Integer status;
-
             NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-            timer-=2;
 
             Thread.sleep(1900);
             status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
@@ -106,7 +99,6 @@ public class DeviceRemoteController {
                 return ResultData.success("关锁成功");
             }
         } catch (Exception e) {
-            //e.printStackTrace();
             logger.error("柜锁连接失败：" + e.getMessage());
             return ResultData.fail("柜锁连接失败！");
         }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabHardware.java

@@ -163,8 +163,9 @@ public class LabHardware extends BaseEntity {
 
     /**
      * 功能状态： 不同设备的功能状态都是不一样的
+     * private String functionStatus;
      */
-    private String functionStatus;
+
 
     /**
      * 横轴坐标

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

@@ -763,7 +763,6 @@ public class LabSubjectManagerService {
             //查询所有有效类目配置
             XxpClassify classify = new XxpClassify();
             classify.setIsShow(1);
-            //classify.setIsSpecial(1);
             classify.setRemark("sort");
             List<XxpClassify> classifyList = classifyService.selectXxpClassifyList(classify);
             for (XxpClassify xcf:classifyList) {