代码漏洞修改

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

@@ -38,8 +38,7 @@ public class LabHaikangUserController extends BaseController {
      */
     @Resource
     private LabHaikangUserService labHaikangUserService;
-    //@Autowired
-    //private HaiKangDoorService haiKangDoorService;
+
 
     /**
      * 查询门禁授权列表

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

@@ -688,7 +688,6 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/listCollege")
     public TableDataInfo<LabSecurityApplyVO> listCollege(LabSecurityApplyVO labSecurityApplyVO)
     {
-        // beginTime endTime subjectId
         startPage();
         List<LabSecurityApplyVO> list = labSecurityApplyService.selectApplyListCollege(labSecurityApplyVO);
         return getDataTable(list);
@@ -716,18 +715,12 @@ public class LabSecurityApplyController extends BaseController
 
     @RequestMapping("/downloadwBatch")
     public void downloadwBatch(HttpServletRequest request, HttpServletResponse response,LabSecurityApplyVO securityApplyVO){
-        Map<String, byte[]> files = new HashMap<String, byte[]>();
+        Map<String, byte[]> files = new HashMap<>();
         String[] urls = securityApplyVO.getFileList().split("@@");
-        //String baseUrl=request.getServerName();
         for(int i=0;i<urls.length;i++){
             String[] dataUrl = urls[i].split(";");
             String newUrl = dataUrl[1].substring(0,dataUrl[1].length()-1);
             String fileUrl= fileConfigUtils.getFileDomainApp() + newUrl;
-            /*if(baseUrl.contains("192.168")){
-                fileUrl=fileConfigUtils.getLocalUrl()+newUrl;
-            }else{
-                fileUrl=fileConfigUtils.getRemoteUrl()+newUrl;
-            }*/
             fileUrl= UrlFormatUtils.getHttpsORHttpUrl(fileUrl);
             try {
                 byte[] f = getFile(fileUrl);
@@ -758,8 +751,7 @@ public class LabSecurityApplyController extends BaseController
             outStream.write(buffer, 0, len);
         }
         inStream.close();
-        byte[] data =  outStream.toByteArray();
-        return data;
+        return outStream.toByteArray();
     }
 
     /***
@@ -852,11 +844,10 @@ public class LabSecurityApplyController extends BaseController
             //判断是否当天值班
             for (Map<String, Object> dutyMap : dutyList) {
                 String userObj = String.valueOf(dutyMap.get("userId"));
-                if (StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)) {
-                    if (Long.parseLong(userObj) == userId) {
-                        map.put("isDutyUser", 1);
-                        break;
-                    }
+                if (StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)
+                        && Long.parseLong(userObj) == userId) {
+                    map.put("isDutyUser", 1);
+                    break;
                 }
             }
         }
@@ -898,11 +889,10 @@ public class LabSecurityApplyController extends BaseController
                     List<Map<String,Object>> dutyList=xxpDutyService.selectDutyUser(labId,dateTime);
                     for(Map<String,Object> dutyMap:dutyList){
                         String userObj=String.valueOf(dutyMap.get("userId"));
-                        if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)){
-                            if(Long.parseLong(userObj)==userId){
-                                map.put("isDutyUser",1);
-                                break;
-                            }
+                        if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)
+                                && Long.parseLong(userObj)==userId){
+                            map.put("isDutyUser",1);
+                            break;
                         }
                     }
                     map.remove("cardNum");

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

@@ -94,9 +94,4 @@ public class LabSecurityGroupController extends BaseController {
         return ResultData.success(labSecurityGroupService.deleteLabSecurityGroupById(ids[0]));
     }
 
-
-//    @PutMapping("/accessReview")
-//    public ResultData accessReview(@RequestBody LabSecurityGroupVO labSecurityGroupVo) {
-//        return ResultData.success(labSecurityGroupService.updateLabSecurityGroup(labSecurityGroupVo));
-//    }
 }

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

@@ -163,17 +163,10 @@ public class LabSecuritySubjectmaterialController extends BaseController
         if(StringUtils.isNotNull(materialDataVO.getSubjectId())){
             cardInfo.setSubjectId(materialDataVO.getSubjectId());
             List<XxpCardInfo> cardInfoList = xxpCardInfoService.selectXxpCardInfoList(cardInfo);
-            if(cardInfoList.size()>0){
+            if(!cardInfoList.isEmpty()){
                 cardInfo = cardInfoList.get(0);
             }
         }
-
-
-
-        /* //教职工模板
-        List<LabSecuritySubjectmaterialVO> listTeacher=  labSecuritySubjectmaterialService.selectTeacherList();
-        //学生模板
-        List<LabSecuritySubjectmaterialVO> listStudent=  labSecuritySubjectmaterialService.selectStudentList();*/
         map.put("listTeacher",listTeacher);
         map.put("listStudent",listStudent);
         map.put("cardInfo",cardInfo);

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

