Merge branch 'dbdx' of http://192.168.1.43:3000/v2/zd-parents into dbdx

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

@@ -1,13 +0,0 @@
-package com.zd.laboratory.config;
-
-/*import Acs.AcsBase;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DisposableConfig implements DisposableBean {
-    @Override
-    public void destroy() throws Exception {
-        AcsBase.sdk_cleanup();
-    }
-}*/

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

@@ -21,10 +21,6 @@ import java.util.regex.Pattern;
 public class InjectFilter implements Filter {
     private static Logger log = LoggerFactory.getLogger(InjectFilter.class);
     private static final String REG_EXP = "\\.\\./";
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-
-    }
 
     public void doFilter(ServletRequest request, ServletResponse response,
                          FilterChain filterchain) throws IOException, ServletException {
@@ -38,11 +34,6 @@ public class InjectFilter implements Filter {
         }
     }
 
-    @Override
-    public void destroy() {
-
-    }
-
     /**
      * 判断request中是否含有注入攻击字符
      *
@@ -52,7 +43,7 @@ public class InjectFilter implements Filter {
     public boolean injectInput(ServletRequest request, ServletResponse response) throws IOException {
         Enumeration e = request.getParameterNames();
         String attributeName;
-        String attributeValues[];
+        String[] attributeValues;
         HttpServletRequest req = (HttpServletRequest) request;
         String cookie = req.getHeader("Cookie");
         if (!isSpecialChar(cookie, response)){

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

@@ -57,7 +57,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;
@@ -19,7 +18,6 @@ import com.zd.model.page.TableDataInfo;
 import com.zd.system.api.entity.SysDictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -55,7 +53,6 @@ public class LabAbnormalController extends BaseController {
 
     @PostMapping("/sendData")
     public void sendData(@RequestBody Map<String, String> params) {
-
         socketService.setSensorData(params.get("data"));
     }
 

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

@@ -67,7 +67,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

@@ -4,7 +4,6 @@ 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;
@@ -98,10 +97,6 @@ public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
     @GetMapping("/getTreeSonList")
     @ApiOperation(value = "查询楼栋(楼层)子集列表")
     public TableDataInfo <LabBuildFloor> getTreeSonList(LabBuildFloor labBuildFloor) {
-//        // 如果选中的是楼层下的布局图，则需要分页，如果不是，不需要分页
-//        if(labBuildFloor.getType()==3){
-//            startPage();
-//        }
         LabBuildFloorPage buildFloorPage = labBuildFloorService.getTreeSonList(labBuildFloor);
         return getDataTable(buildFloorPage.getLabBuildList(),buildFloorPage.getTotal());
     }

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,17 +190,6 @@ 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;
 
@@ -228,7 +212,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();
@@ -273,48 +256,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/LabCheckOptionController.java

@@ -60,7 +60,7 @@ public class LabCheckOptionController extends BaseController {
      */
     @GetMapping("/listApp")
     @ApiOperation(value = "查询检查项选项列表-小程序")
-    public ResultData<List<LabCheckOption>> listApp(LabCheckOption labCheckOption) {
+    public ResultData<List<LabCheckOption>> lstApp(LabCheckOption labCheckOption) {
         List<LabCheckOption> list = labCheckOptionService.selectLabCheckOptionList(labCheckOption);
         return ResultData.success(list);
     }

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

@@ -113,17 +113,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);
@@ -147,51 +136,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);
-    }*/
-
     /**
      * 小程序安全检查 按照时间分组查询
      */
@@ -215,15 +159,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());
@@ -285,13 +220,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);
     }
 
@@ -414,10 +342,10 @@ public class LabCheckRecordController extends BaseController {
         labCheckRecord.setIsFabu(1);//已发布的数据
         List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
 
-        Map<String,Object> maplist = new HashMap<String,Object>();
+        Map<String,Object> maplist = new HashMap<>();
         //按照日期对数据分组
         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);
@@ -425,10 +353,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);
                 }
@@ -449,7 +373,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();
@@ -486,7 +410,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<String, Object> map =new HashMap<>();
         map = getRecordDettailsList(id);
         return ResultData.success(map);
     }
