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

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

@@ -119,8 +119,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateLabCheckRecordDetailsList(LabCheckRecordDetails details) {
-        //boolean senMsg = false;
-
         //获取当前登录用户
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         //查询检查单详情
@@ -130,9 +128,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
         LabCheckRecordDetails selcetDetails = labCheckRecordDetailsMapper.selectLabCheckRecordDetailsById(details.getId());
 
         int id=0;
-        /*if(!sysUser.getUserId().equals(labCheckRecord.getFzrId())){
-                throw new ServiceException("不是负责人，无权提交");
-        }*/
 
         //完成整改
         if(1==details.getSpStatus()){
@@ -143,9 +138,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
 
             //操作日志表对象
             LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
-            //detailslog.setCheckId(labCheckRecord.getId());
-            //detailslog.setCheckDetailsId(selcetDetails.getId());
-            //List<LabCheckRecordDetailslog> listlog=labCheckRecordDetailslogMapper.selectLabCheckRecordDetailslogList(detailslog);
 
             detailslog.setCheckId(selcetDetails.getCheckId());
             detailslog.setCheckDetailsId(selcetDetails.getId());
@@ -154,11 +146,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
             detailslog.setZgUserName(sysUser.getNickName());//整改人姓名
             detailslog.setZgMs(details.getZgMs());//描述
             detailslog.setYhZghImg(details.getYhZghImg());//整改图片
-            /*detailslog.setSpTime(new Date());//审核时间
-            detailslog.setSpUserName(sysUser.getNickName());//审核人
-            detailslog.setSpUserId(sysUser.getUserId());//审核人id
-            detailslog.setSpStatus(1L);//整改完成待确认
-            detailslog.setSpSm(details.getSpMs());//审核说明*/
             detailslog.setCreateTime(new Date());//创建时间
             //整改日志表数据录入
             labCheckRecordDetailslogMapper.insertLabCheckRecordDetailslog(detailslog);
@@ -197,7 +184,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
 
             //3.消息通知
             // 整改通知发送给 实验室负责人
-            //checkMachineMsgService.insertLabCheckMachineTjz(labCheckRecord.getZgType()==0?1:2, labCheckRecord.getId(),2);
 
             //发送通知到整改人员手机端
             //查询有效期内的学生申请集合
@@ -268,8 +254,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
             }
 
             //整改通知发送给 发送给检查者
-            //checkMachineMsgService.insertLabCheckMachineTjz(labCheckRecord.getZgType()==0?1:2, labCheckRecord.getId(),3);
-
 
             //小程序消息通知发送 给检查者
             LabMessageContent labMessageContent = new LabMessageContent();
@@ -279,7 +263,7 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
             labMessageContent.setMessType(13);//无法整改
             labMessageContent.setSubIds(labCheckRecord.getLaboratoryId());
             // 喷雾降尘实验室(103),隐患项即将整改过期,隐患项单号：JC1649410773849,隐患描述:AAA
-            StringBuffer str = new StringBuffer();
+            StringBuilder str = new StringBuilder();
             str.append("安全检查，实验室："+labCheckRecord.getLaboratoryName()+"，检查单号："+labCheckRecord.getCheckNum()+"，隐患项暂无法整改，请注意查看");
             labMessageContent.setContent(str.toString());
             labMessageContent.setUserIds(String.valueOf(labCheckRecord.getCreateUserId()));
@@ -291,7 +275,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
             details.setSpUserName(sysUser.getNickName());//姓名
             details.setSpTime(new Date());//审核时间
             // 整改通知发送给 实验室负责人
-            //checkMachineMsgService.insertLabCheckMachineTjz(labCheckRecord.getZgType()==0?1:2, labCheckRecord.getId(),4);
 
 
             //发送通知到整改人员手机端
@@ -315,7 +298,7 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
             labMessageContent.setMessType(14);//整改完成
             labMessageContent.setSubIds(labCheckRecord.getLaboratoryId());
             // 喷雾降尘实验室(103),隐患项即将整改过期,隐患项单号：JC1649410773849,隐患描述:AAA
-            StringBuffer str = new StringBuffer();
+            StringBuilder str = new StringBuilder();
             str.append("安全检查，实验室："+labCheckRecord.getLaboratoryName()+"，检查单号："+labCheckRecord.getCheckNum()+"，隐患项整改完成，请注意查看");
             labMessageContent.setContent(str.toString());
             labMessageContent.setUserIds(userids+labCheckRecord.getCreateUserId());
@@ -327,13 +310,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
             List<LabCheckRecordDetailslog> listlog=labCheckRecordDetailslogMapper.selectLabCheckRecordDetailslogList(logdetails);
             if(listlog.size()>0){
                 logdetails.setId(listlog.get(0).getId());
-                /*logdetails.setCheckId(selcetDetails.getCheckId());
-                logdetails.setCheckDetailsId(selcetDetails.getId());
-                logdetails.setZgTime(selcetDetails.getZgTime());//整改时间
-                logdetails.setZgUserId(selcetDetails.getZgUserId());//整改人id
-                logdetails.setZgUserName(selcetDetails.getZgUserName());//整改人姓名
-                logdetails.setZgMs(selcetDetails.getZgMs());//描述
-                logdetails.setYhZghImg(selcetDetails.getYhZghImg());//整改图片*/
 
                 logdetails.setSpTime(new Date());//审核时间
                 logdetails.setSpUserName(sysUser.getNickName());//审核人
@@ -364,7 +340,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
                         detailsList.get(i).setIsZg(details.getIsZg());
                         detailsList.get(i).setSpStatus(details.getSpStatus());
                     }
-                    //Long iszg= detailsList.get(i).getIsZg();
                     iszgStr+=String.valueOf(detailsList.get(i).getIsZg())+",";
                     spStatusStr+=String.valueOf(detailsList.get(i).getSpStatus())+",";
                 }

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

