2023-11-10 删除注释的代码，优化StringBuffer。

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

@@ -1,27 +1,23 @@
 package com.zd.laboratory.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.github.pagehelper.PageInfo;
-import com.zd.model.constant.HttpStatus;
-import com.zd.model.domain.ResultData;
-import com.zd.common.core.utils.DateUtils;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SaveUtil;
-
+import com.zd.common.core.utils.SecurityUtils;
+import com.zd.laboratory.domain.LabNegativelistHistory;
 import com.zd.laboratory.domain.LabSemester;
 import com.zd.laboratory.domain.vo.LabNegativelistVO;
 import com.zd.laboratory.domain.vo.LabViolationPageListVO;
+import com.zd.laboratory.mapper.LabNegativelistHistoryMapper;
 import com.zd.laboratory.mapper.LabSemesterMapper;
+import com.zd.laboratory.service.ILabNegativelistHistoryService;
+import com.zd.model.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.laboratory.mapper.LabNegativelistHistoryMapper;
-import com.zd.laboratory.domain.LabNegativelistHistory;
-import com.zd.laboratory.service.ILabNegativelistHistoryService;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 负面清单历史记录Service业务层处理
@@ -164,20 +160,6 @@ public class LabNegativelistHistoryServiceImpl implements ILabNegativelistHistor
             vo.setCreateTime(h.getCreateTime());
             String now = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分").format(h.getHandleDay());
             vo.setRemake("违规行为导致信用分不足，需在 "+now+" 前，完成所有违规处理");
-//            if (h.getWarningStatus()!=null && h.getWarningStatus()!=-1){
-//                LabViolationPageListVO.ViolationInfoVO info= new LabViolationPageListVO().new ViolationInfoVO();
-//                info.setType(1);
-//                info.setContent("违规行为警告，请严格遵守实验室安全管理制度。");
-//                info.setStatus(h.getWarningStatus());
-//                vo.getViolationList().add(info);
-//            }
-//            if (h.getInterviewStatus()!=null && h.getInterviewStatus()!=-1){
-//                LabViolationPageListVO.ViolationInfoVO info= new LabViolationPageListVO().new ViolationInfoVO();
-//                info.setType(2);
-//                info.setContent("联系负责老师进行安全教育约谈。");
-//                info.setStatus(h.getInterviewStatus());
-//                vo.getViolationList().add(info);
-//            }
             if (h.getLearnStatus()!=-1){
                 LabViolationPageListVO.ViolationInfoVO info= new LabViolationPageListVO().new ViolationInfoVO();
                 info.setType(3);

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

@@ -19,7 +19,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.LongAdder;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -78,7 +77,7 @@ public class LabNewnoticeSendmodeServiceImpl implements ILabNewnoticeSendmodeSer
 
 
             // 字符串保存发送方式
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             // 这里插入发送方式的数据
             Optional.ofNullable(labNewnoticeSendmodeVoList)
                     .orElseGet(Collections::emptyList)

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

@@ -1,14 +1,12 @@
 package com.zd.laboratory.service.impl;
 
-import com.zd.model.constant.MqttConstants;
-import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.UrlFormatUtils;
-import com.zd.common.core.utils.ExcelUtil;
-import com.zd.common.core.annotation.DataScope;
-import com.zd.common.core.security.TokenService;
 import com.zd.laboratory.domain.LabNotifyplan;
 import com.zd.laboratory.domain.vo.LabNotifyplanExcelVO;
 import com.zd.laboratory.domain.vo.LabNotifyplanVO;
@@ -16,20 +14,21 @@ import com.zd.laboratory.mapper.LabNotifyplanMapper;
 import com.zd.laboratory.mqtt.entiy.MessageBody;
 import com.zd.laboratory.mqtt.service.impl.CommonSend;
 import com.zd.laboratory.service.ILabNotifyplanService;
+import com.zd.model.constant.MqttConstants;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.SysUser;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 /**
  * 大屏通知计划Service业务层处理
@@ -78,7 +77,6 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
             try {
                 //url不为空时解析
                 if(labNotifyplanVO.getContentUrl()!=null){
-                    SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
                     ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<>(LabNotifyplanExcelVO.class);
 
                     InputStream intstream = null;

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

@@ -1192,7 +1192,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 } catch (Exception e) {
                     log.error("操作硬件设备异！{}",e);
                 } finally {
-                    //return groupId;
                 }
                 return groupId;
             } else {
@@ -1236,7 +1235,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                         } catch (Exception e) {
                             log.error("操作硬件设备异常{}",e);
                         } finally {
-                            //return groupId;
                         }
                         return groupId;
                     }
@@ -1458,8 +1456,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         List<Long> list = new ArrayList<>();
         collect.forEach((key, value) -> {
             Integer count = 0;
-            StringBuffer funNumStr = new StringBuffer();
-//            Integer fireCount = 0;
+            StringBuilder funNumStr = new StringBuilder();
             //预案级别下传感器列表
             for (LabRiskPlanSensorRelation labRiskPlanSensorRelation : value) {
                 List<SensorFunctionStatus> sensorFunctionStatuses = sensorFunctionStatusListMap.get(SenseType.getByCode(labRiskPlanSensorRelation.getSensorType()));
@@ -1480,9 +1477,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                             }
                             count++;
                             funNumStr.append(funNum).append("、");
-//                            if (funNum.equals(RiskPlanConstants.TEMPERATURE_FUN_NUM) || funNum.equals(RiskPlanConstants.SMOKE_FUN_NUM)){
-//                                fireCount++;
-//                            }
                         }
                     }
                 }
@@ -1572,28 +1566,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         return labSubjectVOS;
     }
 
-    private String getSensorTypesByRiskPlanId(Long riskPlanId) {
-        //根据预案id查询该预案对应的传感器类型fun_num
-        List<Integer> list = labRiskPlanMapper.selectSensorType(riskPlanId);
-//        List<String> funNumList = labRiskPlanSubVo.getFunNumList();
-        String typeIds = "";
-        if (null != list) {
-//            List<SensorFunctionStatus> funList = labSensorService.getFunList();
-            SenseType[] sesorList = SenseType.values();
-            StringBuilder types = new StringBuilder();
-            for (int sensorType : list) {
-                for (SenseType senseType : sesorList) {
-                    if (senseType.getCode().equals(sensorType)) {
-                        types.append(senseType.getCode()).append(",");
-                    }
-                }
-            }
-            if (types.toString().endsWith(",")) {
-                typeIds = types.substring(0, types.toString().length() - 1);
-            }
-        }
-        return typeIds;
-    }
 
     @Override
     public int checkBinding(String ids) {
@@ -1670,8 +1642,8 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 }
             });
 
-            StringBuffer tipsStr = new StringBuffer();
-            StringBuffer riskRelationIdStr = new StringBuffer();
+            StringBuilder tipsStr = new StringBuilder();
+            StringBuilder riskRelationIdStr = new StringBuilder();
             if (riskPlanjoinsubList.size() > 0) {
                 //有现有关联实验室与当前绑定实验室冲突
                 Optional.ofNullable(riskPlanjoinsubList).orElseGet(Collections::emptyList).stream().forEach(a -> {
@@ -1779,7 +1751,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = new LabRiskPlanAbnormalGroup();
         labRiskPlanAbnormalGroup.setStatus(1L);
         List<LabRiskPlanAbnormalGroupVO> groupList = labRiskPlanAbnormalGroupMapper.selectLabRiskPlanAbnormalGroupList(labRiskPlanAbnormalGroup);
-//        List<LabRiskPlanAbnormalGroupVO> groupList = labRiskPlanAbnormalGroupMapper.selectByStatus(1L);
         if (groupList.size() == 0) {
             return labBuilder;
         }

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

@@ -74,7 +74,6 @@ public class LabSafeBookServiceImpl implements ILabSafeBookService {
     public int updateLabSafeBook(LabSafeBook labSafeBook) {
         labSafeBook.setUpdateTime(DateUtils.getNowDate());
         labSafeBook.setUpdateBy(SecurityUtils.getUsername());
-//        labSafeBook.setQrCodeUrl(qrUrl + "?id=" + labSafeBook.getId());
         return labSafeBookMapper.updateLabSafeBook(labSafeBook);
     }