@@ -498,7 +422,7 @@ public class LabCheckRecordController extends BaseController {
      */
     @GetMapping("/recordDettailsListApp")
     public ResultData recordDettailsListApp( Long id) {
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         map = getRecordDettailsList(id);
         return ResultData.success(map);
     }
@@ -507,7 +431,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){
@@ -515,14 +439,9 @@ public class LabCheckRecordController extends BaseController {
         }
         //判断负责人是否第一次查看
         if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
+            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);
@@ -538,15 +457,6 @@ public class LabCheckRecordController extends BaseController {
             }
         }
 
-        //处理掉最后一级子项
-        /*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;
@@ -564,7 +474,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){
@@ -575,31 +485,12 @@ public class LabCheckRecordController extends BaseController {
             int 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){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
@@ -619,11 +510,6 @@ 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){
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
@@ -675,7 +561,7 @@ 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);
@@ -725,8 +611,7 @@ 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);
@@ -799,7 +684,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();
 
@@ -827,7 +712,7 @@ 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模糊匹配
@@ -902,9 +787,6 @@ public class LabCheckRecordController extends BaseController {
                 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());//未整改*/
             }
         }
 
@@ -954,9 +836,6 @@ public class LabCheckRecordController extends BaseController {
                 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());//未整改*/
             }
 
         }
@@ -1016,7 +895,7 @@ 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);
@@ -1032,7 +911,7 @@ public class LabCheckRecordController extends BaseController {
             }
         }
 
-        Map<String, Object> backmap =new HashMap<String, Object>();
+        Map<String, Object> backmap =new HashMap<>();
         backmap.put("yhcount",list.size());
         backmap.put("yhlist",list);
         backmap.put("yhflg",flg);

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

@@ -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);
 
@@ -275,7 +275,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<String, Object> map =new HashMap<>();
         map = getDettailsList(id);
         return ResultData.success(map);
     }
@@ -287,7 +287,7 @@ public class LabCheckRecordDetailsController extends BaseController {
      */
     @GetMapping("/dettailsListApp")
     public ResultData dettailsListApp( Long id) {
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         map = getDettailsList(id);
         return ResultData.success(map);
     }
@@ -295,7 +295,7 @@ public class LabCheckRecordDetailsController extends BaseController {
      public   Map<String, Object> getDettailsList(Long id){
          //获取当前登录用户信息
          SysUser sysUser = tokenService.getLoginUser().getSysUser();
-         Map<String, Object> map =new HashMap<String, Object>();
+         Map<String, Object> map =new HashMap<>();
 
          //查询隐患项详情
          LabCheckRecordDetails details = labCheckRecordDetailsService.selectLabCheckRecordDetailsById(id);
@@ -379,15 +379,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();

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

@@ -120,7 +120,7 @@ public class LabNotifyplanController extends BaseController
     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);
@@ -137,7 +137,7 @@ public class LabNotifyplanController extends BaseController
     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);
@@ -153,7 +153,7 @@ public class LabNotifyplanController extends BaseController
     @GetMapping("/listIndexJhDetals")
     public ResultData listIndexJhDetals(LabNotifyplanVO labNotifyplan, HttpServletRequest request)
     {
-        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.listIndexJhDetals(labNotifyplan,request);
@@ -161,24 +161,6 @@ public class LabNotifyplanController extends BaseController
         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);
-    }*/
-
     /**
      * 导出大屏通知计划列表
      */
@@ -213,21 +195,6 @@ public class LabNotifyplanController extends BaseController
     @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));
     }
 

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

@@ -72,49 +72,6 @@ public class LabRiskPlanAbnormalGroupController extends BaseController {
         return ResultData.fail();
     }
 