@@ -74,7 +74,6 @@ public class LabSubAccessCheckLogController {
         LabSubjectAccessRecord accessRecord=new LabSubjectAccessRecord();
         accessRecord.setInitFlag(false);
         accessRecord.setId(id);
-        int i= subjectAccessRecordService.updateLabSubjectAccessRecordById(accessRecord);
 
         //新增日志
         return ResultData.result(labSubAccessCheckLogService.insertLog(labSubAccessCheckInLog));

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

@@ -136,7 +136,6 @@ public class LabSubMangerController extends BaseController {
     @ApiOperation("查询实验室控制数据列表- 仅负责人权限（小程序使用）")
     @GetMapping("/my/list")
     public ResultData<List<LabSubjectControllerVO>> queryMyAadminSubCListVO() {
-//        startPage();
         List<LabSubjectControllerVO> list = subjectManagerService.queryMyAadminSubCListVO();
         return ResultData.success(list);
     }
@@ -255,15 +254,6 @@ public class LabSubMangerController extends BaseController {
     @ApiOperation("心跳接收")
     @PutMapping("/{num}/heartbeat")
     public ResultData heartbeat(@PathVariable("num") @ApiParam("设备编码") String num) {
-//        Boolean aBoolean = redisService.redisTemplate.opsForValue().setIfAbsent(CacheConstants.HEARTBEAT+num, true , 60L, TimeUnit.SECONDS);
-//        if(aBoolean==true)
-//        {
-//            EquipmentStatus equipmentStatus = new EquipmentStatus();
-//            equipmentStatus.setNum(num);
-//            equipmentStatus.setHardwareOperate(HardwareOperate.ONLINE);
-//            OnecStatusEvent onecStatusEvent = new OnecStatusEvent(equipmentStatus);
-//            SpringUtils.getApplicationContext().publishEvent(onecStatusEvent);
-//        }
         if(!redisService.hasKey(CacheConstants.HEARTBEAT+num)){
             redisService.setCacheObject(CacheConstants.HEARTBEAT+num, true , 60L, TimeUnit.SECONDS);
             EquipmentStatus equipmentStatus = new EquipmentStatus();
@@ -289,56 +279,4 @@ public class LabSubMangerController extends BaseController {
         return ResultData.success(i);
     }
 
-
-//
-//    /**
-//     * 正在发生的预案数据： 当前用户数权限和业务权限内的
-//     * @return
-//     */
-//    @ApiOperation("正在发生的预案数据： 当前用户数权限和业务权限内的")
-//    @GetMapping("/warning/{count}")
-//    public ResultData queryWarningSubs(@ApiParam("最大请求数量（-1代表无限制）") @PathVariable Long count)
-//    {
-//        SubQueryConfig subQueryConfig = new SubQueryConfig();
-//        subQueryConfig.setDangerLevel(true);
-//        subQueryConfig.setAddr(true);
-//        subQueryConfig.setConversionDictSubName(true);
-////        subQueryConfig.setBaseInfo(false);
-//        subQueryConfig.setSensorFunction(true);
-//        subQueryConfig.setInitSensorFunctionValue(true);
-//        subQueryConfig.setInitWarnSensorFunction(true);
-//        subQueryConfig.setHardware(true);
-//        subQueryConfig.setBaseInfo(false);
-//        subQueryConfig.setSafeInfo(true);
-//        return ResultData.success(subQueryManager.querySubs(subQueryConfig,10l));
-//    }
-
-//    /**
-//     * 历史预案数据:当前用户数权限和业务权限内的
-//     * @return
-//     */
-//    @ApiOperation("历史预案数据：当前用户数权限和业务权限内的")
-//    @GetMapping("/warned/{day}")
-//    public ResultData queryWarnedSubs(@ApiParam("前几day的数据（-1代表无限制）") @PathVariable Long count)
-//    {
-//
-//        return null;
-//    }
-
-//    /**
-//     * 控制设备
-//     *
-//     * @return
-//     */
-//    @ApiOperation("控制设备")
-//    @PostMapping("/control")
-//    public ResultData control(@RequestBody Control control) {
-//
-//        //
-//        //
-//        //
-//
-//        return null;
-//    }
-
 }

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

@@ -106,7 +106,7 @@ public class LabSubjectController extends BaseController {
      */
     @GetMapping("/list/noadmin")
     @Deprecated
-    public TableDataInfo<LabSubject> listNoAdmin(LabSubject labSubject) {
+    public TableDataInfo<LabSubject> lstNoAdmin(LabSubject labSubject) {
         startPage();
         labSubject.setAdminId(-1L);
         List<LabSubject> list = labSubjectService.selectLabSubjectList(labSubject);
@@ -119,8 +119,6 @@ public class LabSubjectController extends BaseController {
     @Deprecated
     @GetMapping("/list/nopage")
     public ResultData listNoPage(LabSubject labSubject) {
-//        startPage();
-//        labSubject.setAdminId(-1L);
         List<LabSubject> list = labSubjectService.selectLabSubjectList(labSubject);
         return ResultData.success(list);
     }
@@ -130,13 +128,13 @@ public class LabSubjectController extends BaseController {
      */
     @Deprecated
     @GetMapping("/list/security")
-    public ResultData listSecurity(LabSubject labSubject) {
+    public ResultData lstSecurity(LabSubject labSubject) {
         List<LabSubject> list = labSubjectService.selectLabSubjectListSecurity(labSubject);
         return ResultData.success(list);
     }
 
     @GetMapping("/list/listAdmin")
-    public ResultData listAdmin(LabSubject labSubject) {
+    public ResultData admin(LabSubject labSubject) {
         //获取当前登录用户所属学校和学院的deptid
         R<List<Long>> listdeptids = remoteUserService.getLogingUserDeptids();
         List<Long> deptIds= listdeptids.getData();
@@ -169,14 +167,14 @@ public class LabSubjectController extends BaseController {
     }
 
     @GetMapping("/list/listSubAdmin")
-    public ResultData listSubAdmin(LabSubject labSubject) {
+    public ResultData lstSubAdmin(LabSubject labSubject) {
         List<LabSubject> list = labSubjectService.selectLabSubjectListByadminidNotnull(labSubject);
         return ResultData.success(list);
     }
 
 
     @PostMapping("/list/listAdminByLayout")
-    public ResultData listAdminByLayout(@RequestBody LabSubject labSubject) {
+    public ResultData lstAdminByLayout(@RequestBody LabSubject labSubject) {
         //获取当前登录用户所属学校和学院的deptid
         R<List<Long>> listdeptids = remoteUserService.getLogingUserDeptids();
         List<Long> deptIds= listdeptids.getData();
@@ -311,16 +309,6 @@ public class LabSubjectController extends BaseController {
 
     }
 
-
-//    /**
-//     * 删除实验室
-//     */
-//    @PreAuthorize(hasPermi = "laboratory:subject:remove")
-//    @Log(title = "实验室", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/{ids}")
-//    public ResultData remove(@PathVariable Long[] ids) {
-//        return ResultData.success(labSubjectService.deleteLabSubjectByIds(ids));
-//    }
     /**
      * 禁用/启用实验室
      */

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

@@ -89,7 +89,6 @@ public class LabSubjectLayoutController extends BaseController {
         LabSubjectLayout subjectLayout = new LabSubjectLayout();
         subjectLayout.setFloorId(floorId);
         subjectLayout.setId(exId);
-//        subjectLayout.setSubjectId(-1L);
         List<LabSubjectLayout> list = labSubjectLayoutService.selectLabSubjectLayoutNoUseList(subjectLayout);
         return ResultData.success(list);
     }

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

@@ -76,8 +76,6 @@ public class LabViolationController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(LabViolationVO labViolation) {
         startPage();
-
-//        labViolation.setCreact_id(tokenService.getLoginUser().getUserid());
         List<LabViolationVO> list = labViolationService.pageList(labViolation);
         return getDataTable(list);
     }
@@ -187,31 +185,6 @@ public class LabViolationController extends BaseController {
     }
 
     /**
-     * 加入黑名单
-     */
-   /* @PreAuthorize(hasPermi = "laboratory:violation:edit")
-    @Log(title = "黑名单记录", businessType = BusinessType.UPDATE)
-    @PostMapping("/joinBlackList/{ids}")
-    public ResultData joinBlackList(@RequestParam String reason,
-                                    @RequestParam String creditScore,
-                                    @PathVariable("ids") Long... ids) {
-        LabViolation violation = labViolationService.selectLabViolationById(ids[0]);
-        LabBlacklist blackList = new LabBlacklist();
-        blackList.setJoinUserId(violation.getJoinUserId());
-        blackList.setBlacklistStatus(1);
-        blackList.setDeptId(violation.getDeptId());
-        blackList.setDeptName(violation.getDeptName());
-        blackList.setUserId(tokenService.getLoginUser().getUserid());
-        blackList.setCreateBy(tokenService.getLoginUser().getSysUser().getNickName());
-        blackList.setReason(reason);
-        blackList.setCreditScore(creditScore);
-        int i = labBlacklistService.insertLabBlacklist(blackList);
-        //labViolationService.updateStatus(blackList.getUserId());
-        return ResultData.success(i);
-    }*/
-
-
-    /**
      * 大屏 人员违规统计
      */
     @PostMapping("/bigData/statistics")
@@ -270,8 +243,6 @@ public class LabViolationController extends BaseController {
         return labViolationService.blackAdd(labBlacklistVO);
     }
 
-
-
     /**
      * 新增违规记录
      * @param vo
@@ -284,9 +255,6 @@ public class LabViolationController extends BaseController {
         return labViolationService.addViolationHistory(vo);
     }
 
-   /* @Autowired
-    private ILabBlacklistService labBlacklistService;*/
-
     /**
      * 移除黑名单(一体机)
      * @param labBlacklist
@@ -343,7 +311,6 @@ public class LabViolationController extends BaseController {
     public ResultData getIntegralMatchingRules(@RequestParam String creditScore){
         Map<String,Object> markconfigMap = new HashMap<>();
         R<Object> data = remoteExamService.getPointsConfig(markconfigMap);
-        int flag=0;
         if (data!=null) {
             String code = data.getCode() + "";
             if (code.equals("200")) {
@@ -409,9 +376,4 @@ public class LabViolationController extends BaseController {
         List<LabViolationPageListVO> list = labNegativelistHistoryService.historypageList(overStatus,statTime,endTime);
         return getDataTable(list);
     }
-
-
-
-
-
 }

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

@@ -5,19 +5,15 @@ import java.util.List;
 import java.io.IOException;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
-
-import com.alibaba.fastjson.JSONObject;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
 import com.zd.laboratory.domain.LabViolationScoreSite;
 import com.zd.laboratory.service.ILabViolationScoreSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,13 +24,9 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabViolationSite;
 import com.zd.laboratory.service.ILabViolationSiteService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
 import com.zd.common.core.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-
-import com.zd.model.page.TableDataInfo;
 
 /**
  * 违规-违规处理方式设置Controller
@@ -44,8 +36,6 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【违规-处理方式设置】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-
 @RequestMapping("/violationSite")
 public class LabViolationSiteController extends BaseController
 {

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

@@ -38,8 +38,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "【白名单】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-//@ApiSupport(author = Knife4jConfiguration.Author.)
 @RequestMapping("/whitelist")
 public class LabWhitelistController extends BaseController
 {
@@ -52,9 +50,6 @@ public class LabWhitelistController extends BaseController
     @Autowired
     private ILabWhiteJoinSublistService labWhiteJoinSublistService;
 
-    //@Autowired
-    //private HaiKangDoorService haiKangDoorService;
-
     /**
      * 查询白名单列表
      */
@@ -143,29 +138,18 @@ public class LabWhitelistController extends BaseController
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         List<LabWhitelist> labWhitelist=labWhitelistVo.getLabWhitelist();
         int id=0;
-        int count = 0;
         for (int i=0; i<labWhitelist.size(); i++){
             labWhitelist.get(i).setCreateUser(sysUser.getNickName());
             labWhitelist.get(i).setCreateId(sysUser.getUserId());
            id= labWhitelistService.insertLabWhitelist(labWhitelist.get(i));
 
-
            for(LabWhiteJoinSublist labWhiteJoinSublist:labWhitelistVo.getLabWhiteJoinSubList()){
                labWhiteJoinSublist.setWhiteUserId(labWhitelist.get(i).getUserId());
                labWhiteJoinSublist.setCreateBy(sysUser.getNickName());
                labWhiteJoinSublist.setCreateTime(new Date());
                labWhiteJoinSublistService.insertLabWhiteJoinSublist(labWhiteJoinSublist);
            }
-
-            //count += haiKangDoorService.addUserDoorByWhiteList(labWhitelistVo.getLabWhiteJoinSubList(), labWhitelistVo.getLabWhitelist(),
-            //        tokenService.getLoginUser());
-
         }
-
-        /*if(count > 0){
-            throw new NoRollException(HttpStatus.NOT_IMPLEMENTED, count, "门禁授权失败【"+count+"】，是否立即处理");
-        }*/
-
         return ResultData.result(id);
     }
 

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

@@ -243,11 +243,10 @@ 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)){
-                if(Long.parseLong(userObj)==userId){
-                    isDutyUser=1;
-                    break;
-                }
+            if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)
+                    && Long.parseLong(userObj)==userId){
+                isDutyUser=1;
+                break;
             }
         }
         map.put("isDutyUser",isDutyUser);
@@ -289,11 +288,10 @@ 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)){
-                if(Long.parseLong(userObj)==userId){
-                    isDutyUser=1;
-                    break;
-                }
+            if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)
+                    && Long.parseLong(userObj)==userId){
+                isDutyUser=1;
+                break;
             }
         }
         map.put("isDutyUser",isDutyUser);

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

@@ -2,41 +2,28 @@ package com.zd.laboratory.controller;
 
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.common.core.exception.NoRollException;
 import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.api.vo.ClassifyDetailVO;
 import com.zd.laboratory.api.vo.ClassifyVO;
-import com.zd.laboratory.domain.LabWhiteJoinSublist;
-import com.zd.laboratory.domain.LabWhitelist;
 import com.zd.laboratory.domain.XxpClassify;
-import com.zd.laboratory.domain.XxpClassifyDetail;
-import com.zd.laboratory.domain.vo.LabSubjectVO;
-import com.zd.laboratory.domain.vo.LabWhitelistVO;
 import com.zd.laboratory.domain.vo.XxpClassifyDetailVO;
-import com.zd.laboratory.service.ILabWhiteJoinSublistService;
-import com.zd.laboratory.service.ILabWhitelistService;
 import com.zd.laboratory.service.IXxpClassifyDetailedService;
 import com.zd.laboratory.service.IXxpClassifyService;
-import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.entity.SysUser;
 import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

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

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

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

@@ -1,6 +1,5 @@
 package com.zd.laboratory.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;
 import org.hibernate.validator.constraints.Length;
 import com.zd.model.entity.BaseEntity;
@@ -9,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.Date;
-
 /**
  * 检查发布关系对象 lab_check_record_release
  *

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

@@ -1,17 +1,11 @@
 package com.zd.laboratory.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.laboratory.interfaces.HazardTypeInterface;
 import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
-import com.zd.model.enums.HazardTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 灭火设备 lab_fire_device
@@ -94,46 +88,6 @@ public class LabFireDevice extends BaseEntity {
         this.id = id;
     }
 
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public String getDeviceCode() {
-        return deviceCode;
-    }
-
-    public void setDeviceCode(String deviceCode) {
-        this.deviceCode = deviceCode;
-    }
-
-    public Integer getDeviceUrl() {
-        return deviceUrl;
-    }
-
-    public void setDeviceUrl(Integer deviceUrl) {
-        this.deviceUrl = deviceUrl;
-    }
-
-    public Integer getDeviceCountDown() {
-        return deviceCountDown;
-    }
-
-    public void setDeviceCountDown(Integer deviceCountDown) {
-        this.deviceCountDown = deviceCountDown;
-    }
-
-    public Integer getDeviceStatus() {
-        return deviceStatus;
-    }
-
-    public void setDeviceStatus(Integer deviceStatus) {
-        this.deviceStatus = deviceStatus;
-    }
-
     public Long getSubjectId() {
         return subjectId;
     }

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

@@ -1,7 +1,5 @@
 package com.zd.laboratory.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,8 +1,6 @@
 package com.zd.laboratory.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -59,7 +59,7 @@ public class LabHaikangUser extends BaseEntity {
     /**
      * 验证方式(1 人脸，2 指纹，3 密码，4 刷卡，5 工号)
      */
-    private String verifyMode;// = UserVerifyMode.faceOrFpOrCardOrPw.getKey();
+    private String verifyMode;
     /**
      * 失效时间（无代表无限）
      */

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

@@ -221,22 +221,6 @@ public class LabHardware extends BaseEntity {
     @ApiModelProperty(value = "控制记录的id，参考字典表")
     private Integer triggerModes;
 
-    public Integer getManufacturerType() {
-        return manufacturerType;
-    }
-
-    public void setManufacturerType(Integer manufacturerType) {
-        this.manufacturerType = manufacturerType;
-    }
-
-    public String getFunctionStatus() {
-        return functionStatus;
-    }
-
-    public void setFunctionStatus(String functionStatus) {
-        this.functionStatus = functionStatus;
-    }
-
     private LabSubjectHardwarePosition hardwarePosition;
 
     public void setId(Long id) {

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

@@ -7,8 +7,6 @@ import com.zd.model.enums.HazardTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.util.List;
-
 /**
  * 危险源和实验室关联对象 lab_hazard_subject_relation
  *
@@ -37,12 +35,6 @@ public class LabHazardSubjectRelation extends BaseEntity {
      */
     private String chName;
 
-//    /**
-//     * 关联压力容器id
-//     */
-//    @Excel(name = "关联压力容器id")
-//    private Long containerId;
-
     /**
      * 枚举 hazard_type
      */
@@ -164,14 +156,6 @@ public class LabHazardSubjectRelation extends BaseEntity {
         this.subjectId = subjectId;
     }
 
-//    public Long getContainerId() {
-//        return containerId;
-//    }
-//
-//    public void setContainerId(Long containerId) {
-//        this.containerId = containerId;
-//    }
-
     public String getIdentify() {
         return identify;
     }

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

@@ -1,7 +1,5 @@
 package com.zd.laboratory.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
-import java.util.List;
-
 /**
  * 负面清单列表对象 lab_negative_list_records
  * 

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

@@ -1,7 +1,6 @@
 package com.zd.laboratory.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
@@ -9,7 +8,6 @@ import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.zd.model.entity.BaseEntity;
-
 import java.util.Date;
 
 /**

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

@@ -8,7 +8,6 @@ import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 
 /**
  * 安全准入资格对象 lab_security_group

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

@@ -28,8 +28,6 @@ public class LabHaikangUserFingerServiceImpl implements LabHaikangUserFingerServ
     private LabHaikangUserFingerMapper labHaikangUserFingerMapper;
     @Resource
     private LabHaikangUserMapper labHaikangUserMapper;
-    //@Autowired
-    //private HaiKangDoorService haiKangDoorService;
 
     /**
      * 通过ID查询单条数据

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

@@ -36,8 +36,7 @@ import java.util.stream.Collectors;
 public class LabHaikangUserServiceImpl implements LabHaikangUserService {
     @Resource
     private LabHaikangUserMapper labHaikangUserMapper;
-    //@Autowired
-    //private HaiKangDoorService haiKangDoorService;
+
     @Autowired
     private TokenService tokenService;
 

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

@@ -78,8 +78,6 @@ public class LabHardwareServiceImpl implements ILabHardwareService {
     @Autowired
     private RemoteCabinetService remoteCabinetService;
 
-    //@Autowired
-    //private HaiKangDoorService haiKangDoorService;
     @Autowired
     private TokenService tokenService;
 

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

@@ -78,9 +78,6 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
     @Autowired
     private ILabMessageUserService labMessageUserService;
 
-   // @Autowired
-    //private HaiKangDoorService haiKangDoorService;
-
     private static final Logger log = LoggerFactory.getLogger(LabSecurityApplyServiceImpl.class);
 
     @Override

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

@@ -38,8 +38,6 @@ public class LabWhitelistServiceImpl implements ILabWhitelistService
 
     @Autowired
     private TokenService tokenService;
-    //@Autowired
-    //private HaiKangDoorService haiKangDoorService;
 
     /**
      * 查询白名单