代码漏洞修改

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpQualificationApplyManageController.java

@@ -364,19 +364,6 @@ public class QpQualificationApplyManageController extends BaseController
         return ResultData.success(sysUser);
     }
 
-    /**
-     * 查询资格申请气瓶列表
-     */
-   /* @PreAuthorize(hasPermi = PerPrefix.AIRBOTTLE_QUALIFICATIONAPPLYMANAGE+ "apply")
-    @GetMapping("/listApply")
-    @ApiOperation(value = "查询资格申请气瓶列表")
-    public TableDataInfo<QpAirBottleVO> listQp(QpAirBottleVO qpAirBottleVO)
-    {
-        startPage();
-        List<QpAirBottleVO> list = qpAirBottleService.selectQpAirBottleListByParameter(qpAirBottleVO);
-        return getDataTable(list);
-    }*/
-
 
     /***
      * 查询所有供应商气瓶信息

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

@@ -190,9 +190,6 @@ public class LabBuildingController extends BaseController {
             }
         }
 
-        //增加危险等级
-        //List<LabSubClassVO> labSubClassVOS = null;
-
         //增加地址
         List<Long> layoutids = new ArrayList<>();
 

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

@@ -342,7 +342,6 @@ public class LabCheckRecordController extends BaseController {
         labCheckRecord.setIsFabu(1);//已发布的数据
         List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
 
-        //Map<String,Object> maplist = new HashMap<>();
         //按照日期对数据分组
         if(list!=null){
             Map<String, List<LabCheckRecord>> map = new HashMap<>();
@@ -410,9 +409,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<>();
-        map = getRecordDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getRecordDettailsList(id));
     }
 
     /***
@@ -422,9 +419,7 @@ public class LabCheckRecordController extends BaseController {
      */
     @GetMapping("/recordDettailsListApp")
     public ResultData recordDettailsListApp( Long id) {
-        Map<String, Object> map =new HashMap<>();
-        map = getRecordDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getRecordDettailsList(id));
     }
 
     public Map<String, Object> getRecordDettailsList(Long id){
@@ -482,7 +477,7 @@ public class LabCheckRecordController extends BaseController {
         }
         //判断负责人是否第一次查看
         if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
+            labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
         }
 
        //待整改
@@ -559,8 +554,6 @@ public class LabCheckRecordController extends BaseController {
     @ApiOperation(value = "驳回详情")
     @GetMapping("/recordDettailsBh")
     public ResultData recordDettailsBh( Long id) {
-        //获取当前登录用户信息
-        SysUser sysUser = tokenService.getLoginUser().getSysUser();
         Map<String, Object> map =new HashMap<>();
 
         //检查记录
@@ -700,7 +693,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);//未提交的检查记录
@@ -760,7 +752,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]));
@@ -780,7 +771,6 @@ public class LabCheckRecordController extends BaseController {
             startPage();
             list = labCheckRecordDetailsService.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVO);
             if(list.size()>0){
-                //list.get(0).setListVo(listCount);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
                 String remarkDate = sdf.format(labCheckRecordRelease.getCreateTime());
                 list.get(0).setListVo(listVo);
@@ -808,7 +798,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]));
@@ -828,7 +817,6 @@ public class LabCheckRecordController extends BaseController {
 
         startPage();
         list = labCheckRecordDetailsService.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVO);
-        //list.get(0).setListVo(listCount);
             if(list.size()>0) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
                 String remarkDate = sdf.format(labCheckRecordRelease.getCreateTime());
@@ -855,7 +843,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]));
@@ -865,7 +852,6 @@ public class LabCheckRecordController extends BaseController {
 
         startPage();
         List<LabCheckRecordVO> list = labCheckRecordService.selectLabCheckRecordIndexDetals(labCheckRecordVO);
-        //List<LabCheckRecordDetailsVO> listCount = iLabCheckRecordDetailsService.selectLabCheckRecordCountIndex(new LabCheckRecordDetailsVO());
         return getDataTable(list);
     }
 

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

@@ -251,7 +251,7 @@ public class LabCheckRecordDetailsController extends BaseController {
             applyvo.setUserId(sysUser.getUserId());
             List<LabSecurityApplyVO> applist = labSecurityApplyService.selectApplyListEffective(applyvo);
             //获取实验室集合
-            if(!applist.isEmpty() && 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());
@@ -275,9 +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<>();
-        map = getDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getDettailsList(id));
     }
 
     /***
@@ -287,24 +285,23 @@ public class LabCheckRecordDetailsController extends BaseController {
      */
     @GetMapping("/dettailsListApp")
     public ResultData dettailsListApp( Long id) {
-        Map<String, Object> map =new HashMap<>();
-        map = getDettailsList(id);
-        return ResultData.success(map);
+        return ResultData.success(getDettailsList(id));
     }
 
      public   Map<String, Object> getDettailsList(Long id){
-         //获取当前登录用户信息
-         SysUser sysUser = tokenService.getLoginUser().getSysUser();
          Map<String, Object> map =new HashMap<>();
 
          //查询隐患项详情
          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("未获取到相关信息");
          }
 