-    /**
-     * 东北大学，数据大屏， 预案执行统计
-     * @param
-     * @return
-     */
-    /*@GetMapping("/riskRecordCount")
-    @ApiOperation(value = "查询预案执行记录")
-    public TableDataInfo riskRecordCount(LabRiskPlanAbnormalGroup group) {
-        //结束时间
-        Date endTime =DateUtils.dateTime("yyyy-MM-dd",DateUtils.getDate()) ;
-        //开始时间 本年第一天
-        Calendar calendar = Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-        calendar.clear();
-        calendar.set(Calendar.YEAR, year);
-        Date startTime = calendar.getTime();
-
-        group.setStartTime(startTime);
-        group.setEndTime(endTime);
-        group.setStatus(0L);
-        //集合查询
-        List<LabRiskPlanAbnormalGroup> list = labRiskPlanAbnormalGroupService.queryRiskExeRecordList(group);
-        //list.sort(Comparator.comparing(LabRiskPlanAbnormalGroup::getCreateTime));
-
-        //数据封装
-        List<WarningNoticeLogVO> backList= new ArrayList<>();
-        if(list!=null && list.size()>0){
-            for (int i=1;i<13;i++){
-                WarningNoticeLogVO pag = new WarningNoticeLogVO();
-                pag.setYearMonth(i+"月");
-                int num =0;
-                for (LabRiskPlanAbnormalGroup gp:list) {
-                    String strdate = DateUtils.parseDateToStr("MM",gp.getCreateTime());
-                    if(Integer.valueOf(strdate).equals(i)){
-                        num++;
-                    }
-                }
-                pag.setTotalNum(num);
-                backList.add(pag);
-            }
-        }
-        return getDataTable(backList);
-    }*/
 
     public static void main(String[] args) {
         // 获取当前年第一天

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

@@ -250,7 +250,7 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/getDetails")
     public ResultData  getDetails( Long id)
     {
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         map = getDetailsById(id);
         return ResultData.success(map);
     }
@@ -263,13 +263,13 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/getDetailsApp")
     public ResultData  getDetailsApp( Long id)
     {
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         map = getDetailsById(id);
         return ResultData.success(map);
     }
 
     public Map<String, Object> getDetailsById( Long id){
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         //查询申请信息
         LabSecurityApplyVO labSecurityApply= labSecurityApplyService.selectLabSecurityApplyById(id);
 
@@ -277,14 +277,6 @@ public class LabSecurityApplyController extends BaseController
         R<SysUser> rDate =remoteUserService.getUserInfoByUserId(labSecurityApply.getUserId(), SecurityConstants.INNER);
         SysUser  sysUser = rDate.getData();
 
-        /*if("login".equals(userType)){
-            //查询登录用户信息
-            sysUser = tokenService.getLoginUser().getSysUser();
-        }else{
-            //根据id查询用户信息
-            ResultData<SysUser> rDate =remoteUserService.getUserInfoByUserId(labSecurityApply.getUserId(), SecurityConstants.INNER);
-            sysUser = rDate.getData();
-        }*/
         List<LabSecurityMaterialDataVO> listTemp=Collections.emptyList();//模板
         List<Map<String, Object>> listcert = Collections.emptyList();//学生考试证数
         List<Map<String, Object>> fzrsysUser = Collections.emptyList();//实验室负责人
@@ -313,19 +305,6 @@ public class LabSecurityApplyController extends BaseController
                     lmr.setApplyId(labSecurityApply.getId());
                     lmr.setMaterialId(listTemp.get(i).getId());
                     List<LabSecurityMaterialrelation>  list =iLabSecurityMaterialrelationService.selectLabSecurityMaterialrelationList(lmr);
-//                    for(LabSecurityMaterialrelation materialrelation: list){
-//                        String splitUrl[]=materialrelation.getDataUrl().split(",");
-//                        String finalUrl="";
-//                        for(String sp:splitUrl){
-//                            String dataUrl[]=sp.split(";");
-//                            String newUrl=fileConfigUtils.getRemoteUrl().replace("http","https")+"/"+dataUrl[1];
-//                            newUrl= UrlFormatUtils.getHttpsORHttpUrl(newUrl);
-//                            String newDataUrl=dataUrl[0]+";"+newUrl;
-//                            finalUrl+=newDataUrl+",";
-//                        }
-//                        finalUrl=finalUrl.substring(0,finalUrl.length()-1);
-//                        materialrelation.setDataUrl(finalUrl);
-//                    }
                     listTemp.get(i).setListMr(list);
                 }
             }
@@ -420,7 +399,7 @@ public class LabSecurityApplyController extends BaseController
      */
     @GetMapping("/materialApply")
     public ResultData materialApply(Long subjectId,String remark,String beginTime, String endTime ) {
-        Map<String, Object> map =new HashMap<String, Object>();
+        Map<String, Object> map =new HashMap<>();
         //获取当前登录用户信息
         SysUser tokensysUser = tokenService.getLoginUser().getSysUser();
 
@@ -552,7 +531,7 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/getUserTemplate")
     public ResultData getUserTemplate(Long subjectId)
     {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String,Object> map = new HashMap<>();
         //获取登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         List<LabSecurityMaterialDataVO> listTeacher=Collections.emptyList();//教职工
@@ -640,7 +619,7 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/listSchoolApplyColumn")
     public ResultData listSchoolApplyColumn()
     {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String,Object> map = new HashMap<>();
         LabSecurityApply labSecurityApply = new LabSecurityApply();
         //通过
         //labSecurityApply.setAuditStatus(2);
@@ -655,7 +634,7 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/listCollegeApplyColumn")
     public ResultData listCollegeApplyColumn()
     {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String,Object> map = new HashMap<>();
         LabSecurityApply labSecurityApply = new LabSecurityApply();
         //通过
         //labSecurityApply.setAuditStatus(2);
@@ -690,7 +669,7 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/listSchoolColumn")
     public ResultData listSchoolColumn()
     {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String,Object> map = new HashMap<>();
         LabSecurityApply labSecurityApply = new LabSecurityApply();
         //申请
         List<Map<String, Object>> listSq = labSecurityApplyService.selectApplyListSchoolColumn(labSecurityApply);

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

@@ -138,14 +138,9 @@ public class LabSecurityMaterialDataController extends BaseController
      */
     @GetMapping("/listTemplate")
     public ResultData  listTemplate(Long subjectId) {
-        Map<String,Object> map = new HashMap<String,Object>();
+        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);
         return ResultData.success(map);

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

@@ -154,7 +154,7 @@ public class LabSecuritySubjectmaterialController extends BaseController
      */
     @GetMapping("/listData")
     public ResultData  listData(LabSecurityMaterialDataVO materialDataVO) {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String,Object> map = new HashMap<>();
          List<LabSecurityMaterialDataVO> listTeacher= labSecurityMaterialDataService.selectTemplateTeacherList();
          List<LabSecurityMaterialDataVO> listStudent= labSecurityMaterialDataService.selectTemplateStudentList();
 

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

@@ -93,7 +93,7 @@ public class SubDiyVO {
 
 
     @ApiModelProperty("所属测点功能列表")
-    volatile private List<SensorFunctionStatus> sensorFunctionList= Collections.emptyList();
+    private List<SensorFunctionStatus> sensorFunctionList= Collections.emptyList();
 
 
     @ApiModelProperty("所属设备列表")

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/netty/ChannelMap.java

@@ -1,7 +1,6 @@
 package com.zd.laboratory.netty;
 
 import io.netty.channel.ChannelHandlerContext;
-
 import java.util.concurrent.ConcurrentHashMap;
 
 public class ChannelMap {
@@ -9,17 +8,15 @@ public class ChannelMap {
     /**
      * 存放客户端标识ID（消息ID）与channel的对应关系
      */
-    private static volatile ConcurrentHashMap<String, ChannelHandlerContext> channelMap = new ConcurrentHashMap<>();
+    private static ConcurrentHashMap<String, ChannelHandlerContext> channelMap = new ConcurrentHashMap<>();
 
     private ChannelMap() {
     }
 
     public static ConcurrentHashMap<String, ChannelHandlerContext> getChannelMap() {
-        if (null == channelMap) {
-            synchronized (ChannelMap.class) {
-                if (null == channelMap) {
-                    channelMap = new ConcurrentHashMap<>();
-                }
+        synchronized(channelMap) {
+            if (null == channelMap) {
+                channelMap = new ConcurrentHashMap<>();
             }
         }
         return channelMap;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -7,7 +7,6 @@ import com.zd.algorithm.api.face.feign.RemoteFaceService;
 import com.zd.common.core.exception.NoRollException;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;
-import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.Assert;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.IdUtils;
@@ -19,7 +18,6 @@ import com.zd.laboratory.domain.vo.*;
 import com.zd.laboratory.mapper.LabHardwareStateMapper;
 import com.zd.laboratory.mapper.LabSubjectAccessRecordMapper;
 import com.zd.laboratory.mapper.LabSubjectMapper;
-import com.zd.laboratory.mapper.LabSubjectSecurityconfigureMapper;
 import com.zd.laboratory.mqtt.service.impl.SubMessageSendManager;
 import com.zd.laboratory.onemachine.domain.SignInPerInfoVO;
 import com.zd.laboratory.onemachine.domain.SignInfoVO;
@@ -74,8 +72,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
     private ILabSubjectAccessRecordService subjectAccessRecordService;
     @Autowired
     private ILabPhotoInspectionService labPhotoInspectionService;
-    @Autowired
-    private LabSubjectSecurityconfigureMapper labSubjectSecurityconfigureMapper;
+
     @Autowired
     private ILabSubjectService subjectService;
     @Autowired
@@ -92,12 +89,10 @@ public class OneMachineService implements ValidationSignInPerInfo {
     LabSubjectAccessRecordMapper labSubjectAccessRecordMapper;
     @Autowired
     private ILabSecurityApplyService iLabSecurityApplyService;
-    @Autowired
-    private ILabSecuritySubjectmaterialService iLabSecuritySubjectmaterialService;
+
     @Autowired
     private ILabWhitelistService iLabWhitelistService;
-    @Autowired
-    private TokenService tokenService;
+
     @Autowired
     private ILabGradeManageRecordService labGradeManageRecordService;
 
@@ -151,17 +146,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
                     }
                 } else {
                     //如果没有找到用户的准入凭证，则需要查询当前实验室是否配置准入凭证
-                /*LabSubjectSecurityconfigure subjectSecurityconfigure = new LabSubjectSecurityconfigure();
-                subjectSecurityconfigure.setSubjectId(signInfoVO.getSubId());
-                List<LabSubjectSecurityconfigure> labSubjectSecurityconfigures = labSubjectSecurityconfigureMapper.selectLabSubjectSecurityconfigureList(subjectSecurityconfigure);
-                if (CollUtil.isNotEmpty(labSubjectSecurityconfigures)) {
-                    messages.add("您未获取准入凭证！您需要通过小程序申请实验室准入资格后才能签到。");
-                }*/
-                    //学生签到时 验证是否获取准入凭证
-                    /*LabSecuritySubjectmaterial labSecuritySubjectmaterial = new LabSecuritySubjectmaterial();
-                    labSecuritySubjectmaterial.setSubjectId(signInfoVO.getSubId());
-                    List<LabSecuritySubjectmaterial> list = iLabSecuritySubjectmaterialService.selectLabSecuritySubjectmaterialList(labSecuritySubjectmaterial);
-*/
                     //1 获取验证安全准入凭证
                     LabSecurityApplyVO labSecurityApply = new LabSecurityApplyVO();
                     labSecurityApply.setSubjectId(signInfoVO.getSubId());
@@ -241,8 +225,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
             List<String> messages = new ArrayList<>(1);
             signInPerInfoVO.setMessage(messages);
             //是否有正常签到记录
-//            Boolean sigIn = subjectAccessRecordService.isSigIn(signInfoVO.getSubId(), signInfoVO.getSingInUser().getUserId());
-
             LabSubjectAccessRecordVo sigInAndGet = subjectAccessRecordService.isSigInAndGet(signInfoVO.getSingInUser().getUserId(),signInfoVO.getSubId());
 
             //-1 实验室状态
@@ -273,21 +255,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
                         subjectAccessRecordService.out(subject.getId(), signInfoVO.getSingInUser().getUserId());
                     }
 
-//                    //学生登陆时 给奖励分
-//                    SysUser sysUser = tokenService.getLoginUser().getSysUser();
-//                    if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
-//                        Map map = new HashMap();
-//                        map.put("userId", signInfoVO.getSingInUser().getUserId());
-//                        map.put("status", "1");
-//                        ResultData r = remoteExamService.addLoginfo(map);
-//                        if (r.getCode() != 200) {
-//                            logger.info("打卡签出奖励分记录保存失败！");
-//                        }
-//                    }
-//                    else
-//                    {
-//                        tips.add("请在小程序上完成拍照检查再离开实验室！");
-//                    }
                 }
             }
             extracted(signInfoVO, signInPerInfoVO);
@@ -418,23 +385,12 @@ public class OneMachineService implements ValidationSignInPerInfo {
                     redisService.deleteObject(verifyKey);
 //                    return ResultData.result(subjectAccessRecordService.out(Long.parseLong(s), user.getUserId()));
                     subjectAccessRecordService.out(Long.parseLong(s), user.getUserId());
-//                    LabSubjectAccessRecord subjectAccessRecord = new LabSubjectAccessRecord();
-//                    subjectAccessRecord.setSubjectId(Long.parseLong(s));
-//                    user.setUserId(subjectAccessRecord.getUserId());
-//                    LabSubjectAccessRecord labSubjectAccessRecord= labSubjectAccessRecordMapper.queryLastByUserId(subjectAccessRecord);
-//                    if(null==labSubjectAccessRecord){
-//                        ResultData.fail("未查到离开签到记录，请联系管理员！");
-//                    }
 
                     //学生登陆时 给奖励分
-//                    SysUser sysUser = tokenService.getLoginUser().getSysUser();
                     if(UserConstants.USER_TYPE_STUDENT.equals(user.getType())){
                         Map map = new HashMap();
                         map.put("userId", user.getUserId());
                         map.put("status", "1");
-//                    map.put("subId",labSubjectAccessRecord.getSubjectId());
-//                    map.put("inTime",labSubjectAccessRecord.getInTime());
-//                    map.put("outTime",labSubjectAccessRecord.getOutTime());
                         R r = remoteExamService.addLoginfo(map);
                         if (r.getCode() != 200) {
                             logger.info("打卡签出奖励分记录保存失败！");

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabExitLineService.java

@@ -86,7 +86,5 @@ public interface ILabExitLineService
     List<LabExitLineJoinVO> doChange(Long subId, Integer type);
 
 
-    EvacuationLine getRedis();
-
     List<LabExitLineJoinVO> getRoute(Long subId, Integer type);
 }

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

@@ -90,13 +90,13 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
             labCheckRecordDetails.setCheckId(checkMachineMsg.getCheckRecordId());
             checkMachineMsg.setDetails(labCheckRecordDetailsService.selectLabCheckRecordDetailsList(labCheckRecordDetails));
 
+            String checkDateStr = null;
             LabCheckRecord labCheckRecord = labCheckRecordService.selectLabCheckRecordById(checkMachineMsg.getCheckRecordId());
             if (labCheckRecord != null) {
                 checkMachineMsg.setCheckRecord(labCheckRecord);
+                checkDateStr = DateUtil.format(labCheckRecord.getCreateTime(), "yyyy年MM月dd日");
 
             }
-            String checkDateStr = DateUtil.format(labCheckRecord.getCreateTime(), "yyyy年MM月dd日");
-
             String str = "  学院于check_date对你实验室实施了安全管理现场检查，共发现了count个整改项（见整改详情）。请逐一对照、分析原因、采取有效措施实施整改，并于check_date在系统里提交整改证明材料和整改报告。\n" +
                     "  请你实验室务必高度重视，积极采取有效措施，切实加强对实验室的安全管理。同时，要举一反三，对实验室定期开展安全自查与整改，不断提升实验室安全工作水平。";
             str = str.replaceAll("check_date", checkDateStr).replaceAll("count", checkMachineMsg.getDetails().size() + "");
@@ -366,7 +366,7 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
                 logger.error("发送消息通知失败，ID无效");
             }
             // 查询实验室负责人
-            Long userId = checkRecord.getFzrId();
+            Long userId = checkRecord != null ? checkRecord.getFzrId():null;
 
             LabCheckMachineMsg labCheckMachineMsg = null;
             LabMessageContent labMessageContent = null;

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

@@ -453,26 +453,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
      */
     @Override
     public List<LabCheckRecordDetailsVO> selectLabCheckRecordListVoIndex(LabCheckRecordDetailsVO labCheckRecordDetailsVo) {
-        /*//查询发布批次表 并获取最新一次的发布批次
-        List<LabCheckRecordRelease> rrlist = labCheckRecordReleaseMapper.selectLabCheckRecordReleaseList(new LabCheckRecordRelease());
-        List<LabCheckRecordDetailsVO> list = new ArrayList<>();
-        List<LabCheckRecordDetailsVO> listCount = new ArrayList<>();
-        if(rrlist.size()>0){
-          String[] strids=  rrlist.get(0).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);
-          list=labCheckRecordDetailsMapper.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVo);
-          //查询隐患总数、已整改、未整改数据
-          listCount= labCheckRecordDetailsMapper.selectLabCheckRecordCountIndex(labCheckRecordDetailsVo);
-          list.get(0).setListVo(listCount);
-          SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
-          String remarkDate = sdf.format(rrlist.get(0).getCreateTime());
-          list.get(0).setRemark(remarkDate);//检查时间
-        }*/
         return labCheckRecordDetailsMapper.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVo);
     }
 
@@ -484,19 +464,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
      */
     @Override
     public LabCheckRecordDetailsVO selectLabCheckRecordCountIndex(LabCheckRecordDetailsVO labCheckRecordDetailsVo) {
-        /*//查询发布批次表 并获取最新一次的发布批次
-        List<LabCheckRecordRelease> rrlist = labCheckRecordReleaseMapper.selectLabCheckRecordReleaseList(new LabCheckRecordRelease());
-        List<LabCheckRecordDetailsVO> list = new ArrayList<>();
-        if(rrlist.size()>0){
-            String[] strids=  rrlist.get(0).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);
-            list=labCheckRecordDetailsMapper.selectLabCheckRecordCountIndex(labCheckRecordDetailsVo);
-        }*/
         return labCheckRecordDetailsMapper.selectLabCheckRecordCountIndex(labCheckRecordDetailsVo);
     }
 
@@ -507,11 +474,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
      */
     @Override
     public List<LabCheckRecordDetailsVO> selectLabCheckRecordIndexDetals(LabCheckRecordDetailsVO labCheckRecordDetailsVo) {
-        //查询发布批次表 并获取最新一次的发布批次
-        //List<LabCheckRecordRelease> rrlist = labCheckRecordReleaseMapper.selectLabCheckRecordReleaseList(null);
-        /*List<LabCheckRecordDetailsVO> list = new ArrayList<>();
-        list=labCheckRecordDetailsMapper.selectLabCheckRecordIndexDetals(labCheckRecordDetailsVo);*/
-
         return labCheckRecordDetailsMapper.selectLabCheckRecordIndexDetals(labCheckRecordDetailsVo);
     }
 

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

@@ -109,7 +109,7 @@ public class LabContainerServiceImpl implements ILabContainerService {
         List<LabHazardSubjectRelation> labHazardSubjectRelationList = labContainer.getLabHazardSubjectRelationList();
         Long id = labContainer.getId();
         if (StringUtils.isNotNull(labHazardSubjectRelationList)) {
-            List<LabHazardSubjectRelation> list = new ArrayList<LabHazardSubjectRelation>();
+            List<LabHazardSubjectRelation> list = new ArrayList<>();
             for (LabHazardSubjectRelation labHazardSubjectRelation : labHazardSubjectRelationList) {
                 labHazardSubjectRelation.setHazardId(id);
                 list.add(labHazardSubjectRelation);

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

@@ -483,8 +483,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                 logger.info("打开疏散指示灯：{}，{}，{}", lineJoin.getRelayCode(), lineJoin.getRelayBit(), "发送成功");
                 try {
                     Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    //e.printStackTrace();
+                } catch (Exception e) {
                     logger.error("打开疏散指示灯异常", e);
                 }
             }
@@ -541,28 +540,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         return lineJoins;
     }
 
-    /**
-     * 获取逃生线路缓存数据
-     */
-    @Override
-    public EvacuationLine getRedis(){
-        Collection<String> keys = SpringUtils.getBean(RedisService.class).keys(CacheConstants.EVACUATION + "*");
-        for(String key:keys){
-            EvacuationLine evacuationLine = redisService.getCacheObject(key);
-            String keyLength = key.substring(key.indexOf(":")+1);
-            evacuationLine.setSubId(keyLength);
-            LabSubjectVO labSubject = labSubjectMapper.selectLabSubjectVoById(Long.parseLong(keyLength));
-            evacuationLine.setDeptId(labSubject.getDeptId());
-            evacuationLine.setDeptName(labSubject.getDeptName());
-            evacuationLine.setFloorId(labSubject.getFloorId());
-            evacuationLine.setSubName(labSubject.getName());
-            evacuationLine.setBuildId(labSubject.getBuildId());
-            evacuationLine.setBuildName(labSubject.getBuildName());
-            evacuationLine.setFloorName(labSubject.getFloorName());
-            return evacuationLine;
-        }
-        return null;
-    }
+
 
     @Override
     public List<LabExitLineJoinVO> getRoute(Long subId, Integer type) {

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

@@ -834,7 +834,7 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
             chart.setFinishedNum(labGradeManageRecordMapper.selectFinishedByDate(chart));
 
             chart.setRateNum(chart.getPlanNum() == 0 ? 0 :
-                    (int) (BigDecimal.valueOf(chart.getFinishedNum() * 100).divide(BigDecimal.valueOf(chart.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
+                    (int) (BigDecimal.valueOf(chart.getFinishedNum().longValue() * 100).divide(BigDecimal.valueOf(chart.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
         }
 
         List<List<Object>> datas = new ArrayList<>();

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

@@ -184,7 +184,7 @@ public class LabHazardServiceImpl implements ILabHazardService {
         // 先删除
         labHazardMapper.deleteLabHazardSubjectRelationBy(labHazard.getId());
         if (StringUtils.isNotNull(labHazardSubjectRelationList)) {
-            List<LabHazardSubjectRelation> list = new ArrayList<LabHazardSubjectRelation>();
+            List<LabHazardSubjectRelation> list = new ArrayList<>();
             for (LabHazardSubjectRelation labHazardSubjectRelation : labHazardSubjectRelationList) {
                 labHazardSubjectRelation.setHazardId(id);
                 list.add(labHazardSubjectRelation);

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

@@ -99,21 +99,6 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
                 //e.printStackTrace();
                 throw new ServiceException("文件解析异常！");
             }
-            /*//组装文件名
-            String[] filename= labNotifyplanVO.getContentName().split(";");
-            List<String> listFilename= new ArrayList<>();
-              for (int i=0;i<filename.length;i++){
-                  listFilename.add(filename[i]);
-              }
-            labNotifyplanVO.setListFilename(listFilename);
-
-            //组装附件
-            String[] fileurl= labNotifyplanVO.getContentUrl().split(";");
-            List<String> listFileurl= new ArrayList<>();
-            for (int i=0;i<fileurl.length;i++){
-                listFileurl.add(fileurl[i]);
-            }
-            labNotifyplanVO.setListFileurl(listFileurl);*/
         }
         return labNotifyplanVO;
     }

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

@@ -328,34 +328,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
             }
             returnAllList.add(changeList);
         });
-
-
-//        for(Long key:collect.keySet()){
-//            List<LabViolationColumnarVO> allList = new ArrayList<>();
-//            List<SysDictData> dictList = DictUtils.getDictCache("lab_violation_rules");
-//            List<LabViolationColumnarVO> columnarList = collect.get(key);
-//            for(SysDictData sysDictData:dictList){
-//                LabViolationColumnarVO labViolationColumnarVO = new LabViolationColumnarVO();
-//                labViolationColumnarVO.setType(sysDictData.getDictValue());
-//                labViolationColumnarVO.setContent(sysDictData.getDictLabel());
-//                labViolationColumnarVO.setNum(0L);
-//                allList.add(labViolationColumnarVO);
-//            }
-//            String currencyName = "";
-//            for(LabViolationColumnarVO columnarVO:columnarList){
-//                for(LabViolationColumnarVO allColumnar:allList){
-//                    if(columnarVO.getType()!=null && columnarVO.getType().equals(allColumnar.getType())){
-//                        allColumnar.setNum(columnarVO.getNum());
-//                        allColumnar.setCurrencyid(columnarVO.getCurrencyid());
-//                        allColumnar.setCurrencyName(columnarVO.getCurrencyName());
-//                    }
-//                    if(columnarVO.getCurrencyName()!=null){
-//                        currencyName = columnarVO.getCurrencyName();
-//                    }
-//                }
-//            }
-//            allMap.put(currencyName,allList);
-//        }
         return returnAllList;
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/FireLaborUtil.java

@@ -19,10 +19,8 @@ public class FireLaborUtil {
     //36个寄存器查询地址
     private static final  String All_REGISTER="00 24";
 
-    //private static final  String
 
-
-    public static final Map<String, String> statusMap = new HashMap<String, String>();
+    public static final Map<String, String> statusMap = new HashMap<>();
     static {
         statusMap.put("00","无事件");
         statusMap.put("01","火警");
@@ -35,7 +33,7 @@ public class FireLaborUtil {
      * 静态map,用于存储 寄存器状态说明
      *
      */
-    public static final Map<Integer, String> myMap_0 = new HashMap<Integer, String>();
+    public static final Map<Integer, String> myMap_0 = new HashMap<>();
     static {
         myMap_0.put(1, "01 02");
         myMap_0.put(2, "03 04");