代码优化

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

@@ -161,7 +161,7 @@ public class LabApprovalController extends BaseController {
 
     @PostMapping("/accessReview")
     public ResultData accessReview(@RequestBody LabApprovalAndDetailDTO labApproval) {
-        if(labApproval.getId()!=null && !labApproval.getId().equals("")){
+        if(labApproval.getId()!=null){
             return ResultData.success(labApprovalService.updateLabApproval(labApproval));
         }else{
             return ResultData.success(labApprovalService.insertLabApproval(labApproval));

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

@@ -31,10 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 安全检查Controller
@@ -538,18 +535,6 @@ public class LabCheckRecordController extends BaseController {
                 detailslog.setCheckDetailsId(list.get(i).getId());
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 list.get(i).setDetailslogList(deatlog);
-
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    list.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
         }
 
@@ -625,17 +610,6 @@ public class LabCheckRecordController extends BaseController {
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 dzglist.get(i).setDetailslogList(deatlog);
 
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    dzglist.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
          }
 
@@ -661,17 +635,6 @@ public class LabCheckRecordController extends BaseController {
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 yzglist.get(i).setDetailslogList(deatlog);
 
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    yzglist.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
         }
 
@@ -690,17 +653,6 @@ public class LabCheckRecordController extends BaseController {
                 List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
                 wfzglist.get(i).setDetailslogList(deatlog);
 
-                //判断该条检查项的驳回次数
-                /*if(deatlog.size()>0){
-                    int flg=0;
-                    for (int k=0;k<deatlog.size();k++){
-                        flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
-                            flg++;
-                        }
-                    }
-                    dzglist.get(i).setCheckZs(flg);//该条检查项的驳回次数
-                }*/
             }
         }
 
@@ -750,7 +702,7 @@ public class LabCheckRecordController extends BaseController {
                     int flg=0;
                     for (int k=0;k<deatlog.size();k++){
                         flg=0;//重新赋值
-                        if("2".equals(deatlog.get(k).getSpStatus())){
+                        if(deatlog.get(k).getSpStatus()==2){
                             flg++;
                         }
                     }
@@ -800,7 +752,7 @@ public class LabCheckRecordController extends BaseController {
                 if(deatlog.size()>0){
                     int flg=0;
                     for (int k=0;k<deatlog.size();k++){
-                        if("2".equals(deatlog.get(k).getSpStatus())){
+                        if(deatlog.get(k).getSpStatus().longValue()==2){
                             flg++;
                         }
                     }
@@ -888,9 +840,6 @@ public class LabCheckRecordController extends BaseController {
                 }
                 String[] ids =  list.get(i).getJcxId().split(",");
                 for (int k=0;k<ids.length;k++){
-                    if(flg){
-                        break;
-                    }
                     if(ids[k].equals(String.valueOf(jcxId))){
                         checkid=list.get(i).getCheckId();
                         flg=true;

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

@@ -313,18 +313,6 @@ public class LabCheckRecordDetailsController extends BaseController {
          List<LabCheckRecordDetailslog> deatlog= iLabCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(detailslog);
          detailsVO.setDetailslogList(deatlog);//该条检查项的操作日志
 
-         //判断该条检查项的驳回次数
-        /*if(deatlog.size()>0) {
-            int flg = 0;
-            for (int k = 0; k < deatlog.size(); k++) {
-                flg = 0;//重新赋值
-                if ("2".equals(deatlog.get(k).getSpStatus())) {
-                    flg++;
-                }
-            }
-            detailsVO.setCheckZs(flg);
-        }*/
-
          map.put("details",detailsVO);
          map.put("record",labCheckRecord);
          return map;

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

@@ -130,7 +130,8 @@ public class LabControlController extends BaseController {
             Thread.sleep(1000);
             return ResultData.success(labControlService.selectLabControlNewMegById(id));
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            logger.error("获取控制记录详细信息异常："+e);
+            Thread.currentThread().interrupt();
         }
        return ResultData.fail("获取控制记录信息失败！");
     }

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

@@ -97,9 +97,6 @@ public class LabStudentsInfoController extends BaseController {
 //    @PreAuthorize(hasPermi = "laboratory:studentinfo:query")
     @GetMapping(value = "/my")
     public ResultData<LabStudentsInfo> getMyInfo() {
-        if(1==1){
-             logger.info("我是一个小可爱");
-        }
         LabStudentsInfo labStudentsInfo = labStudentsInfoService.selectLabStudentsInfoByJoinStudentsId(SecurityUtils.getUserIdEx());
         if(labStudentsInfo!=null)
         {

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

@@ -193,7 +193,8 @@ public class LabSubMangerController extends BaseController {
             Thread.sleep(500);
             control = subjectManagerService.control(id, Symbol.command.close);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            logger.error("控制通风厨开关异常："+e);
+            Thread.currentThread().interrupt();
         }
         return ResultData.result(control,()->"电源控制失败！");
     }

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

@@ -162,9 +162,9 @@ public class LabWhitelistController extends BaseController
 
         }
 
-        if(count > 0){
+        /*if(count > 0){
             throw new NoRollException(HttpStatus.NOT_IMPLEMENTED, count, "门禁授权失败【"+count+"】，是否立即处理");
-        }
+        }*/
 
         return ResultData.result(id);
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredAndWorkListener.java

@@ -150,6 +150,7 @@ public class RedisExpiredAndWorkListener extends KeyExpirationEventMessageListen
                 int timeOut = (int)(Math.random()*50)+50;
                 Thread.sleep(Long.parseLong(timeOut+""));
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 log.error("这里获取蓝牙信标信息异常", e);
             }
             if (!redisService.hasKey(key)) {

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

@@ -393,17 +393,17 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
         if(labBlack!=null && labBlack.getBlacklistStatus()==1){
             LabBlackdetail labBlackdetail = labBlackdetailMapper.selectLabBlackdetailByBlackId(labBlack.getId());
             LabBlackdetail labBlackdetailNew = new LabBlackdetail();
-            if(blackdetailVO.getLearnStatus()!=null && blackdetailVO.getLearnStatus()==labBlackdetail.getLearnStatus()){
+            if(blackdetailVO.getLearnStatus()!=null && blackdetailVO.getLearnStatus().equals(labBlackdetail.getLearnStatus())){
                 if(blackdetailVO.getLearnTime()>=labBlackdetail.getLearnTime()){
                     labBlackdetailNew.setLearnStatus(1);
                     labBlackdetailNew.setId(labBlackdetail.getId());
                 }
             }
-            if(blackdetailVO.getTestStatus()!=null && blackdetailVO.getTestStatus()==labBlackdetail.getTestStatus()){
+            if(blackdetailVO.getTestStatus()!=null && blackdetailVO.getTestStatus().equals(labBlackdetail.getTestStatus())){
                 labBlackdetailNew.setTestStatus(1);
                 labBlackdetailNew.setId(labBlackdetail.getId());
             }
-            if(blackdetailVO.getPracticeStatus()!=null && blackdetailVO.getPracticeStatus()==labBlackdetail.getPracticeStatus()){
+            if(blackdetailVO.getPracticeStatus()!=null && blackdetailVO.getPracticeStatus().equals(labBlackdetail.getPracticeStatus())){
                 if(blackdetailVO.getNumberTopics()>=labBlackdetail.getNumberTopics()){
                     if(blackdetailVO.getNumberAccuracy()>=labBlackdetail.getNumberAccuracy()){
                         labBlackdetailNew.setPracticeStatus(1);

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

@@ -69,7 +69,7 @@ public class LabBuildFloorServiceImpl implements ILabBuildFloorService {
         // 返回父级下的所有子集列表
         Function <LabBuildFloorVo,List <LabBuildFloorVo>> function = x->Optional.ofNullable(labBuildFloors).orElseGet(Collections::emptyList)
                 .stream()
-                .filter(y->y.getParentId()==x.getId())
+                .filter(y->y.getParentId().equals(x.getId()))
                 .map(y->{
                     LabBuildFloorVo buildFloorVo1 = new LabBuildFloorVo();
                     BeanUtils.copyProperties(y,buildFloorVo1);
@@ -201,7 +201,7 @@ public class LabBuildFloorServiceImpl implements ILabBuildFloorService {
 
                     //获取布局图实验室信息信息
                     LabBuildFloorLayout labBuildFloorLayout = new LabBuildFloorLayout();
-                    labBuildFloorLayout.setFloorId(b.getFloorId().longValue());
+                    labBuildFloorLayout.setFloorId(b.getFloorId());
                     List <LabBuildFloorLayoutVo> buildFloorLayoutVoList = labBuildFloorLayoutMapper.selectLabBuildFloorLayoutList(labBuildFloorLayout);
                     a.getBuildFloorLayoutVoList().addAll(buildFloorLayoutVoList);
                     //处理布局图实验室id

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

@@ -28,6 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 
 /**
@@ -84,13 +85,12 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
         labCheckMachineMsg.setStatus(1);
         List<LabCheckMachineMsg> list = labCheckMachineMsgMapper.selectLabCheckMachineMsgList(labCheckMachineMsg);
 
-        LabCheckRecord labCheckRecord;
         for (LabCheckMachineMsg checkMachineMsg : list) {
             LabCheckRecordDetails labCheckRecordDetails = new LabCheckRecordDetails();
             labCheckRecordDetails.setCheckId(checkMachineMsg.getCheckRecordId());
             checkMachineMsg.setDetails(labCheckRecordDetailsService.selectLabCheckRecordDetailsList(labCheckRecordDetails));
 
-            labCheckRecord = labCheckRecordService.selectLabCheckRecordById(checkMachineMsg.getCheckRecordId());
+            LabCheckRecord labCheckRecord = labCheckRecordService.selectLabCheckRecordById(checkMachineMsg.getCheckRecordId());
             if (labCheckRecord != null) {
                 checkMachineMsg.setCheckRecord(labCheckRecord);
 
@@ -126,95 +126,96 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
             boolean senMsg = false;
             LabCheckRecord checkRecord = labCheckRecordService.selectLabCheckRecordById(checkRecordId);
 
-            if (checkRecord == null) {
-                logger.error("发送消息通知失败，ID无效");
-            }
-            // 查询实验室负责人
-            Long userId = checkRecord.getFzrId();
+            if (checkRecord != null) {
+                // 查询实验室负责人
+                Long userId = checkRecord.getFzrId();
 
-            LabCheckMachineMsg labCheckMachineMsg = null;
-            LabMessageContent labMessageContent = null;
-            if (type == 1) {
-                // 1.短信通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getCheckSmsMsg())) {
-                    // 查询负责人手机号
+                LabCheckMachineMsg labCheckMachineMsg = null;
+                LabMessageContent labMessageContent = null;
+                if (type == 1) {
+                    // 1.短信通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getCheckSmsMsg())) {
+                        // 查询负责人手机号
 //                    ResultData<SysUser> user = remoteUserService.getUserInfoByUserId(userId, SecurityConstants.INNER);
 //                    if (user.getCode() == 200 && user.getData() != null && StringUtils.isNotBlank(user.getData().getPhonenumber())) {
 //                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, new String[]{user.getData().getPhonenumber()}, SendTypes.SMS+"", checkConfigInfo.getCheckSmsMsg());
-                    // 修改为 提交输入的手机号
-
-                    if (StringUtils.isNotBlank(checkRecord.getFzrLxfs())) {
-                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, new String[]{checkRecord.getFzrLxfs()}, SendTypes.SMS + "", checkConfigInfo.getCheckSmsMsg());
-                        MessageBody messageBody = new MessageBody();
-                        messageBody.setData(alarmEntrty);
-                        commonSend.send(MqttConstants.TOPIC_ALERT + checkRecordId, messageBody, SendMode.DISTINCT);
+                        // 修改为 提交输入的手机号
+
+                        if (StringUtils.isNotBlank(checkRecord.getFzrLxfs())) {
+                            AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, new String[]{checkRecord.getFzrLxfs()}, SendTypes.SMS + "", checkConfigInfo.getCheckSmsMsg());
+                            MessageBody messageBody = new MessageBody();
+                            messageBody.setData(alarmEntrty);
+                            commonSend.send(MqttConstants.TOPIC_ALERT + checkRecordId, messageBody, SendMode.DISTINCT);
+                        }
                     }
-                }
-                // 2.一体机通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getCheckAioMsg())) {
-                    labCheckMachineMsg = new LabCheckMachineMsg();
-                    labCheckMachineMsg.setCheckRecordId(checkRecordId);
-                    labCheckMachineMsg.setType(type);
-                    labCheckMachineMsg.setCheckMsg(checkConfigInfo.getCheckAioMsg());
-                    SaveUtil.setCommonAttr(labCheckMachineMsg);
-
-                    senMsg = true;
-                }
-                // 3.小程序消息通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getCheckAppMsg())) {
-                    labMessageContent = new LabMessageContent();
-                    labMessageContent.setSendMode(2);
-                    labMessageContent.setSendRange(3);
-                    labMessageContent.setMessClass(1);
-                    labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
-                    labMessageContent.setUserIds(userId + "");
+                    // 2.一体机通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getCheckAioMsg())) {
+                        labCheckMachineMsg = new LabCheckMachineMsg();
+                        labCheckMachineMsg.setCheckRecordId(checkRecordId);
+                        labCheckMachineMsg.setType(type);
+                        labCheckMachineMsg.setCheckMsg(checkConfigInfo.getCheckAioMsg());
+                        SaveUtil.setCommonAttr(labCheckMachineMsg);
+
+                        senMsg = true;
+                    }
+                    // 3.小程序消息通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getCheckAppMsg())) {
+                        labMessageContent = new LabMessageContent();
+                        labMessageContent.setSendMode(2);
+                        labMessageContent.setSendRange(3);
+                        labMessageContent.setMessClass(1);
+                        labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
+                        labMessageContent.setUserIds(userId + "");
 
-                }
-            } else if (type == 2) {
-                // 1.短信通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getRectifySmsMsg())) {
-                    // 查询负责人手机号
-                    R<SysUser> user = remoteUserService.getUserInfoByUserId(userId, SecurityConstants.INNER);
-                    if (user.getCode() == 200 && user.getData() != null && StringUtils.isNotBlank(user.getData().getPhonenumber())) {
-                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, new String[]{user.getData().getPhonenumber()}, SendTypes.SMS + "", checkConfigInfo.getRectifySmsMsg());
-                        MessageBody messageBody = new MessageBody();
-                        messageBody.setData(alarmEntrty);
-                        commonSend.send(MqttConstants.TOPIC_ALERT + checkRecordId, messageBody, SendMode.DISTINCT);
+                    }
+                } else if (type == 2) {
+                    // 1.短信通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getRectifySmsMsg())) {
+                        // 查询负责人手机号
+                        R<SysUser> user = remoteUserService.getUserInfoByUserId(userId, SecurityConstants.INNER);
+                        if (user.getCode() == 200 && user.getData() != null && StringUtils.isNotBlank(user.getData().getPhonenumber())) {
+                            AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, new String[]{user.getData().getPhonenumber()}, SendTypes.SMS + "", checkConfigInfo.getRectifySmsMsg());
+                            MessageBody messageBody = new MessageBody();
+                            messageBody.setData(alarmEntrty);
+                            commonSend.send(MqttConstants.TOPIC_ALERT + checkRecordId, messageBody, SendMode.DISTINCT);
+                        }
+                    }
+                    // 2.一体机通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAioMsg())) {
+                        labCheckMachineMsg = new LabCheckMachineMsg();
+                        labCheckMachineMsg.setCheckRecordId(checkRecordId);
+                        labCheckMachineMsg.setType(type);
+                        labCheckMachineMsg.setCheckMsg(checkConfigInfo.getRectifyAioMsg());
+                        SaveUtil.setCommonAttr(labCheckMachineMsg);
+
+                        senMsg = true;
+                    }
+                    // 3.小程序消息通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAppMsg())) {
+                        labMessageContent = new LabMessageContent();
+                        labMessageContent.setSendMode(2);
+                        labMessageContent.setSendRange(3);
+                        labMessageContent.setMessClass(1);
+                        labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
+                        labMessageContent.setUserIds(userId + "");
                     }
                 }
-                // 2.一体机通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAioMsg())) {
-                    labCheckMachineMsg = new LabCheckMachineMsg();
-                    labCheckMachineMsg.setCheckRecordId(checkRecordId);
-                    labCheckMachineMsg.setType(type);
-                    labCheckMachineMsg.setCheckMsg(checkConfigInfo.getRectifyAioMsg());
-                    SaveUtil.setCommonAttr(labCheckMachineMsg);
 
-                    senMsg = true;
+                if (labCheckMachineMsg != null) {
+                    labCheckMachineMsg.setStatus(1);
+                    labCheckMachineMsgMapper.insertLabCheckMachineMsg(labCheckMachineMsg);
                 }
-                // 3.小程序消息通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAppMsg())) {
-                    labMessageContent = new LabMessageContent();
-                    labMessageContent.setSendMode(2);
-                    labMessageContent.setSendRange(3);
-                    labMessageContent.setMessClass(1);
-                    labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
-                    labMessageContent.setUserIds(userId + "");
+                if (labMessageContent != null) {
+                    labMessageContentService.insertLabMessageContent(labMessageContent);
                 }
-            }
-
-            if (labCheckMachineMsg != null) {
-                labCheckMachineMsg.setStatus(1);
-                labCheckMachineMsgMapper.insertLabCheckMachineMsg(labCheckMachineMsg);
-            }
-            if (labMessageContent != null) {
-                labMessageContentService.insertLabMessageContent(labMessageContent);
-            }
-            if (senMsg) {
-                MessageBody messageBody = new MessageBody();
-                messageBody.setData(labCheckMachineMsg);
-                //仅发送一次
-                commonSend.send(MqttConstants.TOPIC_LAB_CHECK + checkRecord.getLaboratoryId(), messageBody, SendMode.ONCE);
+                if (senMsg) {
+                    MessageBody messageBody = new MessageBody();
+                    messageBody.setData(labCheckMachineMsg);
+                    //仅发送一次
+                    commonSend.send(MqttConstants.TOPIC_LAB_CHECK + checkRecord.getLaboratoryId(), messageBody, SendMode.ONCE);
+                }
+            } else {
+                logger.error("发送消息通知失败，ID无效");
             }
         }
     }
@@ -234,22 +235,20 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
 
             LabCheckRecord checkRecord = labCheckRecordService.selectLabCheckRecordById(checkRecordId);
 
-            if (checkRecord == null) {
-                logger.error("发送消息通知失败，ID无效");
-            }
-            // 查询实验室负责人
-            Long userId = checkRecord.getCreateUserId();
+            if (checkRecord != null) {
+                // 查询实验室负责人
+                Long userId = checkRecord.getCreateUserId();
 
-            LabCheckMachineMsg labCheckMachineMsg = null;
-            LabMessageContent labMessageContent = null;
-            if (type == 1) {
-                // 1.短信通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getCheckSmsMsg())) {
-                    // 查询负责人手机号
+                LabCheckMachineMsg labCheckMachineMsg = null;
+                LabMessageContent labMessageContent = null;
+                if (type == 1) {
+                    // 1.短信通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getCheckSmsMsg())) {
+                        // 查询负责人手机号
 //                    ResultData<SysUser> user = remoteUserService.getUserInfoByUserId(userId, SecurityConstants.INNER);
 //                    if (user.getCode() == 200 && user.getData() != null && StringUtils.isNotBlank(user.getData().getPhonenumber())) {
 //                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, new String[]{user.getData().getPhonenumber()}, SendTypes.SMS+"", checkConfigInfo.getCheckSmsMsg());
-                    // 修改为 提交输入的手机号
+                        // 修改为 提交输入的手机号
 
                    /* if (StringUtils.isNotBlank(checkRecord.getFzrLxfs())) {
                         AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, new String[]{checkRecord.getFzrLxfs()}, SendTypes.SMS+"", checkConfigInfo.getCheckSmsMsg());
@@ -257,30 +256,30 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
                         messageBody.setData(alarmEntrty);
                         commonSend.send("alarm/"+checkRecordId,messageBody, SendMode.DISTINCT);
                     }*/
-                }
-                // 2.一体机通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getCheckAioMsg())) {
-                    labCheckMachineMsg = new LabCheckMachineMsg();
-                    labCheckMachineMsg.setCheckRecordId(checkRecordId);
-                    labCheckMachineMsg.setType(type);
-                    labCheckMachineMsg.setCheckMsg(checkConfigInfo.getCheckAioMsg());
-                    SaveUtil.setCommonAttr(labCheckMachineMsg);
-
-                    senMsg = true;
-                }
-                // 3.小程序消息通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getCheckAppMsg())) {
-                    labMessageContent = new LabMessageContent();
-                    labMessageContent.setSendMode(2);
-                    labMessageContent.setSendRange(3);
-                    labMessageContent.setMessClass(1);
-                    labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
-                    //labMessageContent.setContent(count);
-                    labMessageContent.setUserIds(userId + "");
+                    }
+                    // 2.一体机通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getCheckAioMsg())) {
+                        labCheckMachineMsg = new LabCheckMachineMsg();
+                        labCheckMachineMsg.setCheckRecordId(checkRecordId);
+                        labCheckMachineMsg.setType(type);
+                        labCheckMachineMsg.setCheckMsg(checkConfigInfo.getCheckAioMsg());
+                        SaveUtil.setCommonAttr(labCheckMachineMsg);
+
+                        senMsg = true;
+                    }
+                    // 3.小程序消息通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getCheckAppMsg())) {
+                        labMessageContent = new LabMessageContent();
+                        labMessageContent.setSendMode(2);
+                        labMessageContent.setSendRange(3);
+                        labMessageContent.setMessClass(1);
+                        labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
+                        //labMessageContent.setContent(count);
+                        labMessageContent.setUserIds(userId + "");
 
-                }
-            } else if (type == 2) {
-                // 1.短信通知
+                    }
+                } else if (type == 2) {
+                    // 1.短信通知
                 /*if(StringUtils.isNotBlank(checkConfigInfo.getRectifySmsMsg())){
                     // 查询负责人手机号
                     ResultData<SysUser> user = remoteUserService.getUserInfoByUserId(userId, SecurityConstants.INNER);
@@ -291,47 +290,50 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
                         commonSend.send("alarm/"+checkRecordId,messageBody, SendMode.DISTINCT);
                     }
                 }*/
-                // 2.一体机通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAioMsg())) {
-                    labCheckMachineMsg = new LabCheckMachineMsg();
-                    labCheckMachineMsg.setCheckRecordId(checkRecordId);
-                    labCheckMachineMsg.setType(type);
-                    labCheckMachineMsg.setCheckMsg(checkConfigInfo.getRectifyAioMsg());
-                    SaveUtil.setCommonAttr(labCheckMachineMsg);
+                    // 2.一体机通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAioMsg())) {
+                        labCheckMachineMsg = new LabCheckMachineMsg();
+                        labCheckMachineMsg.setCheckRecordId(checkRecordId);
+                        labCheckMachineMsg.setType(type);
+                        labCheckMachineMsg.setCheckMsg(checkConfigInfo.getRectifyAioMsg());
+                        SaveUtil.setCommonAttr(labCheckMachineMsg);
+
+                        senMsg = true;
+                    }
+                    // 3.小程序消息通知
+                    if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAppMsg())) {
+                        labMessageContent = new LabMessageContent();
+                        labMessageContent.setSendMode(2);
+                        labMessageContent.setSendRange(3);
+                        labMessageContent.setMessClass(1);
+                        labMessageContent.setContent(checkConfigInfo.getRectifyAppMsg());
+                        labMessageContent.setUserIds(userId + "");
+                    }
+                }
+
+                if (labCheckMachineMsg != null) {
+                    //检查消息通知是否存在
+                    LabCheckMachineMsg lmm = new LabCheckMachineMsg();
+                    lmm.setCheckRecordId(checkRecordId);
+                    List<LabCheckMachineMsg> list = labCheckMachineMsgMapper.selectLabCheckMachineMsgList(lmm);
+                    if (list.size() == 0) {
+                        senMsg = true;
+                        labCheckMachineMsg.setStatus(1);
+                        labCheckMachineMsgMapper.insertLabCheckMachineMsg(labCheckMachineMsg);
+                    }
 
-                    senMsg = true;
                 }
-                // 3.小程序消息通知
-                if (StringUtils.isNotBlank(checkConfigInfo.getRectifyAppMsg())) {
-                    labMessageContent = new LabMessageContent();
-                    labMessageContent.setSendMode(2);
-                    labMessageContent.setSendRange(3);
-                    labMessageContent.setMessClass(1);
-                    labMessageContent.setContent(checkConfigInfo.getRectifyAppMsg());
-                    labMessageContent.setUserIds(userId + "");
+                if (labMessageContent != null) {
+                    labMessageContentService.insertLabMessageContent(labMessageContent);
                 }
-            }
-
-            if (labCheckMachineMsg != null) {
-                //检查消息通知是否存在
-                LabCheckMachineMsg lmm = new LabCheckMachineMsg();
-                lmm.setCheckRecordId(checkRecordId);
-                List<LabCheckMachineMsg> list = labCheckMachineMsgMapper.selectLabCheckMachineMsgList(lmm);
-                if (list.size() == 0) {
-                    senMsg = true;
-                    labCheckMachineMsg.setStatus(1);
-                    labCheckMachineMsgMapper.insertLabCheckMachineMsg(labCheckMachineMsg);
+                if (senMsg) {
+                    MessageBody messageBody = new MessageBody();
+                    messageBody.setData(labCheckMachineMsg);
+                    //仅发送一次
+                    commonSend.send(MqttConstants.TOPIC_LAB_CHECK + checkRecord.getLaboratoryId(), messageBody, SendMode.ONCE);
                 }
-
-            }
-            if (labMessageContent != null) {
-                labMessageContentService.insertLabMessageContent(labMessageContent);
-            }
-            if (senMsg) {
-                MessageBody messageBody = new MessageBody();
-                messageBody.setData(labCheckMachineMsg);
-                //仅发送一次
-                commonSend.send(MqttConstants.TOPIC_LAB_CHECK + checkRecord.getLaboratoryId(), messageBody, SendMode.ONCE);
+            } else {
+                logger.error("发送消息通知失败，ID无效");
             }
         }
     }

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

@@ -360,7 +360,7 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
                 String spStatusStr="";//审核状态字符串集合
                 for (int i=0;i<detailsList.size();i++){
                     //将集合中的检查项 和当前修改的检查项比对并且赋值
-                    if(details.getId() == detailsList.get(i).getId()){
+                    if(details.getId().equals(detailsList.get(i).getId()) ){
                         detailsList.get(i).setIsZg(details.getIsZg());
                         detailsList.get(i).setSpStatus(details.getSpStatus());
                     }

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

@@ -352,6 +352,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                 try {
                     Thread.sleep(500);
                 } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                     e.printStackTrace();
                 }
             }
@@ -480,6 +481,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                 try {
                     Thread.sleep(500);
                 } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                     e.printStackTrace();
                 }
             }

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

@@ -232,6 +232,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                     }
                 }
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 e.printStackTrace();
             }
         }
@@ -319,6 +320,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                             }
                         }
                     } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
                         e.printStackTrace();
                     } catch (ExecutionException e) {
                         e.printStackTrace();
@@ -375,6 +377,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                             }
                         }
                     } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
                         e.printStackTrace();
                     }
                 });

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