@@ -81,9 +81,6 @@ public class LabCheckRecordReleaseServiceImpl implements ILabCheckRecordReleaseS
     @Transactional(rollbackFor = Exception.class)
     public int insertLabCheckRecordRelease(LabCheckRecordRelease labCheckRecordRelease)
     {
-        //设置其他公共字段
-        //SaveUtil.setCommonAttr(labCheckRecordRelease);
-
         //提交的检查项id集合
         String[] ids =labCheckRecordRelease.getCheckId().split(",");
         Long[] idscheck = new Long[ids.length];

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

@@ -118,8 +118,6 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
     {
         int id =0;
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        /*ResultData<Object> r = remoteLaboratoryService.selectUserInfoById(labCheckRecordVo.getUserId());
-        SysUser sysUser =  (SysUser) r.getData();*/
         if(sysUser==null){
             throw new ServiceException("没有查询到用户相关信息");
         }else if(sysUser.getIsCheck()==0){
@@ -157,8 +155,6 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
         int id =0;
         int id2 = 0;
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        /*ResultData<Object> r = remoteLaboratoryService.selectUserInfoById(labCheckRecordVo.getUserId());
-        SysUser sysUser =  (SysUser) r.getData();*/
         if(sysUser==null){
             throw new ServiceException("没有查询到用户相关信息");
         }else if(sysUser.getIsCheck()==0){
@@ -186,17 +182,6 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
                 lcrd.setSpStatus(0);
                 id2 = labCheckRecordDetailsMapper.insertLabCheckRecordDetails(lcrd);
 
-               //检查日志表数据录入
-                /*LabCheckRecordDetailslog detailslog = new LabCheckRecordDetailslog();
-                detailslog.setCheckId(labCheckRecordVo.getId());
-                detailslog.setCheckDetailsId(lcrd.getId());
-                detailslog.setApplyYhImg(lcrd.getYhImg());
-                detailslog.setApplyUserId(labCheckRecordVo.getCreateUserId());
-                detailslog.setApplyUserName(labCheckRecordVo.getJcRyxm());
-                detailslog.setApplyTime(labCheckRecordVo.getCreateTime());
-                detailslog.setCreateTime(new Date());//创建时间
-                detailslog.setSpStatus(0L);
-                labCheckRecordDetailslogMapper.insertLabCheckRecordDetailslog(detailslog);*/
             }
 
             //发布检查关系表数据录入
@@ -366,7 +351,6 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
      * @return
      */
     @Override
-   // @DataScope(deptAlias = "s" , userAlias = "s" , permi = PerPrefix.LABORATORY_CHECKRECORD)
     public List<Map<String, Object>> selectStatusList() {
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         LabCheckRecordVO labCheckRecordVo =new LabCheckRecordVO();
@@ -375,13 +359,6 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
                 labCheckRecordVo.setDeptId(sysUser.getDeptId());
             }
         }else if("11".equals(sysUser.getUserType())){ //教职工
-            /*if(sysUser.getIsCheck() == 1){
-                // 检查者只能查到自己创建的数据
-                labCheckRecordVo.setFzrId(null);
-                labCheckRecordVo.setCreateUserId(sysUser.getUserId());
-            }else{
-                labCheckRecordVo.setFzrId(sysUser.getUserId());
-            }*/
             labCheckRecordVo.setFzrId(sysUser.getUserId());
         }
 
@@ -434,7 +411,6 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
     public List<LabCheckRecordVO> selectLabCheckRecordListOrderBydate(LabCheckRecordVO labCheckRecordVo) {
 
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        //LabCheckRecordVO labCheckRecordVo =new LabCheckRecordVO();
         if("00".equals(sysUser.getUserType())){ //系统用户
             if(sysUser.getDeptId()!=null ){
                 labCheckRecordVo.setDeptId(sysUser.getDeptId());
@@ -478,10 +454,7 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
      */
     @Override
     public List<LabCheckRecordVO> selectLabCheckRecordIndexDetals(LabCheckRecordVO labCheckRecordVo) {
-        /*if(labCheckRecordVo.getId()==null){
-            throw new ServiceException("参数为空！");
-        }*/
-            List<LabCheckRecordVO> list =labCheckRecordMapper.selectLabCheckRecordIndexDetals(labCheckRecordVo);
+        List<LabCheckRecordVO> list =labCheckRecordMapper.selectLabCheckRecordIndexDetals(labCheckRecordVo);
         return list;
     }
 
@@ -499,12 +472,8 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
 
         //最近一次发布记录
         LabCheckRecordRelease labCheckRecordRelease=labCheckRecordReleaseMapper.selectLabCheckRecordReleaseFirst();
-        //String checkid="38,39,40,41";
         String[] ystr = labCheckRecordRelease.getCheckId().split(",");
 
-        /*Long[] idscheck = new Long[2];
-        idscheck[0]=38L;
-        idscheck[1]=39L;*/
 
         Map<String,String> checkMap = new HashMap();
         for (int i=0;i<ystr.length;i++){
@@ -514,7 +483,7 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
             checkMap.remove(ids[k]+"");
         }
 
-        StringBuffer str1 = new StringBuffer();
+        StringBuilder str1 = new StringBuilder();
         checkMap.forEach((key,value)->{
             str1.append(value);
             str1.append(",");
@@ -571,7 +540,7 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
                 labMessageContent.setMessType(16);//即将预期
                 labMessageContent.setSubIds(String.valueOf(list.get(i).getLaboratoryId()));
                 // 喷雾降尘实验室(103),隐患项即将整改过期,隐患项单号：JC1649410773849,隐患描述:AAA
-                StringBuffer str = new StringBuffer();
+                StringBuilder str = new StringBuilder();
                 str.append(list.get(i).getLaboratoryName())
                         .append("，隐患项即将整改过期，隐患项单号:").append(list.get(i).getCheckNum())
                                 .append("，隐患描述:").append(list.get(i).getYhMs());
@@ -608,7 +577,7 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
                 labMessageContent.setMessType(16);//即将预期
                 labMessageContent.setSubIds(String.valueOf(list.get(i).getLaboratoryId()));
                 // 喷雾降尘实验室(103),隐患项即将整改过期,隐患项单号：JC1649410773849,隐患描述:AAA
-                StringBuffer str = new StringBuffer();
+                StringBuilder str = new StringBuilder();
                 str.append(list3.get(i).getLaboratoryName())
                         .append("，隐患项即将整改过期,隐患项单号:").append(list3.get(i).getCheckNum())
                         .append("，隐患描述:").append(list3.get(i).getYhMs());