@@ -337,7 +334,7 @@ public class LabCheckRecordDetailsController extends BaseController {
             applyvo.setUserId(sysUser.getUserId());
             List<LabSecurityApplyVO> applist = labSecurityApplyService.selectApplyListEffective(applyvo);
             //获取实验室集合
-            if(!applist.isEmpty() && 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());
@@ -371,7 +368,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();
@@ -396,7 +393,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();
@@ -406,7 +403,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]));
@@ -416,7 +412,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/LabCheckRecordReleaseController.java

@@ -172,17 +172,4 @@ public class LabCheckRecordReleaseController extends BaseController
         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/LabExitLineController.java

@@ -173,7 +173,6 @@ public class LabExitLineController extends BaseController {
     @ApiOperation(value = "获取逃生线路缓存数据")
     @GetMapping(value = "/getRedis")
     public ResultData getRedis() {
-        //return ResultData.success(labExitLineService.getRedis());
         return ResultData.success();
     }
 

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

@@ -133,7 +133,6 @@ public class LabExitLineVertexController extends BaseController {
     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);
             return ResultData.success(joinPointVOS);
         }

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

@@ -118,31 +118,9 @@ public class LabHaikangUserController extends BaseController {
     @ApiOperation("查询门禁授权类型接口")
     @PostMapping("/queryTypes")
     public ResultData< List<Map<String, String>>> queryTypes() {
-
         List<Map<String, String>> list = new ArrayList<>();
-        /*UserVerifyMode[] modes = UserVerifyMode.values();
-        Map<String, String> map;
-        for (UserVerifyMode mode : modes) {
-            map = new HashMap<>();
-            map.put("key", mode.getKey());
-            map.put("value", mode.getValue());
-            list.add(map);
-        }*/
-
         return ResultData.success(list);
     }
 
-    /*@ApiOperation("海康更新用户卡号")
-    @PostMapping("/updateUserCard")
-    public void updateUserCard(@RequestBody SysUser user) {
-        haiKangDoorService.updateUserCard(user);
-    }
-
-    @ApiOperation("海康更新用户人脸")
-    @PostMapping("/updateUserFace")
-    public void updateUserFace(@RequestBody SysUser user) {
-        haiKangDoorService.updateUserFace(user);
-    }*/
-
 }
 

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

@@ -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,9 +277,6 @@ 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);

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

@@ -84,16 +84,6 @@ 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 = "获取实验室气瓶存储数量")
@@ -119,30 +109,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();
-//    }
-
     /**
      * 查询危化品下拉框
      */
@@ -179,16 +145,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/LabNegativeListRecordsController.java

@@ -158,7 +158,6 @@ public class LabNegativeListRecordsController extends BaseController
     public ResultData delnegativelist(LabNegativelistHistory negativelistHistory)
     {
         negativelistHistoryService.insertLabNegativelistHistory(negativelistHistory);
-//        return ResultData.result(labNegativeListRecordsService.deleteLabNegativeListRecordsByIds(ids));
         return null;
     }
 
@@ -190,18 +189,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/LabNotifyplanController.java

@@ -62,7 +62,6 @@ public class LabNotifyplanController extends BaseController
     {
         startPage();
         List<LabNotifyplanVO> list = labNotifyplanService.selectLabNotifyplanListVO(labNotifyplan,request);
-        //List<LabNotifyplan> list = labNotifyplanService.selectLabNotifyplanList(labNotifyplan);
         return getDataTable(list);
     }
 

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

@@ -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

@@ -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

@@ -95,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/LabRiskPlanAbnormalGroupController.java

@@ -72,13 +72,4 @@ public class LabRiskPlanAbnormalGroupController extends BaseController {
         return ResultData.fail();
     }
 
-
-    public static void main(String[] args) {
-        // 获取当前年第一天
-        Calendar calendar = Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-        calendar.clear();
-        calendar.set(Calendar.YEAR, year);
-        Date yearBegin = calendar.getTime();
-    }
 }

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

@@ -78,16 +78,11 @@ 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);
@@ -140,11 +135,7 @@ public class LabSafeBookController extends BaseController {
 //    @PreAuthorize(hasPermi = "laboratory:safe_book:query")
     @GetMapping(value = "/{id}")
     public ResultData<LabSafeBook> getInfo(@PathVariable("id") Long id, HttpServletRequest request) {
-        //: 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);
+        //2022/3/25  基于内外网访问先做成这个样子，后期优化
         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/LabSecurityApplyController.java

@@ -116,7 +116,6 @@ public class LabSecurityApplyController extends BaseController
             labSecurityApplyVO.setDeptId(sysUser.getDeptId());
         }else if("11".equals(sysUser.getUserType())){
             //教职工登录，实验室负责人为当前用户的数据
-            //labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
             List<Long> ids = new ArrayList<>();
             LabSubject labSubject = new LabSubject();
             labSubject.setAdminId(sysUser.getUserId());
@@ -130,7 +129,7 @@ public class LabSecurityApplyController extends BaseController
             }
             labSecurityApplyVO.setSubjectIds(ids);
         }else if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