@@ -710,7 +710,7 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                         workChartVo.setFinishedNum(labGradeManageRecordMapper.selectFinishedNum(dept.getDeptId()));
 
                         workChartVo.setRateNum(workChartVo.getPlanNum() == 0 ? 0 :
-                                (int) (BigDecimal.valueOf(workChartVo.getFinishedNum() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
+                                (int) (BigDecimal.valueOf(workChartVo.getFinishedNum().longValue() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
 
                         list.add(workChartVo);
                     }
@@ -727,7 +727,7 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                 workChartVo.setFinishedNum(labGradeManageRecordMapper.selectFinishedNumBySubId(labManageWorkChartVo));
 
                 workChartVo.setRateNum(workChartVo.getPlanNum() == 0 ? 0 :
-                        (int) (BigDecimal.valueOf(workChartVo.getFinishedNum() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
+                        (int) (BigDecimal.valueOf(workChartVo.getFinishedNum().longValue() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
             }
 
             list = list.stream().sorted(Comparator.comparing(LabManageWorkChartVo::getPlanNum).reversed()).collect(Collectors.toList());
@@ -878,7 +878,7 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                         workChartVo.setFinishedNum(labGradeManageRecordMapper.selectFinishedNum(dept.getDeptId()));
 
                         workChartVo.setRateNum(workChartVo.getPlanNum() == 0 ? 0 :
-                                (int) (BigDecimal.valueOf(workChartVo.getFinishedNum() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
+                                (int) (BigDecimal.valueOf(workChartVo.getFinishedNum().longValue() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
 
                         list.add(workChartVo);
                     }
@@ -895,7 +895,7 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                 workChartVo.setFinishedNum(labGradeManageRecordMapper.selectFinishedNumBySubId(workChartVo));
 
                 workChartVo.setRateNum(workChartVo.getPlanNum() == 0 ? 0 :
-                        (int) (BigDecimal.valueOf(workChartVo.getFinishedNum() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
+                        (int) (BigDecimal.valueOf(workChartVo.getFinishedNum().longValue() * 100).divide(BigDecimal.valueOf(workChartVo.getPlanNum()), BigDecimal.ROUND_DOWN).doubleValue()));
             }
         }
 

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

@@ -127,7 +127,7 @@ public class LabGradeManageServiceImpl implements ILabGradeManageService {
 
             if(count > 0){
                 LabSubject labSubject = labSubjectMapper.selectLabSubjectById(Long.parseLong(subId));
-                throw new ServiceException("实验室：" + labSubject == null? "" : labSubject.getName() + "已经配置，不能重复配置！");
+                throw new ServiceException("实验室：" +labSubject.getName()==null?"": labSubject.getName()+"已经配置，不能重复配置！");
             }
         }
 

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

@@ -282,17 +282,17 @@ public class LabNegativeListRecordsServiceImpl implements ILabNegativeListRecord
             LabNegativelistHistory labNegativedetail = labNegativelistHistoryMapper.selectLabNegativelistHistoryByUserId(blackdetailVO.getJoinUserId());
 //            LabNegativelistHistory labNegativedetail = negativeHistoryMapper.selectLabNegativelistHistoryById(labNegativeListRecords.getId());
             LabNegativelistHistory labNegativedetailNew = new LabNegativelistHistory();
-            if(blackdetailVO.getLearnStatus()!=null && blackdetailVO.getLearnStatus()==labNegativedetail.getLearnStatus()){
+            if(blackdetailVO.getLearnStatus()!=null && blackdetailVO.getLearnStatus().equals(labNegativedetail.getLearnStatus())){
                 if(blackdetailVO.getLearnTime()>=labNegativedetail.getLearnTime()){
                     labNegativedetailNew.setLearnStatus(1);
                     labNegativedetailNew.setId(labNegativedetail.getId());
                 }
             }
-            if(blackdetailVO.getTestStatus()!=null && blackdetailVO.getTestStatus()==labNegativedetail.getTestStatus()){
+            if(blackdetailVO.getTestStatus()!=null && blackdetailVO.getTestStatus().equals(labNegativedetail.getTestStatus())){
                 labNegativedetailNew.setTestStatus(1);
                 labNegativedetailNew.setId(labNegativedetail.getId());
             }
-            if(blackdetailVO.getPracticeStatus()!=null && blackdetailVO.getPracticeStatus()==labNegativedetail.getPracticeStatus()){
+            if(blackdetailVO.getPracticeStatus()!=null && blackdetailVO.getPracticeStatus().equals(labNegativedetail.getPracticeStatus())){
                 if(blackdetailVO.getNumberTopics()>=labNegativedetail.getNumberTopics()){
                     if(blackdetailVO.getNumberAccuracy()>=labNegativedetail.getNumberAccuracy()){
                         labNegativedetailNew.setPracticeStatus(1);

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

@@ -1192,8 +1192,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 } catch (Exception e) {
                     log.error("操作硬件设备异！{}",e);
                 } finally {
-                    return groupId;
+                    //return groupId;
                 }
+                return groupId;
             } else {
                 labRiskPlanAbnormalGroup = groupList.get(0);
                 //如果查询到是当前组，那么就给日志表插入的时候，补上组id
@@ -1235,8 +1236,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                         } catch (Exception e) {
                             log.error("操作硬件设备异常{}",e);
                         } finally {
-                            return groupId;
+                            //return groupId;
                         }
+                        return groupId;
                     }
                 }
                 //插入风险日志

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

@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.Date;
 import java.util.HashMap;
@@ -423,18 +424,21 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
      */
     @Override
     public void downloadBatchByFile(HttpServletResponse response, Map<String, byte[]> files, String zipName){
+        BufferedInputStream bis=null;
+        ZipOutputStream zos=null;
+        BufferedOutputStream bos=null;
         try{
             response.setContentType("application/x-msdownload");
             response.setHeader("content-disposition", "attachment;filename="+ URLEncoder.encode(zipName, "utf-8"));
 
-            ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
-            BufferedOutputStream bos = new BufferedOutputStream(zos);
+            zos = new ZipOutputStream(response.getOutputStream());
+            bos = new BufferedOutputStream(zos);
 
             for(Map.Entry <String, byte[]> entry : files.entrySet()){
                 String fileName = entry.getKey();            //每个zip文件名
                 byte[]    file = entry.getValue();            //这个zip文件的字节
 
-                BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(file));
+                bis = new BufferedInputStream(new ByteArrayInputStream(file));
                 zos.putNextEntry(new ZipEntry(fileName));
 
                 int len = 0;
@@ -448,6 +452,14 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
             bos.close();
         }catch(Exception e){
             e.printStackTrace();
+        }finally {
+            try {
+                zos.close();
+                bis.close();
+                bos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }