代码漏洞修改

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

@@ -312,7 +312,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
         try {
             logger.info("&&&&&&&&&&&&&&&&&&&&&&" + code + "," + signEnum);
             if (StringUtils.isEmpty(code)) {
-                //            throw new CaptchaException("签到验证码错误，请重新刷卡重试！");
                 return ResultData.fail(600, "签到验证码错误，请重新刷卡重试！");
             }
             String verifyKey = BaseConstants.SINGIN_CAPTCHA_CODE_KEY + code;
@@ -320,8 +319,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
             if (user == null || user.getUserId() == null) {
                 return ResultData.fail(600, "签到&签出人脸已超时，请重新刷卡重试！");
             }
-//            boolean expire = redisService.expire(verifyKey, 120);
-//            if (!expire) return ResultData.fail(600, "签到&签出验证码已超时，请重新刷卡重试！");
             if (user != null) {
                 String s = StrUtil.subAfter(code, "_", true);
                 if (signEnum.equals(SignEnum.SIGN_IN)) {
@@ -372,7 +369,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
                         r = remoteExamService.addLoginfo(map);
                         if (r.getCode() != 200) {
                             logger.info("打卡签到奖励分记录保存失败！");
-                            // throw new ServiceException("打卡签出奖励分记录保存失败！");
                         }
                     }
 
@@ -394,7 +390,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
                         R r = remoteExamService.addLoginfo(map);
                         if (r.getCode() != 200) {
                             logger.info("打卡签出奖励分记录保存失败！");
-                            // throw new ServiceException("打卡签出奖励分记录保存失败！");
                         }
                     }
 
@@ -457,13 +452,10 @@ public class OneMachineService implements ValidationSignInPerInfo {
         }
         //删除key
         redisService.deleteObject(key);
-        //return ResultData.success(true);
         LabSubjectAccessRecord labSubjectAccessRecord = subjectAccessRecordService.selectLabSubjectAccessRecordById(id);
         if (null == labSubjectAccessRecord) {
             throw new ServiceException("查询签到记录失败！！");
         }
-//        //删除key
-//        //redisService.deleteObject(key);
 
         return R.ok(true);
     }
@@ -488,11 +480,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
     @Override
     public SignInPerInfoVO createSignInPerInfoVO(Long subId, SysUser user, SignEnum signEnum) {
 
-        /*SignInfoVO signInPerInfoVO = getSignInPerInfoVO(subId, user);
-        Function<SignInfoVO, SignInPerInfoVO> signInfoVOSignInPerInfoVOFunction = validMap.get(signEnum);
-        Assert.isNotNull(signInfoVOSignInPerInfoVOFunction, "不存在的签到类型！");
-        return signInfoVOSignInPerInfoVOFunction.apply(signInPerInfoVO);*/
-
         SignInfoVO signInPerInfoVO = getSignInPerInfoVO(subId, user);
         Function<SignInfoVO, SignInPerInfoVO> signInfoVOSignInPerInfoVOFunction = validMap.get(signEnum);
         Assert.isNotNull(signInfoVOSignInPerInfoVOFunction, "不存在的签到类型！");
@@ -509,18 +496,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
      */
     private SignInfoVO getSignInPerInfoVO(Long subId, SysUser user) {
 
-        /*if (user == null) return null;
-
-        // 现在是串行处理， 影响大的话可以改为异步处理
-        //1 获取验证安全准入凭证
-        List<LabApprovalVO> labApprovals = getLabApprovals(subId, user);
-        SingInUser singInUser = new SingInUser(user, labApprovals);
-        //2查询最新一条违约记录
-        SingInViolation singInViolation = extracted(user);
-        SignInfoVO signInPerInfoVO = new SignInfoVO(singInUser, singInViolation);
-        signInPerInfoVO.setSubId(subId);
-        return signInPerInfoVO;*/
-
         //2.3签到
         if (user == null) {
             return null;
@@ -657,7 +632,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
         try {
             logger.info("&&&&&&&&&&&&&&&&&&&&&&" + code + ",");
             if (StringUtils.isEmpty(code)) {
-                //            throw new CaptchaException("签到验证码错误，请重新刷卡重试！");
                 ResultData.fail(600, "签到验证码错误，请重新刷卡重试！");
             }
             String verifyKey = BaseConstants.SINGIN_CAPTCHA_CODE_KEY + code;
@@ -666,8 +640,6 @@ public class OneMachineService implements ValidationSignInPerInfo {
                 ResultData.fail(600, "签到&签出人脸已超时，请重新刷卡重试！");
             }
             if (user != null) {
-                String s = StrUtil.subAfter(code, "_", true);
-
                 logger.info("1111111签到调用人脸服务");
                 //调用人脸验证
                 R r = faceCompare(user.getUserId(), face);

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

@@ -77,8 +77,8 @@ public interface ILabRiskPlanService  extends IService<LabRiskPlan> {
      *
      * @param labRiskPlan 风险预案
      * @return 结果
+     * public void riskPlanJoinSub(Long riskPlanId,List<LabSensorHazardRelation> labSensorHazardRelations);
      */
-//    public void riskPlanJoinSub(Long riskPlanId,List<LabSensorHazardRelation> labSensorHazardRelations);
 
     /**
      * 批量删除风险预案

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

@@ -148,8 +148,10 @@ public class LabGradeManageWorkServiceImpl implements ILabGradeManageWorkService
         throw new ServiceException("管控工作已失效或未查询到数据！");
     }
 
-    /**
+    /***
      * 查询分级管控工作列表
+     * @param labGradeManage
+     * @return
      */
     @Override
     public List<LabGradeManageWorkVO> selectMyGradeManageWorkList(LabGradeManage labGradeManage) {