lab服务代码升级修改同步

zd-auth/src/main/java/com/zd/auth/service/SysLoginService.java

@@ -40,19 +40,16 @@ public class SysLoginService {
     public LoginUser login(String username, Integer loginType, String password) {
         // 用户名或密码为空 错误
         if (StringUtils.isAnyBlank(username, password)) {
-//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
             throw new ServiceException("用户/密码必须填写", 530);
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                 || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
             throw new ServiceException("用户密码不在指定范围", 530);
         }
         // 用户名不在指定范围内 错误
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                 || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
             throw new ServiceException("用户名不在指定范围", 530);
         }
         // 查询用户信息
@@ -64,21 +61,17 @@ public class SysLoginService {
             throw new PreAuthorizeException();
         }
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
-//            recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
             throw new ServiceException("账号或密码错误", 530);
         }
         LoginUser userInfo = userResult.getData();
         SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-//            recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new ServiceException("对不起，您的账号：" + username + " 已被删除", 530);
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
             throw new ServiceException("对不起，您的账号：" + username + " 已停用", 530);
         }
         if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
-//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
             throw new ServiceException("账号或密码错误", 530);
         }
         recordLogininfor(user, BaseConstants.LOGIN_SUCCESS, "登录成功");
@@ -115,7 +108,6 @@ public class SysLoginService {
         if (R.FAIL == registerResult.getCode()) {
             throw new ServiceException(registerResult.getMsg());
         }
-//        recordLogininfor(username, Constants.REGISTER, "注册成功");
     }
 
     /**
@@ -124,7 +116,6 @@ public class SysLoginService {
      * @param user    用户名
      * @param status  状态
      * @param message 消息内容
-     * @return
      */
     public void recordLogininfor(SysUser user, String status, String message) {
         SysLogininfor logininfor = new SysLogininfor();

zd-common/common-core/src/main/java/com/zd/common/core/utils/FileConfigUtils.java

@@ -12,6 +12,18 @@ import org.springframework.stereotype.Component;
 @Component
 public class FileConfigUtils {
 
+    /**
+     * 上传文件存储根路径
+     */
+    @Value("${file.path}")
+    private String filePath;
+
+    /**
+     * 资源映射路径前缀
+     */
+    @Value("${file.prefix}")
+    private String filePrefix;
+
     /**文件本地地址*/
     @Value("${sys.file.localUrl}")
     private String localUrl;
@@ -82,4 +94,20 @@ public class FileConfigUtils {
     public void setAgentApp(Boolean agentApp) {
         isAgentApp = agentApp;
     }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getFilePrefix() {
+        return filePrefix;
+    }
+
+    public void setFilePrefix(String filePrefix) {
+        this.filePrefix = filePrefix;
+    }
 }

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

@@ -52,7 +52,6 @@ public class HardwareFunctionStatusConfig {
 
     private Map<String,SensorFunctionStatus> mapFunNum = Collections.emptyMap();
 
-
     public Map<String, SensorFunctionStatus> getMapFunNum() {
         return mapFunNum;
     }
@@ -65,8 +64,6 @@ public class HardwareFunctionStatusConfig {
         return senseValVOS;
     }
 
-
-
     /**
      * 获取设备功能：根据值转换-如果没有则应用默认值
      * @param hardwareTypeEnum 设备配型
@@ -74,7 +71,6 @@ public class HardwareFunctionStatusConfig {
      * @return
      */
     public FunctionStatus conversionByCode(HardwareTypeEnum hardwareTypeEnum, String code) {
-
         return Optional.ofNullable(hardwareFunctionStatusListMap.get(hardwareTypeEnum))
                 .orElseGet(Collections::emptyList)
                 .stream()
@@ -85,7 +81,6 @@ public class HardwareFunctionStatusConfig {
                         .stream()
                         .filter(FunctionStatus::getDefaultStatus)
                         .findFirst().orElse(null));
-
     }
 
     public List<FunctionStatus> getFunctionStatus(HardwareTypeEnum hardwareTypeEnum) {
@@ -98,26 +93,20 @@ public class HardwareFunctionStatusConfig {
     }
 
     public void setHardwareFunctionStatusListMap(Map<HardwareTypeEnum, List<FunctionStatus>> hardwareFunctionStatusListMap) {
-
-
         this.hardwareFunctionStatusListMap = hardwareFunctionStatusListMap;
         cache = new HashMap <>();
         Optional.ofNullable(        hardwareFunctionStatusListMap)
-                .filter(a->a.size()>0)
+                .filter(a-> !a.isEmpty())
                 .orElseGet(Collections::emptyMap)
                 .entrySet()
                 .stream()
                 .forEach(a->{
-
                     a.getValue().forEach(c->{
-
                         cache.put(a.getKey().getCode()+"-"+c.getCode(),c);
                     });
                 });
-
     }
 
-
     public Map<SenseType, List<SensorFunctionStatus>> getSensorFunctionStatusListMap() {
         return sensorFunctionStatusListMap;
     }
@@ -150,7 +139,7 @@ public class HardwareFunctionStatusConfig {
                     return senseValVO;
                 }).collect(Collectors.toList());
 
-        sensorFunctionStatuses =Optional.ofNullable(list).filter(a->a.size()>0)
+        sensorFunctionStatuses =Optional.ofNullable(list).filter(a-> !a.isEmpty())
                 .orElse(Collections.emptyList())
                 .stream()
                 .sorted((c,d)->NumberUtil.compare(c.getOrder(),d.getOrder()) )

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

@@ -2,8 +2,6 @@ package com.zd.laboratory.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.stereotype.Component;
 
 /**
  * Controller

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

@@ -1,9 +1,7 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.service.AlgorithmService;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
@@ -24,7 +22,6 @@ import java.util.List;
  * @Description:
  */
 @Api(tags = {"算法结果"})
-@ApiSupport(author = Knife4jConfiguration.Author.ZP)
 @RestController
 @RequestMapping("/algorithm")
 public class AlgorithmController extends BaseController {

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

@@ -1,12 +1,10 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.ApkMachineconfig;
 import com.zd.laboratory.service.IApkMachineconfigService;
 import com.zd.model.domain.ResultData;
@@ -30,7 +28,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "【【一体机获取配置文件】】")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/machineconfig")
 public class ApkMachineconfigController extends BaseController {
     @Autowired
@@ -57,7 +54,7 @@ public class ApkMachineconfigController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, ApkMachineconfig apkMachineconfig) throws IOException {
         List<ApkMachineconfig> list = apkMachineconfigService.selectApkMachineconfigList(apkMachineconfig);
-        ExcelUtil<ApkMachineconfig> util = new ExcelUtil<ApkMachineconfig>(ApkMachineconfig.class);
+        ExcelUtil<ApkMachineconfig> util = new ExcelUtil<>(ApkMachineconfig.class);
         util.exportExcel(response, list, "【请填写功能名称】数据");
     }
 

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

@@ -3,7 +3,6 @@ package com.zd.laboratory.controller;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.DictUtils;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
@@ -53,37 +52,11 @@ public class LabAbnormalController extends BaseController {
         }
     }
 
-    @GetMapping("/sendALL")
-    public void sendALL(String deviceNum, int type) {
-
-        /*if(type == 1){
-            for (int i = 1; i < 5; i++) {
-                socketService.sendCommand(Symbol.order.control, deviceNum, Symbol.command.open, i);
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }else {
-            for (int i = 1; i < 5; i++) {
-                socketService.sendCommand(Symbol.order.control, deviceNum, Symbol.command.close, i);
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }*/
-    }
-
     @PostMapping("/sendData")
     public void sendData(@RequestBody Map<String, String> params) {
-
         socketService.setSensorData(params.get("data"));
     }
 
-
     /**
      * 查询异常设备列表
      */
@@ -117,16 +90,14 @@ public class LabAbnormalController extends BaseController {
         List<LabAbnormalVO> list = labAbnormalService.getEquipmentList(labAbnormal);
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<SysDictData> dictList = DictUtils.getDictCache("equipment_category");
-        Optional.ofNullable(list).filter(a->a.size()>0).orElseGet(Collections::emptyList).stream().forEach(a->{
+        Optional.ofNullable(list).filter(a-> !a.isEmpty()).orElseGet(Collections::emptyList).stream().forEach(a->{
             String dateString = formatter.format(a.getLastAbnormalTime());
             a.setLastAbnormalTimeStr(dateString);
             a.getHardwareOperateName();
-            String dictLabel = Optional.ofNullable(dictList).filter(b->b.size()>0).orElseGet(Collections::emptyList).stream().filter(b->b.getDictValue().equals(a.getEquipmentType()+"")).map(b->b.getDictLabel()).findFirst().orElse("");
+            String dictLabel = Optional.ofNullable(dictList).filter(b-> !b.isEmpty()).orElseGet(Collections::emptyList).stream().filter(b->b.getDictValue().equals(a.getEquipmentType()+"")).map(b->b.getDictLabel()).findFirst().orElse("");
             a.setTypeStr(dictLabel+"-"+a.getHardwareTypeName());
         });
-//        ExcelUtil<LabAbnormalVO> util = new ExcelUtil<LabAbnormalVO>(LabAbnormalVO.class);
-//        util.exportExcel(response, list, "异常设备数据");
-        ExcelUtil<LabAbnormalVO> util = new ExcelUtil<LabAbnormalVO>(LabAbnormalVO.class);
+        ExcelUtil<LabAbnormalVO> util = new ExcelUtil<>(LabAbnormalVO.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "异常设备数据", null, "异常设备导出数据表"+nowDate);

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

@@ -69,7 +69,7 @@ public class LabApprovalController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabApproval labApproval) throws IOException {
         List<LabApprovalVO> list = labApprovalService.selectLabApprovalList(labApproval);
-        ExcelUtil<LabApprovalVO> util = new ExcelUtil<LabApprovalVO>(LabApprovalVO.class);
+        ExcelUtil<LabApprovalVO> util = new ExcelUtil<>(LabApprovalVO.class);
         util.exportExcel(response, list, "安全准入审批记录数据");
     }
 
@@ -161,7 +161,7 @@ public class LabApprovalController extends BaseController {
 
     @PostMapping("/accessReview")
     public ResultData accessReview(@RequestBody LabApprovalAndDetailDTO labApproval) {
-        if(labApproval.getId()!=null && !labApproval.getId().equals("")){
+        if(labApproval.getId()!=null){
             return ResultData.success(labApprovalService.updateLabApproval(labApproval));
         }else{
             return ResultData.success(labApprovalService.insertLabApproval(labApproval));

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

@@ -23,7 +23,6 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabAudioSynthesis;
 import com.zd.laboratory.service.ILabAudioSynthesisService;
 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;
@@ -67,7 +66,7 @@ public class LabAudioSynthesisController extends BaseController<LabAudioSynthesi
     public void export(HttpServletResponse response, LabAudioSynthesis labAudioSynthesis) throws IOException
     {
         List<LabAudioSynthesis> list = labAudioSynthesisService.selectLabAudioSynthesisList(labAudioSynthesis);
-        ExcelUtil<LabAudioSynthesis> util = new ExcelUtil<LabAudioSynthesis>(LabAudioSynthesis.class);
+        ExcelUtil<LabAudioSynthesis> util = new ExcelUtil<>(LabAudioSynthesis.class);
         util.exportExcel(response, list, "音乐合成数据");
     }
 

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

@@ -1,12 +1,9 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabBuildFloor;
 import com.zd.laboratory.domain.vo.LabBuildFloorPage;
 import com.zd.laboratory.domain.vo.LabBuildFloorVo;
@@ -30,7 +27,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "【楼栋(楼层)】")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/buildFloor")
 public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
 
@@ -88,10 +84,6 @@ public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
     @GetMapping("/getTreeSonList")
     @ApiOperation(value = "查询楼栋(楼层)子集列表")
     public TableDataInfo <LabBuildFloor> getTreeSonList(LabBuildFloor labBuildFloor) {
-//        //todo 如果选中的是楼层下的布局图，则需要分页，如果不是，不需要分页
-//        if(labBuildFloor.getType()==3){
-//            startPage();
-//        }
         LabBuildFloorPage buildFloorPage = labBuildFloorService.getTreeSonList(labBuildFloor);
         return getDataTable(buildFloorPage.getLabBuildList(),buildFloorPage.getTotal());
     }
@@ -138,7 +130,7 @@ public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
     @ApiOperation(value = "查询登录人管理的实验室的楼栋(楼层)对象")
     public ResultData getBuildOrFloorInfo(LabBuildFloorVo labBuildFloorVo) {
         List <LabBuildFloorVo> buildFloorList = labBuildFloorService.getBuildOrFloorList(labBuildFloorVo);
-        if(buildFloorList.size()>0){
+        if(buildFloorList!=null && !buildFloorList.isEmpty()){
             return ResultData.success(buildFloorList.get(0));
         }
         LabBuildFloorVo buildFloorVo = new LabBuildFloorVo();

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

@@ -1,11 +1,9 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabBuildFloorLayout;
 import com.zd.laboratory.domain.vo.LabBuildFloorLayoutVo;
 import com.zd.laboratory.service.ILabBuildFloorLayoutService;
@@ -29,7 +27,6 @@ import java.util.Map;
  */
 @RestController
 @Api(tags = "【楼层布局图】")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/buildFloorLayout")
 public class LabBuildFloorLayoutController extends BaseController<LabBuildFloorLayout> {
 

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

@@ -58,11 +58,6 @@ public class LabBuildingController extends BaseController {
     ILabSubjectService subjectService;
     @Autowired
     ILabSubjectLayoutService subjectLayoutService;
-    /**
-     * 最低危险等级
-     */
-//    @Autowired
-//    private LabSubClassVO getNONELabSubClassVO;
 
     @Autowired
     LabHardwareMapper hardwareMapper;
@@ -100,7 +95,7 @@ public class LabBuildingController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabBuilding labBuilding) throws IOException {
         List<LabBuilding> list = labBuildingService.selectLabBuildingList(labBuilding);
-        ExcelUtil<LabBuilding> util = new ExcelUtil<LabBuilding>(LabBuilding.class);
+        ExcelUtil<LabBuilding> util = new ExcelUtil<>(LabBuilding.class);
         util.exportExcel(response, list, "楼栋数据");
     }
 
@@ -195,30 +190,16 @@ public class LabBuildingController extends BaseController {
             }
         }
 
-
-//        List<SensorFunctionStatus> sensorFunctionStatuseList =  labSubjects.stream().map(a -> {
-//            List<LabSensor> labSensors1 = mapSenseTemp.get(a.getId());
-//            List<SensorFunctionStatus> sensorFunctionStatuses = subjectManagerService.getSensorFunctionStatuses(labSensors1,true);
-//            return sensorFunctionStatuses;
-//        }).collect(Collectors.toList());
-
-//        subjectManagerService.createSubControllerVO(labSubjects,false,true,true,false,true);
-
-
-
-        //增加危险等级
-        List<LabSubClassVO> labSubClassVOS = null;
-
         //增加地址
         List<Long> layoutids = new ArrayList<>();
 
         Map<Long,LabSubjectDetailVO> temp = new HashMap<>();
         List<Long> collect = Optional.ofNullable(allMap)
-                .filter(a -> a.size() > 0)
+                .filter(a -> !a.isEmpty())
                 .orElseGet(Collections::emptyList)
                 .stream()
                 .flatMap(a -> Optional.ofNullable(a.getLayouts())
-                            .filter(c -> c.size() > 0)
+                            .filter(c -> !c.isEmpty())
                             .orElseGet(Collections::emptyList)
                             .stream()
                             .filter(c -> c.getSubjectDetail() != null)
@@ -228,7 +209,6 @@ public class LabBuildingController extends BaseController {
                                 {
                                     layoutids.add(c.getSubjectDetail().getLayoutId());
                                 }
-                                //c.getSubjectDetail().setSubClassVO(getNONELabSubClassVO);
                                 //缓存当前对象,减少循环
                                 temp.put(c.getSubjectDetail().getId(),c.getSubjectDetail());
                                 return   c.getSubjectDetail().getId();
@@ -259,7 +239,7 @@ public class LabBuildingController extends BaseController {
 
 
             Optional.ofNullable(temp)
-                    .filter(a -> a.size() > 0)
+                    .filter(a -> !a.isEmpty())
                     .orElseGet(Collections::emptyMap)
                     .entrySet()
                     .forEach(a->{
@@ -273,48 +253,6 @@ public class LabBuildingController extends BaseController {
                     });
 
         }
-
-
-        //增加传感器测点信息 杨森说不显示了所以注释掉
-//        Map<Long,LabSubjectDetailVO> temp = new HashMap<>();
-//        List<Long> collect = Optional.ofNullable(allMap)
-//                .filter(a -> a.size() > 0)
-//                .orElseGet(Collections::emptyList)
-//                .stream()
-//                .flatMap(a -> Optional.ofNullable(a.getLayouts())
-//                            .filter(c -> c.size() > 0)
-//                            .orElseGet(Collections::emptyList)
-//                            .stream()
-//                            .filter(c -> c.getSubjectDetail() != null)
-//                            .filter(c -> c.getSubjectDetail().getId() != null)
-//                            .map(c -> {
-//                                        //缓存当前对象,减少循环
-//                                        temp.put(c.getSubjectDetail().getId(),c.getSubjectDetail());
-//                                      return   c.getSubjectDetail().getId();
-//                                    })
-//                )
-//                .distinct()
-//                .collect(Collectors.toList());
-//
-//        if(CollUtil.isNotEmpty(collect))
-//        {
-//
-//            //2.获取传感器
-//            List<LabSensor> labSensors = sensorMapper.selectSensorBySubIds(collect.toArray(new Long[collect.size()]));
-//            Optional.ofNullable(labSensors)
-//                    .filter(a -> a.size() > 0)
-//                    .orElseGet(Collections::emptyList)
-//                    .stream()
-//                    .collect(Collectors.groupingBy(LabSensor::getSubjectId))
-//                    .entrySet()
-//                    .forEach(a->{
-//                        List<SensorFunctionStatus> sensorFunctionStatuses = labSubjectManagerService.getSensorFunctionStatuses(a.getValue());
-//                        temp.get(a.getKey()).setSensorFunctionStatuses(Optional.ofNullable(sensorFunctionStatuses).orElseGet(Collections::emptyList));
-//                    });
-//        }
-
-
-
         return ResultData.success(allMap);
     }
 

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

@@ -54,7 +54,7 @@ public class LabCeditScoreSiteController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabCeditScoreSite labCeditScoreSite) throws IOException {
         List<LabCeditScoreSite> list = labCeditScoreSiteService.selectLabCeditScoreSiteList(labCeditScoreSite);
-        ExcelUtil<LabCeditScoreSite> util = new ExcelUtil<LabCeditScoreSite>(LabCeditScoreSite.class);
+        ExcelUtil<LabCeditScoreSite> util = new ExcelUtil<>(LabCeditScoreSite.class);
         util.exportExcel(response, list, "信用合格分设置数据");
     }
 

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

@@ -4,7 +4,6 @@ import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;

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

@@ -35,9 +35,6 @@ public class LabCheckMachineMsgController extends BaseController {
     @GetMapping("/list")
     @ApiOperation(value = "查询一体机安全检查通知消息列表")
     public ResultData<List<LabCheckMachineMsgVo>> list(LabCheckMachineMsg labCheckMachineMsg) {
-        // 2.6 弃用
-        //List<LabCheckMachineMsg> list = labCheckMachineMsgService.selectLabCheckMachineMsgList(labCheckMachineMsg);
-
         List<LabCheckMachineMsgVo> list = labCheckMachineMsgService.selectCheckMsg(labCheckMachineMsg);
         return ResultData.success(list);
     }

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

@@ -11,7 +11,6 @@ import com.zd.laboratory.domain.LabCheckOption;
 import com.zd.laboratory.domain.vo.LabCheckOptionExcelVo;
 import com.zd.laboratory.service.ILabCheckOptionService;
 import com.zd.laboratory.service.impl.WordService;
-import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
@@ -180,7 +179,7 @@ public class LabCheckOptionController extends BaseController {
     @ApiOperation(value = "生成整改报告")
     @RequestMapping("/genReport/{id}")
     public void genReport(@PathVariable("id") Long id, HttpServletResponse response, HttpServletRequest request) {
-        wordService.genReport(id, response, request);
+        wordService.genReport(id, response);
     }
 
 }

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

@@ -116,17 +116,6 @@ public class LabCheckRecordController extends BaseController {
     @GetMapping("/listJcjl")
     @ApiOperation(value = "查询安全检查记录列表")
     public TableDataInfo<LabCheckRecord> listJcjl(LabCheckRecordVO labCheckRecord) {
-        /*SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        if("00".equals(sysUser.getUserType())){ //系统用户
-            if(sysUser.getDeptId()!=null ){
-                labCheckRecord.setDeptId(sysUser.getDeptId());
-            }
-        }else if("11".equals(sysUser.getUserType())){ //教职工
-            labCheckRecord.setCreateUserId(sysUser.getUserId());//创建人
-        }*/
-
-        //labCheckRecord.setIsFabu(1);//已发布的数据
-        //labCheckRecord.setIsCg(0);//已提交 非草稿数据
         startPage();
         List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
         return getDataTable(list);
@@ -150,51 +139,6 @@ public class LabCheckRecordController extends BaseController {
         return ResultData.success(flg);
     }
 
-
-    /**
-     * 查询安全检查列表 问题整改PC端
-     */
-//    @PreAuthorize(hasPermi = "laboratory:checkRecord:list")
-//    @GetMapping("/listWtzg")
-//    @ApiOperation(value = "查询安全检查列表")
-//    public TableDataInfo<LabCheckRecord> listWtzg(LabCheckRecordVO labCheckRecord) {
-//        SysUser sysUser = tokenService.getLoginUser().getSysUser();
-//
-//        if("00".equals(sysUser.getUserType())){ //系统用户
-//            if(sysUser.getDeptId()!=null ){
-//                labCheckRecord.setBuildingId(String.valueOf(sysUser.getDeptId()));
-//            }
-//        }else if("11".equals(sysUser.getUserType())){ //教职工
-//            labCheckRecord.setFzrId(sysUser.getUserId());
-//        }
-//        startPage();
-//        labCheckRecord.setIsFabu(1);//已发布的数据
-//        List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
-//        return getDataTable(list);
-//    }
-
-    /**
-     * 查询安全检查待整改列表
-     */
-   /* @GetMapping("/listDzg")
-    @ApiOperation(value = "查询安全检查列表")
-    public TableDataInfo<LabCheckRecordVO> listDzg(LabCheckRecordVO labCheckRecord) {
-        SysUser sysUser = tokenService.getLoginUser().getSysUser();
-
-        if("00".equals(sysUser.getUserType())){ //系统用户
-            if(sysUser.getDeptId()!=null ){
-                labCheckRecord.setBuildingId(String.valueOf(sysUser.getDeptId()));
-            }
-        }else if("11".equals(sysUser.getUserType())){ //教职工
-            labCheckRecord.setCreateUserId(sysUser.getUserId());//创建人
-        }
-
-        startPage();
-        labCheckRecord.setIsFabu(1);//已发布的数据
-        List<LabCheckRecordVO> list = labCheckRecordService.selectLabCheckRecordZgshList(labCheckRecord);
-        return getDataTable(list);
-    }*/
-
     /**
      * 小程序安全检查 按照时间分组查询
      */
@@ -218,15 +162,6 @@ public class LabCheckRecordController extends BaseController {
     @GetMapping("/listCount")
     @ApiOperation(value = "查询安全检查列表")
     public ResultData listCount(LabCheckRecordVO labCheckRecord) {
-        /*SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        if("00".equals(sysUser.getUserType())){ //系统用户
-            if(sysUser.getDeptId()!=null ){
-                labCheckRecord.setDeptId(sysUser.getDeptId());
-            }
-        }else if("11".equals(sysUser.getUserType())){ //教职工
-            labCheckRecord.setCreateUserId(sysUser.getUserId());//创建人
-        }*/
-        //labCheckRecord.setIsFabu(1);//已发布的数据
         labCheckRecord.setIsCg(1);//草稿
         List<LabCheckRecord> listCount = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
         return ResultData.success(listCount.size());
@@ -242,7 +177,7 @@ public class LabCheckRecordController extends BaseController {
     public void export(HttpServletResponse response, LabCheckRecordVO labCheckRecord) throws IOException {
         labCheckRecord.setIsFabu(1);//已发布的数据
         List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
-        ExcelUtil<LabCheckRecord> util = new ExcelUtil<LabCheckRecord>(LabCheckRecord.class);
+        ExcelUtil<LabCheckRecord> util = new ExcelUtil<>(LabCheckRecord.class);
         util.exportExcel(response, list, "安全检查数据");
     }
 
@@ -288,13 +223,6 @@ public class LabCheckRecordController extends BaseController {
     public ResultData addTj(@RequestBody LabCheckRecordVO labCheckRecordVo) {
         //检查项录入
        int id = labCheckRecordService.insertLabCheckRecordTj(labCheckRecordVo);
-       //if(id>0){
-           // 整改通知 传参时需要将  0一般整改改为1，否则为2 重大整改
-           //int type = labCheckRecordVo.getZgType()==0?1:2;
-           //checkMachineMsgService.insertLabCheckMachineMsg(type, labCheckRecordVo.getId());
-           // 整改通知发送给 实验室负责人
-           //checkMachineMsgService.insertLabCheckMachineTjz(labCheckRecordVo.getZgType()==0?1:2, labCheckRecordVo.getId(),1);
-       //}
         return ResultData.result(id);
     }
 
@@ -417,10 +345,9 @@ public class LabCheckRecordController extends BaseController {
         labCheckRecord.setIsFabu(1);//已发布的数据
         List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
 
-        Map<String,Object> maplist = new HashMap<String,Object>();
         //按照日期对数据分组
         if(list!=null){
-            Map<String, List<LabCheckRecord>> map = new HashMap<String, List<LabCheckRecord>>();
+            Map<String, List<LabCheckRecord>> map = new HashMap<>();
             for (LabCheckRecord record : list) {
                 String date = DateUtils.dateTime(record.getCreateTime());
                 List<LabCheckRecord> tmpList = map.get(date);
@@ -428,10 +355,6 @@ public class LabCheckRecordController extends BaseController {
                     tmpList = new ArrayList<>();
                     tmpList.add(record);
                     map.put(date, tmpList);
-
-                    //maplist.put("list",tmpList);
-                    //maplist.put("date",date);
-
                 }else {
                     tmpList.add(record);
                 }
@@ -452,7 +375,7 @@ public class LabCheckRecordController extends BaseController {
     @GetMapping("/selectInfoByRoom")
     @ApiOperation(value = "小程序未安全检查列表")
     public ResultData selectInfoByRoom(String room,String name,String userName) {
-        Map<String,Object> map = new HashMap<String, Object>();
+        Map<String,Object> map = new HashMap<>();
 
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
@@ -469,7 +392,7 @@ public class LabCheckRecordController extends BaseController {
         List<Long> deptIds= listdeptids.getData();
         map.put("deptIds", deptIds);
 
-         // TODO 白老师证号特殊处理
+         // 白老师证号特殊处理
         if(sysUser.getUserId() == 92612){
             map.put("deptId", sysUser.getDept().getDeptId());
             map.put("remark", null);
@@ -489,9 +412,7 @@ public class LabCheckRecordController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHECKRECORD + PerFun.QUERY)
     @GetMapping("/recordDettailsList")
     public ResultData recordDettailsList( Long id) {
-        Map<String, Object> map =new HashMap<String, Object>();
-        map = getRecordDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getRecordDettailsList(id));
     }
 
     /***
@@ -501,9 +422,7 @@ public class LabCheckRecordController extends BaseController {
      */
     @GetMapping("/recordDettailsListApp")
     public ResultData recordDettailsListApp( Long id) {
-        Map<String, Object> map =new HashMap<String, Object>();
-        map = getRecordDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getRecordDettailsList(id));
     }
 
     public Map<String, Object> getRecordDettailsList(Long id){
@@ -518,20 +437,14 @@ public class LabCheckRecordController extends BaseController {
         }
         //判断负责人是否第一次查看
         if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
+            labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
         }
 
-        //隐患详情
-        /*LabCheckRecordDetails labCheckRecordDetails = new LabCheckRecordDetails();
-        labCheckRecordDetails.setCheckId(id);
-        List<LabCheckRecordDetails> list= labCheckRecordDetailsService.selectLabCheckRecordDetailsList(labCheckRecordDetails);
-        */
         LabCheckRecordDetailsVO dzgDetailsVo = new LabCheckRecordDetailsVO();
         dzgDetailsVo.setCheckId(id);
         List<LabCheckRecordDetailsVO> list= labCheckRecordDetailsService.selectLabCheckRecordDetailsListVo(dzgDetailsVo);
 
-        if(list.size()>0){
+        if(list != null && !list.isEmpty()){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
             //循环查询操作日志信息
             for (int i=0;i<list.size();i++){
@@ -539,30 +452,9 @@ public class LabCheckRecordController extends BaseController {
                 detailslog.setCheckDetailsId(list.get(i).getId());
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 list.get(i).setDetailslogList(deatlog);
-
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    list.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
         }
 
-        //处理掉最后一级子项
-        /*if(list!=null && list.size()>0){
-            for (int i=0;i<list.size();i++){
-                String str=  list.get(i).getAllCheckOptionName();
-                if(str!=null && str.contains("-")){
-                    list.get(i).setAllCheckOptionName(str.substring(0,str.lastIndexOf("-")));
-                }
-            }
-        }*/
         map.put("yhlist",list);
         map.put("record",labCheckRecord);
         return map;
@@ -580,7 +472,7 @@ public class LabCheckRecordController extends BaseController {
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
 
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         //检查记录
         LabCheckRecord labCheckRecord = labCheckRecordService.selectLabCheckRecordById(id);
         if(labCheckRecord==null){
@@ -588,37 +480,17 @@ public class LabCheckRecordController extends BaseController {
         }
         //判断负责人是否第一次查看
         if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
+            labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
         }
 
-        //隐患详情
-        /*LabCheckRecordDetails labCheckRecordDetails = new LabCheckRecordDetails();
-        labCheckRecordDetails.setCheckId(id);
-        List<LabCheckRecordDetails> list= labCheckRecordDetailsService.selectLabCheckRecordDetailsList(labCheckRecordDetails);
-        //处理掉最后一级子项
-        if(list!=null && list.size()>0){
-            for (int i=0;i<list.size();i++){
-                String str=  list.get(i).getAllCheckOptionName();
-                if(str!=null && str.contains("-")){
-                    list.get(i).setAllCheckOptionName(str.substring(0,str.lastIndexOf("-")));
-                }
-            }
-        }*/
-
        //待整改
         LabCheckRecordDetailsVO dzgDetailsVo = new LabCheckRecordDetailsVO();
         dzgDetailsVo.setCheckId(id);
         dzgDetailsVo.setIsZg(1L);//待整改
         dzgDetailsVo.setIsZgStatus(0);//不包含无法整改的数据
         List<LabCheckRecordDetailsVO> dzglist= labCheckRecordDetailsService.selectLabCheckRecordDetailsListVo(dzgDetailsVo);
-       /* //对象复制
-        LabCheckRecordVO checkRecordVO = new LabCheckRecordVO();
-        BeanUtils.copyProperties(checkRecordVO,labCheckRecord);
-        //添加整改项详情集合
-        checkRecordVO.setDetailsListVo(dzglist);*/
 
-        if(dzglist.size()>0){
+        if(!dzglist.isEmpty()){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
             //循环查询操作日志信息
             for (int i=0;i<dzglist.size();i++){
@@ -627,17 +499,6 @@ public class LabCheckRecordController extends BaseController {
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 dzglist.get(i).setDetailslogList(deatlog);
 
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    dzglist.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
          }
 
@@ -647,13 +508,8 @@ public class LabCheckRecordController extends BaseController {
         yzgDetailsVo.setIsZg(0L);//已整改
         yzgDetailsVo.setIsZgStatus(0);//非无法整改
         List<LabCheckRecordDetailsVO> yzglist= labCheckRecordDetailsService.selectLabCheckRecordDetailsListVo(yzgDetailsVo);
-        //对象复制
-        /*LabCheckRecordVO checkRecordVO = new LabCheckRecordVO();
-        BeanUtils.copyProperties(checkRecordVO,labCheckRecord);
-        //添加整改项详情集合
-        checkRecordVO.setDetailsListVo(yzglist);*/
 
-        if(yzglist.size()>0){
+        if(!yzglist.isEmpty()){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
             //循环查询操作日志信息
             for (int i=0;i<yzglist.size();i++){
@@ -663,17 +519,6 @@ public class LabCheckRecordController extends BaseController {
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 yzglist.get(i).setDetailslogList(deatlog);
 
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    yzglist.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
         }
 
@@ -683,7 +528,7 @@ public class LabCheckRecordController extends BaseController {
         wfzgDetailsVo.setIsZgStatus(1);//暂不整改
         List<LabCheckRecordDetailsVO> wfzglist= labCheckRecordDetailsService.selectLabCheckRecordDetailsListVo(wfzgDetailsVo);
 
-        if(wfzglist.size()>0){
+        if(!wfzglist.isEmpty()){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
             //循环查询操作日志信息
             for (int i=0;i<wfzglist.size();i++){
@@ -692,17 +537,6 @@ public class LabCheckRecordController extends BaseController {
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 wfzglist.get(i).setDetailslogList(deatlog);
 
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    dzglist.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
         }
 
@@ -725,25 +559,20 @@ public class LabCheckRecordController extends BaseController {
     public ResultData recordDettailsBh( Long id) {
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
 
         //检查记录
         LabCheckRecord labCheckRecord = labCheckRecordService.selectLabCheckRecordById(id);
         if(labCheckRecord==null){
             throw new ServiceException("未获取到相关信息");
         }
-        //判断负责人是否第一次查看
-        /*if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
-        }*/
 
         //待整改
         LabCheckRecordDetailsVO dzgDetailsVo = new LabCheckRecordDetailsVO();
         dzgDetailsVo.setCheckId(id);
         List<LabCheckRecordDetailsVO> dzglist= labCheckRecordDetailsService.selectLabCheckRecordDetailsListVo(dzgDetailsVo);
 
-        if(dzglist.size()>0){
+        if(!dzglist.isEmpty()){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
             //循环查询操作日志信息
             for (int i=0;i<dzglist.size();i++){
@@ -753,11 +582,11 @@ public class LabCheckRecordController extends BaseController {
                 dzglist.get(i).setDetailslogList(deatlog);
 
                 //判断该条检查项的驳回次数
-                if(deatlog.size()>0){
+                if(!deatlog.isEmpty()){
                     int flg=0;
                     for (int k=0;k<deatlog.size();k++){
                         flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
+                        if(deatlog.get(k).getSpStatus()==2){
                             flg++;
                         }
                     }
@@ -780,26 +609,20 @@ public class LabCheckRecordController extends BaseController {
     @GetMapping("/recordDettailsWc")
     public ResultData recordDettailsWc( Long id) {
         //获取当前登录用户信息
-        SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
 
         //检查记录
         LabCheckRecord labCheckRecord = labCheckRecordService.selectLabCheckRecordById(id);
         if(labCheckRecord==null){
             throw new ServiceException("未获取到相关信息");
         }
-        //判断负责人是否第一次查看
-        /*if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
-        }*/
 
         //待整改
         LabCheckRecordDetailsVO dzgDetailsVo = new LabCheckRecordDetailsVO();
         dzgDetailsVo.setCheckId(id);
         List<LabCheckRecordDetailsVO> dzglist= labCheckRecordDetailsService.selectLabCheckRecordDetailsListVo(dzgDetailsVo);
 
-        if(dzglist.size()>0){
+        if(!dzglist.isEmpty()){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
             //循环查询操作日志信息
             for (int i=0;i<dzglist.size();i++){
@@ -809,10 +632,10 @@ public class LabCheckRecordController extends BaseController {
                 dzglist.get(i).setDetailslogList(deatlog);
 
                 //判断该条检查项的驳回次数
-                if(deatlog.size()>0){
+                if(!deatlog.isEmpty()){
                     int flg=0;
                     for (int k=0;k<deatlog.size();k++){
-                        if("2".equals(deatlog.get(k).getSpStatus())){
+                        if(deatlog.get(k).getSpStatus().longValue()==2){
                             flg++;
                         }
                     }
@@ -859,7 +682,7 @@ public class LabCheckRecordController extends BaseController {
     @GetMapping("/getLoginUserInfo")
     public ResultData getLoginUserInfo( ) {
 
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
 
@@ -875,7 +698,6 @@ public class LabCheckRecordController extends BaseController {
         labCheckRecordvo.setZgStatus(1);
         labCheckRecordvo.setIsFabu(1);//已发布的数据
         List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecordvo);
-        //map.put("sysUser",sysUser);
         map.put("isadmin",flg); //是否实验室管理员
         map.put("ischeck",sysUser.getIsCheck());//是否检查者
         map.put("list",list!=null?list.size():0);//未提交的检查记录
@@ -887,12 +709,12 @@ public class LabCheckRecordController extends BaseController {
      */
     @GetMapping("/getCheckIdByoptionId")
     public ResultData getCheckIdByoptionId( Long jcxId) {
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         Long checkid=0L;
         boolean flg=false;
         //根据检查项id模糊匹配
         List<LabCheckRecordDetails> list =labCheckRecordDetailsService.selectListByJcxId(String.valueOf(jcxId));
-        if(list!=null && list.size()>0){
+        if(list!=null && !list.isEmpty()){
             // 因为存在4、14、34 这类数据 需要循环找出具体对应的id（此集合值不会太多）
             for (int i=0;i<list.size();i++) {
                 if(flg){
@@ -900,9 +722,6 @@ public class LabCheckRecordController extends BaseController {
                 }
                 String[] ids =  list.get(i).getJcxId().split(",");
                 for (int k=0;k<ids.length;k++){
-                    if(flg){
-                        break;
-                    }
                     if(ids[k].equals(String.valueOf(jcxId))){
                         checkid=list.get(i).getCheckId();
                         flg=true;
@@ -938,7 +757,6 @@ public class LabCheckRecordController extends BaseController {
         LabCheckRecordRelease labCheckRecordRelease =iLabCheckRecordReleaseService.selectLabCheckRecordReleaseFirst();
         if(labCheckRecordRelease!=null && labCheckRecordRelease.getCheckId()!=null){
             String[] strids=  labCheckRecordRelease.getCheckId().split(",");
-            //Long[] ids = new Long[strids.length];
             List<Long> ids= new ArrayList<>();
             for (int i=0;i<strids.length;i++){
                 ids.add(Long.valueOf(strids[i]));
@@ -957,17 +775,13 @@ public class LabCheckRecordController extends BaseController {
 
             startPage();
             list = labCheckRecordDetailsService.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVO);
-            if(list.size()>0){
-                //list.get(0).setListVo(listCount);
+            if(!list.isEmpty()){
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
                 String remarkDate = sdf.format(labCheckRecordRelease.getCreateTime());
                 list.get(0).setListVo(listVo);
                 list.get(0).setRemark(remarkDate);//检查时间
                 list.get(0).setLaboratoryId(labCheckRecordRelease.getCheckId());//本批次发布的实验室安全检查id集合
                 list.get(0).setId(labCheckRecordRelease.getId());//发布批次id
-          /*list.get(0).setCheckZs(count.getCheckZs());//隐患总数
-          list.get(0).setCheckYzg(count.getCheckYzg());//已整改
-          list.get(0).setCheckWzg(count.getCheckWzg());//未整改*/
             }
         }
 
@@ -989,7 +803,6 @@ public class LabCheckRecordController extends BaseController {
         LabCheckRecordRelease labCheckRecordRelease =iLabCheckRecordReleaseService.selectLabCheckRecordReleaseFirst();
         if(labCheckRecordRelease!=null && labCheckRecordRelease.getCheckId()!=null){
             String[] strids=  labCheckRecordRelease.getCheckId().split(",");
-            //Long[] ids = new Long[strids.length];
             List<Long> ids= new ArrayList<>();
             for (int i=0;i<strids.length;i++){
                 ids.add(Long.valueOf(strids[i]));
@@ -1009,17 +822,13 @@ public class LabCheckRecordController extends BaseController {
 
         startPage();
         list = labCheckRecordDetailsService.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVO);
-        //list.get(0).setListVo(listCount);
-            if(list.size()>0) {
+            if(!list.isEmpty()) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
                 String remarkDate = sdf.format(labCheckRecordRelease.getCreateTime());
                 list.get(0).setListVo(listVo);
                 list.get(0).setRemark(remarkDate);//检查时间
                 list.get(0).setLaboratoryId(labCheckRecordRelease.getCheckId());//本批次发布的实验室安全检查id集合
                 list.get(0).setId(labCheckRecordRelease.getId());//发布批次id
-            /*list.get(0).setCheckZs(count.getCheckZs());//隐患总数
-            list.get(0).setCheckYzg(count.getCheckYzg());//已整改
-            list.get(0).setCheckWzg(count.getCheckWzg());//未整改*/
             }
 
         }
@@ -1039,7 +848,6 @@ public class LabCheckRecordController extends BaseController {
         LabCheckRecordRelease labCheckRecordRelease =iLabCheckRecordReleaseService.selectLabCheckRecordReleaseById(labCheckRecordVO.getId());
         if(labCheckRecordRelease.getCheckId()!=null){
             String[] strids=  labCheckRecordRelease.getCheckId().split(",");
-            //Long[] ids = new Long[strids.length];
             List<Long> ids= new ArrayList<>();
             for (int i=0;i<strids.length;i++){
                 ids.add(Long.valueOf(strids[i]));
@@ -1049,7 +857,6 @@ public class LabCheckRecordController extends BaseController {
 
         startPage();
         List<LabCheckRecordVO> list = labCheckRecordService.selectLabCheckRecordIndexDetals(labCheckRecordVO);
-        //List<LabCheckRecordDetailsVO> listCount = iLabCheckRecordDetailsService.selectLabCheckRecordCountIndex(new LabCheckRecordDetailsVO());
         return getDataTable(list);
     }
 
@@ -1079,14 +886,14 @@ public class LabCheckRecordController extends BaseController {
             throw new ServiceException("参数不能为空！");
         }
         // 参数 检查项checkId  ,实验室id laboratoryId
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         map.put("laboratoryId",String.valueOf(laboratoryId));
         map.put("checkId", String.valueOf(checkId));
         List<LabCheckRecordVO> list = labCheckRecordService.selectHiddenDangerCount(map);
 
         //判断该检查项是否有未整改记录
         boolean flg =false;
-        if(list.size()>0){
+        if(list != null && !list.isEmpty()){
             for (int i=0;i<list.size();i++){
                 if(1==list.get(i).getIsZg()){
                     flg=true;
@@ -1095,8 +902,8 @@ public class LabCheckRecordController extends BaseController {
             }
         }
 
-        Map<String, Object> backmap =new HashMap<String, Object>();
-        backmap.put("yhcount",list.size());
+        Map<String, Object> backmap =new HashMap<>();
+        backmap.put("yhcount",!list.isEmpty()?list.size():0);
         backmap.put("yhlist",list);
         backmap.put("yhflg",flg);
         return ResultData.success(backmap);

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

@@ -89,7 +89,7 @@ public class LabCheckRecordDetailsController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabCheckRecordDetails labCheckRecordDetails) throws IOException {
         List<LabCheckRecordDetails> list = labCheckRecordDetailsService.selectLabCheckRecordDetailsList(labCheckRecordDetails);
-        ExcelUtil<LabCheckRecordDetails> util = new ExcelUtil<LabCheckRecordDetails>(LabCheckRecordDetails.class);
+        ExcelUtil<LabCheckRecordDetails> util = new ExcelUtil<>(LabCheckRecordDetails.class);
         util.exportExcel(response, list, "安全检查隐患表数据");
     }
 
@@ -110,7 +110,7 @@ public class LabCheckRecordDetailsController extends BaseController {
     //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHECKRECORDDETAILS + PerFun.QUERY)
     @GetMapping(value = "/getInfoById")
     public ResultData getInfoById( Long id) {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String,Object> map = new HashMap<>();
         //隐患项详情
         LabCheckRecordDetails details = labCheckRecordDetailsService.selectLabCheckRecordDetailsById(id);
 
@@ -251,7 +251,7 @@ public class LabCheckRecordDetailsController extends BaseController {
             applyvo.setUserId(sysUser.getUserId());
             List<LabSecurityApplyVO> applist = labSecurityApplyService.selectApplyListEffective(applyvo);
             //获取实验室集合
-            if(applist.size()>0){
+            if(!applist.isEmpty()){
                 List<Long> ids = new ArrayList<>();
                 for (int i=0;i<applist.size();i++){
                     ids.add(applist.get(i).getSubjectId());
@@ -264,8 +264,7 @@ public class LabCheckRecordDetailsController extends BaseController {
         }
         startPage();
         labCheckRecordDetailsVO.setIsFabu(1);//已发布的数据
-        List<LabCheckRecordDetailsVO> list = labCheckRecordDetailsService.selectLabCheckRecordWtzg(labCheckRecordDetailsVO);
-        return  list;
+        return labCheckRecordDetailsService.selectLabCheckRecordWtzg(labCheckRecordDetailsVO);
     }
     /***
      * 根据隐患项id查询详情 - PC
@@ -275,9 +274,7 @@ public class LabCheckRecordDetailsController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHECKRECORDDETAILS + PerFun.QUERY)
     @GetMapping("/dettailsList")
     public ResultData dettailsList( Long id) {
-        Map<String, Object> map =new HashMap<String, Object>();
-        map = getDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getDettailsList(id));
     }
 
     /***
@@ -287,9 +284,7 @@ public class LabCheckRecordDetailsController extends BaseController {
      */
     @GetMapping("/dettailsListApp")
     public ResultData dettailsListApp( Long id) {
-        Map<String, Object> map =new HashMap<String, Object>();
-        map = getDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getDettailsList(id));
     }
 
      public   Map<String, Object> getDettailsList(Long id){
@@ -299,12 +294,15 @@ public class LabCheckRecordDetailsController extends BaseController {
 
          //查询隐患项详情
          LabCheckRecordDetails details = labCheckRecordDetailsService.selectLabCheckRecordDetailsById(id);
+         if(details==null){
+             throw new ServiceException("未获取到相关信息");
+         }
          LabCheckRecordDetailsVO detailsVO = new LabCheckRecordDetailsVO();
          BeanUtils.copyProperties(details ,detailsVO);
 
          //检查记录
          LabCheckRecord labCheckRecord = labCheckRecordService.selectLabCheckRecordById(details.getCheckId());
-         if(labCheckRecord==null || details==null){
+         if(labCheckRecord==null){
              throw new ServiceException("未获取到相关信息");
          }
 
@@ -313,18 +311,6 @@ public class LabCheckRecordDetailsController extends BaseController {
          List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
          detailsVO.setDetailslogList(deatlog);//该条检查项的操作日志
 
-         //判断该条检查项的驳回次数
-        /*if(deatlog.size()>0) {
-            int flg = 0;
-            for (int k = 0; k < deatlog.size(); k++) {
-                flg = 0;//重新赋值
-                if ("2".equals(deatlog.get(k).getSpStatus())) {
-                    flg++;
-                }
-            }
-            detailsVO.setCheckZs(flg);
-        }*/
-
          map.put("details",detailsVO);
          map.put("record",labCheckRecord);
          return map;
@@ -349,7 +335,7 @@ public class LabCheckRecordDetailsController extends BaseController {
             applyvo.setUserId(sysUser.getUserId());
             List<LabSecurityApplyVO> applist = labSecurityApplyService.selectApplyListEffective(applyvo);
             //获取实验室集合
-            if(applist.size()>0){
+            if(!applist.isEmpty()){
                 List<Long> ids = new ArrayList<>();
                 for (int i=0;i<applist.size();i++){
                     ids.add(applist.get(i).getSubjectId());
@@ -383,7 +369,7 @@ public class LabCheckRecordDetailsController extends BaseController {
      */
     @GetMapping("/indexCheckDetalsWzg")
     public TableDataInfo<LabCheckRecordDetailsVO> indexCheckDetalsWzg(LabCheckRecordDetailsVO labCheckRecordDetailsVO) {
-        LabCheckRecordRelease labCheckRecordRelease=new LabCheckRecordRelease();
+        LabCheckRecordRelease labCheckRecordRelease;
         if(labCheckRecordDetailsVO.getId()==null){
             //获取最新一条的发布检查记录
             labCheckRecordRelease =labCheckRecordReleaseService.selectLabCheckRecordReleaseFirst();
@@ -391,15 +377,6 @@ public class LabCheckRecordDetailsController extends BaseController {
             //根据id查村实体
             labCheckRecordRelease =labCheckRecordReleaseService.selectLabCheckRecordReleaseById(labCheckRecordDetailsVO.getId());
         }
-        /*if(labCheckRecordRelease.getCheckId()!=null){
-            String[] strids=  labCheckRecordRelease.getCheckId().split(",");
-            //Long[] ids = new Long[strids.length];
-            List<Long> ids= new ArrayList<>();
-            for (int i=0;i<strids.length;i++){
-                ids.add(Long.valueOf(strids[i]));
-            }
-            labCheckRecordDetailsVO.setIds(ids);
-        }*/
 
         //查询该条发布的检查详情 查询除最新检查发布外的所有数据
         startPage();
@@ -417,7 +394,7 @@ public class LabCheckRecordDetailsController extends BaseController {
      */
     @GetMapping("/indexCheckDetalsYzg")
     public TableDataInfo<LabCheckRecordDetailsVO> indexCheckDetalsYzg(LabCheckRecordDetailsVO labCheckRecordDetailsVO) {
-        LabCheckRecordRelease labCheckRecordRelease=new LabCheckRecordRelease();
+        LabCheckRecordRelease labCheckRecordRelease;
         if(labCheckRecordDetailsVO.getId()==null){
             //获取最新一条的发布检查记录
             labCheckRecordRelease =labCheckRecordReleaseService.selectLabCheckRecordReleaseFirst();
@@ -427,7 +404,6 @@ public class LabCheckRecordDetailsController extends BaseController {
         }
         if(labCheckRecordRelease.getCheckId()!=null){
             String[] strids=  labCheckRecordRelease.getCheckId().split(",");
-            //Long[] ids = new Long[strids.length];
             List<Long> ids= new ArrayList<>();
             for (int i=0;i<strids.length;i++){
                 ids.add(Long.valueOf(strids[i]));
@@ -437,7 +413,6 @@ public class LabCheckRecordDetailsController extends BaseController {
 
         //查询该条发布的检查详情 查询本次发布检查所有详情
         startPage();
-        //labCheckRecordDetailsVO.setIsZg(0L);//已整改
         List<LabCheckRecordDetailsVO> list = labCheckRecordDetailsService.selectLabCheckRecordIndexDetals(labCheckRecordDetailsVO);
         return getDataTable(list);
     }

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

@@ -1,23 +1,14 @@
 package com.zd.laboratory.controller;
 
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.model.domain.ResultData;
 import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.common.core.security.TokenService;
 import com.zd.laboratory.domain.*;
-import com.zd.laboratory.domain.vo.LabCheckRecordDetailsVO;
-import com.zd.laboratory.domain.vo.LabCheckRecordVO;
 import com.zd.laboratory.service.*;
-import com.zd.model.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,11 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 隐患检查审核日志Controller
@@ -39,11 +26,8 @@ import java.util.Map;
  */
 @RestController
 @Api(tags = "【隐患检查审核日志】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-//@ApiSupport(author = Knife4jConfiguration.Author.)
 @RequestMapping("/detailslog")
-public class LabCheckRecordDetailslogController extends BaseController
-{
+public class LabCheckRecordDetailslogController extends BaseController {
     @Autowired
     private ILabCheckRecordDetailslogService labCheckRecordDetailslogService;
 
@@ -53,8 +37,7 @@ public class LabCheckRecordDetailslogController extends BaseController
     @PreAuthorize(hasPermi = "laboratory:detailslog:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询隐患检查审核日志列表")
-    public TableDataInfo<LabCheckRecordDetailslog> list(LabCheckRecordDetailslog labCheckRecordDetailslog)
-    {
+    public TableDataInfo<LabCheckRecordDetailslog> list(LabCheckRecordDetailslog labCheckRecordDetailslog) {
         startPage();
         List<LabCheckRecordDetailslog> list = labCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(labCheckRecordDetailslog);
         return getDataTable(list);
@@ -67,10 +50,9 @@ public class LabCheckRecordDetailslogController extends BaseController
     @PreAuthorize(hasPermi = "laboratory:detailslog:export")
     @Log(title = "隐患检查审核日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabCheckRecordDetailslog labCheckRecordDetailslog) throws IOException
-    {
+    public void export(HttpServletResponse response, LabCheckRecordDetailslog labCheckRecordDetailslog) throws IOException {
         List<LabCheckRecordDetailslog> list = labCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(labCheckRecordDetailslog);
-        ExcelUtil<LabCheckRecordDetailslog> util = new ExcelUtil<LabCheckRecordDetailslog>(LabCheckRecordDetailslog.class);
+        ExcelUtil<LabCheckRecordDetailslog> util = new ExcelUtil<>(LabCheckRecordDetailslog.class);
         util.exportExcel(response, list, "隐患检查审核日志数据");
     }
 
@@ -80,8 +62,7 @@ public class LabCheckRecordDetailslogController extends BaseController
     @ApiOperation(value = "获取隐患检查审核日志详细信息")
     @PreAuthorize(hasPermi = "laboratory:detailslog:query")
     @GetMapping(value = "/{id}")
-    public ResultData<LabCheckRecordDetailslog> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabCheckRecordDetailslog> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labCheckRecordDetailslogService.selectLabCheckRecordDetailslogById(id));
     }
 
@@ -92,8 +73,7 @@ public class LabCheckRecordDetailslogController extends BaseController
     @PreAuthorize(hasPermi = "laboratory:detailslog:add")
     @Log(title = "隐患检查审核日志", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabCheckRecordDetailslog labCheckRecordDetailslog)
-    {
+    public ResultData add(@RequestBody LabCheckRecordDetailslog labCheckRecordDetailslog) {
         return ResultData.result(labCheckRecordDetailslogService.insertLabCheckRecordDetailslog(labCheckRecordDetailslog));
     }
 
@@ -104,9 +84,8 @@ public class LabCheckRecordDetailslogController extends BaseController
     @PreAuthorize(hasPermi = "laboratory:detailslog:edit")
     @Log(title = "隐患检查审核日志", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabCheckRecordDetailslog labCheckRecordDetailslog)
-    {
-        return  ResultData.result(labCheckRecordDetailslogService.updateLabCheckRecordDetailslog(labCheckRecordDetailslog));
+    public ResultData edit(@RequestBody LabCheckRecordDetailslog labCheckRecordDetailslog) {
+        return ResultData.result(labCheckRecordDetailslogService.updateLabCheckRecordDetailslog(labCheckRecordDetailslog));
     }
 
     /**
@@ -116,8 +95,7 @@ public class LabCheckRecordDetailslogController extends BaseController
     @PreAuthorize(hasPermi = "laboratory:detailslog:remove")
     @Log(title = "隐患检查审核日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labCheckRecordDetailslogService.deleteLabCheckRecordDetailslogByIds(ids));
     }
 }

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

@@ -1,7 +1,5 @@
 package com.zd.laboratory.controller;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
@@ -9,13 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.security.TokenService;
-import com.zd.laboratory.domain.LabCheckRecord;
 import com.zd.laboratory.domain.vo.LabCheckRecordReleaseVO;
-import com.zd.laboratory.domain.vo.LabCheckRecordVO;
-import com.zd.laboratory.service.ILabCheckMachineMsgService;
-import com.zd.laboratory.service.ILabCheckRecordService;
-import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,12 +23,9 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabCheckRecordRelease;
 import com.zd.laboratory.service.ILabCheckRecordReleaseService;
 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;
 
 /**
@@ -48,12 +37,9 @@ import com.zd.model.page.TableDataInfo;
 @RestController
 @Api(tags = "【检查发布关系】")
 @RequestMapping("/release")
-public class LabCheckRecordReleaseController extends BaseController
-{
+public class LabCheckRecordReleaseController extends BaseController {
     @Autowired
     private ILabCheckRecordReleaseService labCheckRecordReleaseService;
-    @Autowired
-    private ILabCheckRecordService labCheckRecordService;
 
 
     /**
@@ -62,8 +48,7 @@ public class LabCheckRecordReleaseController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_RELEASE + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询检查发布关系列表")
-    public TableDataInfo<LabCheckRecordRelease> list(LabCheckRecordRelease labCheckRecordRelease)
-    {
+    public TableDataInfo<LabCheckRecordRelease> list(LabCheckRecordRelease labCheckRecordRelease) {
         startPage();
         List<LabCheckRecordRelease> list = labCheckRecordReleaseService.selectLabCheckRecordReleaseList(labCheckRecordRelease);
         return getDataTable(list);
@@ -76,10 +61,9 @@ public class LabCheckRecordReleaseController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_RELEASE + PerFun.EXPORT)
     @Log(title = "检查发布关系", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabCheckRecordRelease labCheckRecordRelease) throws IOException
-    {
+    public void export(HttpServletResponse response, LabCheckRecordRelease labCheckRecordRelease) throws IOException {
         List<LabCheckRecordRelease> list = labCheckRecordReleaseService.selectLabCheckRecordReleaseList(labCheckRecordRelease);
-        ExcelUtil<LabCheckRecordRelease> util = new ExcelUtil<LabCheckRecordRelease>(LabCheckRecordRelease.class);
+        ExcelUtil<LabCheckRecordRelease> util = new ExcelUtil<>(LabCheckRecordRelease.class);
         util.exportExcel(response, list, "检查发布关系数据");
     }
 
@@ -89,8 +73,7 @@ public class LabCheckRecordReleaseController extends BaseController
     @ApiOperation(value = "获取检查发布关系详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_RELEASE + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabCheckRecordRelease> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabCheckRecordRelease> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labCheckRecordReleaseService.selectLabCheckRecordReleaseById(id));
     }
 
@@ -101,9 +84,7 @@ public class LabCheckRecordReleaseController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_RELEASE + PerFun.ADD)
     @Log(title = "检查发布关系", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabCheckRecordRelease labCheckRecordRelease)
-    {
-
+    public ResultData add(@RequestBody LabCheckRecordRelease labCheckRecordRelease) {
         return ResultData.result(labCheckRecordReleaseService.insertLabCheckRecordRelease(labCheckRecordRelease));
     }
 
@@ -114,9 +95,8 @@ public class LabCheckRecordReleaseController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_RELEASE + PerFun.EDIT)
     @Log(title = "检查发布关系", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabCheckRecordRelease labCheckRecordRelease)
-    {
-        return  ResultData.result(labCheckRecordReleaseService.updateLabCheckRecordRelease(labCheckRecordRelease));
+    public ResultData edit(@RequestBody LabCheckRecordRelease labCheckRecordRelease) {
+        return ResultData.result(labCheckRecordReleaseService.updateLabCheckRecordRelease(labCheckRecordRelease));
     }
 
     /**
@@ -126,8 +106,7 @@ public class LabCheckRecordReleaseController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_RELEASE + PerFun.REMOVE)
     @Log(title = "检查发布关系", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labCheckRecordReleaseService.deleteLabCheckRecordReleaseByIds(ids));
     }
 
@@ -138,8 +117,7 @@ public class LabCheckRecordReleaseController extends BaseController
      */
     @GetMapping("/listExist")
     @ApiOperation(value = "查询检查发布关系列表")
-    public TableDataInfo<LabCheckRecordRelease> listExist(LabCheckRecordRelease labCheckRecordRelease)
-    {
+    public TableDataInfo<LabCheckRecordRelease> listExist(LabCheckRecordRelease labCheckRecordRelease) {
         List<LabCheckRecordRelease> list = labCheckRecordReleaseService.selectLabCheckRecordReleaseListExist(labCheckRecordRelease);
         return getDataTable(list);
     }
@@ -151,8 +129,7 @@ public class LabCheckRecordReleaseController extends BaseController
      */
     @GetMapping("/indexListRelease")
     @ApiOperation(value = "查询检查发布关系列表")
-    public TableDataInfo<LabCheckRecordReleaseVO> selectListByParameter(LabCheckRecordReleaseVO labCheckRecordReleaseVO)
-    {
+    public TableDataInfo<LabCheckRecordReleaseVO> selectListByParameter(LabCheckRecordReleaseVO labCheckRecordReleaseVO) {
         startPage();
         List<LabCheckRecordReleaseVO> list = labCheckRecordReleaseService.selectListByParameter(labCheckRecordReleaseVO);
         return getDataTable(list);
@@ -165,24 +142,9 @@ public class LabCheckRecordReleaseController extends BaseController
      */
     @GetMapping("/listRelease")
     @ApiOperation(value = "查询检查发布关系列表")
-    public TableDataInfo<LabCheckRecordReleaseVO> listRelease(LabCheckRecordReleaseVO labCheckRecordReleaseVO)
-    {
+    public TableDataInfo<LabCheckRecordReleaseVO> listRelease(LabCheckRecordReleaseVO labCheckRecordReleaseVO) {
         startPage();
         List<LabCheckRecordReleaseVO> list = labCheckRecordReleaseService.selectListByParameter(labCheckRecordReleaseVO);
         return getDataTable(list);
     }
-
-    /***
-     * PC端检查发布列 详情
-     * @param labCheckRecordVO
-     * @return
-     */
-   /* @GetMapping("/listReleaseDetals")
-    public TableDataInfo<LabCheckRecordVO> indexGetCheckDetals(LabCheckRecordVO labCheckRecordVO)
-    {
-        startPage();
-        List<LabCheckRecordVO> list = labCheckRecordService.selectLabCheckRecordIndexDetals(labCheckRecordVO);
-        return getDataTable(list);
-    }*/
-
 }

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

@@ -1,10 +1,8 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.model.entity.SysFile;
 import com.zd.base.api.feign.RemoteFileService;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabConfig;
 import com.zd.laboratory.service.ILabConfigService;
 import com.zd.model.domain.R;
@@ -21,7 +19,6 @@ import org.springframework.web.multipart.MultipartFile;
  * @Description:
  */
 @Api(tags = {"实验室配置"})
-@ApiSupport(author = Knife4jConfiguration.Author.ZP)
 @RestController
 @RequestMapping("/labconfig")
 public class LabConfigController {

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

@@ -1,26 +1,23 @@
 package com.zd.laboratory.controller;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.laboratory.domain.vo.LabBigViewGroupVO;
-import com.zd.laboratory.domain.vo.LabControlVO;
-import com.zd.laboratory.domain.vo.LabRiskPlanListVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabControl;
+import com.zd.laboratory.domain.vo.LabControlVO;
 import com.zd.laboratory.service.ILabControlService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 控制记录Controller
@@ -53,7 +50,7 @@ public class LabControlController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabControlVO labControl) throws IOException {
         List<LabControlVO> list = labControlService.selectLabControlList(labControl);
-        ExcelUtil<LabControlVO> util = new ExcelUtil<LabControlVO>(LabControlVO.class);
+        ExcelUtil<LabControlVO> util = new ExcelUtil<>(LabControlVO.class);
         util.exportExcel(response, list, "控制记录数据");
     }
 
@@ -101,8 +98,7 @@ public class LabControlController extends BaseController {
      */
     @GetMapping("/getYearControlInfo")
     public ResultData getYearControlInfo(LabControl labControl) {
-        LinkedHashMap <String,Object> list = labControlService.getYearControlInfo(labControl);
-        return ResultData.success(list);
+        return ResultData.success(labControlService.getYearControlInfo(labControl));
     }
 
     /**
@@ -111,8 +107,7 @@ public class LabControlController extends BaseController {
     @GetMapping("/getRiskPlanList")
     public TableDataInfo getRiskPlanList(LabControlVO labControlVO) {
         startPage();
-        List<LabRiskPlanListVO> list = labControlService.getRiskPlanList(labControlVO);
-        return getDataTable(list);
+        return getDataTable(labControlService.getRiskPlanList(labControlVO));
     }
 
 
@@ -125,13 +120,14 @@ public class LabControlController extends BaseController {
             Thread.sleep(1000);
             return ResultData.success(labControlService.selectLabControlNewMegById(id));
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            logger.error("获取控制记录详细信息异常：" + e);
+            Thread.currentThread().interrupt();
         }
-       return ResultData.fail("获取控制记录信息失败！");
+        return ResultData.fail("获取控制记录信息失败！");
     }
 
     @RequestMapping(value = "/timingClearMsg")
-    public void timingClearMsg(){
+    public void timingClearMsg() {
         labControlService.timingClearMsg();
     }
 }

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

@@ -1,36 +1,25 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-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.vo.LabExitLightVO;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabExitLight;
+import com.zd.laboratory.domain.vo.LabExitLightVO;
 import com.zd.laboratory.service.ILabExitLightService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 逃生指引灯Controller
@@ -40,11 +29,8 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【逃生指引灯】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/light")
-public class LabExitLightController extends BaseController
-{
+public class LabExitLightController extends BaseController {
     @Autowired
     private ILabExitLightService labExitLightService;
 
@@ -54,8 +40,7 @@ public class LabExitLightController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_LIGHT + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询逃生指引灯列表")
-    public TableDataInfo<LabExitLightVO> list(LabExitLightVO labExitLightVO)
-    {
+    public TableDataInfo<LabExitLightVO> list(LabExitLightVO labExitLightVO) {
         startPage();
         List<LabExitLightVO> list = labExitLightService.selectLabExitLightList(labExitLightVO);
         return getDataTable(list);
@@ -68,10 +53,9 @@ public class LabExitLightController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_LIGHT + PerFun.EXPORT)
     @Log(title = "逃生指引灯", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabExitLightVO labExitLightVO) throws IOException
-    {
+    public void export(HttpServletResponse response, LabExitLightVO labExitLightVO) throws IOException {
         List<LabExitLightVO> list = labExitLightService.selectLabExitLightList(labExitLightVO);
-        ExcelUtil<LabExitLightVO> util = new ExcelUtil<LabExitLightVO>(LabExitLightVO.class);
+        ExcelUtil<LabExitLightVO> util = new ExcelUtil<>(LabExitLightVO.class);
         util.exportExcel(response, list, "逃生指引灯数据");
     }
 
@@ -81,8 +65,7 @@ public class LabExitLightController extends BaseController
     @ApiOperation(value = "获取逃生指引灯详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_LIGHT + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabExitLightVO> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabExitLightVO> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labExitLightService.selectLabExitLightById(id));
     }
 
@@ -93,8 +76,7 @@ public class LabExitLightController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_LIGHT + PerFun.ADD)
     @Log(title = "逃生指引灯", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabExitLight labExitLight)
-    {
+    public ResultData add(@RequestBody LabExitLight labExitLight) {
         return ResultData.result(labExitLightService.insertLabExitLight(labExitLight));
     }
 
@@ -105,9 +87,8 @@ public class LabExitLightController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_LIGHT + PerFun.EDIT)
     @Log(title = "逃生指引灯", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabExitLight labExitLight)
-    {
-        return  ResultData.result(labExitLightService.updateLabExitLight(labExitLight));
+    public ResultData edit(@RequestBody LabExitLight labExitLight) {
+        return ResultData.result(labExitLightService.updateLabExitLight(labExitLight));
     }
 
     /**
@@ -116,9 +97,8 @@ public class LabExitLightController extends BaseController
     @ApiOperation(value = "删除逃生指引灯")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_LIGHT + PerFun.REMOVE)
     @Log(title = "逃生指引灯", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labExitLightService.deleteLabExitLightByIds(ids));
     }
 }

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

@@ -3,12 +3,9 @@ package com.zd.laboratory.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 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.vo.LabExitLineJoinVO;
 import com.zd.laboratory.domain.vo.LabExitLineVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,11 +22,9 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabExitLine;
 import com.zd.laboratory.service.ILabExitLineService;
 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;
 
@@ -41,8 +36,6 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【逃生线路主】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/line")
 public class LabExitLineController extends BaseController {
     @Autowired
@@ -69,7 +62,7 @@ public class LabExitLineController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabExitLine labExitLine) throws IOException {
         List<LabExitLineVO> list = labExitLineService.selectLabExitLineList(labExitLine);
-        ExcelUtil<LabExitLineVO> util = new ExcelUtil<LabExitLineVO>(LabExitLineVO.class);
+        ExcelUtil<LabExitLineVO> util = new ExcelUtil<>(LabExitLineVO.class);
         util.exportExcel(response, list, "逃生线路主数据");
     }
 

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

@@ -2,16 +2,13 @@ package com.zd.laboratory.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.Feature;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabExitLineVertex;
-import com.zd.laboratory.domain.LabExitPointRelay;
 import com.zd.laboratory.domain.vo.LabExitLineEvacuationVo;
 import com.zd.laboratory.domain.vo.LabExitLineVertexInfoVo;
 import com.zd.laboratory.domain.vo.LabExitLineVertexVo;
@@ -26,7 +23,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,8 +36,6 @@ import java.util.concurrent.TimeUnit;
  */
 @RestController
 @Api(tags = "【逃生线路顶点】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/lineVertex")
 public class LabExitLineVertexController extends BaseController {
     @Autowired
@@ -102,10 +96,10 @@ public class LabExitLineVertexController extends BaseController {
     @PostMapping("/executeEvacuation")
     @ApiOperation(value = "查询逃生线路主列表")
     public ResultData executeEvacuation(@RequestBody LabExitLineEvacuationVo labExitLineEvacuationVo) {
-        Map <String, Object> joinPointVOS = labExitLineVertexService.executeEvacuation(labExitLineEvacuationVo);
-        //todo redis把计算的逃生线路相关信息存储起来
-        redisService.setCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId(), JSON.toJSONString(joinPointVOS), 3L, TimeUnit.HOURS);
-        //todo 下发前端页面通知
+        Map<String, Object> joinPointVOS = labExitLineVertexService.executeEvacuation(labExitLineEvacuationVo);
+        // redis把计算的逃生线路相关信息存储起来
+        redisService.setCacheObject("exitLineBy" + labExitLineEvacuationVo.getBuildId() + "" + labExitLineEvacuationVo.getFloorId(), JSON.toJSONString(joinPointVOS), 3L, TimeUnit.HOURS);
+        // 下发前端页面通知
         messageSendService.exitLineToFloor(labExitLineEvacuationVo.getFloorId());
         return ResultData.success(joinPointVOS);
     }
@@ -117,10 +111,10 @@ public class LabExitLineVertexController extends BaseController {
     @PostMapping("/endEvacuation")
     @ApiOperation(value = "结束疏散")
     public ResultData endEvacuation(@RequestBody LabExitLineEvacuationVo labExitLineEvacuationVo) {
-        new Thread(()->labExitLineVertexService.endEvacuation(labExitLineEvacuationVo)).start();
-        //todo 结束疏散清空redis，以及下发通知
-        redisService.deleteObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId());
-        //todo 下发前端页面通知
+        new Thread(() -> labExitLineVertexService.endEvacuation(labExitLineEvacuationVo)).start();
+        // 结束疏散清空redis，以及下发通知
+        redisService.deleteObject("exitLineBy" + labExitLineEvacuationVo.getBuildId() + "" + labExitLineEvacuationVo.getFloorId());
+        // 下发前端页面通知
         messageSendService.overExitLineToFloor(labExitLineEvacuationVo.getFloorId());
         return ResultData.success();
     }
@@ -131,13 +125,12 @@ public class LabExitLineVertexController extends BaseController {
     @PostMapping("/getRedisEvacuation")
     @ApiOperation(value = "获取redis的疏散数据")
     public ResultData getRedisEvacuation(@RequestBody LabExitLineEvacuationVo labExitLineEvacuationVo) {
-        String joinPointVOSStr = redisService.getCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId());
-        if(StringUtils.isNotNull(joinPointVOSStr)){
-//            String joinPointVOSStr = redisService.getCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId());
-            Map <String, Object> joinPointVOS = (Map <String, Object>) JSON.parseObject(joinPointVOSStr, Object.class, Feature.OrderedField);
+        String joinPointVOSStr = redisService.getCacheObject("exitLineBy" + labExitLineEvacuationVo.getBuildId() + "" + labExitLineEvacuationVo.getFloorId());
+        if (StringUtils.isNotNull(joinPointVOSStr)) {
+            Map<String, Object> joinPointVOS = (Map<String, Object>) JSON.parseObject(joinPointVOSStr, Object.class, Feature.OrderedField);
             return ResultData.success(joinPointVOS);
         }
-        return ResultData.success(new LinkedHashMap <>());
+        return ResultData.success(new LinkedHashMap<>());
     }
 
     /**
@@ -168,5 +161,4 @@ public class LabExitLineVertexController extends BaseController {
     public ResultData<LabExitLineVertexInfoVo> getFloorInfo(@PathVariable("floorId") Long floorId) {
         return ResultData.success(labExitLineVertexService.getFloorInfo(floorId));
     }
-
 }

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

@@ -1,12 +1,9 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabExitPointRelay;
-import com.zd.laboratory.domain.vo.LabExitLineVertexVo;
 import com.zd.laboratory.service.ILabExitPointRelayService;
 import com.zd.model.domain.ResultData;
 import com.zd.model.page.TableDataInfo;
@@ -25,8 +22,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "【逃生灯关联的继电器】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/pointRelay")
 public class LabExitPointRelayController extends BaseController{
 

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

@@ -1,13 +1,9 @@
 package com.zd.laboratory.controller;
 
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,19 +12,15 @@ 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;
-import org.springframework.web.bind.annotation.RestController;;
+import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabGradeManage;
 import com.zd.laboratory.service.ILabGradeManageService;
 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;
 
 /**

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

@@ -83,30 +83,6 @@ public class LabGradeWorkController extends BaseController {
     @ApiOperation(value = "查询分级管控工作列表")
     public ResultData<List<LabGradeManageWorkVO>> havingList(@RequestBody LabGradeManageWorkVO labGradeManageWork) {
         List<LabGradeManageWorkVO> list = labGradeManageWorkService.selectMyGradeManageWorkListV2(labGradeManageWork);
-        // 去除已经完成的部分
-        /*for (int j = 0; j < list.size(); j++) {
-
-            List<LabGradeManageWorkDetailVO> details = list.get(j).getDetailList();
-            if(CollectionUtils.isNotEmpty(details)){
-                for (int i = 0; i < details.size(); i++) {
-                    if(details.get(i).getStatus() == 2){
-                        details.remove(i);
-                        i--;
-                    }
-                }
-                if(details.size() == 0){
-                    list.remove(j);
-                    j --;
-                }
-
-            }
-        }*/
-
-        /*int count = 0;
-        for (LabGradeManageWorkVO labGradeManageWorkVO : list) {
-            count += labGradeManageWorkVO.getDetailList() != null ? labGradeManageWorkVO.getDetailList().size() : 0;
-        }*/
-
         return ResultData.success(list);
     }
 

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

@@ -216,7 +216,7 @@ public class LabHardwareController extends BaseController {
         Map <HardwareTypeEnum, List <FunctionStatus>> list = labHardwareService.getFunList();
 
         return ResultData.success( Optional.ofNullable(list)
-                .filter(a -> a.size() > 0)
+                .filter(a -> !a.isEmpty())
                 .orElseGet(Collections::emptyMap)
                 .entrySet()
                 .stream()
@@ -267,14 +267,6 @@ public class LabHardwareController extends BaseController {
         labSensorVO.setSubjectId(subjectId);
         List<LabSensorVO> listCgq= labSensorService.selectLabSensorList(labSensorVO);
 
-        /*//控制设备-电源开关
-        ytjVo.setType(HardwareTypeEnum.SWITCH);
-        List<LabHardwareVO> listDykg=labHardwareService.selectLabHardwareList(ytjVo);
-
-        //控制设备-智能通风
-        ytjVo.setType(HardwareTypeEnum.AI_VENTILATION);
-        List<LabHardwareVO> listZntf=labHardwareService.selectLabHardwareList(ytjVo);*/
-
         List<Long> ids = new ArrayList<>();
         ids.add(1L);//电源开关
         ids.add(2L);//智能通风
@@ -285,22 +277,16 @@ public class LabHardwareController extends BaseController {
         ytjVo.setIds(null);
         List<LabHardwareVO> listHK = labHardwareService.selectLabHardwareList(ytjVo);
 
-        //实验室详情
-        //LabSubject labSubject =labSubjectService.selectLabSubjectById(subjectId);
-
         XxpCardInfo xxpCardInfo = new XxpCardInfo();
         xxpCardInfo.setSubjectId(subjectId);
         List<XxpCardInfo>  listXxp =xxpCardInfoService.selectXxpCardInfoList(xxpCardInfo);
 
         map.put("listYtj",listYtj);//一体机
-        //map.put("listDykg",listDykg);//控制设备-电源开关
-        //map.put("listZntf",listZntf);//控制设备-智能通风
         map.put("listSpjk",listSpjk); //摄像头
         map.put("listCgq",listCgq); //传感器
         map.put("listkzsb",listkzsb); //控制设备
         map.put("listHK",listHK);
         map.put("listXxp",listXxp);//电子信息牌
-        //map.put("labSubject",labSubject); //实验室详情
         return AjaxResult.success(map);
 
     }
@@ -536,8 +522,7 @@ public class LabHardwareController extends BaseController {
      */
     @RequestMapping("/getBySubjectId")
     public List<LabHazardSubjectRelation>  getBySubjectId(@RequestParam("subjectId") Long subjectId) {
-        List<LabHazardSubjectRelation> list= labHazardSubjectRelationService.queryBySubjectId(subjectId);
-        return list;
+        return labHazardSubjectRelationService.queryBySubjectId(subjectId);
     }
 
     /***
@@ -547,7 +532,6 @@ public class LabHardwareController extends BaseController {
      */
     @RequestMapping("/getBySubjectIds")
     public List<CommonCount>  getBySubjectIds(@RequestParam("ids") Long... ids) {
-        List<CommonCount> list= labHazardSubjectRelationService.queryCountBySubIds(ids);
-        return list;
+        return labHazardSubjectRelationService.queryCountBySubIds(ids);
     }
 }

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

@@ -12,7 +12,6 @@ import com.zd.laboratory.domain.dto.LabHazardNewVo;
 import com.zd.laboratory.domain.vo.LabHazardColumnarVO;
 import com.zd.laboratory.domain.vo.LabHazardSubVO;
 import com.zd.laboratory.domain.vo.LabHazardVO;
-import com.zd.laboratory.service.ILabContainerService;
 import com.zd.laboratory.service.ILabHazardService;
 import com.zd.laboratory.service.ILabHazardSubjectRelationService;
 import com.zd.laboratory.service.ILabQpSubjectRelationService;
@@ -44,8 +43,7 @@ import java.util.Map;
 public class LabHazardController extends BaseController {
     @Autowired
     private ILabHazardService labHazardService;
-    @Autowired
-    private ILabContainerService labContainerService;
+
     @Autowired
     private ILabHazardSubjectRelationService labHazardSubjectRelationService;
     @Autowired
@@ -71,27 +69,16 @@ public class LabHazardController extends BaseController {
         return ResultData.success(labHazardSubjectRelationService.queryHazardSubListVO(subId));
     }
 
-//    /**
-//     * 将危险源关联到多个实验室
-//     */
-//    @PostMapping("/addRelation")
-//    @ApiOperation(value = "将危险源关联到多个实验室")
-//    public ResultData addRelation(@RequestBody @Validated(ValidGroup.Crud.Update.class) LabHazardDTO labHazard) {
-//
-//        labHazardSubjectRelationService.addRelation(labHazard);
-//        return ResultData.success();
-//    }
-
     @GetMapping(value = "/getQpHazard")
     @ApiOperation(value = "获取实验室气瓶存储数量")
     public ResultData<LabQpSubjectRelation> getQpHazard(Long subId) {
-        LabQpSubjectRelation LabQpSubjectRelation = new LabQpSubjectRelation();
-        LabQpSubjectRelation.setSubjectId(subId);
-        List<LabQpSubjectRelation> list = labQpSubjectRelationService.selectLabQpSubjectRelationList(LabQpSubjectRelation);
-        if(list.size()>0){
-            LabQpSubjectRelation = list.get(0);
+        LabQpSubjectRelation labQpSubjectRelation = new LabQpSubjectRelation();
+        labQpSubjectRelation.setSubjectId(subId);
+        List<LabQpSubjectRelation> list = labQpSubjectRelationService.selectLabQpSubjectRelationList(labQpSubjectRelation);
+        if (!list.isEmpty()) {
+            labQpSubjectRelation = list.get(0);
         }
-        return ResultData.success(LabQpSubjectRelation);
+        return ResultData.success(labQpSubjectRelation);
     }
 
     /**
@@ -106,30 +93,6 @@ public class LabHazardController extends BaseController {
     }
 
 
-//    /**
-//     * 将危险源关联到多个实验室
-//     */
-//    @PostMapping("/addRelation")
-//    @ApiOperation(value = "将危险源关联到多个实验室")
-//    public ResultData addRelation(@RequestBody LabHazardDTO labHazard) {
-//        if(labHazard.getHazardId() == null && labHazard.getContainerId() == null){
-//            return error("参数异常");
-//        }
-//        Long id = null;
-//        if(labHazard.getHazardId() != null){
-//            LabHazard labHazard1 = labHazardService.selectLabHazardById(labHazard.getHazardId());
-//            id = labHazard1 != null ? labHazard1.getId() : null;
-//        }else {
-//            LabContainer labContainer = labContainerService.selectLabContainerById(labHazard.getContainerId());
-//            id = labContainer != null ? labContainer.getId() : null;
-//        }
-//        if(id == null){
-//            return error("参数无效！");
-//        }
-//        labHazardSubjectRelationService.addRelation(labHazard);
-//        return ResultData.success();
-//    }
-
     /**
      * 查询危化品下拉框
      */
@@ -151,19 +114,6 @@ public class LabHazardController extends BaseController {
         return ResultData.success(list);
     }
 
-//    /**
-//     * 导出危险源列表
-//     */
-//    @PreAuthorize(hasPermi = "laboratory:hazard:export")
-//    @Log(title = "危险源", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    @ApiOperation(value = "导出危险源列表")
-//    public void export(HttpServletResponse response, LabHazard labHazard) throws IOException {
-//        List<LabHazard> list = labHazardService.selectLabHazardList(labHazard);
-//        ExcelUtil<LabHazard> util = new ExcelUtil<LabHazard>(LabHazard.class);
-//        util.exportExcel(response, list, "危险源数据");
-//    }
-
     /**
      * 获取危险源详细信息
      */
@@ -179,16 +129,6 @@ public class LabHazardController extends BaseController {
         return ResultData.success(labHazardNewVo);
     }
 
-//    /**
-//     * 新增危险源(压力容器)
-//     */
-//    @PreAuthorize(hasPermi = "laboratory:hazard:add")
-//    @Log(title = "危险源", businessType = BusinessType.INSERT)
-//    @PostMapping("/addContainer")
-//    @ApiOperation(value = "新增危险源(压力容器)")
-//    public ResultData addContainer(@RequestBody @Validated(ValidGroup.Crud.Create.class) LabContainer labContainer) {
-//        return ResultData.success(labContainerService.insertLabContainer(labContainer));
-//    }
 
     /**
      * 小程序二维码 查询数据详情 并记录count

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

@@ -3,14 +3,9 @@ package com.zd.laboratory.controller;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
 import com.zd.model.page.TableDataInfo;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.laboratory.domain.LabViolation;
 import com.zd.laboratory.domain.dto.LabViolationDTO;
 import com.zd.laboratory.domain.vo.LabViolationVO;
 import com.zd.laboratory.service.ILabViolationService;
@@ -18,9 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 /**

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

@@ -5,7 +5,6 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.exam.api.feign.RemoteExamService;
 import com.zd.laboratory.domain.LabBlacklist;
 import com.zd.laboratory.domain.LabNegativeListRecords;
 import com.zd.laboratory.domain.LabNegativelistHistory;
@@ -36,7 +35,6 @@ import java.util.Map;
  */
 @RestController
 @Api(tags = "【负面清单列表】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
 @RequestMapping("/negativeListRecords")
 public class LabNegativeListRecordsController extends BaseController
 {
@@ -55,9 +53,6 @@ public class LabNegativeListRecordsController extends BaseController
     @Autowired
     private ILabNegativelistHistoryService negativelistHistoryService;
 
-    @Autowired
-    private RemoteExamService remoteExamService;
-
     /**
      * 查询负面清单列表列表
      */
@@ -72,19 +67,6 @@ public class LabNegativeListRecordsController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出负面清单列表列表
-     */
-   /* @ApiOperation(value = "导出负面清单列表列表")
-    @PreAuthorize(hasPermi = "laboratory:negativeListRecords:export")
-    @Log(title = "负面清单列表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, LabNegativeListRecords labNegativeListRecords) throws IOException
-    {
-        List<LabNegativeListRecords> list = labNegativeListRecordsService.selectLabNegativeListRecordsList(labNegativeListRecords);
-        ExcelUtil<LabNegativeListRecords> util = new ExcelUtil<LabNegativeListRecords>(LabNegativeListRecords.class);
-        util.exportExcel(response, list, "负面清单列表数据");
-    }*/
 
     /**
      * 获取负面清单列表详细信息
@@ -171,7 +153,6 @@ public class LabNegativeListRecordsController extends BaseController
     public ResultData delnegativelist(LabNegativelistHistory negativelistHistory)
     {
         negativelistHistoryService.insertLabNegativelistHistory(negativelistHistory);
-//        return ResultData.result(labNegativeListRecordsService.deleteLabNegativeListRecordsByIds(ids));
         return null;
     }
 
@@ -203,18 +184,6 @@ public class LabNegativeListRecordsController extends BaseController
     }
 
 
- /*   *//**
-     * 完成考试后移除负面清单
-     * @param vo
-     * @return
-     *//*
-    @PostMapping("/delexam")
-    public ResultData delexam(@RequestBody LabNegativeListRecordsVO vo){
-
-        return labNegativeListRecordsService.delexam(vo);
-    }*/
-
-
     /**
      * 负面清单完成学习更改状态
      */

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

@@ -22,12 +22,9 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabNegativeListSite;
 import com.zd.laboratory.service.ILabNegativeListSiteService;
 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;
 
 /**
@@ -38,7 +35,6 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【负面清单设置】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
 @RequestMapping("/negativeListSite")
 public class LabNegativeListSiteController extends BaseController
 {
@@ -68,7 +64,7 @@ public class LabNegativeListSiteController extends BaseController
     public void export(HttpServletResponse response, LabNegativeListSite labNegativeListSite) throws IOException
     {
         List<LabNegativeListSite> list = labNegativeListSiteService.selectLabNegativeListSiteList(labNegativeListSite);
-        ExcelUtil<LabNegativeListSite> util = new ExcelUtil<LabNegativeListSite>(LabNegativeListSite.class);
+        ExcelUtil<LabNegativeListSite> util = new ExcelUtil<>(LabNegativeListSite.class);
         util.exportExcel(response, list, "负面清单设置数据");
     }
 

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

@@ -1,9 +1,6 @@
 package com.zd.laboratory.controller;
 
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.domain.ResultData;
@@ -36,10 +33,8 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【负面清单历史记录/违规历史记录】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
 @RequestMapping("/negativeListHistory")
-public class LabNegativelistHistoryController extends BaseController
-{
+public class LabNegativelistHistoryController extends BaseController {
     @Autowired
     private ILabNegativelistHistoryService labNegativelistHistoryService;
 
@@ -73,22 +68,6 @@ public class LabNegativelistHistoryController extends BaseController
         return getDataTable(list);
     }
 
-
-
-    /**
-     * 导出负面清单历史记录列表
-     *//*
-    @ApiOperation(value = "导出负面清单历史记录列表")
-    @PreAuthorize(hasPermi = "laboratory:negativeListHistory:export")
-    @Log(title = "负面清单历史记录", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, LabNegativelistHistory labNegativelistHistory) throws IOException
-    {
-        List<LabNegativelistHistory> list = labNegativelistHistoryService.selectLabNegativelistHistoryList(labNegativelistHistory);
-        ExcelUtil<LabNegativelistHistory> util = new ExcelUtil<LabNegativelistHistory>(LabNegativelistHistory.class);
-        util.exportExcel(response, list, "负面清单历史记录数据");
-    }*/
-
     /**
      * 获取负面清单历史记录详细信息
      */

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

@@ -1,8 +1,6 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabNewnoticeContent;
 import com.zd.laboratory.service.ILabNewnoticeContentService;
 import com.zd.model.page.TableDataInfo;
@@ -23,7 +21,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "新通知内容")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/newnoticeContent")
 public class LabNewnoticeContentController extends BaseController <LabNewnoticeContent> {
 

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

@@ -1,12 +1,9 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabNewnoticeGroup;
 import com.zd.laboratory.service.ILabNewnoticeGroupService;
 import com.zd.model.domain.ResultData;
-import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +21,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "通知组")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/newnoticeGroup")
 public class LabNewnoticeGroupController extends BaseController <LabNewnoticeGroup> {
 

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

@@ -1,19 +1,15 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabNewnoticeMode;
-import com.zd.laboratory.domain.vo.LabExitLineVertexVo;
-import com.zd.laboratory.domain.vo.LabNewnoticeSendmodeVo;
 import com.zd.laboratory.service.ILabNewnoticeModeService;
 import com.zd.model.domain.ResultData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -25,7 +21,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "发送类型")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/newnoticeMode")
 public class LabNewnoticeModeController extends BaseController <LabNewnoticeMode> {
 

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

@@ -1,14 +1,10 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-import com.zd.laboratory.domain.LabNewnoticeContent;
 import com.zd.laboratory.domain.LabNewnoticeSendmode;
 import com.zd.laboratory.domain.vo.LabNewnoticeSendmodeVo;
-import com.zd.laboratory.service.ILabNewnoticeContentService;
 import com.zd.laboratory.service.ILabNewnoticeSendmodeService;
 import com.zd.model.domain.ResultData;
 import com.zd.model.page.TableDataInfo;
@@ -27,7 +23,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "发送方式")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/newnoticeSendmode")
 public class LabNewnoticeSendmodeController extends BaseController <LabNewnoticeSendmode>{
 

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

@@ -1,35 +1,24 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabNoticeconfig;
 import com.zd.laboratory.service.ILabNoticeconfigService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 通知配置Controller
@@ -39,11 +28,8 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【通知配置】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/noticeconfig")
-public class LabNoticeconfigController extends BaseController
-{
+public class LabNoticeconfigController extends BaseController {
     @Autowired
     private ILabNoticeconfigService labNoticeconfigService;
 
@@ -53,8 +39,7 @@ public class LabNoticeconfigController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTICECONFIG + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询通知配置列表")
-    public TableDataInfo<LabNoticeconfig> list(LabNoticeconfig labNoticeconfig)
-    {
+    public TableDataInfo<LabNoticeconfig> list(LabNoticeconfig labNoticeconfig) {
         startPage();
         List<LabNoticeconfig> list = labNoticeconfigService.selectLabNoticeconfigList(labNoticeconfig);
         return getDataTable(list);
@@ -67,10 +52,9 @@ public class LabNoticeconfigController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTICECONFIG + PerFun.EXPORT)
     @Log(title = "通知配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabNoticeconfig labNoticeconfig) throws IOException
-    {
+    public void export(HttpServletResponse response, LabNoticeconfig labNoticeconfig) throws IOException {
         List<LabNoticeconfig> list = labNoticeconfigService.selectLabNoticeconfigList(labNoticeconfig);
-        ExcelUtil<LabNoticeconfig> util = new ExcelUtil<LabNoticeconfig>(LabNoticeconfig.class);
+        ExcelUtil<LabNoticeconfig> util = new ExcelUtil<>(LabNoticeconfig.class);
         util.exportExcel(response, list, "通知配置数据");
     }
 
@@ -80,8 +64,7 @@ public class LabNoticeconfigController extends BaseController
     @ApiOperation(value = "获取通知配置详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTICECONFIG + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabNoticeconfig> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabNoticeconfig> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labNoticeconfigService.selectLabNoticeconfigById(id));
     }
 
@@ -92,8 +75,7 @@ public class LabNoticeconfigController extends BaseController
 //    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTICECONFIG + PerFun.ADD)
     @Log(title = "通知配置", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabNoticeconfig labNoticeconfig)
-    {
+    public ResultData add(@RequestBody LabNoticeconfig labNoticeconfig) {
         return ResultData.result(labNoticeconfigService.insertLabNoticeconfig(labNoticeconfig));
     }
 
@@ -104,9 +86,8 @@ public class LabNoticeconfigController extends BaseController
 //    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTICECONFIG + PerFun.EDIT)
     @Log(title = "通知配置", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabNoticeconfig labNoticeconfig)
-    {
-        return  ResultData.result(labNoticeconfigService.updateLabNoticeconfig(labNoticeconfig));
+    public ResultData edit(@RequestBody LabNoticeconfig labNoticeconfig) {
+        return ResultData.result(labNoticeconfigService.updateLabNoticeconfig(labNoticeconfig));
     }
 
     /**
@@ -115,25 +96,22 @@ public class LabNoticeconfigController extends BaseController
     @ApiOperation(value = "删除通知配置")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTICECONFIG + PerFun.REMOVE)
     @Log(title = "通知配置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labNoticeconfigService.deleteLabNoticeconfigByIds(ids));
     }
 
 
-
     /**
      * 查询通知配置列表
      */
 //    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTICECONFIG + PerFun.LIST)
     @GetMapping("/getNoticeconfigInfo")
     @ApiOperation(value = "查询通知配置列表")
-    public ResultData<LabNoticeconfig> getNoticeconfigInfo(LabNoticeconfig labNoticeconfig)
-    {
+    public ResultData<LabNoticeconfig> getNoticeconfigInfo(LabNoticeconfig labNoticeconfig) {
         List<LabNoticeconfig> list = labNoticeconfigService.selectLabNoticeconfigList(labNoticeconfig);
         LabNoticeconfig noticeconfig = new LabNoticeconfig();
-        if(list.size()>0){
+        if (!list.isEmpty()) {
             noticeconfig = list.get(0);
         }
         return ResultData.success(noticeconfig);

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

@@ -1,42 +1,30 @@
 package com.zd.laboratory.controller;
 
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-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.vo.LabNotifyplanExcelVO;
-import com.zd.laboratory.domain.vo.LabNotifyplanVO;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabNotifyplan;
+import com.zd.laboratory.domain.vo.LabNotifyplanExcelVO;
+import com.zd.laboratory.domain.vo.LabNotifyplanVO;
 import com.zd.laboratory.service.ILabNotifyplanService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 大屏通知计划Controller
@@ -47,8 +35,7 @@ import com.zd.model.page.TableDataInfo;
 @RestController
 @Api(tags = "【大屏通知计划】")
 @RequestMapping("/notifyplan")
-public class LabNotifyplanController extends BaseController
-{
+public class LabNotifyplanController extends BaseController {
     @Autowired
     private ILabNotifyplanService labNotifyplanService;
 
@@ -58,11 +45,9 @@ public class LabNotifyplanController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTIFYPLAN + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询大屏通知计划列表")
-    public TableDataInfo<LabNotifyplanVO> list(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
-    {
+    public TableDataInfo<LabNotifyplanVO> list(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         startPage();
-        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan,request);
-        //List<LabNotifyplan> list = labNotifyplanService.selectLabNotifyplanList(labNotifyplan);
+        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan, request);
         return getDataTable(list);
     }
 
@@ -72,12 +57,11 @@ public class LabNotifyplanController extends BaseController
      * @return
      */
     @GetMapping("/listTz")
-    public TableDataInfo<LabNotifyplanVO> listTz(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
-    {
+    public TableDataInfo<LabNotifyplanVO> listTz(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         startPage();
         labNotifyplan.setType(1);//工作通知
         labNotifyplan.setNotifyType(1);//大屏通知
-        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan,request);
+        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan, request);
         return getDataTable(list);
     }
 
@@ -88,11 +72,10 @@ public class LabNotifyplanController extends BaseController
      */
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WORKNOTIFYPLAN + PerFun.LIST)
     @GetMapping("/listJh")
-    public TableDataInfo<LabNotifyplanVO> listJh(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
-    {
+    public TableDataInfo<LabNotifyplanVO> listJh(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         startPage();
         labNotifyplan.setType(2);//计划类型
-        List<LabNotifyplanVO> list = labNotifyplanService.selectLabWorkNotifyplanListVO(labNotifyplan,request);
+        List<LabNotifyplanVO> list = labNotifyplanService.selectLabWorkNotifyplanListVO(labNotifyplan, request);
         return getDataTable(list);
     }
 
@@ -102,12 +85,9 @@ public class LabNotifyplanController extends BaseController
      * @return
      */
     @GetMapping("/listCollegeTz")
-    public TableDataInfo<LabNotifyplanVO> listCollegeTz(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
-    {
+    public TableDataInfo<LabNotifyplanVO> listCollegeTz(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         startPage();
-//        labNotifyplan.setType(1);//1大屏通知
-//        labNotifyplan.setNotifyType(2);//2院校通知
-        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan,request);
+        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan, request);
         return getDataTable(list);
     }
 
@@ -117,14 +97,13 @@ public class LabNotifyplanController extends BaseController
      * @return
      */
     @GetMapping("/listCollegeJh")
-    public ResultData listCollegeJh(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
-    {
+    public ResultData listCollegeJh(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         startPage();
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         labNotifyplan.setType(2);//计划类型
         labNotifyplan.setRemark("1");//解析xecel
-        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan,request);
-        map.put("list",list.size()>0?list.get(0):list);
+        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan, request);
+        map.put("list", !list.isEmpty() ? list.get(0) : list);
         return ResultData.success(map);
     }
 
@@ -134,14 +113,13 @@ public class LabNotifyplanController extends BaseController
      * @return
      */
     @GetMapping("/listIndexJh")
-    public ResultData listIndexJh(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
-    {
+    public ResultData listIndexJh(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         startPage();
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         labNotifyplan.setType(2);//计划类型
         labNotifyplan.setRemark("1");//解析xecel
-        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan,request);
-        map.put("list",list.size()>0?list.get(0):list);
+        List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan, request);
+        map.put("list", !list.isEmpty() ? list.get(0) : list);
         return ResultData.success(map);
     }
 
@@ -151,34 +129,15 @@ public class LabNotifyplanController extends BaseController
      * @return
      */
     @GetMapping("/listIndexJhDetals")
-    public ResultData listIndexJhDetals(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
-    {
-        Map<String, Object> map =new HashMap<String, Object>();
+    public ResultData listIndexJhDetals(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
         labNotifyplan.setType(2);//计划类型
         labNotifyplan.setRemark("1");//解析xecel
-        List<LabNotifyplanVO> list = labNotifyplanService.listIndexJhDetals(labNotifyplan,request);
-        map.put("list",list.size()>0?list.get(0):list);
+        List<LabNotifyplanVO> list = labNotifyplanService.listIndexJhDetals(labNotifyplan, request);
+        map.put("list", !list.isEmpty() ? list.get(0) : list);
         return ResultData.success(map);
     }
 
-   /* public static InputStream byteByUrl(String urlOrPath) throws IOException {
-        InputStream in = null;
-        byte[] bytes;
-        if (urlOrPath.toLowerCase().startsWith("https")) {
-            bytes = HttpsUtils.doGet(urlOrPath);
-        } else if (urlOrPath.toLowerCase().startsWith("http")) {
-            URL url = new URL(urlOrPath);
-            return url.openStream();
-        } else {
-            File file = new File(urlOrPath);
-            if (!file.isFile() || !file.exists() || !file.canRead()) {
-                return null;
-            }
-            return new FileInputStream(file);
-        }
-        return new ByteArrayInputStream(bytes);
-    }*/
-
     /**
      * 导出大屏通知计划列表
      */
@@ -186,10 +145,9 @@ public class LabNotifyplanController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTIFYPLAN + PerFun.EXPORT)
     @Log(title = "大屏通知计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabNotifyplan labNotifyplan) throws IOException
-    {
+    public void export(HttpServletResponse response, LabNotifyplan labNotifyplan) throws IOException {
         List<LabNotifyplan> list = labNotifyplanService.selectLabNotifyplanList(labNotifyplan);
-        ExcelUtil<LabNotifyplan> util = new ExcelUtil<LabNotifyplan>(LabNotifyplan.class);
+        ExcelUtil<LabNotifyplan> util = new ExcelUtil<>(LabNotifyplan.class);
         util.exportExcel(response, list, "大屏通知计划数据");
     }
 
@@ -199,8 +157,7 @@ public class LabNotifyplanController extends BaseController
     @ApiOperation(value = "获取大屏通知计划详细信息")
 //    @PreAuthorize(hasPermi = "laboratory:notifyplan:query")
     @GetMapping(value = "/{id}")
-    public ResultData<LabNotifyplanVO> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabNotifyplanVO> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labNotifyplanService.selectLabNotifyplanById(id));
     }
 
@@ -211,24 +168,8 @@ public class LabNotifyplanController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTIFYPLAN + PerFun.ADD)
     @Log(title = "大屏通知计划", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabNotifyplan labNotifyplan,HttpServletRequest request)
-    {
-        //大屏通知发布
-        /* `title`   '通知标题',
-        `notify_type` '通知类型 1工作通知 2校院通知  ',
-        `type` '1大屏通知  ',
-        `content`   '内容',
-        `company`   '发布单位',*/
-
-        //大屏工作计划发布
-        /* `title`   '标题',
-        `type` '2工作计划  ',
-        `content`   '内容',
-        `company`   '发布单位',
-        `content_name`   '工作计划文件名称',
-        `content_url`   '附件地址',
-        */
-        return ResultData.result(labNotifyplanService.insertLabNotifyplan(labNotifyplan,request));
+    public ResultData add(@RequestBody LabNotifyplan labNotifyplan, HttpServletRequest request) {
+        return ResultData.result(labNotifyplanService.insertLabNotifyplan(labNotifyplan, request));
     }
 
 
@@ -239,8 +180,7 @@ public class LabNotifyplanController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WORKNOTIFYPLAN + PerFun.ADD)
     @Log(title = "新增工作计划", businessType = BusinessType.INSERT)
     @PostMapping("/addWorkPlan")
-    public ResultData addWorkNotifyplan(@RequestBody LabNotifyplan labNotifyplan,HttpServletRequest request)
-    {
+    public ResultData addWorkNotifyplan(@RequestBody LabNotifyplan labNotifyplan, HttpServletRequest request) {
         //大屏通知发布
         /* `title`   '通知标题',
         `notify_type` '通知类型 1工作通知 2校院通知  ',
@@ -256,7 +196,7 @@ public class LabNotifyplanController extends BaseController
         `content_name`   '工作计划文件名称',
         `content_url`   '附件地址',
         */
-        return ResultData.result(labNotifyplanService.insertLabNotifyplan(labNotifyplan,request));
+        return ResultData.result(labNotifyplanService.insertLabNotifyplan(labNotifyplan, request));
     }
 
     /**
@@ -266,9 +206,8 @@ public class LabNotifyplanController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTIFYPLAN + PerFun.EDIT)
     @Log(title = "大屏通知计划", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabNotifyplan labNotifyplan)
-    {
-        return  ResultData.result(labNotifyplanService.updateLabNotifyplan(labNotifyplan));
+    public ResultData edit(@RequestBody LabNotifyplan labNotifyplan) {
+        return ResultData.result(labNotifyplanService.updateLabNotifyplan(labNotifyplan));
     }
 
     /**
@@ -278,8 +217,7 @@ public class LabNotifyplanController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_NOTIFYPLAN + PerFun.REMOVE)
     @Log(title = "大屏通知计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labNotifyplanService.deleteLabNotifyplanByIds(ids));
     }
 
@@ -290,8 +228,7 @@ public class LabNotifyplanController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WORKNOTIFYPLAN + PerFun.REMOVE)
     @Log(title = "删除工作计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/workPlan/{ids}")
-    public ResultData workPlanRemove(@PathVariable Long[] ids)
-    {
+    public ResultData workPlanRemove(@PathVariable Long[] ids) {
         return ResultData.result(labNotifyplanService.deleteLabNotifyplanByIds(ids));
     }
 
@@ -302,10 +239,9 @@ public class LabNotifyplanController extends BaseController
      */
     @Log(title = "大屏通知计划", businessType = BusinessType.EXPORT)
     @PostMapping("/exportModel")
-    public void exportModel(HttpServletResponse response) throws IOException
-    {
+    public void exportModel(HttpServletResponse response) throws IOException {
         List<LabNotifyplanExcelVO> list = new ArrayList<>();
-        ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<LabNotifyplanExcelVO>(LabNotifyplanExcelVO.class);
+        ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<>(LabNotifyplanExcelVO.class);
         util.exportExcel(response, list, "工作计划模板");
     }
 }

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

@@ -53,7 +53,7 @@ public class LabOnepcController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabOnepc labOnepc) throws IOException {
         List<LabOnepc> list = labOnepcService.selectLabOnepcList(labOnepc);
-        ExcelUtil<LabOnepc> util = new ExcelUtil<LabOnepc>(LabOnepc.class);
+        ExcelUtil<LabOnepc> util = new ExcelUtil<>(LabOnepc.class);
         util.exportExcel(response, list, "一体机设备勾选数据");
     }
 
@@ -96,12 +96,4 @@ public class LabOnepcController extends BaseController {
         return ResultData.success(labOnepcService.deleteLabOnepcByIds(ids));
     }
 
-
-//    /**
-//     * 一体机获取实验室安全制度
-//     */
-//    @GetMapping("/safesystem")
-//    public ResultData safeSystem(@Param("subjectId") Long subjectId) {
-//        return ResultData.success(labSafeClasstypeService.safeSystemById(subjectId));
-//    }
 }

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

@@ -67,7 +67,7 @@ public class LabPhotoInspectionController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabPhotoInspection labPhotoInspection) throws IOException {
         List<LabPhotoInspection> list = labPhotoInspectionService.selectLabPhotoInspectionList(labPhotoInspection);
-        ExcelUtil<LabPhotoInspection> util = new ExcelUtil<LabPhotoInspection>(LabPhotoInspection.class);
+        ExcelUtil<LabPhotoInspection> util = new ExcelUtil<>(LabPhotoInspection.class);
         util.exportExcel(response, list, "拍照检查附件数据");
     }
 
@@ -131,7 +131,7 @@ public class LabPhotoInspectionController extends BaseController {
         if(StringUtils.isNotNull(imgUrl) && !"".equals(imgUrl)){
             Map<String,String> imgMap = new HashMap <>();
             imgMap.put("imgName", imgName);
-            imgMap.put("imgUrl", fileConfigUtils.getFileDomainAdmin()+imgUrl);
+            imgMap.put("imgUrl", imgUrl);
             allList.add(imgMap);
         }
     }
@@ -166,7 +166,6 @@ public class LabPhotoInspectionController extends BaseController {
             }
         }
         return ResultData.success(allMap);
-//        return ResultData.success(labPhotoInspectionService.outSubjectPhoto());
     }
 
 

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

@@ -51,20 +51,6 @@ public class LabPhotoNoteController extends BaseController {
         return getDataTable(list);
     }
 
-//    /**
-//     * 导出随手拍记录列表
-//     */
-//    @ApiOperation(value = "导出随手拍记录列表")
-//    @PreAuthorize(hasPermi = "laboratory:photonote:export")
-//    @Log(title = "随手拍记录", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, LabPhotoNote labPhotoNote) throws IOException
-//    {
-//        List<LabPhotoNote> list = labPhotoNoteService.selectLabPhotoNoteList(labPhotoNote);
-//        ExcelUtil<LabPhotoNote> util = new ExcelUtil<LabPhotoNote>(LabPhotoNote.class);
-//        util.exportExcel(response, list, "随手拍记录数据");
-//    }
-
     /**
      * 获取随手拍记录详细信息
      */
@@ -109,39 +95,12 @@ public class LabPhotoNoteController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_PHOTONOTE + PerFun.EDIT)
     @PostMapping("/handle")
     public ResultData handle(@RequestBody LabPhotoNote labPhotoNote) {
-//        LabPhotoNote add = new LabPhotoNote();
-//        add.setHandleStatus(1);
-//        add.setHandleTime(DateUtils.getNowDate());
-//        add.setId(labPhotoNote.getId());
         labPhotoNote.setHandleStatus(1);
         labPhotoNote.setHandleTime(DateUtils.getNowDate());
         labPhotoNote.setHandleUser(SecurityUtils.getUserId());
         return ResultData.result(labPhotoNoteService.updateLabPhotoNote(labPhotoNote));
     }
 
-//    /**
-//     * 修改随手拍记录
-//     */
-//    @ApiOperation(value = "修改随手拍记录")
-//    @PreAuthorize(hasPermi = "laboratory:photonote:edit")
-//    @Log(title = "随手拍记录", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public ResultData edit(@RequestBody LabPhotoNote labPhotoNote)
-//    {
-//        return  ResultData.result(labPhotoNoteService.updateLabPhotoNote(labPhotoNote));
-//    }
-
-//    /**
-//     * 删除随手拍记录
-//     */
-//    @ApiOperation(value = "删除随手拍记录")
-//    @PreAuthorize(hasPermi = "laboratory:photonote:remove")
-//    @Log(title = "随手拍记录", businessType = BusinessType.DELETE)
-//	@DeleteMapping("/{ids}")
-//    public ResultData remove(@PathVariable Long[] ids)
-//    {
-//        return ResultData.result(labPhotoNoteService.deleteLabPhotoNoteByIds(ids));
-//    }
 
     /**
      * 查询登录人接收随手拍统计

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

@@ -22,12 +22,9 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabPintsScoreSite;
 import com.zd.laboratory.service.ILabPintsScoreSiteService;
 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;
 
 /**
@@ -38,7 +35,6 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【��值条件设置】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
 @RequestMapping("/pintsScoreSite")
 public class LabPintsScoreSiteController extends BaseController
 {
@@ -68,7 +64,7 @@ public class LabPintsScoreSiteController extends BaseController
     public void export(HttpServletResponse response, LabPintsScoreSite labPintsScoreSite) throws IOException
     {
         List<LabPintsScoreSite> list = labPintsScoreSiteService.selectLabPintsScoreSiteList(labPintsScoreSite);
-        ExcelUtil<LabPintsScoreSite> util = new ExcelUtil<LabPintsScoreSite>(LabPintsScoreSite.class);
+        ExcelUtil<LabPintsScoreSite> util = new ExcelUtil<>(LabPintsScoreSite.class);
         util.exportExcel(response, list, "��值条件设置数据");
     }
 

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

@@ -65,7 +65,7 @@ public class LabProcessSiteController extends BaseController
     public void export(HttpServletResponse response, LabProcessSite labProcessSite) throws IOException
     {
         List<LabProcessSite> list = labProcessSiteService.selectLabProcessSiteList(labProcessSite);
-        ExcelUtil<LabProcessSite> util = new ExcelUtil<LabProcessSite>(LabProcessSite.class);
+        ExcelUtil<LabProcessSite> util = new ExcelUtil<>(LabProcessSite.class);
         util.exportExcel(response, list, "违��-处理方式设置数据");
     }
 

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

@@ -3,7 +3,6 @@ package com.zd.laboratory.controller;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabRiskPlanAbnormalDesc;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalDescService;
-import com.zd.laboratory.service.impl.LabRiskPlanAbnormalDescServiceImpl;
 import com.zd.model.domain.ResultData;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +31,7 @@ public class LabRiskPlanAbnormalDescController extends BaseController {
             LabRiskPlanAbnormalDesc desc = new LabRiskPlanAbnormalDesc();
             desc.setGroupId(groupId);
             List<LabRiskPlanAbnormalDesc> list = labRiskPlanAbnormalDescService.selectByList(desc);
-            if (list != null && list.size() > 0) {
+            if (list != null && !list.isEmpty()) {
                 LabRiskPlanAbnormalDesc result = list.get(0);
                 return ResultData.success(result);
             }

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

@@ -1,23 +1,20 @@
 package com.zd.laboratory.controller;
 
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
 import com.zd.laboratory.domain.LabRiskPlanAbnormalGroup;
 import com.zd.laboratory.domain.vo.LabRiskPlanAbnormalGroupVO;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalGroupService;
+import com.zd.model.domain.ResultData;
 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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.zd.common.core.utils.PageHelperUtil.startPage;
-
 /**
  * 风险异常组Controller
  *

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

@@ -59,7 +59,7 @@ public class LabRiskPlanAbnormalLogController extends BaseController {
     @ApiOperation(value = "导出风险异常日志列表")
     public void export(HttpServletResponse response, LabRiskPlanAbnormalLog labRiskPlanAbnormalLog) throws IOException {
         List<LabRiskPlanAbnormalLog> list = labRiskPlanAbnormalLogService.selectLabRiskPlanAbnormalLogList(labRiskPlanAbnormalLog);
-        ExcelUtil<LabRiskPlanAbnormalLog> util = new ExcelUtil<LabRiskPlanAbnormalLog>(LabRiskPlanAbnormalLog.class);
+        ExcelUtil<LabRiskPlanAbnormalLog> util = new ExcelUtil<>(LabRiskPlanAbnormalLog.class);
         util.exportExcel(response, list, "风险异常日志数据");
     }
 

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

@@ -95,7 +95,7 @@ public class LabRiskPlanController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabRiskPlan labRiskPlan) throws IOException {
         List<LabRiskPlan> list = labRiskPlanService.selectLabRiskPlanList(labRiskPlan);
-        ExcelUtil<LabRiskPlan> util = new ExcelUtil<LabRiskPlan>(LabRiskPlan.class);
+        ExcelUtil<LabRiskPlan> util = new ExcelUtil<>(LabRiskPlan.class);
         util.exportExcel(response, list, "风险预案数据");
     }
 
@@ -218,8 +218,8 @@ public class LabRiskPlanController extends BaseController {
     /**
      * 查询当前触发预案的楼栋、楼层、实验室信息列表
      */
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_PLAN + PerFun.QUERY)
-    @Log(title = "查询当前触发预案的信息", businessType = BusinessType.OTHER)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_PLAN + PerFun.QUERY)
+    //@Log(title = "查询当前触发预案的信息", businessType = BusinessType.OTHER)
     @GetMapping("/selectTriggerInfo")
     public ResultData selectTriggerInfo() {
         return ResultData.success(labRiskPlanService.selectTriggerInfo());
@@ -313,34 +313,31 @@ public class LabRiskPlanController extends BaseController {
     @PostMapping("/triggerRiskPlan")
     public ResultData triggerRiskPlan(@RequestBody SubFunction <SensorFunctionStatus> subFunction) {
         try {
-            logger.error("调用火焰触发预案={}",JSON.toJSONString(subFunction));
             int flag=1;
             //如果实验室ID为空 通过设备ID查询绑定实验室ID
-            if(StringUtils.isNull(subFunction.getSubId())){
-                if(subFunction.getFunctionStatuses().size()>0){
-                    Long subId = labHardwareService.querySubIdByNum(subFunction.getFunctionStatuses().get(0).getHardwareNum());
-                    if(StringUtils.isNull(subId)){
-                        return ResultData.success(flag);
-                    }
-                    subFunction.setSubId(subId);
-                    //这里整理了一下，如果是关于火焰报警的，那么其他传感器上报数据将不再执行匹配预案，直到手动关闭了火焰预案，那么才能继续执行对应预案。
-                    Optional.ofNullable(subFunction.getFunctionStatuses()).orElseGet(Collections::emptyList)
-                            .stream()
-                            .filter(a->"huoyan".equals(a.getFunNum()))
-                            .forEach(a->{
-                                //没有火焰预警的缓存信息，则执行智能预警方法，否则不执行， 需要手动关闭火焰预警
-                                if(redisService.getCacheObject("subjectByHuoyan"+subFunction.getSubId())==null){
-                                    labRiskPlanService.triggerRiskPlan(subFunction, RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
-                                }
-                            });
+            if(StringUtils.isNull(subFunction.getSubId()) && !subFunction.getFunctionStatuses().isEmpty()){
+                Long subId = labHardwareService.querySubIdByNum(subFunction.getFunctionStatuses().get(0).getHardwareNum());
+                if(StringUtils.isNull(subId)){
+                    return ResultData.success(flag);
                 }
+                subFunction.setSubId(subId);
+                //这里整理了一下，如果是关于火焰报警的，那么其他传感器上报数据将不再执行匹配预案，直到手动关闭了火焰预案，那么才能继续执行对应预案。
+                Optional.ofNullable(subFunction.getFunctionStatuses()).orElseGet(Collections::emptyList)
+                        .stream()
+                        .filter(a->"huoyan".equals(a.getFunNum()))
+                        .forEach(a->{
+                            //没有火焰预警的缓存信息，则执行智能预警方法，否则不执行， 需要手动关闭火焰预警
+                            if(redisService.getCacheObject("subjectByHuoyan"+subFunction.getSubId())==null){
+                                labRiskPlanService.triggerRiskPlan(subFunction, RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
+                            }
+                        });
             }
             if(redisService.getCacheObject("subjectByHuoyan"+subFunction.getSubId())==null){
                 labRiskPlanService.triggerRiskPlan(subFunction,RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
             }
             return ResultData.success(flag);
         }catch (Exception e){
-            e.printStackTrace();
+            logger.error("执行传感器对应的风险预案异常："+e);
         }
         return ResultData.success(500);
     }

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

@@ -1,35 +1,25 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-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.vo.LabRiskPlanDistributionVO;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabRiskPlanDistribution;
+import com.zd.laboratory.domain.vo.LabRiskPlanDistributionVO;
 import com.zd.laboratory.service.ILabRiskPlanDistributionService;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 分配记录日志Controller
@@ -39,8 +29,6 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【分配记录日志】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/distribution")
 public class LabRiskPlanDistributionController extends BaseController
 {
@@ -70,7 +58,7 @@ public class LabRiskPlanDistributionController extends BaseController
     public void export(HttpServletResponse response, LabRiskPlanDistribution labRiskPlanDistribution) throws IOException
     {
         List<LabRiskPlanDistributionVO> list = labRiskPlanDistributionService.selectLabRiskPlanDistributionList(labRiskPlanDistribution);
-        ExcelUtil<LabRiskPlanDistributionVO> util = new ExcelUtil<LabRiskPlanDistributionVO>(LabRiskPlanDistributionVO.class);
+        ExcelUtil<LabRiskPlanDistributionVO> util = new ExcelUtil<>(LabRiskPlanDistributionVO.class);
         util.exportExcel(response, list, "分配记录日志数据");
     }
 

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

@@ -1,35 +1,26 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.model.constant.MqttConstants;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-import com.zd.laboratory.mqtt.service.impl.CommonSend;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabRotationChart;
+import com.zd.laboratory.mqtt.service.impl.CommonSend;
 import com.zd.laboratory.service.ILabRotationChartService;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.constant.MqttConstants;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-import com.zd.model.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 轮播图Controller
@@ -39,11 +30,8 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【轮播图】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/chart")
-public class LabRotationChartController extends BaseController
-{
+public class LabRotationChartController extends BaseController {
     @Autowired
     private ILabRotationChartService labRotationChartService;
     @Autowired
@@ -55,8 +43,7 @@ public class LabRotationChartController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHART + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询轮播图列表")
-    public TableDataInfo<LabRotationChart> list(LabRotationChart labRotationChart)
-    {
+    public TableDataInfo<LabRotationChart> list(LabRotationChart labRotationChart) {
         startPage();
         List<LabRotationChart> list = labRotationChartService.selectLabRotationChartList(labRotationChart);
         return getDataTable(list);
@@ -69,10 +56,9 @@ public class LabRotationChartController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHART + PerFun.EXPORT)
     @Log(title = "轮播图", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabRotationChart labRotationChart) throws IOException
-    {
+    public void export(HttpServletResponse response, LabRotationChart labRotationChart) throws IOException {
         List<LabRotationChart> list = labRotationChartService.selectLabRotationChartList(labRotationChart);
-        ExcelUtil<LabRotationChart> util = new ExcelUtil<LabRotationChart>(LabRotationChart.class);
+        ExcelUtil<LabRotationChart> util = new ExcelUtil<>(LabRotationChart.class);
         util.exportExcel(response, list, "轮播图数据");
     }
 
@@ -82,8 +68,7 @@ public class LabRotationChartController extends BaseController
     @ApiOperation(value = "获取轮播图详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHART + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabRotationChart> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabRotationChart> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labRotationChartService.selectLabRotationChartById(id));
     }
 
@@ -94,8 +79,7 @@ public class LabRotationChartController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHART + PerFun.ADD)
     @Log(title = "轮播图", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabRotationChart labRotationChart)
-    {
+    public ResultData add(@RequestBody LabRotationChart labRotationChart) {
         int num = labRotationChartService.insertLabRotationChart(labRotationChart);
 
         commonSend.send(MqttConstants.TOPIC_LAB_ROTATION, "新增了一个轮播图");
@@ -109,11 +93,10 @@ public class LabRotationChartController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHART + PerFun.EDIT)
     @Log(title = "轮播图", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabRotationChart labRotationChart)
-    {
+    public ResultData edit(@RequestBody LabRotationChart labRotationChart) {
         int count = labRotationChartService.updateLabRotationChart(labRotationChart);
         commonSend.send(MqttConstants.TOPIC_LAB_ROTATION, "修改了一个轮播图");
-        return  ResultData.result(count);
+        return ResultData.result(count);
     }
 
     /**
@@ -122,9 +105,8 @@ public class LabRotationChartController extends BaseController
     @ApiOperation(value = "删除轮播图")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHART + PerFun.REMOVE)
     @Log(title = "轮播图", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         int count = labRotationChartService.deleteLabRotationChartByIds(ids);
         commonSend.send(MqttConstants.TOPIC_LAB_ROTATION, "删除了一个轮播图");
         return ResultData.result(count);
@@ -137,17 +119,16 @@ public class LabRotationChartController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CHART + PerFun.EDIT)
     @Log(title = "轮播图", businessType = BusinessType.UPDATE)
     @PutMapping("/editRotationType/{id}")
-    public ResultData editRotationType(@PathVariable("id") Long id)
-    {
+    public ResultData editRotationType(@PathVariable("id") Long id) {
         LabRotationChart labRotationChart = labRotationChartService.selectLabRotationChartById(id);
-        if(labRotationChart.getImgType()==1){
+        if (labRotationChart.getImgType() == 1) {
             labRotationChart.setImgType(2);
-        }else{
+        } else {
             labRotationChart.setImgType(1);
         }
         labRotationChartService.updateLabRotationChart(labRotationChart);
         commonSend.send(MqttConstants.TOPIC_LAB_ROTATION, "打开或关闭轮播图");
-        return  ResultData.success(labRotationChart.getImgType());
+        return ResultData.success(labRotationChart.getImgType());
     }
 
 }

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

@@ -56,12 +56,9 @@ public class LabSafeBookController extends BaseController {
         Optional.ofNullable(list).ifPresent(a->{
             Map<String, String> safe_type = DictUtils.getDictCacheMap("safe_type");
             a.forEach(b->{
-                if(safe_type.containsKey(b.getType()))
-                {
+                if(safe_type.containsKey(b.getType())) {
                     b.setTypeLable(safe_type.get(b.getType()));
-                }
-                else
-                {
+                } else {
                     b.setTypeLable(StrUtil.EMPTY);
                 }
             });
@@ -78,27 +75,18 @@ public class LabSafeBookController extends BaseController {
     @ApiOperation(value = "查询实验室安全制度列表")
     public List<LabSafeBook> queryOption(LabSafeBook labSafeBook, HttpServletRequest request) {
         List<LabSafeBook> list = labSafeBookService.selectLabSafeBookList(labSafeBook);
-        String baseUrl=request.getServerName() ;
-
         Optional.ofNullable(list).ifPresent(a->{
             Map<String, String> safe_type = DictUtils.getDictCacheMap("safe_type");
             a.forEach(b->{
                 if(StringUtils.isNotBlank(b.getContent())){
-                    /*String url=fileConfigUtils.getRemoteUrl()+ File.separator+b.getContent();
-                    if(baseUrl.contains("192.168")){
-                        url=fileConfigUtils.getLocalUrl()+ File.separator+b.getContent();
-                    }*/
                     //通过配置动态获取域名
                     String url = fileConfigUtils.getFileDomainApp() + File.separator+b.getContent();
                     url= UrlFormatUtils.getHttpsORHttpUrl(url);
                     b.setContent(url);
                 }
-                if(safe_type.containsKey(b.getType()))
-                {
+                if(safe_type.containsKey(b.getType())) {
                     b.setTypeLable(safe_type.get(b.getType()));
-                }
-                else
-                {
+                } else {
                     b.setTypeLable(StrUtil.EMPTY);
                 }
             });
@@ -115,7 +103,7 @@ public class LabSafeBookController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSafeBook labSafeBook) throws IOException {
         List<LabSafeBook> list = labSafeBookService.selectLabSafeBookList(labSafeBook);
-        ExcelUtil<LabSafeBook> util = new ExcelUtil<LabSafeBook>(LabSafeBook.class);
+        ExcelUtil<LabSafeBook> util = new ExcelUtil<>(LabSafeBook.class);
         util.exportExcel(response, list, "实验室安全制度数据");
     }
 
@@ -137,14 +125,9 @@ public class LabSafeBookController extends BaseController {
      * 获取实验室安全制度详细信息
      */
     @ApiOperation(value = "获取实验室安全制度详细信息")
-//    @PreAuthorize(hasPermi = "laboratory:safe_book:query")
     @GetMapping(value = "/{id}")
     public ResultData<LabSafeBook> getInfo(@PathVariable("id") Long id, HttpServletRequest request) {
-        // TODO: 2022/3/25  基于内外网访问先做成这个样子，后期优化
-        //String baseUrl=request.getServerName();
-        //String baseUrl=request.getHeader("X-Real-IP");
-        //String baseUrls=request.getHeader("X-Forwarded-For");
-        //logger.info("X-Real-IP:"+baseUrl+"  "+"X-Forwarded-For:"+baseUrls);
+        //基于内外网访问先做成这个样子，后期优化
         LabSafeBook labSafeBook=labSafeBookService.selectLabSafeBookById(id);
         if (labSafeBook.getContent() != null && labSafeBook.getContent().length() > 0) {
             //通过配置动态获取域名

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

@@ -69,7 +69,7 @@ public class LabSafeClassifiedController extends BaseController
     public void export(HttpServletResponse response, LabSafeClassified labSafeClassified) throws IOException
     {
         List<LabSafeClassified> list = labSafeClassifiedService.selectLabSafeClassifiedList(labSafeClassified);
-        ExcelUtil<LabSafeClassified> util = new ExcelUtil<LabSafeClassified>(LabSafeClassified.class);
+        ExcelUtil<LabSafeClassified> util = new ExcelUtil<>(LabSafeClassified.class);
         util.exportExcel(response, list, "安全分级数据");
     }
 

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

@@ -1,16 +1,16 @@
 package com.zd.laboratory.controller;
 
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.utils.ExcelUtil;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
-import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSafeClasstype;
 import com.zd.laboratory.service.ILabSafeClasstypeService;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ public class LabSafeClasstypeController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSafeClasstype labSafeClasstype) throws IOException {
         List<LabSafeClasstype> list = labSafeClasstypeService.selectLabSafeClasstypeList(labSafeClasstype);
-        ExcelUtil<LabSafeClasstype> util = new ExcelUtil<LabSafeClasstype>(LabSafeClasstype.class);
+        ExcelUtil<LabSafeClasstype> util = new ExcelUtil<>(LabSafeClasstype.class);
         util.exportExcel(response, list, "安全分级类型数据");
     }
 

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

@@ -1,24 +1,24 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.annotation.Log;
-import com.zd.laboratory.domain.vo.LabSecurityGroupVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSecurityGroup;
+import com.zd.laboratory.domain.vo.LabSecurityGroupVO;
 import com.zd.laboratory.service.ILabSecurityGroupService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 安全准入资格Controller
@@ -51,7 +51,7 @@ public class LabSecurityGroupController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSecurityGroup labSecurityGroup) throws IOException {
         List<LabSecurityGroup> list = labSecurityGroupService.selectLabSecurityGroupList(labSecurityGroup);
-        ExcelUtil<LabSecurityGroup> util = new ExcelUtil<LabSecurityGroup>(LabSecurityGroup.class);
+        ExcelUtil<LabSecurityGroup> util = new ExcelUtil<>(LabSecurityGroup.class);
         util.exportExcel(response, list, "安全准入资格数据");
     }
 
@@ -93,10 +93,4 @@ public class LabSecurityGroupController extends BaseController {
     public ResultData remove(@PathVariable Long[] ids) {
         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/LabSecurityMaterialController.java

@@ -1,34 +1,25 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-import com.zd.model.domain.ResultData;
-import com.zd.laboratory.domain.vo.LabSecurityMaterialVO;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSecurityMaterial;
+import com.zd.laboratory.domain.vo.LabSecurityMaterialVO;
 import com.zd.laboratory.service.ILabSecurityMaterialService;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+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.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 安全准入资格材料Controller
@@ -64,7 +55,7 @@ public class LabSecurityMaterialController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSecurityMaterial labSecurityMaterial) throws IOException {
         List<LabSecurityMaterial> list = labSecurityMaterialService.selectLabSecurityMaterialList(labSecurityMaterial);
-        ExcelUtil<LabSecurityMaterial> util = new ExcelUtil<LabSecurityMaterial>(LabSecurityMaterial.class);
+        ExcelUtil<LabSecurityMaterial> util = new ExcelUtil<>(LabSecurityMaterial.class);
         util.exportExcel(response, list, "安全准入资格材料数据");
     }
 

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

@@ -1,39 +1,29 @@
 package com.zd.laboratory.controller;
 
-import java.util.HashMap;
-import java.util.List;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-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.LabSecuritySubjectmaterial;
-import com.zd.laboratory.domain.vo.LabSecurityMaterialDataVO;
-import com.zd.laboratory.service.ILabSecuritySubjectmaterialService;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSecurityMaterialData;
+import com.zd.laboratory.domain.LabSecuritySubjectmaterial;
+import com.zd.laboratory.domain.vo.LabSecurityMaterialDataVO;
 import com.zd.laboratory.service.ILabSecurityMaterialDataService;
-import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.service.ILabSecuritySubjectmaterialService;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 安全准入申请材料配置Controller
@@ -44,20 +34,19 @@ import com.zd.model.page.TableDataInfo;
 @RestController
 @Api(tags = "【安全准入申请材料配置】")
 @RequestMapping("/materialdata")
-public class LabSecurityMaterialDataController extends BaseController
-{
+public class LabSecurityMaterialDataController extends BaseController {
     @Autowired
     private ILabSecurityMaterialDataService labSecurityMaterialDataService;
     @Autowired
     private ILabSecuritySubjectmaterialService iLabSecuritySubjectmaterialService;
+
     /**
      * 查询安全准入申请材料配置列表
      */
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALDATA + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询安全准入申请材料配置列表")
-    public TableDataInfo<LabSecurityMaterialData> list(LabSecurityMaterialData labSecurityMaterialData)
-    {
+    public TableDataInfo<LabSecurityMaterialData> list(LabSecurityMaterialData labSecurityMaterialData) {
         startPage();
         List<LabSecurityMaterialData> list = labSecurityMaterialDataService.selectLabSecurityMaterialDataList(labSecurityMaterialData);
         return getDataTable(list);
@@ -70,10 +59,9 @@ public class LabSecurityMaterialDataController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALDATA + PerFun.EXPORT)
     @Log(title = "安全准入申请材料配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabSecurityMaterialData labSecurityMaterialData) throws IOException
-    {
+    public void export(HttpServletResponse response, LabSecurityMaterialData labSecurityMaterialData) throws IOException {
         List<LabSecurityMaterialData> list = labSecurityMaterialDataService.selectLabSecurityMaterialDataList(labSecurityMaterialData);
-        ExcelUtil<LabSecurityMaterialData> util = new ExcelUtil<LabSecurityMaterialData>(LabSecurityMaterialData.class);
+        ExcelUtil<LabSecurityMaterialData> util = new ExcelUtil<>(LabSecurityMaterialData.class);
         util.exportExcel(response, list, "安全准入申请材料配置数据");
     }
 
@@ -83,8 +71,7 @@ public class LabSecurityMaterialDataController extends BaseController
     @ApiOperation(value = "获取安全准入申请材料配置详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALDATA + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabSecurityMaterialData> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabSecurityMaterialData> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labSecurityMaterialDataService.selectLabSecurityMaterialDataById(id));
     }
 
@@ -95,8 +82,7 @@ public class LabSecurityMaterialDataController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALDATA + PerFun.ADD)
     @Log(title = "安全准入申请材料配置", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public ResultData add(@RequestBody LabSecurityMaterialData labSecurityMaterialData)
-    {
+    public ResultData add(@RequestBody LabSecurityMaterialData labSecurityMaterialData) {
         return ResultData.result(labSecurityMaterialDataService.insertLabSecurityMaterialData(labSecurityMaterialData));
     }
 
@@ -107,9 +93,8 @@ public class LabSecurityMaterialDataController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALDATA + PerFun.EDIT)
     @Log(title = "安全准入申请材料配置", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabSecurityMaterialData labSecurityMaterialData)
-    {
-        return  ResultData.result(labSecurityMaterialDataService.updateLabSecurityMaterialData(labSecurityMaterialData));
+    public ResultData edit(@RequestBody LabSecurityMaterialData labSecurityMaterialData) {
+        return ResultData.result(labSecurityMaterialDataService.updateLabSecurityMaterialData(labSecurityMaterialData));
     }
 
     /**
@@ -119,13 +104,12 @@ public class LabSecurityMaterialDataController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALDATA + PerFun.REMOVE)
     @Log(title = "安全准入申请材料配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         //删除前校验改模板是否有实验室在使用
         LabSecuritySubjectmaterial lss = new LabSecuritySubjectmaterial();
         lss.setMaterialId(ids[0]);
-        List<LabSecuritySubjectmaterial> list= iLabSecuritySubjectmaterialService.selectLabSecuritySubjectmaterialList(lss);
-        if(list.size()>0){
+        List<LabSecuritySubjectmaterial> list = iLabSecuritySubjectmaterialService.selectLabSecuritySubjectmaterialList(lss);
+        if (!list.isEmpty()) {
             return ResultData.fail("该模板已有实验室在使用不可删除！");
         }
         return ResultData.result(labSecurityMaterialDataService.deleteLabSecurityMaterialDataByIds(ids));
@@ -137,17 +121,13 @@ public class LabSecurityMaterialDataController extends BaseController
      * @return
      */
     @GetMapping("/listTemplate")
-    public ResultData  listTemplate(Long subjectId) {
-        Map<String,Object> map = new HashMap<String,Object>();
-        List<LabSecurityMaterialDataVO> listTeacher= labSecurityMaterialDataService.selectLabSecurityMaterialDataTeacher(subjectId);
-        List<LabSecurityMaterialDataVO> listStudent= labSecurityMaterialDataService.selectLabSecurityMaterialDataStudent(subjectId);
+    public ResultData listTemplate(Long subjectId) {
+        Map<String, Object> map = new HashMap<>();
+        List<LabSecurityMaterialDataVO> listTeacher = labSecurityMaterialDataService.selectLabSecurityMaterialDataTeacher(subjectId);
+        List<LabSecurityMaterialDataVO> listStudent = labSecurityMaterialDataService.selectLabSecurityMaterialDataStudent(subjectId);
 
-        /* //教职工模板
-        List<LabSecuritySubjectmaterialVO> listTeacher=  labSecuritySubjectmaterialService.selectTeacherList();
-        //学生模板
-        List<LabSecuritySubjectmaterialVO> listStudent=  labSecuritySubjectmaterialService.selectStudentList();*/
-        map.put("listTeacher",listTeacher);
-        map.put("listStudent",listStudent);
+        map.put("listTeacher", listTeacher);
+        map.put("listStudent", listStudent);
         return ResultData.success(map);
     }
 }

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

@@ -1,34 +1,24 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSecurityMaterialrelation;
 import com.zd.laboratory.service.ILabSecurityMaterialrelationService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 安全准入申请材料关系Controller
@@ -39,8 +29,7 @@ import com.zd.model.page.TableDataInfo;
 @RestController
 @Api(tags = "【安全准入申请材料关系】")
 @RequestMapping("/materialrelation")
-public class LabSecurityMaterialrelationController extends BaseController
-{
+public class LabSecurityMaterialrelationController extends BaseController {
     @Autowired
     private ILabSecurityMaterialrelationService labSecurityMaterialrelationService;
 
@@ -50,8 +39,7 @@ public class LabSecurityMaterialrelationController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALRELATION + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询安全准入申请材料关系列表")
-    public TableDataInfo<LabSecurityMaterialrelation> list(LabSecurityMaterialrelation labSecurityMaterialrelation)
-    {
+    public TableDataInfo<LabSecurityMaterialrelation> list(LabSecurityMaterialrelation labSecurityMaterialrelation) {
         startPage();
         List<LabSecurityMaterialrelation> list = labSecurityMaterialrelationService.selectLabSecurityMaterialrelationList(labSecurityMaterialrelation);
         return getDataTable(list);
@@ -64,10 +52,9 @@ public class LabSecurityMaterialrelationController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALRELATION + PerFun.EXPORT)
     @Log(title = "安全准入申请材料关系", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabSecurityMaterialrelation labSecurityMaterialrelation) throws IOException
-    {
+    public void export(HttpServletResponse response, LabSecurityMaterialrelation labSecurityMaterialrelation) throws IOException {
         List<LabSecurityMaterialrelation> list = labSecurityMaterialrelationService.selectLabSecurityMaterialrelationList(labSecurityMaterialrelation);
-        ExcelUtil<LabSecurityMaterialrelation> util = new ExcelUtil<LabSecurityMaterialrelation>(LabSecurityMaterialrelation.class);
+        ExcelUtil<LabSecurityMaterialrelation> util = new ExcelUtil<>(LabSecurityMaterialrelation.class);
         util.exportExcel(response, list, "安全准入申请材料关系数据");
     }
 
@@ -77,8 +64,7 @@ public class LabSecurityMaterialrelationController extends BaseController
     @ApiOperation(value = "获取安全准入申请材料关系详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALRELATION + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabSecurityMaterialrelation> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabSecurityMaterialrelation> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labSecurityMaterialrelationService.selectLabSecurityMaterialrelationById(id));
     }
 
@@ -89,8 +75,7 @@ public class LabSecurityMaterialrelationController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALRELATION + PerFun.ADD)
     @Log(title = "安全准入申请材料关系", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabSecurityMaterialrelation labSecurityMaterialrelation)
-    {
+    public ResultData add(@RequestBody LabSecurityMaterialrelation labSecurityMaterialrelation) {
         return ResultData.result(labSecurityMaterialrelationService.insertLabSecurityMaterialrelation(labSecurityMaterialrelation));
     }
 
@@ -101,9 +86,8 @@ public class LabSecurityMaterialrelationController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALRELATION + PerFun.EDIT)
     @Log(title = "安全准入申请材料关系", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabSecurityMaterialrelation labSecurityMaterialrelation)
-    {
-        return  ResultData.result(labSecurityMaterialrelationService.updateLabSecurityMaterialrelation(labSecurityMaterialrelation));
+    public ResultData edit(@RequestBody LabSecurityMaterialrelation labSecurityMaterialrelation) {
+        return ResultData.result(labSecurityMaterialrelationService.updateLabSecurityMaterialrelation(labSecurityMaterialrelation));
     }
 
     /**
@@ -113,8 +97,7 @@ public class LabSecurityMaterialrelationController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_MATERIALRELATION + PerFun.REMOVE)
     @Log(title = "安全准入申请材料关系", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labSecurityMaterialrelationService.deleteLabSecurityMaterialrelationByIds(ids));
     }
 }

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

@@ -1,43 +1,32 @@
 package com.zd.laboratory.controller;
 
-import java.util.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+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.domain.LabSecuritySubjectmaterial;
 import com.zd.laboratory.domain.XxpCardInfo;
-import com.zd.laboratory.service.IXxpCardInfoService;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-import com.zd.common.core.security.TokenService;
-import com.zd.laboratory.domain.LabSecurityMaterialData;
-import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.vo.LabSecurityMaterialDataVO;
 import com.zd.laboratory.domain.vo.LabSecuritySubjectmaterialVO;
 import com.zd.laboratory.service.ILabSecurityMaterialDataService;
-import com.zd.model.entity.SysUser;
-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;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.laboratory.domain.LabSecuritySubjectmaterial;
 import com.zd.laboratory.service.ILabSecuritySubjectmaterialService;
-import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.service.IXxpCardInfoService;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+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.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 实验室和准入模板关系Controller
@@ -48,8 +37,7 @@ import com.zd.model.page.TableDataInfo;
 @RestController
 @Api(tags = "【实验室和准入模板关系】")
 @RequestMapping("/subjectmaterial")
-public class LabSecuritySubjectmaterialController extends BaseController
-{
+public class LabSecuritySubjectmaterialController extends BaseController {
     @Autowired
     private ILabSecuritySubjectmaterialService labSecuritySubjectmaterialService;
 
@@ -59,8 +47,6 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @Autowired
     private IXxpCardInfoService xxpCardInfoService;
 
-    @Autowired
-    private TokenService tokenService;
 
     /**
      * 查询实验室和准入模板关系列表
@@ -68,8 +54,7 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECTMATERIAL + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询实验室和准入模板关系列表")
-    public TableDataInfo<LabSecuritySubjectmaterial> list(LabSecuritySubjectmaterial labSecuritySubjectmaterial)
-    {
+    public TableDataInfo<LabSecuritySubjectmaterial> list(LabSecuritySubjectmaterial labSecuritySubjectmaterial) {
         startPage();
         List<LabSecuritySubjectmaterial> list = labSecuritySubjectmaterialService.selectLabSecuritySubjectmaterialList(labSecuritySubjectmaterial);
         return getDataTable(list);
@@ -82,10 +67,9 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECTMATERIAL + PerFun.EXPORT)
     @Log(title = "实验室和准入模板关系", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabSecuritySubjectmaterial labSecuritySubjectmaterial) throws IOException
-    {
+    public void export(HttpServletResponse response, LabSecuritySubjectmaterial labSecuritySubjectmaterial) throws IOException {
         List<LabSecuritySubjectmaterial> list = labSecuritySubjectmaterialService.selectLabSecuritySubjectmaterialList(labSecuritySubjectmaterial);
-        ExcelUtil<LabSecuritySubjectmaterial> util = new ExcelUtil<LabSecuritySubjectmaterial>(LabSecuritySubjectmaterial.class);
+        ExcelUtil<LabSecuritySubjectmaterial> util = new ExcelUtil<>(LabSecuritySubjectmaterial.class);
         util.exportExcel(response, list, "实验室和准入模板关系数据");
     }
 
@@ -95,8 +79,7 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @ApiOperation(value = "获取实验室和准入模板关系详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECTMATERIAL + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabSecuritySubjectmaterial> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabSecuritySubjectmaterial> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labSecuritySubjectmaterialService.selectLabSecuritySubjectmaterialById(id));
     }
 
@@ -107,8 +90,7 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECTMATERIAL + PerFun.ADD)
     @Log(title = "实验室和准入模板关系", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabSecuritySubjectmaterial labSecuritySubjectmaterial)
-    {
+    public ResultData add(@RequestBody LabSecuritySubjectmaterial labSecuritySubjectmaterial) {
         return ResultData.result(labSecuritySubjectmaterialService.insertLabSecuritySubjectmaterial(labSecuritySubjectmaterial));
     }
 
@@ -119,9 +101,8 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECTMATERIAL + PerFun.EDIT)
     @Log(title = "实验室和准入模板关系", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabSecuritySubjectmaterial labSecuritySubjectmaterial)
-    {
-        return  ResultData.result(labSecuritySubjectmaterialService.updateLabSecuritySubjectmaterial(labSecuritySubjectmaterial));
+    public ResultData edit(@RequestBody LabSecuritySubjectmaterial labSecuritySubjectmaterial) {
+        return ResultData.result(labSecuritySubjectmaterialService.updateLabSecuritySubjectmaterial(labSecuritySubjectmaterial));
     }
 
     /**
@@ -131,8 +112,7 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECTMATERIAL + PerFun.REMOVE)
     @Log(title = "实验室和准入模板关系", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labSecuritySubjectmaterialService.deleteLabSecuritySubjectmaterialByIds(ids));
     }
 
@@ -143,43 +123,34 @@ public class LabSecuritySubjectmaterialController extends BaseController
     @Log(title = "实验室和准入模板关系")
     @PostMapping("/addlist")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECTMATERIAL + PerFun.ADD)
-    public ResultData addlist(@RequestBody LabSecuritySubjectmaterialVO labSecuritySubjectmaterialVO)
-    {
+    public ResultData addlist(@RequestBody LabSecuritySubjectmaterialVO labSecuritySubjectmaterialVO) {
         return ResultData.result(labSecuritySubjectmaterialService.addList(labSecuritySubjectmaterialVO));
     }
 
     /**
      * 获取模板
+     *
      * @return
      */
     @GetMapping("/listData")
-    public ResultData  listData(LabSecurityMaterialDataVO materialDataVO) {
-        Map<String,Object> map = new HashMap<String,Object>();
-         List<LabSecurityMaterialDataVO> listTeacher= labSecurityMaterialDataService.selectTemplateTeacherList();
-         List<LabSecurityMaterialDataVO> listStudent= labSecurityMaterialDataService.selectTemplateStudentList();
-
-         //查询实验室下的电子信息牌
-        XxpCardInfo cardInfo = new XxpCardInfo();;
-        if(StringUtils.isNotNull(materialDataVO.getSubjectId())){
+    public ResultData listData(LabSecurityMaterialDataVO materialDataVO) {
+        Map<String, Object> map = new HashMap<>();
+        List<LabSecurityMaterialDataVO> listTeacher = labSecurityMaterialDataService.selectTemplateTeacherList();
+        List<LabSecurityMaterialDataVO> listStudent = labSecurityMaterialDataService.selectTemplateStudentList();
+
+        //查询实验室下的电子信息牌
+        XxpCardInfo cardInfo = new XxpCardInfo();
+        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);
+        map.put("listTeacher", listTeacher);
+        map.put("listStudent", listStudent);
+        map.put("cardInfo", cardInfo);
         return ResultData.success(map);
     }
-
-
-
 }

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

@@ -1,33 +1,24 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-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.service.ILabSemesterService;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.laboratory.domain.LabSemester;
-import com.zd.common.core.web.controller.BaseController;
+import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.domain.LabSemester;
+import com.zd.laboratory.service.ILabSemesterService;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+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.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 学期设置Controller
@@ -39,8 +30,7 @@ import com.zd.model.page.TableDataInfo;
 @Api(tags = "【学期设置】")
 
 @RequestMapping("/semester")
-public class LabSemesterController extends BaseController
-{
+public class LabSemesterController extends BaseController {
     @Autowired
     private ILabSemesterService labSemesterService;
 
@@ -50,8 +40,7 @@ public class LabSemesterController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SEMESTER + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询学期设置列表")
-    public TableDataInfo<LabSemester> list(LabSemester labSemester)
-    {
+    public TableDataInfo<LabSemester> list(LabSemester labSemester) {
         startPage();
         List<LabSemester> list = labSemesterService.selectLabSemesterList(labSemester);
         return getDataTable(list);
@@ -60,8 +49,7 @@ public class LabSemesterController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SEMESTER + PerFun.LIST)
     @GetMapping("/getlist")
     @ApiOperation(value = "查询学期设置列表")
-    public ResultData getlist()
-    {
+    public ResultData getlist() {
         List<LabSemester> list = labSemesterService.selectLabSemesterList(null);
         return ResultData.success(list);
     }
@@ -73,10 +61,9 @@ public class LabSemesterController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SEMESTER + PerFun.EXPORT)
     @Log(title = "学期设置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabSemester labSemester) throws IOException
-    {
+    public void export(HttpServletResponse response, LabSemester labSemester) throws IOException {
         List<LabSemester> list = labSemesterService.selectLabSemesterList(labSemester);
-        ExcelUtil<LabSemester> util = new ExcelUtil<LabSemester>(LabSemester.class);
+        ExcelUtil<LabSemester> util = new ExcelUtil<>(LabSemester.class);
         util.exportExcel(response, list, "学期设置数据");
     }
 
@@ -86,8 +73,7 @@ public class LabSemesterController extends BaseController
     @ApiOperation(value = "获取学期设置详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SEMESTER + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabSemester> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabSemester> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labSemesterService.selectLabSemesterById(id));
     }
 
@@ -98,8 +84,7 @@ public class LabSemesterController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SEMESTER + PerFun.ADD)
     @Log(title = "学期设置", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabSemester labSemester)
-    {
+    public ResultData add(@RequestBody LabSemester labSemester) {
         return ResultData.result(labSemesterService.insertLabSemester(labSemester));
     }
 
@@ -110,9 +95,8 @@ public class LabSemesterController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SEMESTER + PerFun.EDIT)
     @Log(title = "学期设置", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabSemester labSemester)
-    {
-        return  ResultData.result(labSemesterService.updateLabSemester(labSemester));
+    public ResultData edit(@RequestBody LabSemester labSemester) {
+        return ResultData.result(labSemesterService.updateLabSemester(labSemester));
     }
 
     /**
@@ -121,9 +105,8 @@ public class LabSemesterController extends BaseController
     @ApiOperation(value = "删除学期设置")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SEMESTER + PerFun.REMOVE)
     @Log(title = "学期设置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labSemesterService.deleteLabSemesterByIds(ids));
     }
 
@@ -133,8 +116,7 @@ public class LabSemesterController extends BaseController
      */
     @GetMapping("/getSemesterList")
     @ApiOperation(value = "查询学期列表")
-    public ResultData getSemesterList(LabSemester labSemester)
-    {
+    public ResultData getSemesterList(LabSemester labSemester) {
         List<LabSemester> list = labSemesterService.selectLabSemesterList(labSemester);
         return ResultData.success(list);
     }

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

@@ -1,16 +1,16 @@
 package com.zd.laboratory.controller;
 
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.utils.ExcelUtil;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
-import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSparseHardware;
 import com.zd.laboratory.service.ILabSparseHardwareService;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class LabSparseHardwareController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSparseHardware labSparseHardware) throws IOException {
         List<LabSparseHardware> list = labSparseHardwareService.selectLabSparseHardwareList(labSparseHardware);
-        ExcelUtil<LabSparseHardware> util = new ExcelUtil<LabSparseHardware>(LabSparseHardware.class);
+        ExcelUtil<LabSparseHardware> util = new ExcelUtil<>(LabSparseHardware.class);
         util.exportExcel(response, list, "疏散硬件数据");
     }
 

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

@@ -97,26 +97,17 @@ public class LabStudentsInfoController extends BaseController {
 //    @PreAuthorize(hasPermi = "laboratory:studentinfo:query")
     @GetMapping(value = "/my")
     public ResultData<LabStudentsInfo> getMyInfo() {
-        if(1==1){
-             logger.info("我是一个小可爱");
-        }
         LabStudentsInfo labStudentsInfo = labStudentsInfoService.selectLabStudentsInfoByJoinStudentsId(SecurityUtils.getUserIdEx());
-        if(labStudentsInfo!=null)
-        {
-            if(labStudentsInfo.getFaceFeature()!=null)
-            {
+        if (labStudentsInfo != null) {
+            if (labStudentsInfo.getFaceFeature() != null) {
                 labStudentsInfo.setIfFaceFeature(true);
-            }
-            else
-            {
+            } else {
                 labStudentsInfo.setIfFaceFeature(false);
             }
-            if(labStudentsInfo.getAuditStatus()==null)
-            {
+            if (labStudentsInfo.getAuditStatus() == null) {
                 labStudentsInfo.setAuditStatus(AuditStatusEnum.NO_COMMIT);
             }
-        }
-        else {
+        } else {
             labStudentsInfo = new LabStudentsInfo();
             labStudentsInfo.setIfFaceFeature(false);
             labStudentsInfo.setAuditStatus(AuditStatusEnum.NO_COMMIT);
@@ -152,7 +143,7 @@ public class LabStudentsInfoController extends BaseController {
      * 提交学生卡
      */
     @ApiOperation(value = "提交学生卡信息")
-    @PostMapping ("/commit/crad")
+    @PostMapping("/commit/crad")
     public R commitCard(@RequestParam("file") MultipartFile file) {
 
         if (!file.isEmpty()) {
@@ -179,29 +170,28 @@ public class LabStudentsInfoController extends BaseController {
     public R edit(@RequestParam("file") MultipartFile file) {
         if (!file.isEmpty()) {
 
-
-            R< byte[]> fileResult1 = remoteFaceService.upload(file);
-            if(fileResult1.getCode()!=200){
+            R<byte[]> fileResult1 = remoteFaceService.upload(file);
+            if (fileResult1.getCode() != 200) {
                 return R.fail("图片人脸信息检测失败，请重新上传！");
             }
             //保存
             R<SysFile> fileResult = remoteFileService.upload(file);
-            if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData())) {
-                return R.fail("文件服务异常，请联系管理员");
-            }
-            String url = fileResult.getData().getUrl();
-            if (labStudentsInfoService.commitMyFace(url,fileResult1.getData()) == 1) {
-                Map data = new HashMap(2);
-                data.put("cardUrl", url);
-
-                // 海康更新人脸信息
-                SysUser user = new SysUser();
-                user.setUserId(SecurityUtils.getUserIdEx());
-                user.setFaceImg(url);
-                remoteMessageContentService.updateUserFace(user);
-
-                return R.ok(data);
+            if (fileResult.getCode() == 200 && StringUtils.isNotNull(fileResult.getData())) {
+                String url = fileResult.getData().getUrl();
+                if (labStudentsInfoService.commitMyFace(url, fileResult1.getData()) == 1) {
+                    Map data = new HashMap(2);
+                    data.put("cardUrl", url);
+
+                    // 海康更新人脸信息
+                    SysUser user = new SysUser();
+                    user.setUserId(SecurityUtils.getUserIdEx());
+                    user.setFaceImg(url);
+                    remoteMessageContentService.updateUserFace(user);
+
+                    return R.ok(data);
+                }
             }
+            return fileResult;
         }
         return R.fail("上传图片异常，请联系管理员");
     }
@@ -223,7 +213,7 @@ public class LabStudentsInfoController extends BaseController {
     @ApiOperation(value = "获取安全实验室安全人员的人脸信息")
     @RequestMapping(value = "/getFaceBySecuritySubjectId")
     public ResultData<List<LabSysUserInfo>> getFaceBySecuritySubjectId(Long subjectId) {
-        List<LabSysUserInfo> labSysUserInfoList= labStudentsInfoService.selectLabStudentsInfoBySubjectId(subjectId);
+        List<LabSysUserInfo> labSysUserInfoList = labStudentsInfoService.selectLabStudentsInfoBySubjectId(subjectId);
         return ResultData.success(labSysUserInfoList);
     }
 

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

@@ -1,9 +1,7 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.Assert;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabSubAccessCheckInLog;
 import com.zd.laboratory.domain.LabSubjectAccessRecord;
 import com.zd.laboratory.service.ILabSubAccessCheckLogService;
@@ -23,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
  * @Description:
  */
 @Api(tags = {"签到检查记录管理"})
-@ApiSupport(author = Knife4jConfiguration.Author.ZP)
 @RestController
 @RequestMapping("/checklog")
 public class LabSubAccessCheckLogController {
@@ -74,7 +71,7 @@ public class LabSubAccessCheckLogController {
         LabSubjectAccessRecord accessRecord=new LabSubjectAccessRecord();
         accessRecord.setInitFlag(false);
         accessRecord.setId(id);
-        int i= subjectAccessRecordService.updateLabSubjectAccessRecordById(accessRecord);
+        subjectAccessRecordService.updateLabSubjectAccessRecordById(accessRecord);
 
         //新增日志
         return ResultData.result(labSubAccessCheckLogService.insertLog(labSubAccessCheckInLog));

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

@@ -1,11 +1,9 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.api.entity.LabSubjectControllerVO;
 import com.zd.laboratory.domain.dto.LabSubListQuery;
 import com.zd.laboratory.domain.vo.LabHardwareVO;
@@ -45,7 +43,6 @@ import java.util.concurrent.TimeUnit;
  * @Description:
  */
 @Api(tags = {"实验室控制管理"})
-@ApiSupport(author = Knife4jConfiguration.Author.ZP)
 @RestController
 @RequestMapping("/subject/manger")
 public class LabSubMangerController extends BaseController {
@@ -136,7 +133,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);
     }
@@ -169,7 +165,7 @@ public class LabSubMangerController extends BaseController {
      * @return
      */
     @ApiOperation("控制设备开关")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBCONTROL + PerFun.SET)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBCONTROL + PerFun.SET)
     @PostMapping("/control/{id}/{command}")
     public ResultData controlSwitch(@PathVariable("id") @ApiParam("设备ID") Long id ,@PathVariable("command") Symbol.command command) {
 
@@ -193,7 +189,8 @@ public class LabSubMangerController extends BaseController {
             Thread.sleep(500);
             control = subjectManagerService.control(id, Symbol.command.close);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            logger.error("控制通风厨开关异常："+e);
+            Thread.currentThread().interrupt();
         }
         return ResultData.result(control,()->"电源控制失败！");
     }
@@ -254,15 +251,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();
@@ -288,56 +276,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/LabSubMangerV2Controller.java

@@ -1,10 +1,7 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-import com.zd.laboratory.api.vo.ClassifyVO;
 import com.zd.laboratory.domain.AdminWranCount;
 import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.SubDiyVO;
@@ -30,7 +27,6 @@ import java.util.Map;
  * 实验室控制管理
  */
 @Api(tags = {"实验室控制管理-V2"})
-@ApiSupport(author = Knife4jConfiguration.Author.ZP)
 @RestController
 @RequestMapping("/subject/manger/V2")
 public class LabSubMangerV2Controller extends BaseController {
@@ -85,7 +81,7 @@ public class LabSubMangerV2Controller extends BaseController {
     @PostMapping("/diy/{id}/common")
     public ResultData<List<SubDiyVO>> querySubCListVO(@PathVariable("id") Long id, @RequestBody SubQueryConfig subQueryConfig) {
         List<SubDiyVO> subDiyVOList = subQueryManager.querySubs(subQueryConfig, id);
-        if(subDiyVOList.size()>0){
+        if (!subDiyVOList.isEmpty()) {
             //安全类目信息查询
             subDiyVOList.get(0).setClassifyList(subjectManagerService.getSubClassify(id));
             //实验室二维码

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

@@ -1,29 +1,27 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.FileConfigUtils;
+import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.domain.LabSubjectAccessRecord;
+import com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo;
+import com.zd.laboratory.service.ILabSubjectAccessRecordService;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.model.domain.ResultData;
-import com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.laboratory.domain.LabSubjectAccessRecord;
-import com.zd.laboratory.service.ILabSubjectAccessRecordService;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
-import com.zd.model.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 实验室进出记录Controller
@@ -70,7 +68,7 @@ public class LabSubjectAccessRecordController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectAccessRecordVo labSubjectAccessRecord) throws IOException {
         List<LabSubjectAccessRecordVo> list = labSubjectAccessRecordService.selectLabSubjectAccessRecordList(labSubjectAccessRecord);
-        ExcelUtil<LabSubjectAccessRecordVo> util = new ExcelUtil<LabSubjectAccessRecordVo>(LabSubjectAccessRecordVo.class);
+        ExcelUtil<LabSubjectAccessRecordVo> util = new ExcelUtil<>(LabSubjectAccessRecordVo.class);
         util.exportExcel(response, list, "实验室进出记录数据");
     }
 

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

@@ -136,9 +136,6 @@ public class LabSubjectController extends BaseController {
     @GetMapping("/list/listAdmin")
     public ResultData listAdmin(LabSubject labSubject) {
         //获取当前登录用户所属学校和学院的deptid
-        R<List<Long>> listdeptids = remoteUserService.getLogingUserDeptids();
-        List<Long> deptIds= listdeptids.getData();
-        labSubject.setDeptIds(deptIds);
         List<LabSubject> list = labSubjectService.selectLabSubjectListByadminidNotnull(labSubject);
         return ResultData.success(list);
     }
@@ -175,7 +172,7 @@ public class LabSubjectController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubject labSubject) throws IOException {
         List<LabSubject> list = labSubjectService.selectLabSubjectList(labSubject);
-        ExcelUtil<LabSubject> util = new ExcelUtil<LabSubject>(LabSubject.class);
+        ExcelUtil<LabSubject> util = new ExcelUtil<>(LabSubject.class);
         util.exportExcel(response, list, "实验室数据");
     }
 
@@ -273,16 +270,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));
-//    }
     /**
      * 禁用/启用实验室
      */
@@ -351,7 +338,7 @@ public class LabSubjectController extends BaseController {
         labSubject.setId(subId);
         List<LabSubjectVO> labSubjectVOS = labSubjectMapper.selectLabSubjectVOList(labSubject);
         String s = Optional.ofNullable(labSubjectVOS)
-                .filter(a -> a.size() > 0)
+                .filter(a -> !a.isEmpty())
                 .map(a -> a.get(0).getAdminPhone())
                 .filter(a-> StrUtil.isNotBlank(a))
                 .orElse(null);
@@ -416,7 +403,7 @@ public class LabSubjectController extends BaseController {
     public ResultData getUserRoleBySubOperation(LabSubjectVO labSubject) {
         List<LabSubject> list = labSubjectService.getUserRoleBySub(labSubject);
         Boolean subOperation = false;
-        if(list.size()>0){
+        if(!list.isEmpty()){
             subOperation = true;
         }
         return ResultData.success(subOperation);
@@ -626,7 +613,7 @@ public class LabSubjectController extends BaseController {
     public void exportProblemData(HttpServletResponse response) throws Exception {
         ExcelUtil<SubjectUploadTemplateFail> util2 = new ExcelUtil<>(SubjectUploadTemplateFail.class);
         List<SubjectUploadTemplateFail> subjectUploadTemplateFail = redisService.getCacheObject("subjectUploadTemplateFail"+SecurityUtils.getUserId());
-        if(subjectUploadTemplateFail.size()>0){
+        if(!subjectUploadTemplateFail.isEmpty()){
             util2.exportExcel(response, subjectUploadTemplateFail, "实验室信息问题数据", tips, "实验室信息-未导入问题数据");
         }
     }

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

@@ -1,33 +1,24 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSubjectHardwarePosition;
 import com.zd.laboratory.service.ILabSubjectHardwarePositionService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+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.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 实验室硬件位置Controller
@@ -63,7 +54,7 @@ public class LabSubjectHardwarePositionController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectHardwarePosition labSubjectHardwarePosition) throws IOException {
         List<LabSubjectHardwarePosition> list = labSubjectHardwarePositionService.selectLabSubjectHardwarePositionList(labSubjectHardwarePosition);
-        ExcelUtil<LabSubjectHardwarePosition> util = new ExcelUtil<LabSubjectHardwarePosition>(LabSubjectHardwarePosition.class);
+        ExcelUtil<LabSubjectHardwarePosition> util = new ExcelUtil<>(LabSubjectHardwarePosition.class);
         util.exportExcel(response, list, "实验室硬件位置数据");
     }
 

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

@@ -1,33 +1,25 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.hutool.core.collection.CollUtil;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabSubjectLayout;
 import com.zd.laboratory.service.ILabSubjectLayoutService;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.model.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 实验室布局Controller
@@ -89,7 +81,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);
     }
@@ -103,7 +94,7 @@ public class LabSubjectLayoutController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectLayout labSubjectLayout) throws IOException {
         List<LabSubjectLayout> list = labSubjectLayoutService.selectLabSubjectLayoutList(labSubjectLayout);
-        ExcelUtil<LabSubjectLayout> util = new ExcelUtil<LabSubjectLayout>(LabSubjectLayout.class);
+        ExcelUtil<LabSubjectLayout> util = new ExcelUtil<>(LabSubjectLayout.class);
         util.exportExcel(response, list, "实验室布局数据");
     }
 

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

@@ -62,7 +62,7 @@ public class LabSubjectSecurityconfigureController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectSecurityconfigure labSubjectSecurityconfigure) throws IOException {
         List<LabSubjectSecurityconfigure> list = labSubjectSecurityconfigureService.selectLabSubjectSecurityconfigureList(labSubjectSecurityconfigure);
-        ExcelUtil<LabSubjectSecurityconfigure> util = new ExcelUtil<LabSubjectSecurityconfigure>(LabSubjectSecurityconfigure.class);
+        ExcelUtil<LabSubjectSecurityconfigure> util = new ExcelUtil<>(LabSubjectSecurityconfigure.class);
         util.exportExcel(response, list, "实验室和安全准入配置中间关联数据");
     }
 

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

@@ -187,7 +187,7 @@ public class LabTimedExhaustController  extends BaseController {
      */
     public void sendMassage(){
         List <LabTimedExhaustJoinsubVo> timedExhaustJoinsubList = labTimedExhaustJoinsubMapper.selectJoinsubList();
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuffer = new StringBuilder();
         Optional.ofNullable(timedExhaustJoinsubList).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->{

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

@@ -65,7 +65,7 @@ public class LabValueSegmentSiteController extends BaseController
     public void export(HttpServletResponse response, LabValueSegmentSite labValueSegmentSite) throws IOException
     {
         List<LabValueSegmentSite> list = labValueSegmentSiteService.selectLabValueSegmentSiteList(labValueSegmentSite);
-        ExcelUtil<LabValueSegmentSite> util = new ExcelUtil<LabValueSegmentSite>(LabValueSegmentSite.class);
+        ExcelUtil<LabValueSegmentSite> util = new ExcelUtil<>(LabValueSegmentSite.class);
         util.exportExcel(response, 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);
     }
@@ -130,7 +128,7 @@ public class LabViolationController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabViolationVO labViolation) throws IOException {
         List<LabViolationVO> list = labViolationService.selectLabViolationList(labViolation);
-        ExcelUtil<LabViolationVO> util = new ExcelUtil<LabViolationVO>(LabViolationVO.class);
+        ExcelUtil<LabViolationVO> util = new ExcelUtil<>(LabViolationVO.class);
         util.exportExcel(response, list, "违规记录数据");
     }
 
@@ -143,20 +141,6 @@ public class LabViolationController extends BaseController {
         return ResultData.success(labViolationService.selectLabViolationById(id));
     }
 
-   /* *//**
-     * 新增违规记录
-     *//*
-    @PreAuthorize(hasPermi = "laboratory:violation:add")
-    @Log(title = "old违规记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData add(@RequestBody LabViolationVO labViolationVO) {
-        labViolationVO.setUserId(tokenService.getLoginUser().getUserid());
-        labViolationVO.setUpdateBy(tokenService.getLoginUser().getSysUser().getNickName());
-        labViolationVO.setDeptId(tokenService.getLoginUser().getSysUser().getDeptId());
-        labViolationVO.setDeptName(tokenService.getLoginUser().getSysUser().getDeptName());
-        return ResultData.success(labViolationService.insertLabViolation(labViolationVO));
-    }*/
-
     /**
      * 修改违规记录
      */
@@ -201,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")
@@ -239,8 +198,7 @@ public class LabViolationController extends BaseController {
      */
     @GetMapping("/bigData/newStatistics")
     public ResultData newStatistics(LabViolation labViolation) {
-        LinkedHashMap <String,Object> data = labViolationService.newStatistics(labViolation);
-        return ResultData.success(data);
+        return ResultData.success(labViolationService.newStatistics(labViolation));
     }
 
 
@@ -284,8 +242,6 @@ public class LabViolationController extends BaseController {
         return labViolationService.blackAdd(labBlacklistVO);
     }
 
-
-
     /**
      * 新增违规记录
      * @param vo
@@ -298,9 +254,6 @@ public class LabViolationController extends BaseController {
         return labViolationService.addViolationHistory(vo);
     }
 
-   /* @Autowired
-    private ILabBlacklistService labBlacklistService;*/
-
     /**
      * 移除黑名单(一体机)
      * @param labBlacklist
@@ -357,7 +310,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")) {
@@ -423,9 +375,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/LabViolationHistoryRecordController.java

@@ -75,7 +75,7 @@ public class LabViolationHistoryRecordController extends BaseController
     public void export(HttpServletResponse response, LabViolationHistoryRecord labViolationHistoryRecord) throws IOException
     {
         List<LabViolationHistoryRecord> list = labViolationHistoryRecordService.selectLabViolationHistoryRecordList(labViolationHistoryRecord);
-        ExcelUtil<LabViolationHistoryRecord> util = new ExcelUtil<LabViolationHistoryRecord>(LabViolationHistoryRecord.class);
+        ExcelUtil<LabViolationHistoryRecord> util = new ExcelUtil<>(LabViolationHistoryRecord.class);
         util.exportExcel(response, list, "违规历史记录数据");
     }
 

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

@@ -1,34 +1,24 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabViolationRecord;
 import com.zd.laboratory.service.ILabViolationRecordService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 违规记录Controller
@@ -38,10 +28,8 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【违规记录】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
 @RequestMapping("/violationRecord")
-public class LabViolationRecordController extends BaseController
-{
+public class LabViolationRecordController extends BaseController {
     @Autowired
     private ILabViolationRecordService labViolationRecordService;
 
@@ -51,8 +39,7 @@ public class LabViolationRecordController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONRECORD + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询违规记录列表")
-    public TableDataInfo<LabViolationRecord> list(LabViolationRecord labViolationRecord)
-    {
+    public TableDataInfo<LabViolationRecord> list(LabViolationRecord labViolationRecord) {
         startPage();
         List<LabViolationRecord> list = labViolationRecordService.selectLabViolationRecordList(labViolationRecord);
         return getDataTable(list);
@@ -65,10 +52,9 @@ public class LabViolationRecordController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONRECORD + PerFun.EXPORT)
     @Log(title = "违规记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabViolationRecord labViolationRecord) throws IOException
-    {
+    public void export(HttpServletResponse response, LabViolationRecord labViolationRecord) throws IOException {
         List<LabViolationRecord> list = labViolationRecordService.selectLabViolationRecordList(labViolationRecord);
-        ExcelUtil<LabViolationRecord> util = new ExcelUtil<LabViolationRecord>(LabViolationRecord.class);
+        ExcelUtil<LabViolationRecord> util = new ExcelUtil<>(LabViolationRecord.class);
         util.exportExcel(response, list, "违规记录数据");
     }
 
@@ -78,8 +64,7 @@ public class LabViolationRecordController extends BaseController
     @ApiOperation(value = "获取违规记录详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONRECORD + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabViolationRecord> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabViolationRecord> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labViolationRecordService.selectLabViolationRecordById(id));
     }
 
@@ -90,8 +75,7 @@ public class LabViolationRecordController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONRECORD + PerFun.ADD)
     @Log(title = "违规记录", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabViolationRecord labViolationRecord)
-    {
+    public ResultData add(@RequestBody LabViolationRecord labViolationRecord) {
         return ResultData.result(labViolationRecordService.insertLabViolationRecord(labViolationRecord));
     }
 
@@ -102,9 +86,8 @@ public class LabViolationRecordController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONRECORD + PerFun.EDIT)
     @Log(title = "违规记录", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabViolationRecord labViolationRecord)
-    {
-        return  ResultData.result(labViolationRecordService.updateLabViolationRecord(labViolationRecord));
+    public ResultData edit(@RequestBody LabViolationRecord labViolationRecord) {
+        return ResultData.result(labViolationRecordService.updateLabViolationRecord(labViolationRecord));
     }
 
     /**
@@ -113,9 +96,8 @@ public class LabViolationRecordController extends BaseController
     @ApiOperation(value = "删除违规记录")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONRECORD + PerFun.REMOVE)
     @Log(title = "违规记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labViolationRecordService.deleteLabViolationRecordByIds(ids));
     }
 }

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

@@ -1,32 +1,24 @@
 package com.zd.laboratory.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.domain.ResultData;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabViolationScoreSite;
 import com.zd.laboratory.service.ILabViolationScoreSiteService;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.model.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 违规项扣分设置Controller
@@ -36,10 +28,8 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【违规项扣分设置】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
 @RequestMapping("/violationScoreSite")
-public class LabViolationScoreSiteController extends BaseController
-{
+public class LabViolationScoreSiteController extends BaseController {
     @Autowired
     private ILabViolationScoreSiteService labViolationScoreSiteService;
 
@@ -49,8 +39,7 @@ public class LabViolationScoreSiteController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONSCORESITE + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询违规项扣分设置列表")
-    public TableDataInfo<LabViolationScoreSite> list(LabViolationScoreSite labViolationScoreSite)
-    {
+    public TableDataInfo<LabViolationScoreSite> list(LabViolationScoreSite labViolationScoreSite) {
         startPage();
         List<LabViolationScoreSite> list = labViolationScoreSiteService.selectLabViolationScoreSiteList(labViolationScoreSite);
         return getDataTable(list);
@@ -63,10 +52,9 @@ public class LabViolationScoreSiteController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONSCORESITE + PerFun.EXPORT)
     @Log(title = "违规项扣分设置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabViolationScoreSite labViolationScoreSite) throws IOException
-    {
+    public void export(HttpServletResponse response, LabViolationScoreSite labViolationScoreSite) throws IOException {
         List<LabViolationScoreSite> list = labViolationScoreSiteService.selectLabViolationScoreSiteList(labViolationScoreSite);
-        ExcelUtil<LabViolationScoreSite> util = new ExcelUtil<LabViolationScoreSite>(LabViolationScoreSite.class);
+        ExcelUtil<LabViolationScoreSite> util = new ExcelUtil<>(LabViolationScoreSite.class);
         util.exportExcel(response, list, "违规项扣分设置数据");
     }
 
@@ -76,8 +64,7 @@ public class LabViolationScoreSiteController extends BaseController
     @ApiOperation(value = "获取违规项扣分设置详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONSCORESITE + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabViolationScoreSite> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabViolationScoreSite> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labViolationScoreSiteService.selectLabViolationScoreSiteById(id));
     }
 
@@ -88,8 +75,7 @@ public class LabViolationScoreSiteController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONSCORESITE + PerFun.ADD)
     @Log(title = "违规项扣分设置", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabViolationScoreSite labViolationScoreSite)
-    {
+    public ResultData add(@RequestBody LabViolationScoreSite labViolationScoreSite) {
         return ResultData.result(labViolationScoreSiteService.insertLabViolationScoreSite(labViolationScoreSite));
     }
 
@@ -100,9 +86,8 @@ public class LabViolationScoreSiteController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONSCORESITE + PerFun.EDIT)
     @Log(title = "违规项扣分设置", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabViolationScoreSite labViolationScoreSite)
-    {
-        return  ResultData.result(labViolationScoreSiteService.updateLabViolationScoreSite(labViolationScoreSite));
+    public ResultData edit(@RequestBody LabViolationScoreSite labViolationScoreSite) {
+        return ResultData.result(labViolationScoreSiteService.updateLabViolationScoreSite(labViolationScoreSite));
     }
 
     /**
@@ -111,9 +96,8 @@ public class LabViolationScoreSiteController extends BaseController
     @ApiOperation(value = "删除违规项扣分设置")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_VIOLATIONSCORESITE + PerFun.REMOVE)
     @Log(title = "违规项扣分设置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labViolationScoreSiteService.deleteLabViolationScoreSiteByIds(ids));
     }
 
@@ -123,8 +107,7 @@ public class LabViolationScoreSiteController extends BaseController
      */
     @GetMapping("/getDictViolation")
     @ApiOperation(value = "查询违规项扣分设置列表")
-    public ResultData getDictViolation()
-    {
+    public ResultData getDictViolation() {
         List<LabViolationScoreSite> list = labViolationScoreSiteService.selectLabScoreSiteList();
         return ResultData.success(list);
     }

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

@@ -1,40 +1,27 @@
 package com.zd.laboratory.controller;
 
-import java.util.HashMap;
-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;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.domain.LabViolationScoreSite;
 import com.zd.laboratory.domain.LabViolationSite;
+import com.zd.laboratory.service.ILabViolationScoreSiteService;
 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 com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.zd.model.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 违规-违规处理方式设置Controller
@@ -44,11 +31,8 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【违规-处理方式设置】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-
 @RequestMapping("/violationSite")
-public class LabViolationSiteController extends BaseController
-{
+public class LabViolationSiteController extends BaseController {
     @Autowired
     private ILabViolationSiteService labViolationSiteService;
 
@@ -62,14 +46,13 @@ public class LabViolationSiteController extends BaseController
     @GetMapping("/list")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SITE + PerFun.LIST)
     @ApiOperation(value = "查询违规-处理方式设置列表")
-    public ResultData list()
-    {
-       Map result  = new HashMap();
+    public ResultData list() {
+        Map result = new HashMap();
         List<LabViolationSite> list = labViolationSiteService.selectLabViolationSite();
         List<LabViolationScoreSite> scoreSite = labViolationScoreSiteService.selectLabViolationScore();
-        result.put("violationType",list);
-        result.put("violationMeth",scoreSite);
-        result.put("remake",list.size()>0? list.get(0).getRemake():"0");
+        result.put("violationType", list);
+        result.put("violationMeth", scoreSite);
+        result.put("remake", !list.isEmpty() ? list.get(0).getRemake() : "0");
         return ResultData.success(result);
     }
 
@@ -80,10 +63,9 @@ public class LabViolationSiteController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SITE + PerFun.EXPORT)
     @Log(title = "违规-违���项设置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabViolationSite labViolationSite) throws IOException
-    {
+    public void export(HttpServletResponse response, LabViolationSite labViolationSite) throws IOException {
         List<LabViolationSite> list = labViolationSiteService.selectLabViolationSiteList(labViolationSite);
-        ExcelUtil<LabViolationSite> util = new ExcelUtil<LabViolationSite>(LabViolationSite.class);
+        ExcelUtil<LabViolationSite> util = new ExcelUtil<>(LabViolationSite.class);
         util.exportExcel(response, list, "违规-违���项设置数据");
     }
 
@@ -93,8 +75,7 @@ public class LabViolationSiteController extends BaseController
     @ApiOperation(value = "获取违规-违规处理方式详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SITE + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabViolationSite> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabViolationSite> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labViolationSiteService.selectLabViolationSiteById(id));
     }
 
@@ -105,8 +86,7 @@ public class LabViolationSiteController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SITE + PerFun.ADD)
     @Log(title = "违规-违规项设置", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody Map obj)
-    {
+    public ResultData add(@RequestBody Map obj) {
         return ResultData.result(labViolationSiteService.insertLabViolationSite(obj));
     }
 
@@ -117,9 +97,8 @@ public class LabViolationSiteController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SITE + PerFun.EDIT)
     @Log(title = "违规-违规项设置", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabViolationSite labViolationSite)
-    {
-        return  ResultData.result(labViolationSiteService.updateLabViolationSite(labViolationSite));
+    public ResultData edit(@RequestBody LabViolationSite labViolationSite) {
+        return ResultData.result(labViolationSiteService.updateLabViolationSite(labViolationSite));
     }
 
     /**
@@ -128,25 +107,18 @@ public class LabViolationSiteController extends BaseController
     @ApiOperation(value = "删除违规-处理方式设置")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SITE + PerFun.REMOVE)
     @Log(title = "违规-违规项设置", businessType = BusinessType.DELETE)
-	@PostMapping("/del")
-    public ResultData remove(@RequestBody Map obj)
-    {
+    @PostMapping("/del")
+    public ResultData remove(@RequestBody Map obj) {
         return ResultData.result(labViolationSiteService.removeIds(obj));
     }
 
 
-
     @ApiOperation(value = "违规-违规项")
     @GetMapping("/type")
-    public ResultData type(){
+    public ResultData type() {
         List<LabViolationScoreSite> scoreSite = labViolationScoreSiteService.selectLabViolationScore();
         return ResultData.success(scoreSite);
     }
 
 
-
-
-
-
-
 }

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

@@ -39,11 +39,8 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "【白名单】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-//@ApiSupport(author = Knife4jConfiguration.Author.)
 @RequestMapping("/whitelist")
-public class LabWhitelistController extends BaseController
-{
+public class LabWhitelistController extends BaseController {
     @Autowired
     private ILabWhitelistService labWhitelistService;
 
@@ -62,8 +59,7 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询白名单列表")
-    public TableDataInfo<LabWhitelist> list(LabWhitelist labWhitelist)
-    {
+    public TableDataInfo<LabWhitelist> list(LabWhitelist labWhitelist) {
         startPage();
         List<LabWhitelist> list = labWhitelistService.selectLabWhitelistList(labWhitelist);
         return getDataTable(list);
@@ -76,10 +72,9 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.EXPORT)
     @Log(title = "白名单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LabWhitelist labWhitelist) throws IOException
-    {
+    public void export(HttpServletResponse response, LabWhitelist labWhitelist) throws IOException {
         List<LabWhitelist> list = labWhitelistService.selectLabWhitelistList(labWhitelist);
-        ExcelUtil<LabWhitelist> util = new ExcelUtil<LabWhitelist>(LabWhitelist.class);
+        ExcelUtil<LabWhitelist> util = new ExcelUtil<>(LabWhitelist.class);
         util.exportExcel(response, list, "白名单数据");
     }
 
@@ -89,8 +84,7 @@ public class LabWhitelistController extends BaseController
     @ApiOperation(value = "获取白名单详细信息")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<LabWhitelist> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<LabWhitelist> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(labWhitelistService.selectLabWhitelistById(id));
     }
 
@@ -99,8 +93,7 @@ public class LabWhitelistController extends BaseController
      */
     @ApiOperation(value = "获取白名单详细信息")
     @GetMapping(value = "/subList/{userId}")
-    public TableDataInfo<LabSubjectVO> getSubList(@PathVariable("userId") Long userId)
-    {
+    public TableDataInfo<LabSubjectVO> getSubList(@PathVariable("userId") Long userId) {
         LabWhiteJoinSublist labWhiteJoinSublist = new LabWhiteJoinSublist();
         labWhiteJoinSublist.setWhiteUserId(userId);
         return getDataTable(labWhiteJoinSublistService.selectLabWhiteJoinSublistList(labWhiteJoinSublist));
@@ -108,13 +101,13 @@ public class LabWhitelistController extends BaseController
 
     /**
      * 获取白名单信息-值班使用
+     *
      * @param userId
      * @return
      */
     @ApiOperation(value = "获取白名单详细信息-值班使用")
     @GetMapping(value = "/subWhiteList")
-    public ResultData<List<LabWhitelistVO>> getWhiteSubList(Long userId)
-    {
+    public ResultData<List<LabWhitelistVO>> getWhiteSubList(Long userId) {
         LabWhitelistVO vo = new LabWhitelistVO();
         vo.setUserId(userId);
         return ResultData.success(labWhitelistService.selectWhiteSublist(vo));
@@ -127,8 +120,7 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.ADD)
     @Log(title = "白名单", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody LabWhitelist labWhitelist)
-    {
+    public ResultData add(@RequestBody LabWhitelist labWhitelist) {
         return ResultData.result(labWhitelistService.insertLabWhitelist(labWhitelist));
     }
 
@@ -139,39 +131,37 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.ADD)
     @PostMapping("/addList")
     @Transactional(noRollbackFor = {NoRollException.class})
-    public ResultData addList(@RequestBody LabWhitelistVO labWhitelistVo)
-    {
+    public ResultData addList(@RequestBody LabWhitelistVO labWhitelistVo) {
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         List<LabWhitelist> labWhitelist=labWhitelistVo.getLabWhitelist();
         int id=0;
         int count = 0;
-        for (int i=0; i<labWhitelist.size(); i++){
+        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));
+            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);
-           }
+            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+"】，是否立即处理");
+        if (count > 0) {
+            throw new NoRollException(HttpStatus.NOT_IMPLEMENTED, count, "门禁授权失败【" + count + "】，是否立即处理");
         }
 
         return ResultData.result(id);
     }
 
 
-
     /**
      * 修改白名单以及关联的实验室表
      */
@@ -179,9 +169,8 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = "laboratory:whitelist:edit")
     @Log(title = "白名单", businessType = BusinessType.UPDATE)
     @PutMapping("/editWhiteBySubJoin")
-    public ResultData editWhiteBySubJoin(@RequestBody LabWhitelistVO labWhitelistVo)
-    {
-        return  ResultData.result(labWhitelistService.editWhiteBySubJoin(labWhitelistVo));
+    public ResultData editWhiteBySubJoin(@RequestBody LabWhitelistVO labWhitelistVo) {
+        return ResultData.result(labWhitelistService.editWhiteBySubJoin(labWhitelistVo));
     }
 
     /**
@@ -191,9 +180,8 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.EDIT)
     @Log(title = "白名单", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody LabWhitelist labWhitelist)
-    {
-        return  ResultData.result(labWhitelistService.updateLabWhitelist(labWhitelist));
+    public ResultData edit(@RequestBody LabWhitelist labWhitelist) {
+        return ResultData.result(labWhitelistService.updateLabWhitelist(labWhitelist));
     }
 
     /**
@@ -203,13 +191,13 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.REMOVE)
     @Log(title = "白名单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(labWhitelistService.deleteLabWhitelistByIds(ids));
     }
 
     /**
      * 根据id删除关联关系
+     *
      * @param id
      * @return
      */
@@ -217,8 +205,7 @@ public class LabWhitelistController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_WHITELIST + PerFun.REMOVE)
     @Log(title = "白名单", businessType = BusinessType.DELETE)
     @PostMapping("/{id}")
-    public ResultData remove(@PathVariable Long id)
-    {
+    public ResultData remove(@PathVariable Long id) {
         return ResultData.result(labWhitelistService.deleteLabWhitelistById(id));
     }
 

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

@@ -91,7 +91,7 @@ public class LabXxpCardInfoController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, XxpCardInfo xxpCardInfo) throws IOException {
         List<XxpCardInfo> list = xxpCardInfoService.selectXxpCardInfoList(xxpCardInfo);
-        ExcelUtil<XxpCardInfo> util = new ExcelUtil<XxpCardInfo>(XxpCardInfo.class);
+        ExcelUtil<XxpCardInfo> util = new ExcelUtil<>(XxpCardInfo.class);
         util.exportExcel(response, list, "电子信息牌数据");
     }
 
@@ -196,7 +196,7 @@ public class LabXxpCardInfoController extends BaseController {
     @RequestMapping("/XxpCardInfoByCard/{num}")
     public ResultData XxpCardInfoByCard(@PathVariable("num") String cardNum) {
         List<Map<String, Object>> list = xxpCardInfoService.selectXxpCardInfoByCard(cardNum);
-        if (list.size() > 0) {
+        if (list!=null && !list.isEmpty()) {
             return ResultData.success(list.get(0));
         }
         return ResultData.success();
@@ -243,11 +243,9 @@ 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) && Long.parseLong(userObj)==userId){
+                isDutyUser=1;
+                break;
             }
         }
         map.put("isDutyUser",isDutyUser);
@@ -289,11 +287,9 @@ 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) && 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,42 +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.laboratory.service.impl.HaiKangDoorService;
-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;
 
 /**
@@ -57,9 +43,6 @@ public class LabXxpClassifyController extends BaseController
     @Autowired
     private IXxpClassifyDetailedService xxpClassifyDetailedService;
 
-    @Autowired
-    private TokenService tokenService;
-
     /**
      * 查询信息牌类目列表
      */
@@ -84,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) {
@@ -118,7 +100,7 @@ public class LabXxpClassifyController extends BaseController
     public void export(HttpServletResponse response, XxpClassify xxpClassify) throws IOException
     {
         List<XxpClassify> list = xxpClassifyService.selectXxpClassifyList(xxpClassify);
-        ExcelUtil<XxpClassify> util = new ExcelUtil<XxpClassify>(XxpClassify.class);
+        ExcelUtil<XxpClassify> util = new ExcelUtil<>(XxpClassify.class);
         util.exportExcel(response, list, "信息牌类目数据");
     }
 
@@ -206,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/LabXxpClassifyDetailedController.java

@@ -3,18 +3,14 @@ package com.zd.laboratory.controller;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 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.web.controller.BaseController;
 import com.zd.laboratory.api.vo.LabXxpClassifyVo;
-import com.zd.laboratory.domain.LabWhitelist;
-import com.zd.laboratory.domain.XxpClassify;
 import com.zd.laboratory.domain.XxpClassifyDetail;
 import com.zd.laboratory.domain.XxpClassifySubject;
 import com.zd.laboratory.domain.vo.XxpClassifyDetailVO;
 import com.zd.laboratory.service.IXxpClassifyDetailedService;
 import com.zd.laboratory.service.IXxpClassifySubjectService;
-import com.zd.laboratory.service.IXxpClassifyService;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
@@ -37,18 +33,11 @@ import java.util.List;
 @RestController
 @Api(tags = "【安全信息类目详情】")
 @RequestMapping("/XxpClassifyDet")
-public class LabXxpClassifyDetailedController extends BaseController
-{
+public class LabXxpClassifyDetailedController extends BaseController {
     @Autowired
     private IXxpClassifyDetailedService classifyDetailedService;
 
     @Autowired
-    private IXxpClassifyService iXxpClassifyService;
-
-    @Autowired
-    private TokenService tokenService;
-
-    @Autowired
     private IXxpClassifySubjectService classifySubjectService;
 
     /**
@@ -58,8 +47,7 @@ public class LabXxpClassifyDetailedController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询安全信息类目详情列表")
-    public TableDataInfo<XxpClassifyDetailVO> list(XxpClassifyDetailVO classifyDetailed)
-    {
+    public TableDataInfo<XxpClassifyDetailVO> list(XxpClassifyDetailVO classifyDetailed) {
         startPage();
         classifyDetailed.setRemark("list");
         List<XxpClassifyDetailVO> list = classifyDetailedService.selectXxpClassifyDetailedList(classifyDetailed);
@@ -70,14 +58,13 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 导出安全信息类目详情列表
      */
     @ApiOperation(value = "导出安全信息类目详情列表")
-   // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EXPORT)
+    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EXPORT)
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.EXPORT)
     @Log(title = "安全信息类目详情", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, XxpClassifyDetailVO classifyDetailed) throws IOException
-    {
+    public void export(HttpServletResponse response, XxpClassifyDetailVO classifyDetailed) throws IOException {
         List<XxpClassifyDetailVO> list = classifyDetailedService.selectXxpClassifyDetailedList(classifyDetailed);
-        ExcelUtil<XxpClassifyDetailVO> util = new ExcelUtil<XxpClassifyDetailVO>(XxpClassifyDetailVO.class);
+        ExcelUtil<XxpClassifyDetailVO> util = new ExcelUtil<>(XxpClassifyDetailVO.class);
         util.exportExcel(response, list, "安全信息类目详情数据");
     }
 
@@ -88,8 +75,7 @@ public class LabXxpClassifyDetailedController extends BaseController
     //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.QUERY)
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<XxpClassifyDetail> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<XxpClassifyDetail> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(classifyDetailedService.selectXxpClassifyDetailedById(id));
     }
 
@@ -102,13 +88,11 @@ public class LabXxpClassifyDetailedController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.ADD)
     @Log(title = "安全信息类目详情", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody XxpClassifyDetail classifyDetailed)
-    {
+    public ResultData add(@RequestBody XxpClassifyDetail classifyDetailed) {
         return ResultData.result(classifyDetailedService.insertXxpClassifyDetailed(classifyDetailed));
     }
 
 
-
     /**
      * 修改安全信息类目详情
      */
@@ -117,9 +101,8 @@ public class LabXxpClassifyDetailedController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.EDIT)
     @Log(title = "安全信息类目详情", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody XxpClassifyDetail classifyDetailed)
-    {
-        return  ResultData.result(classifyDetailedService.updateXxpClassifyDetailed(classifyDetailed));
+    public ResultData edit(@RequestBody XxpClassifyDetail classifyDetailed) {
+        return ResultData.result(classifyDetailedService.updateXxpClassifyDetailed(classifyDetailed));
     }
 
     /**
@@ -130,49 +113,45 @@ public class LabXxpClassifyDetailedController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.REMOVE)
     @Log(title = "安全信息类目详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(classifyDetailedService.deleteXxpClassifyDetailedByIds(ids));
     }
 
     /**
      * 根据id删除关联关系
+     *
      * @param id
      * @return
      */
     @ApiOperation(value = "根据id删除安全信息类目详情关联关系")
-   // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.REMOVE)
     @Log(title = "安全信息类目详情", businessType = BusinessType.DELETE)
     @PostMapping("/{id}")
-    public ResultData remove(@PathVariable Long id)
-    {
+    public ResultData remove(@PathVariable Long id) {
         return ResultData.result(classifyDetailedService.deleteXxpClassifyDetailedById(id));
     }
 
 
-
     /**
      * 根据实验室id查询信息牌数据
+     *
      * @param id
      * @return
      */
     @RequestMapping("/classifyDetail/{id}")
-    public ResultData getClassifyDetailed(@PathVariable Long id)
-    {
-        List<LabXxpClassifyVo> xxpClassifyVoList=classifyDetailedService.selectXxpClassify(id);
+    public ResultData getClassifyDetailed(@PathVariable Long id) {
+        List<LabXxpClassifyVo> xxpClassifyVoList = classifyDetailedService.selectXxpClassify(id);
         return ResultData.success(xxpClassifyVoList);
     }
 
     @PostMapping(value = "/addSub")
-    public ResultData addSub(@RequestBody XxpClassifySubject subject)
-    {
+    public ResultData addSub(@RequestBody XxpClassifySubject subject) {
         return ResultData.success(classifySubjectService.insertClassifySubject(subject));
     }
 
     @GetMapping(value = "/delSub")
-    public ResultData delSub(Long subjectId)
-    {
+    public ResultData delSub(Long subjectId) {
         return ResultData.success(classifySubjectService.deleteBySubjectId(subjectId));
     }
 

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

@@ -3,14 +3,12 @@ package com.zd.laboratory.controller;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.XxpDuty;
-import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.vo.XxpDutyVO;
 import com.zd.laboratory.service.IXxpDutyService;
 import com.zd.model.domain.ResultData;
@@ -24,7 +22,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 值班Controller
@@ -35,15 +36,11 @@ import java.util.*;
 @RestController
 @Api(tags = "【值班】")
 @RequestMapping("/XxpDuty")
-public class LabXxpDutyController extends BaseController
-{
+public class LabXxpDutyController extends BaseController {
     @Autowired
     private IXxpDutyService xxpDutyService;
 
     @Autowired
-    private TokenService tokenService;
-
-    @Autowired
     private FileConfigUtils fileConfigUtils;
 
     /**
@@ -52,8 +49,7 @@ public class LabXxpDutyController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询值班列表")
-    public TableDataInfo<XxpDuty> list(XxpDuty xxpDuty)
-    {
+    public TableDataInfo<XxpDuty> list(XxpDuty xxpDuty) {
         startPage();
         List<XxpDuty> list = xxpDutyService.selectXxpDutyList(xxpDuty);
         return getDataTable(list);
@@ -65,15 +61,13 @@ public class LabXxpDutyController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.LIST)
     @GetMapping("/listYmd")
     @ApiOperation(value = "查询值班列表")
-    public TableDataInfo<XxpDutyVO> listGroup(XxpDuty xxpDuty)
-    {
-        //startPage();
+    public TableDataInfo<XxpDutyVO> listGroup(XxpDuty xxpDuty) {
         List<XxpDutyVO> list = xxpDutyService.selectDutyYmdById(xxpDuty);
-        XxpDuty du  = new XxpDuty();
-        for (XxpDutyVO duty:list) {
+        XxpDuty du = new XxpDuty();
+        for (XxpDutyVO duty : list) {
             du.setDeptId(xxpDuty.getDeptId());
             du.setDutyTime(duty.getDutyTime());
-            XxpDutyVO vo= xxpDutyService.selectSubAndUserSum(du);
+            XxpDutyVO vo = xxpDutyService.selectSubAndUserSum(du);
             duty.setSubSum(vo.getSubSum());
             duty.setUserSum(vo.getUserSum());
         }
@@ -87,10 +81,9 @@ public class LabXxpDutyController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.EXPORT)
     @Log(title = "值班", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, XxpDuty xxpDuty) throws IOException
-    {
+    public void export(HttpServletResponse response, XxpDuty xxpDuty) throws IOException {
         List<XxpDuty> list = xxpDutyService.selectXxpDutyList(xxpDuty);
-        ExcelUtil<XxpDuty> util = new ExcelUtil<XxpDuty>(XxpDuty.class);
+        ExcelUtil<XxpDuty> util = new ExcelUtil<>(XxpDuty.class);
         util.exportExcel(response, list, "值班数据");
     }
 
@@ -100,8 +93,7 @@ public class LabXxpDutyController extends BaseController
     @ApiOperation(value = "获取值班详细")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<XxpDuty> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<XxpDuty> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(xxpDutyService.selectXxpDutyById(id));
     }
 
@@ -112,16 +104,15 @@ public class LabXxpDutyController extends BaseController
     @ApiOperation(value = "根据时间获取值班详情")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.QUERY)
     @GetMapping(value = "/getInfoByDate")
-    public TableDataInfo<XxpDutyVO> getInfoByDate(XxpDuty xxpDuty)
-    {
+    public TableDataInfo<XxpDutyVO> getInfoByDate(XxpDuty xxpDuty) {
         startPage();
         List<XxpDutyVO> listVo = xxpDutyService.selectInfoByDate(xxpDuty);
         XxpDuty newDuty = new XxpDuty();
-        for (XxpDutyVO duty:listVo) {
+        for (XxpDutyVO duty : listVo) {
             newDuty.setSubjectId(duty.getSubjectId());
             newDuty.setDutyTime(xxpDuty.getDutyTime());
             newDuty.setDeptId(xxpDuty.getDeptId());
-            List<XxpDuty> list =xxpDutyService.selectXxpDutyList(newDuty);
+            List<XxpDuty> list = xxpDutyService.selectXxpDutyList(newDuty);
             duty.setDutyList(list);
         }
         return getDataTable(listVo);
@@ -134,13 +125,11 @@ public class LabXxpDutyController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.ADD)
     @Log(title = "值班", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody XxpDutyVO xxpDutyVO)
-    {
+    public ResultData add(@RequestBody XxpDutyVO xxpDutyVO) {
         return ResultData.result(xxpDutyService.insertXxpDuty(xxpDutyVO));
     }
 
 
-
     /**
      * 修改值班
      */
@@ -148,9 +137,8 @@ public class LabXxpDutyController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.EDIT)
     @Log(title = "值班", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody XxpDuty xxpDuty)
-    {
-        return  ResultData.result(xxpDutyService.updateXxpDuty(xxpDuty));
+    public ResultData edit(@RequestBody XxpDuty xxpDuty) {
+        return ResultData.result(xxpDutyService.updateXxpDuty(xxpDuty));
     }
 
     /**
@@ -160,13 +148,13 @@ public class LabXxpDutyController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.REMOVE)
     @Log(title = "值班", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(xxpDutyService.deleteXxpDutyByIds(ids));
     }
 
     /**
      * 根据id删除
+     *
      * @param id
      * @return
      */
@@ -174,22 +162,19 @@ public class LabXxpDutyController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_DUTY + PerFun.REMOVE)
     @Log(title = "值班", businessType = BusinessType.DELETE)
     @PostMapping("/{id}")
-    public ResultData remove(@PathVariable Long id)
-    {
+    public ResultData remove(@PathVariable Long id) {
         return ResultData.result(xxpDutyService.deleteXxpDutyById(id));
     }
 
 
-    /*--------------------------------------------------------------------------------*/
     @RequestMapping("/api/selectDutyUser")
     @ApiOperation(value = "查询值班列表")
-    public ResultData<List<Map<String,Object>>> list(Long labId,String dateTime)
-    {
-        List<Map<String,Object>> list = xxpDutyService.selectDutyUser(labId,dateTime);
-        for(Map<String,Object> map:list){
-            if(StringUtils.isNotNull(map.get("avatar"))){
-                String avatar=fileConfigUtils.getFileDomainApp() + map.get("avatar");
-                map.put("avatar",avatar);
+    public ResultData<List<Map<String, Object>>> list(Long labId, String dateTime) {
+        List<Map<String, Object>> list = xxpDutyService.selectDutyUser(labId, dateTime);
+        for (Map<String, Object> map : list) {
+            if (StringUtils.isNotNull(map.get("avatar"))) {
+                String avatar = fileConfigUtils.getFileDomainApp() + map.get("avatar");
+                map.put("avatar", avatar);
             }
         }
         return ResultData.success(list);
@@ -198,15 +183,14 @@ public class LabXxpDutyController extends BaseController
 
     @RequestMapping("/api/selectDutyUserList")
     @ApiOperation(value = "查询值班人员列表")
-    public ResultData<List<Map<String,Object>>> selectDutyUserList(Long labId,String startTime,String endTime)
-    {
-        List<Map<String,Object>> list = xxpDutyService.selectDutyUserList(labId,startTime,endTime);
+    public ResultData<List<Map<String, Object>>> selectDutyUserList(Long labId, String startTime, String endTime) {
+        List<Map<String, Object>> list = xxpDutyService.selectDutyUserList(labId, startTime, endTime);
         Optional.ofNullable(list).orElseGet(Collections::emptyList)
                 .stream()
-                .forEach(a->{
-                    if(StringUtils.isNotNull(a.get("avatar"))){
+                .forEach(a -> {
+                    if (StringUtils.isNotNull(a.get("avatar"))) {
                         String url = fileConfigUtils.getFileDomainApp() + a.get("avatar");
-                        a.put("avatar",url);
+                        a.put("avatar", url);
                     }
                 });
         return ResultData.success(list);
@@ -217,8 +201,7 @@ public class LabXxpDutyController extends BaseController
      * 获取当前时间
      */
     @GetMapping(value = "/getDate")
-    public ResultData getDate()
-    {
+    public ResultData getDate() {
         return ResultData.success(DateUtils.getDate());
     }
 }

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)
@@ -158,7 +157,7 @@ public class LabXxpInspectionController extends BaseController
     public void export(HttpServletResponse response, XxpInspection xxpInspection) throws IOException
     {
         List<XxpInspection> list = xxpInspectionService.selectXxpInspectionList(xxpInspection);
-        ExcelUtil<XxpInspection> util = new ExcelUtil<XxpInspection>(XxpInspection.class);
+        ExcelUtil<XxpInspection> util = new ExcelUtil<>(XxpInspection.class);
         util.exportExcel(response, list, "巡查数据");
     }
 

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

@@ -1,18 +1,14 @@
 package com.zd.laboratory.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.redis.RedisService;
-import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.DictUtils;
 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.XxpUserAuthVo;
-import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.XxpCardInfo;
 import com.zd.laboratory.domain.XxpUserAuth;
 import com.zd.laboratory.service.ILabSubjectService;
@@ -29,10 +25,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 信息牌人员权限 Controller
@@ -43,8 +40,7 @@ import java.util.*;
 @RestController
 @Api(tags = "【信息牌人员权限】")
 @RequestMapping("/XxpUserAuth")
-public class LabXxpUserAuthController extends BaseController
-{
+public class LabXxpUserAuthController extends BaseController {
     @Autowired
     private IXxpUserAuthService xxpUserAuthService;
 
@@ -63,8 +59,7 @@ public class LabXxpUserAuthController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询列表")
-    public TableDataInfo<XxpUserAuth> list(XxpUserAuth xxpUserAuth)
-    {
+    public TableDataInfo<XxpUserAuth> list(XxpUserAuth xxpUserAuth) {
         startPage();
         List<XxpUserAuth> list = xxpUserAuthService.selectXxpUserAuthList(xxpUserAuth);
         return getDataTable(list);
@@ -75,8 +70,7 @@ public class LabXxpUserAuthController extends BaseController
      */
     @GetMapping("/authTypelist")
     @ApiOperation(value = "查询授权类型列表")
-    public TableDataInfo<SysDictData> authTypelist()
-    {
+    public TableDataInfo<SysDictData> authTypelist() {
         List<SysDictData> dictDataList = DictUtils.getDictCache("xxp_auth_type");
         return getDataTable(dictDataList);
     }
@@ -88,10 +82,9 @@ public class LabXxpUserAuthController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.EXPORT)
     @Log(title = "信息牌人员权限", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, XxpUserAuth xxpUserAuth) throws IOException
-    {
+    public void export(HttpServletResponse response, XxpUserAuth xxpUserAuth) throws IOException {
         List<XxpUserAuth> list = xxpUserAuthService.selectXxpUserAuthList(xxpUserAuth);
-        ExcelUtil<XxpUserAuth> util = new ExcelUtil<XxpUserAuth>(XxpUserAuth.class);
+        ExcelUtil<XxpUserAuth> util = new ExcelUtil<>(XxpUserAuth.class);
         util.exportExcel(response, list, "巡查数据");
     }
 
@@ -101,8 +94,7 @@ public class LabXxpUserAuthController extends BaseController
     @ApiOperation(value = "获取详细")
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<XxpUserAuth> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<XxpUserAuth> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(xxpUserAuthService.selectXxpUserAuthById(id));
     }
 
@@ -114,8 +106,7 @@ public class LabXxpUserAuthController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.ADD)
     @Log(title = "信息牌人员权限", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody XxpUserAuth xxpUserAuth)
-    {
+    public ResultData add(@RequestBody XxpUserAuth xxpUserAuth) {
         return ResultData.result(xxpUserAuthService.insertXxpUserAuth(xxpUserAuth));
     }
 
@@ -128,8 +119,7 @@ public class LabXxpUserAuthController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.ADD)
     @Log(title = "信息牌人员权限", businessType = BusinessType.INSERT)
     @PostMapping("/addAuth")
-    public ResultData addAuth(@RequestBody XxpUserAuth xxpUserAuth)
-    {
+    public ResultData addAuth(@RequestBody XxpUserAuth xxpUserAuth) {
         return ResultData.result(xxpUserAuthService.insertXxpUserAuthBatch(xxpUserAuth));
     }
 
@@ -140,9 +130,8 @@ public class LabXxpUserAuthController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.EDIT)
     @Log(title = "信息牌人员权限", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody XxpUserAuth xxpUserAuth)
-    {
-        return  ResultData.result(xxpUserAuthService.updateXxpUserAuth(xxpUserAuth));
+    public ResultData edit(@RequestBody XxpUserAuth xxpUserAuth) {
+        return ResultData.result(xxpUserAuthService.updateXxpUserAuth(xxpUserAuth));
     }
 
     /**
@@ -152,13 +141,13 @@ public class LabXxpUserAuthController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.REMOVE)
     @Log(title = "信息牌人员权限", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(xxpUserAuthService.deleteXxpUserAuthByIds(ids));
     }
 
     /**
      * 根据id删除
+     *
      * @param id
      * @return
      */
@@ -166,25 +155,24 @@ public class LabXxpUserAuthController extends BaseController
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXPUSERAUTH + PerFun.REMOVE)
     @Log(title = "信息牌人员权限", businessType = BusinessType.DELETE)
     @PostMapping("/{id}")
-    public ResultData remove(@PathVariable Long id)
-    {
+    public ResultData remove(@PathVariable Long id) {
         return ResultData.result(xxpUserAuthService.deleteXxpUserAuthById(id));
     }
 
     /**
      * 电子信息牌指纹录入
+     *
      * @param xxpUserAuthVo
      * @return
      */
     @ApiOperation(value = "电子信息牌指纹录入")
     @PostMapping("/addUserAuth")
-    public ResultData addUserAuth(@RequestBody XxpUserAuthVo xxpUserAuthVo)
-    {
-        XxpCardInfo xxpCardInfo=iXxpCardInfoService.selectXxpInfoByCard(xxpUserAuthVo.getNum());
-        if(null==xxpCardInfo){
+    public ResultData addUserAuth(@RequestBody XxpUserAuthVo xxpUserAuthVo) {
+        XxpCardInfo xxpCardInfo = iXxpCardInfoService.selectXxpInfoByCard(xxpUserAuthVo.getNum());
+        if (null == xxpCardInfo) {
             return ResultData.fail("电子班牌查询错误");
         }
-        XxpUserAuth xxpUserAuth=new XxpUserAuth();
+        XxpUserAuth xxpUserAuth = new XxpUserAuth();
         xxpUserAuth.setUserId(xxpUserAuthVo.getUserId());
         xxpUserAuth.setUserName(xxpUserAuthVo.getUserName());
         xxpUserAuth.setUserType(xxpUserAuthVo.getUserType());
@@ -203,42 +191,40 @@ public class LabXxpUserAuthController extends BaseController
 
     /**
      * 根据用户id查询指纹信息
+     *
      * @param userId
      * @return
      */
     @GetMapping("/getFingerByUserId")
-    public ResultData getFingerByUserId(@RequestParam Long labId,@RequestParam Long userId)
-    {
-        List<Map<String,Object>> mapList= xxpUserAuthService.getFingerByUserId(userId);
-        for(Map<String,Object> map:mapList){
-            Integer isDutyUser=0;
-            String userType=String.valueOf(map.get("userType"));
-            if(StringUtils.isNull(userType)){
+    public ResultData getFingerByUserId(@RequestParam Long labId, @RequestParam Long userId) {
+        List<Map<String, Object>> mapList = xxpUserAuthService.getFingerByUserId(userId);
+        for (Map<String, Object> map : mapList) {
+            Integer isDutyUser = 0;
+            String userType = String.valueOf(map.get("userType"));
+            if (StringUtils.isNull(userType)) {
                 return ResultData.fail("用户不存在！");
             }
-            String isWhite=String.valueOf(map.get("isWhite"));
+            String isWhite = String.valueOf(map.get("isWhite"));
             //如果是学生 或者白名单的老师 进二类页面
-            if(userType.equals("22") || (userType.equals("11") && isWhite.equals("0"))){
-                map.put("pageType",2);
+            if (userType.equals("22") || (userType.equals("11") && isWhite.equals("0"))) {
+                map.put("pageType", 2);
             }
-            int number=iLabSubjectService.isAdminOrSafeUser(labId,userId);
+            int number = iLabSubjectService.isAdminOrSafeUser(labId, userId);
             //一类首页对应身份为白名单老师、实验室负责人、安全责任人
-            if(number>0 || (userType.equals("11") && isWhite.equals("1"))){
-                map.put("pageType",1);
+            if (number > 0 || (userType.equals("11") && isWhite.equals("1"))) {
+                map.put("pageType", 1);
             }
             String dateTime = DateUtils.getDate();
-            List<Map<String,Object>> list = iXxpDutyService.selectDutyUser(labId,dateTime);
+            List<Map<String, Object>> list = iXxpDutyService.selectDutyUser(labId, dateTime);
             //判断是否当天值班
-            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;
-                    }
+            for (Map<String, Object> dutyMap : list) {
+                String userObj = String.valueOf(dutyMap.get("userId"));
+                if (StringUtils.isNotEmpty(userObj) && Long.parseLong(userObj) == userId) {
+                    isDutyUser = 1;
+                    break;
                 }
             }
-            map.put("isDutyUser",isDutyUser);
+            map.put("isDutyUser", isDutyUser);
             map.remove("isWhite");
         }
         return ResultData.success(mapList);
@@ -247,12 +233,12 @@ public class LabXxpUserAuthController extends BaseController
 
     /**
      * 根据用户id查询指纹信息
+     *
      * @param id
      * @return
      */
     @GetMapping("/deleteFingerById")
-    public ResultData deleteFingerById(@RequestParam Long id)
-    {
+    public ResultData deleteFingerById(@RequestParam Long id) {
         return ResultData.result(xxpUserAuthService.deleteXxpUserAuthById(id));
     }
 

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

@@ -1,8 +1,6 @@
 package com.zd.laboratory.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.model.domain.ResultData;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.interfaces.SysProperties;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Description:
  */
 @Api(tags = {"实验室系统配置"})
-@ApiSupport(author = Knife4jConfiguration.Author.ZP)
 @RestController
 @RequestMapping("/sys/lab")
 @EnableConfigurationProperties(SysProperties.class)

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

@@ -80,7 +80,7 @@ public class WarningNoticeLogController extends AbstractController {
         queryWrapper.orderByDesc(WarningNoticeLog::getId);
         Page page = warningNoticeLogService.page(new Page(queryWarningLogParam.getPageNum(), queryWarningLogParam.getPageSize()), queryWrapper);
         List<WarningNoticeLog> records = page.getRecords();
-        if (records.size() > 0) {
+        if (!records.isEmpty()) {
             BeanUtils.copyProperties(page, warningNoticeLogPage);
             List<WarningNoticeLogVO> warningNoticeLogVOS = com.zd.common.core.utils.BeanUtils.copyList2List(records, WarningNoticeLogVO.class);
             warningNoticeLogPage.setRecords(warningNoticeLogVOS);
@@ -94,7 +94,7 @@ public class WarningNoticeLogController extends AbstractController {
         Page<WarningNoticeLogVO> VOPage = new Page<>();
         Page<WarningNoticeLog> page = warningNoticeLogService.page(new Page<WarningNoticeLog>(queryAppWarningLogParam.getPageNum(), queryAppWarningLogParam.getPageSize()), new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE).orderByDesc(WarningNoticeLog::getCreateTime));
         List<WarningNoticeLog> records = page.getRecords();
-        if (records.size() > 0) {
+        if (!records.isEmpty()) {
             List<WarningNoticeLogVO> warningNoticeLogVOS = com.zd.common.core.utils.BeanUtils.copyList2List(records, WarningNoticeLogVO.class);
             warningNoticeLogVOS.forEach(warningNoticeLogVO -> {
                 warningNoticeLogVO.setCreateDate(LocalDateTimeUtil.ofDate(warningNoticeLogVO.getCreateTime()));

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/bigview/BigViewController.java

@@ -5,8 +5,8 @@ import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.api.entity.LabSubjectControllerVO;
+import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.domain.LabHazardSubjectRelation;
 import com.zd.laboratory.domain.bigview.HardwareState;
 import com.zd.laboratory.domain.bigview.HazardTotal;
@@ -24,7 +24,6 @@ import com.zd.model.page.TableDataInfo;
 import com.zd.system.api.feign.RemoteUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.parser.Token;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -393,9 +392,9 @@ public class BigViewController extends BaseController {
         labHornMessageVo.setSendName(tokenService.getLoginUser().getNickName());
         labHornMessageVo.setNowTime(localDateTime.format(DateTimeFormatter.ofPattern("HH:mm")));
         redisService.setCacheObject("sendHornMess"+labHornMessageVo.getFloorId(), labHornMessageVo, 3L, TimeUnit.HOURS);
-        //todo 消息下发，告诉前端
+        // 消息下发，告诉前端
         messageSendService.sendHornMessToFloor(labHornMessageVo.getFloorId());
-        //todo 调用喇叭服务
+        // 调用喇叭服务
         remoteSpeakService.textParseUrlIps(labHornMessageVo.getMessageContext(),labHornMessageVo.getPlayVo());
         return ResultData.success();
     }

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

@@ -4,9 +4,7 @@ import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.ReUtil;
 import com.zd.laboratory.api.entity.CabinetLock;
 import com.zd.laboratory.api.entity.CabinetV2Lock;
-import com.zd.laboratory.mqtt.service.impl.CommonSend;
 import com.zd.laboratory.netty.NettyPushMsgService;
-import com.zd.laboratory.socket.runner.TCPServer;
 import com.zd.laboratory.socket.service.SocketService;
 import com.zd.laboratory.utils.CRCCHECK;
 import com.zd.model.domain.ResultData;
@@ -20,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.io.OutputStream;
 
 /**
  * 设备远程控制接口
@@ -34,8 +31,6 @@ public class DeviceRemoteController {
     private SocketService socketService;
     @Autowired
     private RedisService redisService;
-    @Autowired
-    private CommonSend commonSend;
 
     @Value("${sys.lockTimer:30}")
     private Integer lockTimer;
@@ -55,35 +50,17 @@ 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 {
-//            ops.write(ReUtil.hexStringToByteArray(instruct));
-//            ops.flush();
-//            for (int i = 0; i < 5; i++) {
-//                NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-//                logger.info("柜锁开锁指令：" + instruct);
-//
-//                Thread.sleep(1000);
-//            }
 
             NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
             logger.info("柜锁开锁指令：" + instruct);
             Thread.sleep(1000);
-//            ops.write(ReUtil.hexStringToByteArray(instruct));
-//            ops.flush();
-//
-//            Thread.sleep(1500);
-//            ops.write(ReUtil.hexStringToByteArray(instruct));
-//            ops.flush();
 
             instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
             int timer = lockTimer;
             Integer status;
             while (timer > 1){
-
-//                ops.write(ReUtil.hexStringToByteArray(instruct));
-//                ops.flush();
                 NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
                 timer-=3;
 
@@ -96,47 +73,10 @@ public class DeviceRemoteController {
             }
 
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("柜锁连接失败：" + e.getMessage());
             return ResultData.fail("柜锁连接失败！");
         }
         return ResultData.fail("开锁失败");
-
-        //  mqtt 方式
-        /*String instruct = CRCCHECK.getOpenLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-        logger.info("柜锁MQTT开锁发送：" + instruct);
-        commonSend.send(socketService.getSteerSubscriptPrefix() + "/" + cabinetV2Lock.getRelayCode(),
-                ReUtil.hexStringToByteArray(instruct));
-
-        instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-        int timer = lockTimer;
-        Integer status;
-        byte[] bytes = ReUtil.hexStringToByteArray(instruct);
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        while (timer > 1){
-
-            commonSend.send(socketService.getSteerSubscriptPrefix() + "/" + cabinetV2Lock.getRelayCode(),
-                    bytes);
-            timer-=2;
-
-            try {
-                Thread.sleep(1900);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-            status = redisService.getCacheObject(cabinetV2Lock.getRelayCode() + ":" + cabinetV2Lock.getLockId());
-            logger.info("柜锁MQTT开锁状态查询：" + instruct + "，开锁结果：" + status);
-            if(status != null && status == 1){
-                return ResultData.success("开锁成功");
-            }
-        }
-        return ResultData.fail("开锁失败");*/
     }
 
     /**
@@ -144,73 +84,23 @@ public class DeviceRemoteController {
      */
     @PostMapping("/V2/closeLock")
     public ResultData cabinetV2CloseLock(@RequestBody CabinetV2Lock cabinetV2Lock){
-        /*try {
-            Thread.sleep(5 * 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return ResultData.success("关锁成功");*/
-
-        // socket 方式发送
-//        String instruct = CRCCHECK.getCloseLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
         String relayCode = cabinetV2Lock.getRelayCode();
-        OutputStream ops = TCPServer.cacheMap.get(relayCode);
 
         try {
-            /*ops.write(ReUtil.hexStringToByteArray(instruct));
-            ops.flush();
-            logger.info("柜锁关锁指令：" + instruct);
-            Thread.sleep(1000);*/
-
             String instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-            int timer = lockTimer;
             Integer status;
-//            while (timer > 1){
-
-//                ops.write(ReUtil.hexStringToByteArray(instruct));
-//                ops.flush();
-                NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-                timer-=2;
-
-                Thread.sleep(1900);
-                status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
-                logger.info("柜锁关锁状态查询：" + instruct + "，关锁结果" + status);
-                if(status != null && status == 0){
-                    return ResultData.success("关锁成功");
-                }
-//            }
+            NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
 
-//            return ResultData.success("关锁成功");
+            Thread.sleep(1900);
+            status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
+            logger.info("柜锁关锁状态查询：" + instruct + "，关锁结果" + status);
+            if(status != null && status == 0){
+                return ResultData.success("关锁成功");
+            }
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("柜锁连接失败：" + e.getMessage());
             return ResultData.fail("柜锁连接失败！");
         }
         return ResultData.fail("关锁失败：请手动按压柜锁，确认已关闭！");
-
-        // mqtt 方式
-        /*String instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-        int timer = lockTimer;
-        Integer status;
-        byte[] bytes = ReUtil.hexStringToByteArray(instruct);
-        while (timer > 1){
-
-            commonSend.send(socketService.getSteerSubscriptPrefix() + "/" + cabinetV2Lock.getRelayCode(),
-                    bytes);
-            timer--;
-
-            try {
-                Thread.sleep(900);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            status = redisService.getCacheObject(cabinetV2Lock.getRelayCode() + ":" + cabinetV2Lock.getLockId());
-            logger.info("柜锁MQTT关锁状态查询：" + instruct + "，开锁结果：" + status);
-            if(status != null && status == 1){
-                return ResultData.success("关锁成功");
-            }
-        }
-
-        return ResultData.fail("关锁失败");*/
     }
 }

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

@@ -1,15 +1,9 @@
 package com.zd.laboratory.controller.device;
 
-import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.domain.vo.LabHardwareVO;
 import com.zd.laboratory.service.ILabHardwareService;
-import com.zd.model.domain.AjaxResult;
-import com.zd.model.domain.R;
 import com.zd.model.domain.ResultData;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,12 +1,5 @@
 package com.zd.laboratory.domain;
 
-import com.zd.laboratory.domain.vo.LabRiskPlanAbnormalLogVO;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * @Author: zhoupan
  * @Date: 2021/11/11/16:56

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

@@ -4,8 +4,6 @@ import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotNull;
 

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

@@ -1,17 +1,15 @@
 package com.zd.laboratory.domain;
 
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.model.valid.ValidGroup;
-import org.hibernate.validator.constraints.Length;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.model.entity.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+
+import java.util.Date;
 
 /**
  * 安全检查对象 lab_check_record

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

@@ -1,13 +1,12 @@
 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 com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.model.entity.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;

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

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/LabHazardSubjectRelation.java

@@ -35,12 +35,6 @@ public class LabHazardSubjectRelation extends BaseEntity {
      */
     private String chName;
 
-//    /**
-//     * 关联压力容器id
-//     */
-//    @Excel(name = "关联压力容器id")
-//    private Long containerId;
-
     /**
      * 枚举 hazard_type
      */
@@ -143,14 +137,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;
     }