漏洞修复

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/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);
     }
 
@@ -538,15 +466,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;
@@ -575,20 +494,6 @@ 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);
@@ -619,11 +524,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();
@@ -725,7 +625,6 @@ 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>();
 
         //检查记录
@@ -902,9 +801,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 +850,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());//未整改*/
             }
 
         }

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/impl/LabExitLineVertexServiceImpl.java

@@ -319,7 +319,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                                 }
                             }
                         }
-                    } catch (InterruptedException e) {
+                    } catch (InterruptedException | ExecutionException e) {
                         Thread.currentThread().interrupt();
                         //e.printStackTrace();
                     }