-            //labSecurityApply.setUserId(sysUser.getUserId());// 学生登录(学生无审核权限)，申请人id 为当前用户id的数据
+            // 学生登录(学生无审核权限)，申请人id 为当前用户id的数据
             return getDataTable(new ArrayList());
         }
         startPage();
@@ -162,15 +161,8 @@ public class LabSecurityApplyController extends BaseController
     {
         //获取登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        //判断当前登录用户角色
-        /*if("00".equals(sysUser.getUserType())){
-            labSecurityApplyVO.setDeptId(sysUser.getDeptId());// 系统用户按部门查询
-        }else if(UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())){
-            // 申请人id 为当前用户id的数据
-        }*/
         // 只查自己数据
         labSecurityApplyVO.setUserId(sysUser.getUserId());
-        //labSecurityApplyVO.setRemark("1");//标注查询未通过的审核 0待审核 1驳回 的数据 (2022-04-08 需求突然变更去除校验)
 
         startPage();
         List<LabSecurityApplyVO> list = labSecurityApplyService.selectLabSecurityApplyList(labSecurityApplyVO);
@@ -189,11 +181,10 @@ public class LabSecurityApplyController extends BaseController
         //获取登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         if("00".equals(sysUser.getUserType())){
-            labSecurityApplyVO.setDeptId(sysUser.getDeptId());// 系统用户按部门查询
+            // 系统用户按部门查询
+            labSecurityApplyVO.setDeptId(sysUser.getDeptId());
         }else if("11".equals(sysUser.getUserType())){
             // 教职工登录，实验室负责人为当前用户的数据
-            //labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
-
             List<Long> ids = new ArrayList<>();
             LabSubject labSubject = new LabSubject();
             labSubject.setAdminId(sysUser.getUserId());
@@ -263,9 +254,7 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/getDetailsApp")
     public ResultData  getDetailsApp( Long id)
     {
-        Map<String, Object> map =new HashMap<>();
-        map = getDetailsById(id);
-        return ResultData.success(map);
+        return ResultData.success(getDetailsById(id));
     }
 
     public Map<String, Object> getDetailsById( Long id){
@@ -319,19 +308,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);
                 }
             }
@@ -429,19 +405,6 @@ public class LabSecurityApplyController extends BaseController
             }
         }
 
-        //申请时校验是否存在
-        /*if(StringUtils.isNotBlank(remark)){
-            //校验用户是否已有申请中的数据
-            LabSecurityApplyVO labSecurityApplyVo = new LabSecurityApplyVO();
-            labSecurityApplyVo.setSubjectId(subjectId);
-            labSecurityApplyVo.setUserId(sysUser.getUserId());
-            labSecurityApplyVo.setRemark(remark);
-            List<LabSecurityApplyVO> listapp= labSecurityApplyService.selectLabSecurityApplyList(labSecurityApplyVo);
-            if(listapp!=null && listapp.size()>0){
-                throw new ServiceException("已申请该实验室，无需重复申请！");
-            }
-        }*/
-
         List<LabSecurityMaterialDataVO> listTeacher=Collections.emptyList();//教职工
         List<LabSecurityMaterialDataVO> listStudent=Collections.emptyList();//学生
         List<Map<String, Object>> listcert = Collections.emptyList();//学生考试证数
@@ -581,8 +544,6 @@ public class LabSecurityApplyController extends BaseController
             labSecurityApplyVO.setDeptId(sysUser.getDeptId());
         }else if("11".equals(sysUser.getUserType())){
             //教职工登录，该人员负责的实验室
-            //labSecurityApplyVO.setSubjectAdminid(sysUser.getUserId());
-
             List<Long> ids = new ArrayList<>();
             LabSubject labSubject = new LabSubject();
             labSubject.setAdminId(sysUser.getUserId());
@@ -622,7 +583,6 @@ public class LabSecurityApplyController extends BaseController
         Map<String,Object> map = new HashMap<>();
         LabSecurityApply labSecurityApply = new LabSecurityApply();
         //通过
-        //labSecurityApply.setAuditStatus(2);
         List<Map<String, Object>> listTg = labSecurityApplyService.selectApplyListSchoolColumn(labSecurityApply);
         map.put("listTg",listTg);
         return ResultData.success(map);
@@ -637,7 +597,6 @@ public class LabSecurityApplyController extends BaseController
         Map<String,Object> map = new HashMap<>();
         LabSecurityApply labSecurityApply = new LabSecurityApply();
         //通过
-        //labSecurityApply.setAuditStatus(2);
         List<Map<String, Object>> listTg = labSecurityApplyService.selectApplyListCollegelColumn(labSecurityApply);
 
         //计算申请总数

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

@@ -89,9 +89,10 @@ public class LabSubjectController extends BaseController {
     private RemoteAirBottleService remoteAirBottleService;
 
 
-
-    /**
+    /***
      * 查询实验室列表
+     * @param labSubject
+     * @return
      */
     @GetMapping("/list")
     @Deprecated