化学品审计修复代码同步

zd-modules/zd-chemical/src/main/java/com/zd/chemical/ZdChemicalApplication.java

@@ -46,13 +46,13 @@ public class ZdChemicalApplication implements ApplicationRunner {
                     HxpClassifyConfig hxpClassifyConfigSel = new HxpClassifyConfig();
                     hxpClassifyConfigSel.setJoinClassifyId(Integer.parseInt(a.getId()+""));
                     List<HxpClassifyConfig> classifyConfigList = hxpClassifyConfigService.selectHxpClassifyConfigList(hxpClassifyConfigSel);
-                    if(classifyConfigList.size()==0 && a.getHazardLevel()==1){
+                    if(classifyConfigList.isEmpty() && a.getHazardLevel()==1){
                         //初始化危险化学品
                         HxpClassifyConfig classifyConfig = new HxpClassifyConfig();
                         classifyConfig.setJoinClassifyId(Integer.parseInt(a.getId()+""));
                         classifyConfig.initDanger();
                         hxpClassifyConfigService.insertHxpClassifyConfig(classifyConfig);
-                    }else if(classifyConfigList.size()==0 && a.getHazardLevel()==2){
+                    }else if(classifyConfigList.isEmpty() && a.getHazardLevel()==2){
                         //初始化普通化学品
                         HxpClassifyConfig classifyConfig = new HxpClassifyConfig();
                         classifyConfig.setJoinClassifyId(Integer.parseInt(a.getId()+""));

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActApplytaskController.java

@@ -58,7 +58,7 @@ public class ActApplytaskController extends BaseController<ActApplytask>
     public void export(HttpServletResponse response, ActApplytask actApplytask) throws IOException
     {
         List<ActApplytask> list = actApplytaskService.selectActApplytaskList(actApplytask);
-        ExcelUtil<ActApplytask> util = new ExcelUtil<ActApplytask>(ActApplytask.class);
+        ExcelUtil<ActApplytask> util = new ExcelUtil<>(ActApplytask.class);
         util.exportExcel(response, list, "化学品申购任务数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActApplytaskNodeController.java

@@ -54,7 +54,7 @@ public class ActApplytaskNodeController extends BaseController<ActApplytaskNode>
     public void export(HttpServletResponse response, ActApplytaskNode actApplytaskNode) throws IOException
     {
         List<ActApplytaskNode> list = actApplytaskNodeService.selectActApplytaskNodeList(actApplytaskNode);
-        ExcelUtil<ActApplytaskNode> util = new ExcelUtil<ActApplytaskNode>(ActApplytaskNode.class);
+        ExcelUtil<ActApplytaskNode> util = new ExcelUtil<>(ActApplytaskNode.class);
         util.exportExcel(response, list, "化学品申购任务节点数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActAuditconfigController.java

@@ -81,7 +81,7 @@ public class ActAuditconfigController extends BaseController<ActAuditconfig>
     public void export(HttpServletResponse response, ActAuditconfig actAuditconfig) throws IOException
     {
         List<ActAuditconfig> list = actAuditconfigService.selectActAuditconfigList(actAuditconfig);
-        ExcelUtil<ActAuditconfig> util = new ExcelUtil<ActAuditconfig>(ActAuditconfig.class);
+        ExcelUtil<ActAuditconfig> util = new ExcelUtil<>(ActAuditconfig.class);
         util.exportExcel(response, list, "工作流审批数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActAudituserController.java

@@ -54,7 +54,7 @@ public class ActAudituserController extends BaseController<ActAudituser>
     public void export(HttpServletResponse response, ActAudituser actAudituser) throws IOException
     {
         List<ActAudituser> list = actAudituserService.selectActAudituserList(actAudituser);
-        ExcelUtil<ActAudituser> util = new ExcelUtil<ActAudituser>(ActAudituser.class);
+        ExcelUtil<ActAudituser> util = new ExcelUtil<>(ActAudituser.class);
         util.exportExcel(response, list, "工作流审批用户数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActHxpapplyController.java

@@ -49,7 +49,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply> {
         startPage();
         List<ActHxpapplyListVo> list = actHxpapplyService.selectActHxpapplyList(actHxpapplySearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalNames(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalNames()));
             });
@@ -71,7 +71,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply> {
         startPage();
         List<ActHxpapplyDraftsListVo> list = actHxpapplyService.draftsList(actHxpapplySearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalNames(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalNames()));
             });
@@ -92,7 +92,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply> {
         actHxpapplySearch.setUserId(SecurityUtils.getUserId());
         List<ActHxpapplyListVo> list = actHxpapplyService.selectActHxpapplyList(actHxpapplySearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalNames(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalNames()));
             });
@@ -151,7 +151,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply> {
                         a.setHistoryApprover(historyApprover.substring(1));
                     }
                 });
-        ExcelUtil<ActHxpapplyListVo> util = new ExcelUtil<ActHxpapplyListVo>(ActHxpapplyListVo.class);
+        ExcelUtil<ActHxpapplyListVo> util = new ExcelUtil<>(ActHxpapplyListVo.class);
         util.exportExcel(response, list, "化学品申购数据");
     }
 
@@ -166,7 +166,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply> {
         //去除无效小数点
         if (vo != null) {
             List <ActHxpapplyDetailVo> list = vo.getActHxpapplyDetailList();
-            if (list != null && list.size() > 0) {
+            if (list != null && !list.isEmpty()) {
                 list.stream().forEach(detailVo -> {
                     detailVo.setApplyNum(ChemicalUtils.removeZeroForAfterPoint(detailVo.getApplyNum()));
                     detailVo.setRemainingStorage(ChemicalUtils.removeZeroForAfterPoint(detailVo.getRemainingStorage()));
@@ -269,7 +269,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply> {
     public ResultData<List<ActRestStockManyVo>> getRestStockByManyCabinet(ActRestStockManySearch actRestStockVo) {
         List<ActRestStockManyVo> list = actHxpapplyService.getRestStockByManyCabinet(actRestStockVo);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setRestStock(ChemicalUtils.removeZeroForAfterPoint(vo.getRestStock()));
             });

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActHxpapplyDetailController.java

@@ -54,7 +54,7 @@ public class ActHxpapplyDetailController extends BaseController<ActHxpapplyDetai
     public void export(HttpServletResponse response, ActHxpapplyDetail actHxpapplyDetail) throws IOException
     {
         List<ActHxpapplyDetail> list = actHxpapplyDetailService.selectActHxpapplyDetailList(actHxpapplyDetail);
-        ExcelUtil<ActHxpapplyDetail> util = new ExcelUtil<ActHxpapplyDetail>(ActHxpapplyDetail.class);
+        ExcelUtil<ActHxpapplyDetail> util = new ExcelUtil<>(ActHxpapplyDetail.class);
         util.exportExcel(response, list, "化学品申购详情数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpAIOController.java

@@ -217,14 +217,13 @@ public class HxpAIOController extends BaseController {
         hxpStock.setTagCode(null);
         List<HxpStock> list = hxpStockService.selectHxpStockList(hxpStock);
         // 识别结果应该只能有一条
-        if(list.size() > 0){
+        if(list!=null && !list.isEmpty()){
             hxpStock = list.get(0);
             HxpUserecord hxpUserecord = new HxpUserecord();
-            //hxpUserecord.setUseStatus(1);
             hxpUserecord.setStockId(hxpStock.getId());
             hxpUserecord.setUserId(SecurityUtils.getUserIdEx());
             List<HxpUserecord> userecordList = hxpUserecordService.selectByUsed(hxpUserecord);
-            if(userecordList.size() == 0){
+            if(userecordList==null || userecordList.isEmpty()){
                 return R.fail("您当前未领用该化学品，不用归还！");
             }else if(userecordList.size() > 1){
                 return R.fail("查询失败：领用数据【" + hxpStock.getScanCode() + "】，请联系管理员！");
@@ -283,7 +282,7 @@ public class HxpAIOController extends BaseController {
         startPage();
         List<AioUserecordVo> list = hxpUserecordService.queryRecordList(aioUserecordVo);
         //小数点后去0处理
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setUseStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getUseStockNum()));
                 vo.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectStockNum()));
@@ -355,7 +354,7 @@ public class HxpAIOController extends BaseController {
         startPage();
         List<AioChemicalVo> list = hxpCabinetJoinCabinetService.selectChemicalVoList(aioChemicalVo);
         //小数点后去0 处理
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmount(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmount()));
                 vo.setTare(ChemicalUtils.removeZeroForAfterPoint(vo.getTare()));
@@ -387,22 +386,16 @@ public class HxpAIOController extends BaseController {
         }
         int qType = hxpStock.getqType();
         // 终端传参数据有问题，暂临时后端处理
-//        hxpStock.setTagCode(hxpStock.getTagCode().replaceAll("%00", "").trim());
-
         if(qType != 2 && qType != 5){
-            //hxpStock.setStatus(1);
             hxpStock.setSubId(getSubIdByTerminalNum(hxpStock.getMachineCode()));
         }
-//        if(qType == 3){
-//            hxpStock.setStatus(null);
-//        }
         logger.info("queryByTagCode 查询参数：" + hxpStock.getTagCode()+ ", 实验室ID：" + hxpStock.getSubId() + ", qType: " + hxpStock.getqType());
 
         hxpStock.setScanCode(hxpStock.getTagCode());
         hxpStock.setTagCode(null);
         List<HxpStock> list = hxpStockService.selectHxpStockList(hxpStock);
         // 识别结果应该只能有一条
-        if(list.size() == 0){
+        if(list==null || list.isEmpty()){
             logger.info("入参校验qType000000000：" + qType);
             if(qType != 0 && qType != 2){
                 return R.fail("未查询到数据：查无数据或已出库！");
@@ -432,7 +425,7 @@ public class HxpAIOController extends BaseController {
                     case 3:
                         // 化学品出库
                         userecordList = hxpUserecordService.selectHxpUserecordList(hxpUserecord);
-                        if(userecordList.size() > 0){
+                        if(!userecordList.isEmpty()){
                             if(qType == 1){
                                 // 领用化学品
                                 return R.fail("该化学品领用中，还未归还！");
@@ -449,7 +442,7 @@ public class HxpAIOController extends BaseController {
                         // 归还化学品
                         hxpUserecord.setUserId(SecurityUtils.getUserIdEx());
                         userecordList = hxpUserecordService.selectHxpUserecordList(hxpUserecord);
-                        if(userecordList.size() == 0){
+                        if(userecordList==null || userecordList.isEmpty()){
                             return R.fail("您当前未领用该化学品，不用归还！");
                         }
                         break;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpAlarmConfigController.java

@@ -55,7 +55,7 @@ public class HxpAlarmConfigController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, HxpAlarmConfig hxpAlarmConfig) throws IOException {
         List<HxpAlarmConfig> list = hxpAlarmConfigService.selectHxpAlarmConfigList(hxpAlarmConfig);
-        ExcelUtil<HxpAlarmConfig> util = new ExcelUtil<HxpAlarmConfig>(HxpAlarmConfig.class);
+        ExcelUtil<HxpAlarmConfig> util = new ExcelUtil<>(HxpAlarmConfig.class);
         util.exportExcel(response, list, "化学品报警配置数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpAlarmRecordController.java

@@ -63,7 +63,7 @@ public class HxpAlarmRecordController extends BaseController {
             hxpAlarmRecordSearch.setIds(Arrays.asList(ids));
         }
         List<HxpAlarmRecordVo> list = hxpAlarmRecordService.selectHxpAlarmRecordList(hxpAlarmRecordSearch);
-        ExcelUtil<HxpAlarmRecordVo> util = new ExcelUtil<HxpAlarmRecordVo>(HxpAlarmRecordVo.class);
+        ExcelUtil<HxpAlarmRecordVo> util = new ExcelUtil<>(HxpAlarmRecordVo.class);
         util.exportExcel(response, list, "化学品报警记录数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpCabinetController.java

@@ -1,10 +1,7 @@
 package com.zd.chemical.controller;
 
 import com.zd.chemical.domain.HxpCabinet;
-import com.zd.chemical.domain.vo.HxpCabinetInclusionChemicalSon;
-import com.zd.chemical.domain.vo.HxpCabinetInclusionChemicalVo;
-import com.zd.chemical.domain.vo.HxpCabinetSearch;
-import com.zd.chemical.domain.vo.HxpCabinetVo;
+import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpCabinetService;
 import com.zd.chemical.util.ChemicalUtils;
 import com.zd.common.core.annotation.Log;
@@ -64,7 +61,7 @@ public class HxpCabinetController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, HxpCabinetSearch hxpCabinetSearch) throws IOException {
         List<HxpCabinetVo> list = hxpCabinetService.selectHxpCabinetList(hxpCabinetSearch);
-        ExcelUtil<HxpCabinetVo> util = new ExcelUtil<HxpCabinetVo>(HxpCabinetVo.class);
+        ExcelUtil<HxpCabinetVo> util = new ExcelUtil<>(HxpCabinetVo.class);
         util.exportExcel(response, list, "化学品机柜管理信息数据");
     }
 
@@ -111,7 +108,7 @@ public class HxpCabinetController extends BaseController {
         HxpCabinetSearch hxpCabinetSearch = new HxpCabinetSearch();
         hxpCabinetSearch.setId(ids[0]);
         List<HxpCabinetInclusionChemicalVo> list = hxpCabinetService.getCabinetByChemical(hxpCabinetSearch);
-        if(list.size()>0){
+        if(list!=null && !list.isEmpty()){
             throw new ServiceException("删除失败，机柜已经产生化学品相关信息");
         }
         return ResultData.result(hxpCabinetService.deleteHxpCabinetByIds(ids));
@@ -139,11 +136,11 @@ public class HxpCabinetController extends BaseController {
         startPage();
         List<HxpCabinetInclusionChemicalVo> list = hxpCabinetService.getCabinetByChemical(hxpCabinetSearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setTotalStock(ChemicalUtils.removeZeroForAfterPoint(vo.getTotalStock()));
                 List <HxpCabinetInclusionChemicalSon> voList = vo.getHxpCabinetInclusionChemicalSonList();
-                if (voList != null && voList.size() > 0) {
+                if (voList != null && !voList.isEmpty()) {
                     voList.stream().forEach(son -> {
                         son.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(son.getChemicalAmountUnit()));
                         son.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(son.getOutUsages()));

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpCabinetlockLogController.java

@@ -61,7 +61,7 @@ public class HxpCabinetlockLogController extends BaseController<HxpCabinetlockLo
     public void export(HttpServletResponse response, HxpCabinetlockLogSearch hxpCabinetlockLogSearch) throws IOException
     {
         List<HxpCabinetlockLogVo> list = hxpCabinetlockLogService.selectHxpCabinetlockLogList(hxpCabinetlockLogSearch);
-        ExcelUtil<HxpCabinetlockLogVo> util = new ExcelUtil<HxpCabinetlockLogVo>(HxpCabinetlockLogVo.class);
+        ExcelUtil<HxpCabinetlockLogVo> util = new ExcelUtil<>(HxpCabinetlockLogVo.class);
         util.exportExcel(response, list, "【柜锁日志】数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpChemicalClassifyController.java

@@ -1,30 +1,21 @@
 package com.zd.chemical.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.model.domain.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.chemical.domain.HxpChemicalClassify;
 import com.zd.chemical.service.IHxpChemicalClassifyService;
-import com.zd.common.core.web.controller.BaseController;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.model.domain.ResultData;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-import com.zd.model.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 化学品分类Controller
@@ -34,8 +25,6 @@ import com.zd.model.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【化学品分类】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/classify")
 public class HxpChemicalClassifyController extends BaseController
 {
@@ -63,7 +52,7 @@ public class HxpChemicalClassifyController extends BaseController
     public void export(HttpServletResponse response, HxpChemicalClassify hxpChemicalClassify) throws IOException
     {
         List<HxpChemicalClassify> list = hxpChemicalClassifyService.selectHxpChemicalClassifyList(hxpChemicalClassify);
-        ExcelUtil<HxpChemicalClassify> util = new ExcelUtil<HxpChemicalClassify>(HxpChemicalClassify.class);
+        ExcelUtil<HxpChemicalClassify> util = new ExcelUtil<>(HxpChemicalClassify.class);
         util.exportExcel(response, list, "化学品分类数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpChemicalController.java

@@ -87,7 +87,7 @@ public class HxpChemicalController extends BaseController {
             hxpChemicalSearch.setIds(Arrays.asList(ids));
         }
         List<HxpChemicalVo> list = hxpChemicalService.selectHxpChemicalList(hxpChemicalSearch);
-        ExcelUtil<HxpChemicalVo> util = new ExcelUtil<HxpChemicalVo>(HxpChemicalVo.class);
+        ExcelUtil<HxpChemicalVo> util = new ExcelUtil<>(HxpChemicalVo.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "化学品信息", null, "化学品信息-导出数据表"+nowDate);
@@ -98,7 +98,7 @@ public class HxpChemicalController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.HPX_CHEMICAL+PerFun.IMPORT)
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, HxpChemicalByExcel hxpChemicalByExcel) throws Exception {
-        ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<HxpChemicalByExcel>(HxpChemicalByExcel.class);
+        ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<>(HxpChemicalByExcel.class);
         List<HxpChemicalByExcel> chemicalList = util.importExcel(file.getInputStream(),true);
         String operName = SecurityUtils.getUsername();
         List<HxpChemicalByExcel> hxpChemicalByExcels = hxpChemicalService.importUserByChemical(chemicalList, operName, hxpChemicalByExcel);
@@ -106,8 +106,8 @@ public class HxpChemicalController extends BaseController {
         resultMap.put("totalNum",chemicalList.size());
         resultMap.put("successNum",chemicalList.size()- hxpChemicalByExcels.size());
         resultMap.put("failureNum", hxpChemicalByExcels.size());
-        resultMap.put("downFile", hxpChemicalByExcels.size()>0?true:false);
-        if(hxpChemicalByExcels.size()>0){
+        resultMap.put("downFile", !hxpChemicalByExcels.isEmpty());
+        if(!hxpChemicalByExcels.isEmpty()){
             redisService.setCacheObject("exportByChemical"+SecurityUtils.getUserId(), hxpChemicalByExcels, 1L, TimeUnit.HOURS);
         }
         return AjaxResult.success(resultMap);
@@ -128,9 +128,9 @@ public class HxpChemicalController extends BaseController {
                 "化学品属性：爆炸品、压缩气体或液化气体、易燃液体、易燃固体、自燃物品和遇湿易燃物品、氧化剂和有机过氧化物、有毒品、放射性物品、腐蚀品、无；\n"+
                 "形态：固体、液体、气体、其他，\n"+
                 "计量方式：重量、体积、个数";
-        ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<HxpChemicalByExcel>(HxpChemicalByExcel.class);
+        ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<>(HxpChemicalByExcel.class);
         List<HxpChemicalByExcel> chemicalByExcels = redisService.getCacheObject("exportByChemical"+SecurityUtils.getUserId());
-        if(chemicalByExcels.size()>0){
+        if(chemicalByExcels!=null && !chemicalByExcels.isEmpty()){
             util.exportExcel(response, chemicalByExcels, "未导入的化学品数据数据", tips, "化学品批量导入模板");
         }
     }
@@ -150,7 +150,7 @@ public class HxpChemicalController extends BaseController {
                 "化学品属性：爆炸品、压缩气体或液化气体、易燃液体、易燃固体、自燃物品和遇湿易燃物品、氧化剂和有机过氧化物、有毒品、放射性物品、腐蚀品、无，\n"+
                 "形态：固体、液体、气体、其他，\n"+
                 "计量方式：重量、体积、个数";
-        ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<HxpChemicalByExcel>(HxpChemicalByExcel.class);
+        ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<>(HxpChemicalByExcel.class);
         util.exportExcel(response, null, "化学品信息", tips, "化学品信息-批量导入模板");
     }
 
@@ -219,7 +219,7 @@ public class HxpChemicalController extends BaseController {
         HxpChemicalJoinCabinetSearch hxpChemicalJoinCabinetSearch = new HxpChemicalJoinCabinetSearch();
         hxpChemicalJoinCabinetSearch.setChemicalId(ids[0]);
         List<HxpChemicalJoinCabinetListVo> list = hxpChemicalJoinCabinetService.selectHxpChemicalJoinCabinetList(hxpChemicalJoinCabinetSearch);
-        if(list.size()>0){
+        if(list!=null && !list.isEmpty()){
             throw new ServiceException("化学品已有入库记录，无法删除！");
         }
         return ResultData.result(hxpChemicalService.deleteHxpChemicalByIds(ids));
@@ -240,7 +240,7 @@ public class HxpChemicalController extends BaseController {
     @ApiOperation(value = "查询实验室化学品临界量风险指标")
     @GetMapping("/queryCriticaliBySubId")
     public R<List<Map<String, Object>>> queryCriticaliBySubId(@RequestParam List<Long> subIds) {
-        if(subIds.isEmpty()){
+        if(subIds==null || subIds.isEmpty()){
             return R.ok(ListUtil.empty());
         }
         return R.ok(hxpChemicalService.queryCriticaliBySubId(subIds));

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpChemicalJoinCabinetController.java

@@ -56,7 +56,7 @@ public class HxpChemicalJoinCabinetController extends BaseController {
         startPage();
         List<HxpChemicalJoinCabinetListVo> list = hxpChemicalJoinCabinetService.selectHxpChemicalJoinCabinetList(hxpChemicalJoinCabinetSearch);
         //去除多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setTare(ChemicalUtils.removeZeroForAfterPoint(vo.getTare()));
@@ -72,7 +72,7 @@ public class HxpChemicalJoinCabinetController extends BaseController {
         hxpChemicalJoinCabinetSearch.setUserId(SecurityUtils.getUserId());
         List<HxpChemicalJoinCabinetListVo> list = hxpChemicalJoinCabinetService.selectHxpChemicalJoinCabinetList(hxpChemicalJoinCabinetSearch);
         //去除多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setTare(ChemicalUtils.removeZeroForAfterPoint(vo.getTare()));
@@ -89,7 +89,7 @@ public class HxpChemicalJoinCabinetController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, HxpChemicalJoinCabinetSearch hxpChemicalJoinCabinetSearch) throws IOException {
         List<HxpChemicalJoinCabinetListVo> list = hxpChemicalJoinCabinetService.selectHxpChemicalJoinCabinetList(hxpChemicalJoinCabinetSearch);
-        ExcelUtil<HxpChemicalJoinCabinetListVo> util = new ExcelUtil<HxpChemicalJoinCabinetListVo>(HxpChemicalJoinCabinetListVo.class);
+        ExcelUtil<HxpChemicalJoinCabinetListVo> util = new ExcelUtil<>(HxpChemicalJoinCabinetListVo.class);
         util.exportExcel(response, list, "化学品和机柜关联数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpClassifyConfigController.java

@@ -1,6 +1,5 @@
 package com.zd.chemical.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.chemical.domain.HxpClassifyConfig;
 import com.zd.chemical.service.IHxpClassifyConfigService;
 import com.zd.common.core.annotation.Log;
@@ -8,7 +7,6 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
@@ -30,7 +28,6 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "【【请填写功能名称】】")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/classifyConfig")
 public class HxpClassifyConfigController extends BaseController {
     @Autowired
@@ -57,7 +54,7 @@ public class HxpClassifyConfigController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, HxpClassifyConfig hxpClassifyConfig) throws IOException {
         List<HxpClassifyConfig> list = hxpClassifyConfigService.selectHxpClassifyConfigList(hxpClassifyConfig);
-        ExcelUtil<HxpClassifyConfig> util = new ExcelUtil<HxpClassifyConfig>(HxpClassifyConfig.class);
+        ExcelUtil<HxpClassifyConfig> util = new ExcelUtil<>(HxpClassifyConfig.class);
         util.exportExcel(response, list, "【请填写功能名称】数据");
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpHomePageStatisticsController.java

@@ -6,19 +6,21 @@ import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpAlarmRecordService;
 import com.zd.chemical.service.IHxpChemicalService;
 import com.zd.chemical.util.ChemicalUtils;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
-import com.zd.common.core.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 化学品信息Controller
@@ -68,7 +70,7 @@ public class HxpHomePageStatisticsController extends BaseController {
     public ResultData chemicalUsagesCount(HxpChemical hxpChemical) {
         List<HxpHomeChemicalUsagesVo> hxpHomeChemicalVo = hxpChemicalService.chemicalUsagesCount(hxpChemical);
         //去除小数点后多余的0
-        if (hxpHomeChemicalVo != null && hxpHomeChemicalVo.size() > 0) {
+        if (hxpHomeChemicalVo != null && !hxpHomeChemicalVo.isEmpty()) {
             hxpHomeChemicalVo.stream().forEach(vo -> {
                 vo.setChemicalUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalUsages()));
             });

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpSmartTerminalController.java

@@ -110,7 +110,7 @@ public class HxpSmartTerminalController extends BaseController {
         resultMap.put("successNum", smartTerminalList.size() - hxpSmartTerminalByExcels.size());
         resultMap.put("failureNum", hxpSmartTerminalByExcels.size());
         resultMap.put("downFile", hxpSmartTerminalByExcels.size() > 0);
-        if (hxpSmartTerminalByExcels.size() > 0) {
+        if (hxpSmartTerminalByExcels!=null && !hxpSmartTerminalByExcels.isEmpty()) {
             redisService.setCacheObject("exportBySmartTerminal" + SecurityUtils.getUserId(), hxpSmartTerminalByExcels, 1L, TimeUnit.HOURS);
         }
         return AjaxResult.success(resultMap);
@@ -128,7 +128,7 @@ public class HxpSmartTerminalController extends BaseController {
                 "6、请注意：实验室，需填写系统中已录入的对应数据名称，否则无法正常导入。\n";
         ExcelUtil<HxpSmartTerminalByExcel> util = new ExcelUtil<>(HxpSmartTerminalByExcel.class);
         List<HxpSmartTerminalByExcel> smartTerminalByExcels = redisService.getCacheObject("exportBySmartTerminal" + SecurityUtils.getUserId());
-        if (smartTerminalByExcels.size() > 0) {
+        if (smartTerminalByExcels!=null && !smartTerminalByExcels.isEmpty()) {
             util.exportExcel(response, smartTerminalByExcels, "未导入的智能终端数据数据", tips, "智能终端批量导入模板");
         }
     }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpStockController.java

@@ -73,7 +73,7 @@ public class HxpStockController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, HxpStock hxpStock) throws IOException {
         List<HxpStock> list = hxpStockService.selectHxpStockList(hxpStock);
-        ExcelUtil<HxpStock> util = new ExcelUtil<HxpStock>(HxpStock.class);
+        ExcelUtil<HxpStock> util = new ExcelUtil<>(HxpStock.class);
         util.exportExcel(response, list, "库存管理数据");
     }
 
@@ -87,7 +87,7 @@ public class HxpStockController extends BaseController {
         startPage();
         List<HxpStockDetailVO> list = hxpStockService.selectHxpStockListDetail(hxpStockSearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
@@ -112,7 +112,7 @@ public class HxpStockController extends BaseController {
             hxpStockSearch.setIds(Arrays.asList(ids));
         }
         List<HxpStockDetailVO> list = hxpStockService.selectHxpStockListDetail(hxpStockSearch);
-        ExcelUtil<HxpStockDetailVO> util = new ExcelUtil<HxpStockDetailVO>(HxpStockDetailVO.class);
+        ExcelUtil<HxpStockDetailVO> util = new ExcelUtil<>(HxpStockDetailVO.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "化学品库存明细", null, "化学品库存明细-导出数据表"+nowDate);
@@ -128,7 +128,7 @@ public class HxpStockController extends BaseController {
         startPage();
         List<HxpStockJoinVO> list = hxpStockService.selectHxpStockListJoin(hxpStockSearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
@@ -146,7 +146,7 @@ public class HxpStockController extends BaseController {
         hxpStockSearch.setLoginUserId(SecurityUtils.getUserId());
         List<HxpStockJoinVO> list = hxpStockService.selectHxpStockListJoin(hxpStockSearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
@@ -165,13 +165,13 @@ public class HxpStockController extends BaseController {
     @Log(title = "化学品信息", businessType = BusinessType.EXPORT)
     @PostMapping({"/exportJoin","/exportJoin/{ids}"})
     public void exportJoin(HttpServletResponse response, HxpStockSearch hxpStockSearch, @PathVariable(value = "ids",required = false) Long... ids) throws IOException {
-        if(ids!=null&&ids.length>0)
+        if(ids!=null && ids.length>0)
         {
             hxpStockSearch = new HxpStockSearch();
             hxpStockSearch.setIds(Arrays.asList(ids));
         }
         List<HxpStockJoinVO> list = hxpStockService.selectHxpStockListJoin(hxpStockSearch);
-        ExcelUtil<HxpStockJoinVO> util = new ExcelUtil<HxpStockJoinVO>(HxpStockJoinVO.class);
+        ExcelUtil<HxpStockJoinVO> util = new ExcelUtil<>(HxpStockJoinVO.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "化学品入库记录", null, "化学品入库记录-导出数据表"+nowDate);
@@ -185,7 +185,7 @@ public class HxpStockController extends BaseController {
     @ApiOperation(value = "查询库存管理列表(出库记录)")
     public TableDataInfo<HxpStockOutVO> listOut(HxpStockSearch hxpStockSearch) {
         startPage();
-        List<HxpStockOutVO> list = new ArrayList<>();
+        List<HxpStockOutVO> list;
         if(tokenService.getLoginUser().getSysUser().getUserType().equals("22")) {
             hxpStockSearch.setLoginUserId(tokenService.getLoginUser().getUserid());
             list = hxpStockService.selectHxpStockListOut(hxpStockSearch);
@@ -193,7 +193,7 @@ public class HxpStockController extends BaseController {
             list = hxpStockService.selectHxpStockListOut(hxpStockSearch);
         }
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
@@ -211,7 +211,7 @@ public class HxpStockController extends BaseController {
         hxpStockSearch.setLoginUserId(SecurityUtils.getUserId());
         List<HxpStockOutVO> list = hxpStockService.selectHxpStockListOut(hxpStockSearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
@@ -235,7 +235,7 @@ public class HxpStockController extends BaseController {
             hxpStockSearch.setIds(Arrays.asList(ids));
         }
         List<HxpStockOutVO> list = hxpStockService.selectHxpStockListOut(hxpStockSearch);
-        ExcelUtil<HxpStockOutVO> util = new ExcelUtil<HxpStockOutVO>(HxpStockOutVO.class);
+        ExcelUtil<HxpStockOutVO> util = new ExcelUtil<>(HxpStockOutVO.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "化学品出库记录", null, "化学品出库记录-导出数据表"+nowDate);
@@ -282,7 +282,6 @@ public class HxpStockController extends BaseController {
         try {
             return smsSydUtil.sendSydSms(content, purpose, lockApplyId, phones);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("四医大短信调用发生异常!" + e.getMessage());
            return R.fail("短信发送失败：" + e.getMessage());
         }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpUserecordController.java

@@ -1,21 +1,23 @@
 package com.zd.chemical.controller;
 
 import com.zd.chemical.domain.HxpUserecord;
-import com.zd.chemical.domain.vo.*;
+import com.zd.chemical.domain.vo.HxpUserecordDetailVo;
+import com.zd.chemical.domain.vo.HxpUserecordSearch;
+import com.zd.chemical.domain.vo.HxpUserecordVo;
 import com.zd.chemical.service.IHxpUserecordService;
 import com.zd.chemical.util.ChemicalUtils;
 import com.zd.chemical.util.SmsSydUtil;
-import com.zd.model.domain.R;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
+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.security.TokenService;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.model.domain.R;
 import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.common.core.security.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +26,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -67,7 +68,7 @@ public class HxpUserecordController extends BaseController {
         startPage();
         List<HxpUserecordVo> list = hxpUserecordService.getHxpUserecordList(hxpUserecordSearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectStockNum()));
@@ -87,7 +88,7 @@ public class HxpUserecordController extends BaseController {
         hxpUserecordSearch.setLoginUserId(tokenService.getLoginUser().getUserid());
         List<HxpUserecordVo> list = hxpUserecordService.getHxpUserecordList(hxpUserecordSearch);
         //去除小数点后多余的0
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             list.stream().forEach(vo -> {
                 vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
                 vo.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectStockNum()));
@@ -142,7 +143,7 @@ public class HxpUserecordController extends BaseController {
             hxpUserecordSearch.setIds(Arrays.asList(ids));
         }
         List<HxpUserecordVo> list = hxpUserecordService.getHxpUserecordList(hxpUserecordSearch);
-        ExcelUtil<HxpUserecordVo> util = new ExcelUtil<HxpUserecordVo>(HxpUserecordVo.class);
+        ExcelUtil<HxpUserecordVo> util = new ExcelUtil<>(HxpUserecordVo.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "使用记录", null, "使用记录-导出数据表"+nowDate);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActAuditconfig.java

@@ -1,14 +1,13 @@
 package com.zd.chemical.domain;
 
 import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-import com.zd.model.entity.BaseEntity;
 
 /**
  * 工作流审批对象 act_auditconfig

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActAudituser.java

@@ -1,14 +1,13 @@
 package com.zd.chemical.domain;
 
 import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-import com.zd.model.entity.BaseEntity;
 
 /**
  * 工作流审批用户对象 act_audituser

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpAlarmRecord.java

@@ -1,16 +1,14 @@
 package com.zd.chemical.domain;
 
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+
 /**
  * 化学品报警记录对象 hxp_alarm_record
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpCabinetlockLog.java

@@ -1,16 +1,13 @@
 package com.zd.chemical.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import com.zd.model.entity.BaseEntity;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 hxp_cabinetlock_log

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpChemicalJoinCabinet.java

@@ -1,13 +1,12 @@
 package com.zd.chemical.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.model.entity.BaseEntity;
-import org.hibernate.validator.constraints.Length;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpClassifyConfig.java

@@ -4,8 +4,6 @@ import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 【请填写功能名称】对象 hxp_classify_config

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpStock.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpUserecord.java

@@ -2,7 +2,6 @@ package com.zd.chemical.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;
-import com.zd.model.valid.ValidGroup;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/SydSmsLog.java

@@ -1,17 +1,12 @@
 package com.zd.chemical.domain;
 
-import javax.validation.constraints.NotBlank;
-
-import org.hibernate.validator.constraints.Length;
-import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-import com.zd.model.entity.BaseEntity;
 
 /**
  * 四医大校方短信对接日志对象 syd_sms_log

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActApplytaskNodeVo.java

@@ -5,9 +5,6 @@ import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.ArrayList;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActAuditconfigInfoVo.java

@@ -1,15 +1,10 @@
 package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.chemical.domain.ActApplytaskNode;
 import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 
 import java.util.ArrayList;
 import java.util.Date;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActAuditconfigVo.java

@@ -1,6 +1,5 @@
 package com.zd.chemical.domain.vo;
 
-import com.zd.chemical.domain.ActAuditconfig;
 import com.zd.chemical.domain.ActAudituser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActAudituserVo.java

@@ -1,13 +1,8 @@
 package com.zd.chemical.domain.vo;
 
-import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 
 /**
  * 工作流审批用户对象 act_audituser

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplyDetailVo.java

@@ -5,13 +5,8 @@ import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
-import java.math.BigDecimal;
-
 /**
  * 化学品申购详情对象 act_hxpapply_detail
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplyInfoVo.java

@@ -1,15 +1,11 @@
 package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.ActApplytask;
-import com.zd.chemical.domain.ActHxpapplyDetail;
 import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.ArrayList;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplyVo.java

@@ -1,7 +1,6 @@
 package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.ActHxpapplyDetail;
-import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +8,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
 
 import java.util.ArrayList;
 import java.util.List;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActRestStockManyVo.java

@@ -3,9 +3,6 @@ package com.zd.chemical.domain.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Controller
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/AioAlarmRecordVo.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;
-import java.util.List;
 
 public class AioAlarmRecordVo {
 
@@ -95,9 +94,7 @@ public class AioAlarmRecordVo {
 
     @ApiModelProperty(value = "责任人姓名")
     private String liableUserNames;
-//
-//    @ApiModelProperty(value = "责任人手机号码")
-//    private String liableUserPhones;
+
 
     public Long getId() {
         return id;
@@ -227,13 +224,6 @@ public class AioAlarmRecordVo {
         this.liableUserIds = liableUserIds;
     }
 
-//    public String getLiableUserPhones() {
-//        return liableUserPhones;
-//    }
-//
-//    public void setLiableUserPhones(String liableUserPhones) {
-//        this.liableUserPhones = liableUserPhones;
-//    }
 
     public Integer getAlarmType() {
         return alarmType;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpAlarmConfigVo.java

@@ -2,12 +2,8 @@ package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.HxpAlarmConfig;
 import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.hibernate.validator.constraints.Length;
 
 import java.util.ArrayList;
 import java.util.List;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpAlarmRecordSearch.java

@@ -1,11 +1,9 @@
 package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;
 import java.util.List;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetInclusionChemicalSon.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetInclusionChemicalVo.java

@@ -1,13 +1,9 @@
 package com.zd.chemical.domain.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetSearch.java

@@ -4,9 +4,6 @@ import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 化学品和机柜关联对象 hxp_cabinet_join_cabinet
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetlockLogSearch.java

@@ -6,9 +6,6 @@ import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import java.util.Date;
 
 /**
  * 【柜锁日志】对象 hxp_cabinetlock_log

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetlockLogVo.java

@@ -2,13 +2,9 @@ package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalJoinCabinetListVo.java

@@ -2,13 +2,9 @@ package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalVo.java

@@ -1,10 +1,7 @@
 package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.chemical.domain.HxpChemical;
 import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpSmartTerminalByExcel.java

@@ -3,7 +3,6 @@ package com.zd.chemical.domain.vo;
 import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * 化学品信息对象 hxp_chemical

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpSmartTerminalSearch.java

@@ -1,12 +1,7 @@
 package com.zd.chemical.domain.vo;
 
-import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * 化学品设备管理对象 hxp_smart_terminal

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpSmartTerminalVo.java

@@ -1,14 +1,9 @@
 package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpStockSearch.java

@@ -1,16 +1,10 @@
 package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.chemical.domain.HxpUserecord;
-import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpStockVO.java

@@ -3,13 +3,9 @@ package com.zd.chemical.domain.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.chemical.domain.HxpClassifyConfig;
 import com.zd.chemical.domain.HxpUserecord;
-import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpUserecordSearch.java

@@ -1,13 +1,10 @@
 package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpUserecordVo.java

@@ -2,7 +2,6 @@ package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;
-import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/mapper/HxpAlarmRecordMapper.java

@@ -4,7 +4,6 @@ import com.zd.chemical.domain.HxpAlarmRecord;
 import com.zd.chemical.domain.vo.AioAlarmRecordVo;
 import com.zd.chemical.domain.vo.HxpAlarmRecordSearch;
 import com.zd.chemical.domain.vo.HxpAlarmRecordVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/mapper/HxpChemicalMapper.java

@@ -1,15 +1,14 @@
 package com.zd.chemical.mapper;
 
-import java.math.BigDecimal;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.zd.chemical.domain.HxpChemical;
 import com.zd.chemical.domain.HxpStock;
 import com.zd.chemical.domain.vo.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 化学品信息Mapper接口
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/IActHxpapplyService.java

@@ -1,12 +1,11 @@
 package com.zd.chemical.service;
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
 import com.zd.chemical.domain.ActHxpapply;
 import com.zd.chemical.domain.vo.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 化学品申购Service接口
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/IHxpSmartTerminalService.java

@@ -1,12 +1,12 @@
 package com.zd.chemical.service;
 
-import java.util.List;
 import com.zd.chemical.domain.HxpSmartTerminal;
-import com.zd.chemical.domain.vo.HxpChemicalByExcel;
 import com.zd.chemical.domain.vo.HxpSmartTerminalByExcel;
 import com.zd.chemical.domain.vo.HxpSmartTerminalSearch;
 import com.zd.chemical.domain.vo.HxpSmartTerminalVo;
 
+import java.util.List;
+
 /**
  *  化学品设备管理Service接口
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActApplytaskNodeServiceImpl.java

@@ -47,7 +47,7 @@ public class ActApplytaskNodeServiceImpl implements IActApplytaskNodeService
 
     @Override
     public List<ActApplytaskNode> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+        if (ids==null || ids.isEmpty()){
             new ArrayList <>();
         }
         return actApplytaskNodeMapper.getListByIds(ids);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActApplytaskServiceImpl.java

@@ -78,7 +78,7 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
 
     @Override
     public List<ActApplytask> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+        if (ids==null || ids.isEmpty()){
             new ArrayList <>();
         }
         return actApplytaskMapper.getListByIds(ids);
@@ -153,10 +153,10 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
         ActApplytask actApplytask = new ActApplytask();
         actApplytask.setTaskId(actApplytaskVo.getTaskId());
         List <ActApplytask> actApplytasks = actApplytaskMapper.selectActApplytaskList(actApplytask);
-        if(actApplytasks.size()>1){
+        if(actApplytasks!=null && !actApplytasks.isEmpty() && actApplytasks.size()>1){
             throw new ServiceException("申请单对应的工作流task是多个，请联系管理员！！");
         }
-        if(actApplytasks.size()==0){
+        if(actApplytasks==null || actApplytasks.isEmpty()){
             throw new ServiceException("申请单无工作流task，请提交申请单！！");
         }
         ActApplytask applytask = actApplytasks.get(0);
@@ -213,7 +213,7 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
                 actApplytask.setNextStep(actApplytaskNodes.get(i).getId());
             }
         }
-        if(actApplytaskNodes.size()==0){
+        if(actApplytaskNodes.isEmpty()){
             actApplytask.setOverTime(new Date());
             actApplytask.setApprovalStatus(1);
             //发送审批通过的消息
@@ -227,12 +227,8 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
         actHxpapplyDetail.setHxpapplyId(actApplytaskVo.getTaskId());
         List <ActHxpapplyDetail> actHxpapplyDetails = actHxpapplyDetailMapper.selectActHxpapplyDetailList(actHxpapplyDetail);
 
-//        Map<String, String> collect = new HashMap <>();
         Map<Long, BigDecimal> collect = actApplytaskVo.getActHxpapplyDetailList().stream()
                 .collect(Collectors.toMap(ActHxpapplyDetail::getId,ActHxpapplyDetail::getRemainingStorage));
-//                .forEach(a->{
-//                    collect.put(a.getChemicalId()+"@"+a.getCabinetId(),a.getChemicalId()+"@"+a.getCabinetId());
-//                });
         Consumer <List <ActHxpapplyDetail>> comparator = x->x.stream().forEach(p->{
             Predicate<Map <Long, BigDecimal>> pre = pt -> StringUtils.isNotNull(pt.get(p.getId()));
             if(pre.test(collect)){
@@ -251,12 +247,13 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
     public int approvalRefuse(ActApplytask actApplytask) {
         //根据申请单的id，查询对应的工作流
         List <ActApplytask> actApplytasks = actApplytaskMapper.selectActApplytaskList(actApplytask);
-        if(actApplytasks.size()>1){
-            throw new ServiceException("申请单对应的工作流task是多个，请联系管理员！！");
-        }
-        if(actApplytasks.size()==0){
+        if(actApplytasks==null || actApplytasks.isEmpty()){
             throw new ServiceException("申请单无工作流task，请提交申请单！！");
         }
+
+        if(actApplytasks!=null && !actApplytasks.isEmpty() && actApplytasks.size()>1){
+            throw new ServiceException("申请单对应的工作流task是多个，请联系管理员！！");
+        }
         ActApplytask applytask = actApplytasks.get(0);
         ActApplytaskNode actApplytaskNode = new ActApplytaskNode();
         actApplytaskNode.setApplytaskId(applytask.getId());
@@ -283,8 +280,7 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
         ActHxpapplyInfoVo actHxpapplyInfoVo = actHxpapplyMapper.selectActHxpapplyById(actApplytask.getTaskId());
         //发送审批拒绝的消息
         sendMess(actHxpapplyInfoVo.getUserId()+"","你的采购申请审批未通过，可登录系统查看详情。");
-        int flag = actApplytaskMapper.updateActApplytask(applytask);
-        return flag;
+        return actApplytaskMapper.updateActApplytask(applytask);
     }
 
 
@@ -305,12 +301,14 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
     public int approvalRevoke(ActApplytask actApplytask) {
         //根据申请单的id，查询对应的工作流
         List <ActApplytask> actApplytasks = actApplytaskMapper.selectActApplytaskList(actApplytask);
+        if(actApplytasks==null || actApplytasks.isEmpty()){
+            throw new ServiceException("申请单无工作流task，请提交申请单！！");
+        }
+
         if(actApplytasks.size()>1){
             throw new ServiceException("申请单对应的工作流task是多个，请联系管理员！！");
         }
-        if(actApplytasks.size()==0){
-            throw new ServiceException("申请单无工作流task，请提交申请单！！");
-        }
+
         //这里把申请订单变为以撤销
         ActHxpapply actHxpapply = new ActHxpapply();
         actHxpapply.setId(actApplytask.getTaskId());
@@ -324,7 +322,6 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
         // 这里修改主流程的审批状态变为撤销
         applytask.setApprovalStatus(3);
         applytask.setOverTime(new Date());
-        int flag = actApplytaskMapper.updateActApplytask(applytask);
-        return flag;
+        return actApplytaskMapper.updateActApplytask(applytask);
     }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActAuditconfigServiceImpl.java

@@ -72,7 +72,7 @@ public class ActAuditconfigServiceImpl implements IActAuditconfigService
     {
         actAuditconfig.setAuditStatus(1);
         List <ActAuditconfig> actAuditconfigList = actAuditconfigMapper.selectActAuditconfigList(actAuditconfig);
-        List <ActAuditconfigVo> collect = Optional.ofNullable(actAuditconfigList).orElseGet(Collections::emptyList)
+        return Optional.ofNullable(actAuditconfigList).orElseGet(Collections::emptyList)
                 .stream()
                 .map(a -> {
                     ActAuditconfigVo actAuditconfigVo = new ActAuditconfigVo();
@@ -83,12 +83,11 @@ public class ActAuditconfigServiceImpl implements IActAuditconfigService
                     actAuditconfigVo.setActAudituserInfo(actAudituserList);
                     return actAuditconfigVo;
                 }).collect(Collectors.toList());
-        return collect;
     }
 
     @Override
     public List<ActAuditconfig> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+        if (ids==null || ids.isEmpty()){
             new ArrayList <>();
         }
         return actAuditconfigMapper.getListByIds(ids);
@@ -105,7 +104,6 @@ public class ActAuditconfigServiceImpl implements IActAuditconfigService
     public int insertActAuditconfig(List<ActAuditconfigVo> actAuditconfigList)
     {
         //先删除审批相关配置
-//        actAudituserMapper.deleteActAudituserByAll();
         actAuditconfigMapper.deleteActAuditconfigByAll();
         //插入审批相关数据
         Optional.ofNullable(actAuditconfigList).orElseGet(Collections::emptyList)

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActAudituserServiceImpl.java

@@ -51,7 +51,7 @@ public class ActAudituserServiceImpl implements IActAudituserService
 
     @Override
     public List<ActAudituser> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+        if (ids==null || ids.isEmpty()){
             new ArrayList <>();
         }
         return actAudituserMapper.getListByIds(ids);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyDetailServiceImpl.java

@@ -47,7 +47,7 @@ public class ActHxpapplyDetailServiceImpl implements IActHxpapplyDetailService
 
     @Override
     public List<ActHxpapplyDetail> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+        if (ids==null || ids.isEmpty()){
             new ArrayList <>();
         }
         return actHxpapplyDetailMapper.getListByIds(ids);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyServiceImpl.java

@@ -73,7 +73,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
         List <ActApplytask> actApplytasks = actApplytaskMapper.selectActApplytaskList(actApplytask);
         Function<List <ActApplytask>,ActApplytask> function = x->x.stream().findFirst().orElse(null);
         ActApplytask apply = function.apply(actApplytasks);
-        Predicate<List <ActApplytask>> pre = p->p.size()>0;
+        Predicate<List <ActApplytask>> pre = p->!p.isEmpty();
         // 查询申请单相关的化学品详细信息列表
         ActHxpapplyInfoVo actHxpapplyInfoVo = actHxpapplyMapper.selectActHxpapplyById(id);
         ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
@@ -95,7 +95,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
         List <ActHxpapplyDetailVo> actHxpapplyDetailVos = actHxpapplyDetailMapper.selectApplyDetailList(actHxpapplyDetail);
         consumer.accept(actHxpapplyDetailVos);
         //小数点后无效0去除
-        if (actHxpapplyDetailVos != null && actHxpapplyDetailVos.size() > 0) {
+        if (actHxpapplyDetailVos != null && !actHxpapplyDetailVos.isEmpty()) {
             actHxpapplyDetailVos.stream().forEach(vo -> {
                 vo.setApplyNum(ChemicalUtils.removeZeroForAfterPoint(vo.getApplyNum()));
                 vo.setRemainingStorage(ChemicalUtils.removeZeroForAfterPoint(vo.getRemainingStorage()));
@@ -124,7 +124,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                         //获取环节审批的最后一个人审批的时间
                         Map<String,Date> applyTaskTime = new HashMap <>();
                         List <ActApplytaskNodeVo> collect = Optional.ofNullable(actApplytaskNodes).orElseGet(Collections::emptyList)
-                                .stream().filter(n -> n.getAuditconfigId() == c.getId())
+                                .stream().filter(n -> n.getAuditconfigId().equals(c.getId()))
                                 .map(n->{
                                     if(StringUtils.isNotNull(n.getUpdateTime())){
                                         applyTaskTime.put("applyTaskTime",n.getUpdateTime());
@@ -145,8 +145,10 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                                                 Map<String,String> userInfo = new HashMap<>();
                                                 userInfo.put("id",arrInfo[0]);
                                                 userInfo.put("name",arrInfo[1]);
-                                                userInfo.put("avatar",arrInfo[2]);
-                                                userInfo.put("postName",arrInfo[3]);
+                                                userInfo.put("avatar", arrInfo[2]);
+                                                if(arrInfo.length==4){
+                                                    userInfo.put("postName",arrInfo[3]);
+                                                }
                                                 n.getApplyUserList().add(userInfo);
                                             });
                                     return n;
@@ -256,8 +258,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
     @Override
     public List<ActHxpapplyDraftsListVo> draftsList(ActHxpapplySearch actHxpapplySearch)
     {
-        List <ActHxpapplyDraftsListVo> actHxpapplyListVos = actHxpapplyMapper.draftsList(actHxpapplySearch);
-        return actHxpapplyListVos;
+        return actHxpapplyMapper.draftsList(actHxpapplySearch);
     }
 
 
@@ -276,7 +277,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
 
     @Override
     public List<ActHxpapply> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+        if (ids==null || ids.isEmpty()){
             new ArrayList <>();
         }
         return actHxpapplyMapper.getListByIds(ids);
@@ -359,12 +360,12 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                     if(a.getAuditType()==2){
                         countAdder.add(1);
                         List <ActAudituser> collect = Optional.ofNullable(actAudituserList).orElseGet(Collections::emptyList).stream()
-                                .filter(b->b.getConfigId()==a.getId())
+                                .filter(b->b.getConfigId().equals(a.getId()))
                                 .sorted((s1, s2) -> NumberUtil.compare(s1.getAuditOrder(), s2.getAuditOrder()))
                                 .collect(Collectors.toList());
 
                         ActApplytaskNode actApplytaskNode = new ActApplytaskNode();
-                        StringBuffer stringBuffer = new StringBuffer();
+                        StringBuilder stringBuffer = new StringBuilder();
                         //这里生成或签的规则。
                         jumpApplyFun(pre,collect,jumpApply,actApplytaskNode,actApplytask);
                         Optional.ofNullable(collect).orElseGet(Collections::emptyList)
@@ -427,7 +428,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                 actApplytask.setNextStep(actApplytaskNodes.get(i).getId());
             }
         }
-        if(actApplytaskNodes.size()==0){
+        if(actApplytaskNodes.isEmpty()){
             actApplytask.setOverTime(new Date());
             actApplytask.setApprovalStatus(1);
             //发送审批通过的消息
@@ -450,7 +451,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
-            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            // 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
             ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
             actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
             actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);
@@ -466,7 +467,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
-            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            //这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
             ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
             actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
             actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);
@@ -561,7 +562,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
         List<ActRestStockManyVo> actRestStockManyVoList = new ArrayList <>();
         Optional.ofNullable(actRestStockVo.getCabinetIds()).orElseGet(Collections::emptyList).stream().forEach(a->{
             ActRestStockManyVo manyVo = new ActRestStockManyVo();
-            manyVo.setCabinetId(a.longValue());
+            manyVo.setCabinetId(a);
             manyVo.setRestStock("0");
             actRestStockManyVoList.add(manyVo);
         });
@@ -570,7 +571,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
         Optional.ofNullable(actRestStockManyVoList).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->Optional.ofNullable(restStockByManyCabinet).orElseGet(Collections::emptyList).stream()
-                .filter(b->b.getCabinetId()==a.getCabinetId()).forEach(c->{
+                .filter(b->b.getCabinetId().equals(a.getCabinetId())).forEach(c->{
                                     a.setRestStock(c.getRestStock());
                                 })
                 );
@@ -589,7 +590,6 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
     public List<ActRestStockManyVo> getRestStockByManyCabinetAndChemical(ActRestStockManySearch actRestStockVo)
     {
         actRestStockVo.setApplyUserId(SecurityUtils.getUserId());
-        List <ActRestStockManyVo> restStockByManyCabinet = actHxpapplyMapper.getRestStockByManyCabinetAndChemical(actRestStockVo);
-        return restStockByManyCabinet;
+        return actHxpapplyMapper.getRestStockByManyCabinetAndChemical(actRestStockVo);
     }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpAlarmConfigServiceImpl.java

@@ -1,20 +1,18 @@
 package com.zd.chemical.service.impl;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
+import com.zd.chemical.domain.HxpAlarmConfig;
 import com.zd.chemical.domain.vo.HxpAlarmConfigVo;
-import com.zd.common.core.utils.DateUtils;
+import com.zd.chemical.mapper.HxpAlarmConfigMapper;
+import com.zd.chemical.service.IHxpAlarmConfigService;
 import com.zd.common.core.utils.SaveUtil;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.chemical.mapper.HxpAlarmConfigMapper;
-import com.zd.chemical.domain.HxpAlarmConfig;
-import com.zd.chemical.service.IHxpAlarmConfigService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * 化学品报警配置Service业务层处理
  *

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpAlarmRecordServiceImpl.java

@@ -67,41 +67,7 @@ public class HxpAlarmRecordServiceImpl implements IHxpAlarmRecordService {
     @Override
     @DataScope(deptAlias = "st", permi = PerPrefix.HXP_ALARMRECORD)
     public List<HxpAlarmRecordVo> selectHxpAlarmRecordList(HxpAlarmRecordSearch hxpAlarmRecordSearch) {
-
-        List<HxpAlarmRecordVo> list = hxpAlarmRecordMapper.selectHxpAlarmRecordList(hxpAlarmRecordSearch);
-
-        List<Map<String,String>> userInfos = hxpAlarmRecordMapper.selectHxpAlarmRecordUserInfo();
-
-//        list.forEach(a -> {
-//            if(a.getAlarmModeStatus() != null){
-//                if(a.getAlarmModeStatus() == 1 && a.getLiableUserIds() != null){
-//                    a.setLiableUserName(
-//                            userInfos.stream().filter(u -> a.getLiableUserIds().contains(String.valueOf(u.get("user_id")))).collect(Collectors.toList())
-//                            .stream().map(n -> n.get("nick_name")).collect(Collectors.joining(","))
-//                    );
-//                }else if(a.getSafeUserId() != null){
-//                    a.setLiableUserName(
-//                            userInfos.stream().filter(u -> a.getSafeUserId().contains(String.valueOf(u.get("user_id")))).collect(Collectors.toList())
-//                            .stream().map(n -> n.get("nick_name")).collect(Collectors.joining(","))
-//                    );
-//                }
-//            }
-//
-//            if(a.getAdminId() != null){
-//                a.setAdminNames(
-//                        userInfos.stream().filter(u -> a.getAdminId().contains(String.valueOf(u.get("user_id")))).collect(Collectors.toList())
-//                        .stream().map(n -> n.get("nick_name") + ", " + n.get("phonenumber")).collect(Collectors.joining(","))
-//                );
-//            }
-//            if(a.getSafeUserId() != null){
-//                a.setSafeUserNames(
-//                        userInfos.stream().filter(u -> a.getSafeUserId().contains(String.valueOf(u.get("user_id")))).collect(Collectors.toList())
-//                        .stream().map(n -> n.get("nick_name") + ", " + n.get("phonenumber")).collect(Collectors.joining(","))
-//                );
-//            }
-//        });
-
-        return list;
+        return hxpAlarmRecordMapper.selectHxpAlarmRecordList(hxpAlarmRecordSearch);
     }
 
     /**
@@ -127,9 +93,6 @@ public class HxpAlarmRecordServiceImpl implements IHxpAlarmRecordService {
         if(oldAlarmRecord == null){
             throw new ServiceException("参数无效，请刷新重试！");
         }
-//        if(oldAlarmRecord.getAlarmMode() != 3){
-//            throw new ServiceException("类型不符，操作失败！");
-//        }
         hxpAlarmRecord.setHandlingTime(DateUtils.getNowDate());
         hxpAlarmRecord.setHandlingUserId(SecurityUtils.getUserId());
         int count = hxpAlarmRecordMapper.updateHxpAlarmRecord(hxpAlarmRecord);
@@ -213,7 +176,6 @@ public class HxpAlarmRecordServiceImpl implements IHxpAlarmRecordService {
         int count = hxpAlarmRecordMapper.updateHxpAlarmRecord(hxpAlarmRecord);
 
         if(hxpAlarmRecord.getHandlingStatus() == 2){
-//            hxpAlarmRecordMapper.updateOtherByParentId(hxpAlarmRecord.getId());
             hxpAlarmRecordMapper.updateByReturnUserecord(hxpAlarmRecord.getId());
         }
         return count;
@@ -278,13 +240,11 @@ public class HxpAlarmRecordServiceImpl implements IHxpAlarmRecordService {
                         .split(",");
                 //打电话
                 AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.Call.name(), hxpAlarmRecord.getAlarmContent());
-                //alarmEntrty.setLogId(logId);
                 remoteAlarmService.send(alarmEntrty);
                 log.info("阶梯电话通知完成！");
             } catch (Exception e) {
                 log.error("阶梯电话通知发送异常：" + e.getMessage());
             }
-//            hxpAlarmRecord.setHasValid(1);
             //已处理
             hxpAlarmRecord.setHandlingStatus(2);
             hxpAlarmRecordMapper.updateHxpAlarmRecord(hxpAlarmRecord);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpCabinetServiceImpl.java

@@ -14,7 +14,6 @@ import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.swagger.config.AppListener;
 import com.zd.laboratory.api.entity.CabinetLock;
 import com.zd.laboratory.api.entity.CabinetV2Lock;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
@@ -46,7 +45,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class HxpCabinetServiceImpl implements IHxpCabinetService {
-    private static org.slf4j.Logger logger= LoggerFactory.getLogger(AppListener.class);
+    private static org.slf4j.Logger logger = LoggerFactory.getLogger(HxpCabinetServiceImpl.class);
 
     @Autowired
     private HxpCabinetMapper hxpCabinetMapper;
@@ -80,22 +79,21 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
      */
     @Override
     @DataScope(deptAlias = "st", userAlias = "ct", permi = PerPrefix.HXP_CABINET)
-    public List <HxpCabinetVo> selectHxpCabinetList(HxpCabinetSearch hxpCabinetSearch) {
-        List <HxpCabinetVo> hxpCabinetVos = hxpCabinetMapper.selectHxpCabinetList(hxpCabinetSearch);
-        Function <List <HxpCabinetVo>, List <Long>> function = x -> x.parallelStream().map(HxpCabinetVo::getId).collect(Collectors.toList());
-        Map<String,List <Long>> allMap = new HashMap();
+    public List<HxpCabinetVo> selectHxpCabinetList(HxpCabinetSearch hxpCabinetSearch) {
+        List<HxpCabinetVo> hxpCabinetVos = hxpCabinetMapper.selectHxpCabinetList(hxpCabinetSearch);
+        Function<List<HxpCabinetVo>, List<Long>> function = x -> x.parallelStream().map(HxpCabinetVo::getId).collect(Collectors.toList());
+        Map<String, List<Long>> allMap = new HashMap();
         allMap.put("ids", function.apply(hxpCabinetVos));
-        R <List <LinkedHashMap <String, String>>> cabinetLockList = remoteLaboratoryService.getHardwareByLockList(allMap);
-        Predicate <R <List <LinkedHashMap <String, String>>>> predicate = b -> b.getData() != null && b.getData().size() > 0;
+        R<List<LinkedHashMap<String, String>>> cabinetLockList = remoteLaboratoryService.getHardwareByLockList(allMap);
+        Predicate<R<List<LinkedHashMap<String, String>>>> predicate = b -> b.getData() != null && b.getData().size() > 0;
         if (predicate.test(cabinetLockList)) {
-            List <HxpCabinetVo> cabinetVoList = Optional.ofNullable(hxpCabinetVos).orElseGet(Collections::emptyList).parallelStream()
-                    .map(a -> {
-                                Optional.ofNullable(cabinetLockList.getData()).orElseGet(Collections::emptyList)
-                                        .stream().filter(b -> b.get("joinCabinetId").equals(a.getId() + "")).forEach(b -> a.getCabinetLockList().add(b));
-                                return a;
-                            }
-                    ).sorted(Comparator.comparing(HxpCabinetVo::getCreateTime).reversed()).collect(Collectors.toList());
-            return cabinetVoList;
+            Optional.ofNullable(hxpCabinetVos).orElseGet(Collections::emptyList).parallelStream()
+                    .forEach(a -> {
+                        Optional.ofNullable(cabinetLockList.getData()).orElseGet(Collections::emptyList)
+                                .stream().filter(b -> b.get("joinCabinetId").equals(a.getId() + "")).forEach(b -> a.getCabinetLockList().add(b));
+                    });
+
+            return hxpCabinetVos;
         }
         return hxpCabinetVos;
     }
@@ -214,9 +212,9 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
      * @return 化学品机柜管理信息
      */
     @Override
-    public List <HxpCabinetInclusionChemicalVo> getCabinetByChemical(HxpCabinetSearch hxpCabinetSearch) {
+    public List<HxpCabinetInclusionChemicalVo> getCabinetByChemical(HxpCabinetSearch hxpCabinetSearch) {
         //这里查询化学品统计的分页数据。
-        List <HxpCabinetInclusionChemicalVo> inclusionChemicalVoList = hxpCabinetMapper.getCabinetByChemical(hxpCabinetSearch);
+        List<HxpCabinetInclusionChemicalVo> inclusionChemicalVoList = hxpCabinetMapper.getCabinetByChemical(hxpCabinetSearch);
 
         //查询每个化学品对应的库存信息等。
         Optional.ofNullable(inclusionChemicalVoList).orElseGet(Collections::emptyList).stream()
@@ -242,30 +240,24 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
     @Override
     public CabinetV2Lock openLock(AioCabinetLockVo aioCabinetLockVo) {
         // 第一版开锁流程
-        // Map<String, Object> result = doLock(aioCabinetLockVo, 1);
-
-        CabinetV2Lock cabinetV2Lock = doLockTwo(aioCabinetLockVo, 1);
-        return cabinetV2Lock;
+        return doLockTwo(aioCabinetLockVo, 1);
     }
 
     @Override
     public CabinetV2Lock closeLock(AioCabinetLockVo aioCabinetLockVo) {
         // 一版关锁流程
-        // Map<String, Object> result = doLock(aioCabinetLockVo, 2);
-
-        CabinetV2Lock result = doLockTwo(aioCabinetLockVo, 2);
-        return result;
+        return doLockTwo(aioCabinetLockVo, 2);
     }
 
     private CabinetV2Lock doLockTwo(AioCabinetLockVo aioCabinetLockVo, int type) {
         CabinetV2Lock result;
-        if(LockTypeEnum.SYSTEM.equals(aioCabinetLockVo.getLockType()) && aioCabinetLockVo.getLockId() != null){
+        if (LockTypeEnum.SYSTEM.equals(aioCabinetLockVo.getLockType()) && aioCabinetLockVo.getLockId() != null) {
             result = hxpCabinetMapper.selectIpAddressByLockId(aioCabinetLockVo.getSubId(), aioCabinetLockVo.getLockId());
-        }else {
+        } else {
             result = hxpCabinetMapper.selectByJoinId(aioCabinetLockVo.getJoinId());
         }
 
-        if(result == null){
+        if (result == null) {
             throw new ServiceException("未查询到柜锁设置，操作失败！");
         }
 
@@ -279,58 +271,57 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
             logger.info("柜锁开锁返回数值：" + r.getCode() + ";;;;" + r.getMsg());
             msg = r.getMsg();
             // 2. 判断执行状态
-            if(r.getCode() == HttpStatus.SUCCESS){
+            if (r.getCode() == HttpStatus.SUCCESS) {
                 success = true;
                 // 3. 调用录像功能
                 remoteCameraService.startRecord(result.getIpAddress());
             }
-        }else if(type == 2){
+        } else if (type == 2) {
             // 关锁
             R r = remoteSubQueryService.cabinetV2CloseLock(result);
             logger.info("柜锁关锁返回数值：" + r.getCode() + ";;;;" + r.getMsg());
             msg = r.getMsg();
             // 判断执行状态
-            if(r.getCode() == HttpStatus.SUCCESS){
+            if (r.getCode() == HttpStatus.SUCCESS) {
                 success = true;
                 // 结束录像获取地址
                 R r1 = remoteCameraService.stopRecord(result.getIpAddress());
-                if(r1 != null && HttpStatus.SUCCESS == r1.getCode()){
+                if (r1 != null && HttpStatus.SUCCESS == r1.getCode()) {
                     logger.info("柜锁关闭获取录像地址：" + r1.getData());
                     closeLockVideo = r1.getData() + "";
                     success = true;
-                }else {
+                } else {
                     logger.error("柜锁关闭获取摄像头录像失败：" + r.getMsg());
                 }
             }
         }
 
         // 添加记录
-        if(success){
-            if(type == 1){
+        if (success) {
+            if (type == 1) {
                 HxpCabinetlockLog hxpCabinetlockLog = new HxpCabinetlockLog();
                 hxpCabinetlockLog.setCabinetlockId(Long.parseLong(result.getHardwareId()));
                 hxpCabinetlockLog.setUnLockTime(DateUtils.getNowDate());
                 hxpCabinetlockLog.setOperationType(aioCabinetLockVo.getLockType().getCode());
                 hxpCabinetlockLog.setCreateTime(DateUtils.getNowDate());
-                hxpCabinetlockLog.setUserIds(SecurityUtils.getUserId()+ "");
+                hxpCabinetlockLog.setUserIds(SecurityUtils.getUserId() + "");
                 hxpCabinetlockLog.setCreateBy(SecurityUtils.getUsername());
                 cabinetlockLogService.insertHxpCabinetlockLog(hxpCabinetlockLog);
 
                 result.setLockLogId(hxpCabinetlockLog.getId());
-            }else if(type == 2){
+            } else if (type == 2) {
                 // 关锁之后要存储录像
-//                HxpCabinetlockLog hxpCabinetlockLog = cabinetlockLogMapper.selectByLockId(aioCabinetLockVo.getSubId(), Integer.parseInt(result.getLockId()));
                 HxpCabinetlockLog hxpCabinetlockLog = cabinetlockLogMapper.selectHxpCabinetlockLogById(aioCabinetLockVo.getLockLogId());
                 result.setLockLogId(aioCabinetLockVo.getLockLogId());
-                if(hxpCabinetlockLog != null){
-                    if(LockTypeEnum.IN_STOCK.equals(aioCabinetLockVo.getLockType()) && aioCabinetLockVo.getStockId() != null){
+                if (hxpCabinetlockLog != null) {
+                    if (LockTypeEnum.IN_STOCK.equals(aioCabinetLockVo.getLockType()) && aioCabinetLockVo.getStockId() != null) {
                         logger.info("关锁绑定入库ID：" + aioCabinetLockVo.getStockId());
                         hxpCabinetlockLog.setStockId(aioCabinetLockVo.getStockId());
                     }
                     hxpCabinetlockLog.setCloseLockTime(DateUtils.getNowDate());
                     hxpCabinetlockLog.setCloseLockVideo(closeLockVideo);
                     cabinetlockLogService.updateHxpCabinetlockLog(hxpCabinetlockLog);
-                }else {
+                } else {
                     logger.error("柜锁关闭修改操作记录失败：" + aioCabinetLockVo.getSubId() + "---------" + result.getLockId());
                 }
 
@@ -339,8 +330,6 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
         }
 
 
-
-
         result.setSuccess(success);
         result.setMsg(msg);
 
@@ -349,23 +338,22 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
     }
 
 
-    private CabinetV2Lock doLock(AioCabinetLockVo aioCabinetLockVo, int type){
+    private CabinetV2Lock doLock(AioCabinetLockVo aioCabinetLockVo, int type) {
         CabinetV2Lock result;
-        if(LockTypeEnum.SYSTEM.equals(aioCabinetLockVo.getLockType()) && aioCabinetLockVo.getLockId() != null){
+        if (LockTypeEnum.SYSTEM.equals(aioCabinetLockVo.getLockType()) && aioCabinetLockVo.getLockId() != null) {
             result = hxpCabinetMapper.selectIpAddressByLockId(aioCabinetLockVo.getSubId(), aioCabinetLockVo.getLockId());
-        }else {
+        } else {
             result = hxpCabinetMapper.selectByJoinId(aioCabinetLockVo.getJoinId());
-            //lockId = hxpCabinetMapper.selectLockIdByJoinId(aioCabinetLockVo.getJoinId());
         }
 
         try {
             Integer lockId = Integer.parseInt(result.getLockId());
-            if(lockId == null){
+            if (lockId == null) {
                 logger.error("柜锁参数未设置，执行跳过");
                 return result;
             }
             String position = "940";
-            if(type == 2){
+            if (type == 2) {
                 position = "2340";
             }
             // 调用开锁接口
@@ -381,41 +369,41 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
             String ipAddress = result.getIpAddress();
             String closeLockVideo = "";
             boolean success = false;
-            if(org.apache.commons.lang3.StringUtils.isNotBlank(ipAddress)){
-                if(type == 1){
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(ipAddress)) {
+                if (type == 1) {
                     remoteCameraService.startRecord(ipAddress);
-                }else {
+                } else {
                     R r = remoteCameraService.stopRecord(ipAddress);
-                    if(r != null && HttpStatus.SUCCESS == r.getCode()){
+                    if (r != null && HttpStatus.SUCCESS == r.getCode()) {
                         closeLockVideo = r.getData() + "";
                         success = true;
-                    }else {
+                    } else {
                         logger.error("柜锁关闭获取摄像头录像失败：" + r.getMsg());
                     }
                 }
             }
 
             // 添加记录
-            if(type == 1){
+            if (type == 1) {
                 HxpCabinetlockLog hxpCabinetlockLog = new HxpCabinetlockLog();
                 hxpCabinetlockLog.setCabinetlockId(Long.parseLong(result.getHardwareId()));
                 hxpCabinetlockLog.setUnLockTime(DateUtils.getNowDate());
                 hxpCabinetlockLog.setOperationType(aioCabinetLockVo.getLockType().getCode());
                 hxpCabinetlockLog.setCreateTime(DateUtils.getNowDate());
-                hxpCabinetlockLog.setUserIds(SecurityUtils.getUserId()+ "");
+                hxpCabinetlockLog.setUserIds(SecurityUtils.getUserId() + "");
                 hxpCabinetlockLog.setCreateBy(SecurityUtils.getUsername());
                 cabinetlockLogService.insertHxpCabinetlockLog(hxpCabinetlockLog);
-            }else if(success){
+            } else if (success) {
                 HxpCabinetlockLog hxpCabinetlockLog = cabinetlockLogMapper.selectByLockId(aioCabinetLockVo.getSubId(), lockId);
-                if(hxpCabinetlockLog != null){
+                if (hxpCabinetlockLog != null) {
                     hxpCabinetlockLog.setCloseLockTime(DateUtils.getNowDate());
                     hxpCabinetlockLog.setCloseLockVideo(closeLockVideo);
                     cabinetlockLogService.updateHxpCabinetlockLog(hxpCabinetlockLog);
-                }else {
+                } else {
                     logger.error("柜锁关闭修改操作记录失败：" + aioCabinetLockVo.getSubId() + "---------" + lockId);
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("进行柜锁操作异常（doLock）：" + e.getMessage());
             return result;
         }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpCabinetlockLogServiceImpl.java

@@ -1,20 +1,17 @@
 package com.zd.chemical.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.zd.chemical.domain.HxpCabinetlockLog;
 import com.zd.chemical.domain.vo.HxpCabinetlockLogSearch;
 import com.zd.chemical.domain.vo.HxpCabinetlockLogVo;
-import com.zd.common.core.utils.DateUtils;
-import com.zd.common.core.utils.SecurityUtils;
+import com.zd.chemical.mapper.HxpCabinetlockLogMapper;
+import com.zd.chemical.service.IHxpCabinetlockLogService;
 import com.zd.common.core.utils.SaveUtil;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.zd.chemical.mapper.HxpCabinetlockLogMapper;
-import com.zd.chemical.domain.HxpCabinetlockLog;
-import com.zd.chemical.service.IHxpCabinetlockLogService;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -54,7 +51,7 @@ public class HxpCabinetlockLogServiceImpl implements IHxpCabinetlockLogService
 
     @Override
     public List<HxpCabinetlockLog> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+        if (ids==null || ids.isEmpty()){
             new ArrayList <>();
         }
         return hxpCabinetlockLogMapper.getListByIds(ids);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalJoinCabinetServiceImpl.java

@@ -10,6 +10,8 @@ import com.zd.common.core.utils.DictUtils;
 import com.zd.common.core.utils.SaveUtil;
 import com.zd.system.api.entity.SysDictData;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +30,9 @@ import java.util.stream.IntStream;
  */
 @Service
 public class HxpChemicalJoinCabinetServiceImpl implements IHxpChemicalJoinCabinetService {
+
+    private Logger logger = LoggerFactory.getLogger(HxpChemicalJoinCabinetServiceImpl.class);
+
     @Autowired
     private HxpChemicalJoinCabinetMapper hxpChemicalJoinCabinetMapper;
     @Autowired
@@ -72,12 +77,11 @@ public class HxpChemicalJoinCabinetServiceImpl implements IHxpChemicalJoinCabine
             hxpChemicalJoinCabinetVo.getChemicalJoinCabinetSonList().add(hxpChemicalJoinCabinetSon);
 
             Map <BigDecimal, List<HxpChemicalJoinCabinet>> collect2 = Optional.ofNullable(value)
-                    .filter(a->a.size()>0)
+                    .filter(a->!a.isEmpty())
                     .orElseGet(Collections::emptyList)
                     .stream()
                     .collect(Collectors.groupingBy(HxpChemicalJoinCabinet::getChemicalAmount));
 
-            List<HxpChemicalJoinCabinetGrandSon> hxpChemicalJoinCabinetGrandSonList = new ArrayList<>();
             LongAdder num = new LongAdder();
             collect2.forEach((key2, value2) -> {
                 HxpChemicalJoinCabinetGrandSon hxpChemicalJoinCabinetGrandSon = new HxpChemicalJoinCabinetGrandSon();
@@ -86,7 +90,7 @@ public class HxpChemicalJoinCabinetServiceImpl implements IHxpChemicalJoinCabine
 
 
                 Optional.ofNullable(value2)
-                        .filter(a->a.size()>0)
+                        .filter(a->!a.isEmpty())
                         .orElseGet(Collections::emptyList)
                         .stream()
                         .forEach(v2->{
@@ -131,13 +135,10 @@ public class HxpChemicalJoinCabinetServiceImpl implements IHxpChemicalJoinCabine
     @Transactional(rollbackFor = Exception.class)
     public int insertHxpChemicalJoinCabinet(HxpChemicalJoinCabinetVo hxpChemicalJoinCabinetVo) {
         //删除化学品下的所有关联数据
-//        Long[] ids = new Long[1];
-//        ids[0] = hxpChemicalJoinCabinetVo.getChemicalId();
-//        hxpChemicalJoinCabinetMapper.delByChemical(ids);
         Optional.ofNullable(hxpChemicalJoinCabinetVo.getChemicalJoinCabinetSonList()).orElseGet(Collections::emptyList)
                 .stream().forEach(a-> IntStream.range(0,a.getStorageNum()).forEach(b->{
             HxpChemicalJoinCabinet chemicalJoinCabinet = new HxpChemicalJoinCabinet();
-            String localTime =  new Date().getTime()+"";
+            String localTime =System.currentTimeMillis()+"";
             chemicalJoinCabinet.setJoinNum(localTime.substring(1));
             chemicalJoinCabinet.setChemicalId(hxpChemicalJoinCabinetVo.getChemicalId());
             chemicalJoinCabinet.setSubId(hxpChemicalJoinCabinetVo.getSubId());
@@ -153,26 +154,10 @@ public class HxpChemicalJoinCabinetServiceImpl implements IHxpChemicalJoinCabine
             try {
                 Thread.sleep(10);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                logger.error("新增化学品和机柜关联异常："+e);
+                Thread.currentThread().interrupt();
             }
         }));
-
-//        Optional.ofNullable(hxpChemicalJoinCabinetVo.getChemicalJoinCabinetSonList()).orElseGet(Collections::emptyList)
-//                .stream().forEach(a->{
-//                    HxpChemicalJoinCabinet chemicalJoinCabinet = new HxpChemicalJoinCabinet();
-//                    String localTime =  new Date().getTime()+"";
-//                    chemicalJoinCabinet.setJoinNum(localTime.substring(2));
-//                    chemicalJoinCabinet.setChemicalId(hxpChemicalJoinCabinetVo.getChemicalId());
-//                    chemicalJoinCabinet.setSubId(hxpChemicalJoinCabinetVo.getSubId());
-//                    chemicalJoinCabinet.setCabinetId(a.getCabinetId());
-//                    chemicalJoinCabinet.setChemicalAmount(a.getChemicalAmount());
-//                    chemicalJoinCabinet.setChemicalAmountUnit(a.getChemicalAmountUnit());
-////                    chemicalJoinCabinet.setExpireTime(b.getExpireTime());     过期时间作废，不存任何值
-//                    chemicalJoinCabinet.setTare(a.getTare());
-//                    //设置其他公共字段
-//                    SaveUtil.setCommonAttr(chemicalJoinCabinet);
-//                    hxpChemicalJoinCabinetMapper.insertHxpChemicalJoinCabinet(chemicalJoinCabinet);
-//        });
         return 1;
     }
 
@@ -200,7 +185,7 @@ public class HxpChemicalJoinCabinetServiceImpl implements IHxpChemicalJoinCabine
             HxpChemicalJoinCabinet hxpChemicalJoinCabinet = new HxpChemicalJoinCabinet();
             hxpChemicalJoinCabinet.setId(ids[0]);
             List<HxpChemicalJoinCabinet> chemicalJoinCabinetList = hxpChemicalJoinCabinetMapper.selectChemicalListById(hxpChemicalJoinCabinet);
-            if(chemicalJoinCabinetList.size()>0){
+            if(!chemicalJoinCabinetList.isEmpty()){
                 throw new ServiceException("删除失败，化学品已经绑定库存");
             }
         }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -28,6 +28,8 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
 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;
 
@@ -47,6 +49,10 @@ import java.util.stream.Stream;
  */
 @Service
 public class HxpChemicalServiceImpl implements IHxpChemicalService {
+
+
+    private Logger logger = LoggerFactory.getLogger(HxpChemicalServiceImpl.class);
+
     @Autowired
     private HxpChemicalMapper hxpChemicalMapper;
     @Autowired
@@ -85,24 +91,23 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
     @Override
     @DataScope(deptAlias = "su", userAlias = "su", permi = PerPrefix.HPX_CHEMICAL)
     public List<HxpChemicalVo> selectHxpChemicalList(HxpChemicalSearch hxpChemicalSearch) {
-        List<HxpChemicalVo> hxpChemicalList = hxpChemicalMapper.selectHxpChemicalList(hxpChemicalSearch);
-        return hxpChemicalList;
+        return hxpChemicalMapper.selectHxpChemicalList(hxpChemicalSearch);
     }
 
     @Override
-    public List <HxpChemicalByExcel> importUserByChemical(List <HxpChemicalByExcel> chemicalList, String operName, HxpChemicalByExcel hxpChemicalByExcel) {
-        if (StringUtils.isNull(chemicalList) || chemicalList.size() == 0) {
+    public List<HxpChemicalByExcel> importUserByChemical(List<HxpChemicalByExcel> chemicalList, String operName, HxpChemicalByExcel hxpChemicalByExcel) {
+        if (StringUtils.isNull(chemicalList) || chemicalList.isEmpty()) {
             throw new ServiceException("导入危险品数据不能为空！");
         }
         List<HxpChemicalByExcel> failChemicalList = new ArrayList<>();
         for (HxpChemicalByExcel chemical : chemicalList) {
             //流水线验证
-            flowLineCheck(chemical,failChemicalList, hxpChemicalByExcel);
+            flowLineCheck(chemical, failChemicalList, hxpChemicalByExcel);
         }
         return failChemicalList;
     }
 
-    private void flowLineCheck(HxpChemicalByExcel chemical, List<HxpChemicalByExcel> failChemicalList, HxpChemicalByExcel hxpChemicalByExcel){
+    private void flowLineCheck(HxpChemicalByExcel chemical, List<HxpChemicalByExcel> failChemicalList, HxpChemicalByExcel hxpChemicalByExcel) {
         // 校验是否装入错误数据
         boolean checkBox = true;
 
@@ -110,61 +115,61 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         HxpChemical hxpChemical = new HxpChemical();
 
         //验证化学品名称不能为空
-        if(StringUtils.isEmpty(chemical.getChemicalName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(chemical.getChemicalName())) {
+            if (checkBox) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
                 checkBox = false;
             }
             chemical.getFailRemark().append("化学品名称不能为空、");
-        }else{
-            if(chemical.getChemicalName().length()>150){
-                if(checkBox){
+        } else {
+            if (chemical.getChemicalName().length() > 30) {
+                if (checkBox) {
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
                 }
-                chemical.getFailRemark().append("化学品名称最多一百五十个字符、");
+                chemical.getFailRemark().append("化学品名称最多三十个字符、");
             }
         }
         hxpChemical.setChemicalName(chemical.getChemicalName());
 
         //分类名称
-        if(StringUtils.isEmpty(chemical.getClassifyName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(chemical.getClassifyName())) {
+            if (checkBox) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
                 checkBox = false;
             }
             chemical.getFailRemark().append("分类名称不能为空、");
-        }else{
+        } else {
             //化学品分类配置读取
             List<HxpChemicalClassify> classifyList = redisService.getCacheObject("chemical_classify");
-            if (classifyList==null || classifyList.size()==0){
+            if (classifyList == null || classifyList.isEmpty()) {
                 HxpChemicalClassify hxpChemicalClassify = new HxpChemicalClassify();
                 classifyList = hxpChemicalClassifyMapper.selectHxpChemicalClassifyList(hxpChemicalClassify);
-                redisService.setCacheObject("chemical_classify",classifyList, 60L, TimeUnit.SECONDS);
+                redisService.setCacheObject("chemical_classify", classifyList, 60L, TimeUnit.SECONDS);
                 classifyList = redisService.getCacheObject("chemical_classify");
             }
 
-            if(classifyList!=null && classifyList.size()>0){
+            if (classifyList != null && !classifyList.isEmpty()) {
                 //化学品分类是否匹配到
-                Boolean flg=false;
-                for (HxpChemicalClassify chemicalClassify:classifyList) {
+                Boolean flg = false;
+                for (HxpChemicalClassify chemicalClassify : classifyList) {
                     if (chemicalClassify.getClassifyName().equals(chemical.getClassifyName())) {
                         hxpChemical.setChemicalClassify(chemicalClassify.getId());
-                        flg=true;
+                        flg = true;
                     }
                 }
 
-                if(checkBox && !flg){
+                if (checkBox && !flg) {
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
                     chemical.getFailRemark().append("分类名称不存在、");
                 }
-            }else{
-                if(checkBox){
+            } else {
+                if (checkBox) {
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
@@ -174,25 +179,25 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         }
 
         //形态
-        if(StringUtils.isEmpty(chemical.getChemicalShapeInfo())){
-            if(checkBox){
+        if (StringUtils.isEmpty(chemical.getChemicalShapeInfo())) {
+            if (checkBox) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
                 checkBox = false;
             }
             chemical.getFailRemark().append("形态不能为空、");
-        }else{
+        } else {
             List<SysDictData> proDictDatas = DictUtils.getDictCache("chemical_shape");
             //化学品形态比对标识
-            boolean flgshape= false;
-            for(SysDictData dictData : proDictDatas){
-                if(dictData.getDictLabel().equals(chemical.getChemicalShapeInfo().trim())){
+            boolean flgshape = false;
+            for (SysDictData dictData : proDictDatas) {
+                if (dictData.getDictLabel().equals(chemical.getChemicalShapeInfo().trim())) {
                     hxpChemical.setChemicalShape(Integer.parseInt(dictData.getDictValue()));
-                    flgshape=true;
+                    flgshape = true;
                 }
             }
-            if(StringUtils.isNull(hxpChemical.getChemicalShape())){
-                if(checkBox && !flgshape){
+            if (StringUtils.isNull(hxpChemical.getChemicalShape())) {
+                if (checkBox && !flgshape) {
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
@@ -202,11 +207,11 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         }
 
         //计量单位
-        if(StringUtils.isNotEmpty(chemical.getChemicalUnit())){
+        if (StringUtils.isNotEmpty(chemical.getChemicalUnit())) {
             if (chemical.getChemicalUnit().length() > 8) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
-                if(checkBox) {
+                if (checkBox) {
                     chemical.getFailRemark().append("计量单位过长、");
                     checkBox = false;
                 }
@@ -214,14 +219,14 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
             //获取化学品单位集合
             List<SysDictData> dictDataList = DictUtils.getDictCache("chemicals_measuring_unit");
-            boolean flgunit=false;
-            for (SysDictData sysdic: dictDataList) {
-                if(chemical.getChemicalUnit().equals(sysdic.getDictValue())){
-                    flgunit=true;
+            boolean flgunit = false;
+            for (SysDictData sysdic : dictDataList) {
+                if (chemical.getChemicalUnit().equals(sysdic.getDictValue())) {
+                    flgunit = true;
                 }
             }
 
-            if(checkBox && !flgunit){
+            if (checkBox && !flgunit) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
                 chemical.getFailRemark().append("字典表未配置单位、");
@@ -229,8 +234,8 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
             }
 
             hxpChemical.setChemicalUnit(chemical.getChemicalUnit());
-        }else{
-            if(checkBox) {
+        } else {
+            if (checkBox) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
                 checkBox = false;
@@ -239,69 +244,44 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         }
 
         //计量方式
-        if(StringUtils.isNotEmpty(chemical.getMeasuringMethod())){
-            if("重量".equals(chemical.getMeasuringMethod())){
+        if (StringUtils.isNotEmpty(chemical.getMeasuringMethod())) {
+            if ("重量".equals(chemical.getMeasuringMethod())) {
                 hxpChemical.setMeasuringMethod(1);
-            }else if("体积".equals(chemical.getMeasuringMethod())){
+            } else if ("体积".equals(chemical.getMeasuringMethod())) {
                 hxpChemical.setMeasuringMethod(2);
-            }else if("个数".equals(chemical.getMeasuringMethod())){
+            } else if ("个数".equals(chemical.getMeasuringMethod())) {
                 hxpChemical.setMeasuringMethod(3);
-            }else{
-                if(checkBox) {
+            } else {
+                if (checkBox) {
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
                 }
                 chemical.getFailRemark().append("计量方式不存在、");
             }
-        }else {
-            if(checkBox) {
+        } else {
+            if (checkBox) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
                 checkBox = false;
             }
             chemical.getFailRemark().append("计量方式不能为空、");
         }
-
-//        Map<String,Integer> labelMap = new HashMap<>();
-//        labelMap.put("RFID",1);
-//        labelMap.put("二维码",2);
-//        //标签类型
-//        if(StringUtils.isEmpty(chemical.getLabelContent())){
-//            if(checkBox){
-//                chemical.getFailRemark().append("失败：");
-//                failChemicalList.add(chemical);
-//                checkBox = false;
-//            }
-//            chemical.getFailRemark().append("标签类型不能为空、");
-//        }else{
-//            if(StringUtils.isNotNull(labelMap.get(chemical.getLabelContent()))){
-//                hxpChemical.setLabelType(labelMap.get(chemical.getLabelContent()));
-//            }else{
-//                if(checkBox){
-//                    chemical.getFailRemark().append("失败：");
-//                    failChemicalList.add(chemical);
-//                    checkBox = false;
-//                }
-//                chemical.getFailRemark().append("标签类型不存在、");
-//            }
-//        }
-
         //属性
-        if(StringUtils.isNotEmpty(chemical.getClassifyAttribute())){
+        if (StringUtils.isNotEmpty(chemical.getClassifyAttribute())) {
             Optional.ofNullable(DictUtils.getDictCache("hxp_classifyattribute")).orElseGet(Collections::emptyList).stream()
-                    .forEach(a->Optional.ofNullable(chemical.getClassifyAttribute().split(",")).map(b->{
-                        for(int i=0;i<b.length;i++){
-                            if(a.getDictLabel().equals(b[i])){
-                                hxpChemical.setClassifyAttribute(hxpChemical.getClassifyAttribute()==null?","+a.getDictValue():hxpChemical.getClassifyAttribute()+","+a.getDictValue());
+                    .forEach(a -> Optional.ofNullable(chemical.getClassifyAttribute().split(",")).map(b -> {
+                        for (int i = 0; i < b.length; i++) {
+                            if (a.getDictLabel().equals(b[i])) {
+                                hxpChemical.setClassifyAttribute(hxpChemical.getClassifyAttribute() == null ? "," + a.getDictValue() : hxpChemical.getClassifyAttribute() + "," + a.getDictValue());
                             }
                         }
                         return a;
                     }));
-            if(StringUtils.isNotEmpty(hxpChemical.getClassifyAttribute())){
+            if (StringUtils.isNotEmpty(hxpChemical.getClassifyAttribute())) {
                 hxpChemical.setClassifyAttribute(hxpChemical.getClassifyAttribute().substring(1));
-            }else{
-                if(checkBox){
+            } else {
+                if (checkBox) {
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
@@ -311,12 +291,12 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         }
 
         //cas号
-        if(StringUtils.isNotEmpty(chemical.getCasNum())){
+        if (StringUtils.isNotEmpty(chemical.getCasNum())) {
             HxpChemicalSearch hxpChemicalSearch = new HxpChemicalSearch();
             hxpChemicalSearch.setCasNum(chemical.getCasNum());
             List<HxpChemicalVo> hxpChemicalVoList = hxpChemicalMapper.selectHxpChemicalList(hxpChemicalSearch);
-            if(hxpChemicalVoList.size()>0){
-                if(checkBox){
+            if (hxpChemicalVoList!=null && !hxpChemicalVoList.isEmpty()) {
+                if (checkBox) {
                     chemical.getFailRemark().append("失败：");
                     failChemicalList.add(chemical);
                     checkBox = false;
@@ -333,8 +313,8 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         hxpChemical.setPurity(chemical.getPurity());
 
         //生产厂家
-        if(chemical.getFactory().length()>30){
-            if(checkBox){
+        if (chemical.getFactory().length() > 30) {
+            if (checkBox) {
                 chemical.getFailRemark().append("失败：");
                 failChemicalList.add(chemical);
                 checkBox = false;
@@ -343,20 +323,13 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         }
         hxpChemical.setFactory(chemical.getFactory());
 
-        //是否管控
-        if(StringUtils.isNotEmpty(chemical.getIsControl())){
-            hxpChemical.setIsControl(1);
-        }
 
-        if(StringUtils.isNotEmpty(chemical.getFailRemark())){
-            chemical.getFailRemark().deleteCharAt(chemical.getFailRemark().length()-1);
+        if (StringUtils.isNotEmpty(chemical.getFailRemark())) {
+            chemical.getFailRemark().deleteCharAt(chemical.getFailRemark().length() - 1);
         }
 
-        if(StringUtils.isEmpty(chemical.getFailRemark())){
+        if (StringUtils.isEmpty(chemical.getFailRemark())) {
             //这里目前先写死
-            //hxpChemical.setMeasuringMethod(1);
-            //hxpChemical.setChemicalUnit("");
-            // hxpChemical.setChemicalUnit("g");
             hxpChemicalService.insertHxpChemical(hxpChemical);
         }
     }
@@ -371,22 +344,15 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
     public int insertHxpChemical(HxpChemical hxpChemical) {
         //这里需要查询危险品分类的级别
         HxpChemicalClassify hxpChemicalClassify = hxpChemicalClassifyMapper.selectHxpChemicalClassifyById(hxpChemical.getChemicalClassify());
-        if(StringUtils.isNull(hxpChemicalClassify)){
+        if (StringUtils.isNull(hxpChemicalClassify)) {
             throw new ServiceException("危险品分类级别未配置，请联系管理员！！");
         }
-        if(hxpChemicalClassify.getClassifyName().length()<2){
+        if (hxpChemicalClassify.getClassifyName().length() < 2) {
             throw new ServiceException("分类名称错误，请联系管理员");
         }
-        String classifyName = hxpChemicalClassify.getClassifyName().substring(0,2);
+        String classifyName = hxpChemicalClassify.getClassifyName().substring(0, 2);
         StringBuffer hxpNum = new StringBuffer();
         hxpNum.append(generateLetter(classifyName));
-//        if(hxpChemicalClassify.getHazardLevel().equals(1)){
-//            hxpNum.append("WX");
-//        }else if(hxpChemicalClassify.getHazardLevel().equals(2)){
-//            hxpNum.append("PT");
-//        }else if(hxpChemicalClassify.getHazardLevel().equals(3)){
-//            hxpNum.append("QT");
-//        }
         hxpChemical.setChemicalNum(generateNumber(hxpNum));
         //设置其他公共字段
         SaveUtil.setCommonAttr(hxpChemical);
@@ -398,26 +364,26 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         return hxpChemicalMapper.insertHxpChemical(hxpChemical);
     }
 
-    public String generateNumber(StringBuffer hxpNum){
+    public String generateNumber(StringBuffer hxpNum) {
         HxpChemical hxpChemical = hxpChemicalMapper.selectHxpChemicalMaxById(hxpNum.toString());
-        if(StringUtils.isNull(hxpChemical)){
-            synthesisNumber("1",hxpNum);
-        }else{
-            String chemicalNum = hxpChemical.getChemicalNum().substring(2,hxpChemical.getChemicalNum().length());
-            chemicalNum = (Integer.parseInt(chemicalNum)+1)+"";
-            synthesisNumber(chemicalNum,hxpNum);
+        if (StringUtils.isNull(hxpChemical)) {
+            synthesisNumber("1", hxpNum);
+        } else {
+            String chemicalNum = hxpChemical.getChemicalNum().substring(2, hxpChemical.getChemicalNum().length());
+            chemicalNum = (Integer.parseInt(chemicalNum) + 1) + "";
+            synthesisNumber(chemicalNum, hxpNum);
         }
         return hxpNum.toString();
     }
 
-    public void synthesisNumber(String num,StringBuffer hxpNum){
-        for(int i=0;i<6-num.length();i++){
+    public void synthesisNumber(String num, StringBuffer hxpNum) {
+        for (int i = 0; i < 6 - num.length(); i++) {
             hxpNum.append("0");
         }
         hxpNum.append(num);
     }
 
-    public String generateLetter(String china){
+    public String generateLetter(String china) {
         HanyuPinyinOutputFormat formart = new HanyuPinyinOutputFormat();
         formart.setCaseType(HanyuPinyinCaseType.LOWERCASE);
         formart.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
@@ -425,12 +391,12 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         char[] arrays = china.trim().toCharArray();
         String result = "";
         try {
-            for (int i=0;i<2;i++) {
+            for (int i = 0; i < 2; i++) {
                 char ti = arrays[i];
-                if(Character.toString(ti).matches("[\\u4e00-\\u9fa5]")){ //匹配是否是中文
-                    String[] temp = PinyinHelper.toHanyuPinyinStringArray(ti,formart);
-                    result += temp[0].substring(0,1).toUpperCase();
-                }else{
+                if (Character.toString(ti).matches("[\\u4e00-\\u9fa5]")) { //匹配是否是中文
+                    String[] temp = PinyinHelper.toHanyuPinyinStringArray(ti, formart);
+                    result += temp[0].substring(0, 1).toUpperCase();
+                } else {
                     result += ti;
                 }
             }
@@ -469,7 +435,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
     public int editChemicalByJoinHazard(HxpChemical hxpChemical) {
         hxpChemical.setUpdateTime(DateUtils.getNowDate());
         hxpChemical.setUpdateBy(SecurityUtils.getUsername());
-        if(StringUtils.isNull(hxpChemical.getJoinHazardId())){
+        if (StringUtils.isNull(hxpChemical.getJoinHazardId())) {
             hxpChemicalMapper.clearHxpChemicalByJoinHazard(hxpChemical);
         }
         return hxpChemicalMapper.updateHxpChemical(hxpChemical);
@@ -543,24 +509,24 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      */
     @Override
     @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
-    public List<LinkedHashMap <String,String>> chemicalClassifyMix(HxpChemical hxpChemical) {
-        List<LinkedHashMap <String,String>> chemicalList = hxpChemicalMapper.chemicalClassifyMix(hxpChemical);
+    public List<LinkedHashMap<String, String>> chemicalClassifyMix(HxpChemical hxpChemical) {
+        List<LinkedHashMap<String, String>> chemicalList = hxpChemicalMapper.chemicalClassifyMix(hxpChemical);
         DoubleAdder doubleAdder = new DoubleAdder();
         Optional.ofNullable(chemicalList).orElseGet(Collections::emptyList).stream()
-                .forEach(a->{
-                    a.forEach((key,value)->{
-                        if(key.equals("chemicalMix")){
+                .forEach(a -> {
+                    a.forEach((key, value) -> {
+                        if (key.equals("chemicalMix")) {
                             doubleAdder.add(Long.parseLong(value));
                         }
 
                     });
                 });
         Double sumMix = doubleAdder.sum();
-        List<LinkedHashMap <String,String>> linkedList = Optional.ofNullable(chemicalList).orElseGet(Collections::emptyList).stream()
-                .map(a->{
-                    a.forEach((key,value)->{
-                        if(key.equals("chemicalMix")){
-                            a.put(key,(Math.round(Double.parseDouble(value)/sumMix.doubleValue()*100))+"%");
+        List<LinkedHashMap<String, String>> linkedList = Optional.ofNullable(chemicalList).orElseGet(Collections::emptyList).stream()
+                .map(a -> {
+                    a.forEach((key, value) -> {
+                        if (key.equals("chemicalMix")) {
+                            a.put(key, (Math.round(Double.parseDouble(value) / sumMix.doubleValue() * 100)) + "%");
                         }
                     });
                     return a;
@@ -572,7 +538,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
     @Override
     @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
-    public Long stockTotal(HxpChemical hxpChemical){
+    public Long stockTotal(HxpChemical hxpChemical) {
         return hxpChemicalMapper.stockTotal(hxpChemical);
     }
 
@@ -585,16 +551,15 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      */
     @Override
     @DataScope(deptAlias = "ur", userAlias = "ur", permi = PerPrefix.HPX_HOMEPAGE)
-    public List<LinkedHashMap <String,String>> joinOutCount(HxpStock hxpStock) {
-        List<LinkedHashMap <String,String>> stockCountList = hxpChemicalMapper.joinOutCount(hxpStock);
-        return stockCountList;
+    public List<LinkedHashMap<String, String>> joinOutCount(HxpStock hxpStock) {
+        return hxpChemicalMapper.joinOutCount(hxpStock);
     }
 
     @Override
     public List<Map<String, Object>> queryCriticaliBySubId(List<Long> subIds) {
         List<Map<String, Object>> list = hxpChemicalMapper.queryCriticaliBySubId(subIds);
-        if(CollectionUtils.isNotEmpty(list)){
-            if(list.get(0) == null){
+        if (CollectionUtils.isNotEmpty(list)) {
+            if (list.get(0) == null) {
                 list.remove(0);
             }
         }
@@ -604,18 +569,18 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
     @Override
     public void indicatorMonitoring() {
         List<Map<String, Object>> list = hxpChemicalMapper.queryCriticaliBySubId(new ArrayList<>());
-        if(!list.isEmpty()){
-            if(list.get(0) == null){
+        if (list!=null && !list.isEmpty()) {
+            if (list.get(0) == null) {
                 list.remove(0);
             }
 
             list.forEach(map -> {
-                if(BigDecimal.valueOf(1L).compareTo(BigDecimal.valueOf(Double.parseDouble(map.get("criticali")+""))) < 0){
+                if (BigDecimal.valueOf(1L).compareTo(BigDecimal.valueOf(Double.parseDouble(map.get("criticali") + ""))) < 0) {
 
-                    Map<String,Object> subInfo = hxpUserecordMapper.selectSubInfoById(Long.parseLong(map.get("subId") + ""));
+                    Map<String, Object> subInfo = hxpUserecordMapper.selectSubInfoById(Long.parseLong(map.get("subId") + ""));
                     String safeUserId = "";
-                    if(subInfo != null){
-                        safeUserId = subInfo.get("safeUserId")==null?"":String.valueOf(subInfo.get("safeUserId"));
+                    if (subInfo != null) {
+                        safeUserId = subInfo.get("safeUserId") == null ? "" : String.valueOf(subInfo.get("safeUserId"));
                     }
 
                     HxpAlarmRecord hxpAlarmRecord = new HxpAlarmRecord();
@@ -632,21 +597,22 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
                     // 此处需要发送短信通知
 
-                    String[] strings = Stream.of(new String[]{subInfo.get("phones")+""})
+                    String[] strings = Stream.of(new String[]{subInfo.get("phones") + ""})
                             .filter(a -> StrUtil.isNotBlank(a))
                             .collect(Collectors.joining(","))
                             .split(",");
 
-                    String subName = subInfo.get("name")==null?"":subInfo.get("name")+"";
+                    String subName = subInfo.get("name") == null ? "" : subInfo.get("name") + "";
                     String content = subName + "房间内危化品已定为重大危险源，请确认安全存放量！";
-                    if(HxpStockServiceImpl.phoneMode == 0){
+                    if (HxpStockServiceImpl.phoneMode == 0) {
 
-                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings,content);
+                        AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, content);
                         remoteAlarmService.send(alarmEntrty);
-                    }else if(HxpStockServiceImpl.phoneMode == 1){
+                    } else if (HxpStockServiceImpl.phoneMode == 1) {
                         try {
                             smsSydUtil.sendSydSms(content, 1, null, strings);
                         } catch (Exception e) {
+                            logger.error("indicatorMonitoring 异常："+e);
                         }
                     }
                 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpSmartTerminalServiceImpl.java

@@ -58,7 +58,7 @@ public class HxpSmartTerminalServiceImpl implements IHxpSmartTerminalService {
 
     @Override
     public List <HxpSmartTerminalByExcel> importSmartTerminal(List <HxpSmartTerminalByExcel> smartTerminalList, String operName, HxpSmartTerminalByExcel hxpSmartTerminalByExcel) {
-        if (StringUtils.isNull(smartTerminalList) || smartTerminalList.size() == 0) {
+        if (smartTerminalList==null || smartTerminalList.isEmpty()) {
             throw new ServiceException("导入智能设备数据不能为空！");
         }
         List<HxpSmartTerminalByExcel> failSmartTerminalList = new ArrayList <>();
@@ -87,7 +87,7 @@ public class HxpSmartTerminalServiceImpl implements IHxpSmartTerminalService {
             HxpSmartTerminalSearch hxpSmartTerminalSearch = new HxpSmartTerminalSearch();
             hxpSmartTerminalSearch.setTerminalNum(smartTerminal.getTerminalNum());
             List<HxpSmartTerminalVo> hxpSmartTerminalVoList = hxpSmartTerminalMapper.selectHxpSmartTerminalList(hxpSmartTerminalSearch);
-            if(hxpSmartTerminalVoList.size()>0){
+            if(hxpSmartTerminalVoList!=null && !hxpSmartTerminalVoList.isEmpty()){
                 if(checkBox){
                     smartTerminal.getFailRemark().append("失败：");
                     failSmartTerminalList.add(smartTerminal);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -194,8 +194,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
     @Override
     @DataScope(deptAlias = "st", permi = PerPrefix.HXP_STOCKDETAIL)
     public List<HxpStockDetailVO> selectHxpStockListDetail(HxpStockSearch hxpStockSearch) {
-        List<HxpStockDetailVO> list = hxpStockMapper.selectHxpStockListDetail(hxpStockSearch);
-        return list;
+        return hxpStockMapper.selectHxpStockListDetail(hxpStockSearch);
     }
 
     /**
@@ -207,8 +206,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
     @Override
     @DataScope(deptAlias = "st", permi = PerPrefix.HXP_STOCKJOIN)
     public List<HxpStockJoinVO> selectHxpStockListJoin(HxpStockSearch hxpStockSearch) {
-        List<HxpStockJoinVO> list = hxpStockMapper.selectHxpStockListJoin(hxpStockSearch);
-        return list;
+        return  hxpStockMapper.selectHxpStockListJoin(hxpStockSearch);
+
     }
 
     /**
@@ -220,8 +219,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
     @Override
     @DataScope(deptAlias = "st", permi = PerPrefix.HXP_STOCKOUT)
     public List<HxpStockOutVO> selectHxpStockListOut(HxpStockSearch hxpStockSearch) {
-        List<HxpStockOutVO> list = hxpStockMapper.selectHxpStockListOut(hxpStockSearch);
-        return list;
+        return hxpStockMapper.selectHxpStockListOut(hxpStockSearch);
     }
 
     /**
@@ -320,9 +318,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
         hxpStock.setUpdateTime(DateUtils.getNowDate());
         hxpStock.setUpdateBy(SecurityUtils.getUsername());
         hxpStock.setChemicalShape(null);
-        int count = hxpStockMapper.updateHxpStock(hxpStock);
-
-        return count;
+        return hxpStockMapper.updateHxpStock(hxpStock);
     }
 
     /**
@@ -492,7 +488,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     List<Map<String, Object>> terminalList = hxpSmartTerminalMapper.selectTerminalBySubId(8, hxpStock.getSubId());
                     Map<String, Object> smartTerminal = terminalList.get(0);
                     String terminalNum = String.valueOf(smartTerminal.get("hardwareNum"));
-                    //Integer dealTime = (Integer) smartTerminal.get("dealTime");
                     terminalList.get(0).get("ringTime");
                     ResultData<LabHardwareDto> hardwareByType = remoteLabHardwareService.findHardwareByType(hxpStock.getSubId(), 8, null, null);
                     if (HttpStatus.SUCCESS == hardwareByType.getCode()) {
@@ -548,8 +543,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
                         hxpAlarmRecord.setAlarmTime(date);
                         hxpAlarmRecord.setSubId(hxpStock.getSubId());
                         hxpAlarmRecord.setStockId(hxpStock.getId());
-                        //hxpAlarmRecord.setParentId(recordId);
-                        //hxpAlarmRecord.setTerminalNum();
                         hxpAlarmRecord.setHandlingStatus(1);
                         hxpAlarmRecord.setLiableUserIds(hxpAlarmConfig.getAlarmPhone());
                         hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
@@ -593,7 +586,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
 
         try {
             String[] to = phones.split(",");
-            if(to == null && to.length == 0){
+            if(to == null || to.length == 0){
                 logger.error("RFID触发电话报警失败：实验室【"+subName+"】管理员未配置手机号！");
                 return null;
             }
@@ -615,51 +608,24 @@ public class HxpStockServiceImpl implements IHxpStockService {
             // 判断四医大还是其他学校短信方案
             String content;
             if(phoneMode == 0){
-                /*HxpAlarmRecord hxpAlarmRecord = new HxpAlarmRecord();
-                hxpAlarmRecord.setAlarmContent("未领用即携带化学品离开实验室【"+subName+"】，" + "化学品（"+chemicalName+"）,请尽快确认！");
-                hxpAlarmRecord.setAlarmType(2);
-                hxpAlarmRecord.setAlarmMode(3);
-                hxpAlarmRecord.setHasValid(1);
-                hxpAlarmRecord.setAlarmTime(DateUtils.getNowDate());
-                hxpAlarmRecord.setSubId(subId);
-                hxpAlarmRecord.setHandlingStatus(1);
-                hxpAlarmRecord.setLiableUserIds(phones);
-
-                hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);*/
-
                 content = "电话报警：" + subName + "的化学品" + chemicalName + "违规带离实验室，请尽快确认！";
                 AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, to, content);
                 AjaxResult result = remoteAlarmService.send(alarmEntrty);
 
                 logger.error(JSONUtil.toJsonStr(result));
             }else if(phoneMode == 1){
-                /*for (String s : to) {
-                    HxpAlarmRecord hxpAlarmRecord = new HxpAlarmRecord();
-                    hxpAlarmRecord.setAlarmContent("未领用即携带化学品离开实验室【"+subName+"】，" + "化学品（"+chemicalName+"）,请尽快确认！");
-                    hxpAlarmRecord.setAlarmType(2);
-                    hxpAlarmRecord.setAlarmMode(3);
-                    hxpAlarmRecord.setHasValid(1);
-                    hxpAlarmRecord.setAlarmTime(DateUtils.getNowDate());
-                    hxpAlarmRecord.setSubId(subId);
-                    hxpAlarmRecord.setHandlingStatus(1);
-                    hxpAlarmRecord.setLiableUserIds(s);
-
-                    hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
-                }*/
-
                 content = "【实验室安全系统】" + subName + "-实验人员未领用即携带化学品离开房间，发生时间："
                         + DateUtil.format(DateUtil.date(), DateUtils.YYYY_MM_DD_HH_MM_SS)
                         + "，请尽快确认。";//短信回复“CL”确认已处理。
                 try {
                     smsSydUtil.sendSydSms(content, 1, null, to);
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    logger.error("sendPhoneAlarm异常："+e);
                 }
             }
 
             return hxpAlarmRecord.getId();
         }catch (Exception e){
-            e.printStackTrace();
             logger.error("【"+subName+"】RFID触发报警器进行电话通知失败：" + e.getMessage());
             return null;
         }
@@ -678,7 +644,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
         // 化学品即将过期、已过期-实验室安全责任人  通知功能
 
         List<HxpStockVO> list = hxpStockMapper.selectStockByExpired();
-        if(list.size() > 0){
+        if(list!=null && !list.isEmpty()){
             List<HxpStockVO> wasExpirelist = new ArrayList<>();
             List<Long> stockIds = new ArrayList<>();
             List<Long> joinIds = new ArrayList<>();
@@ -710,13 +676,13 @@ public class HxpStockServiceImpl implements IHxpStockService {
 
             }
             //快过期list有数据需要单独处理
-            if(wasExpirelist.size()>0){
+            if(wasExpirelist!=null && !wasExpirelist.isEmpty()){
                 wasExpire(wasExpirelist);
             }
-            if(stockIds.size() > 0){
+            if(!stockIds.isEmpty()){
                 hxpStockMapper.updateExpiredByIds(stockIds);
             }
-            if(joinIds.size() > 0){
+            if(joinIds==null || !joinIds.isEmpty()){
                 hxpChemicalJoinCabinetMapper.updateExpiredByIds(joinIds);
             }
             hxpChemicalJoinCabinetMapper.updateChemicalJoinCabinetByExpired();
@@ -810,7 +776,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
     @Override
     public void outStock(HxpStock hxpStock) {
         //出库，将库存量置为 0
-        // hxpStock.setOutUsages(BigDecimal.ZERO);
         hxpStock.setOutTime(DateUtils.getNowDate());
         hxpStock.setOutUserId(SecurityUtils.getUserId());
 
@@ -823,7 +788,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
         hxpUserecord.setUseStatus(1);
         hxpUserecord.setStockId(hxpStock.getId());
         List<HxpUserecord> userecordList = hxpUserecordService.selectHxpUserecordList(hxpUserecord);
-        if(userecordList.size() > 0){
+        if(userecordList!=null &&  !userecordList.isEmpty()){
             throw new ServiceException("化学品领用中，请在完成归还后再操作出库。");
         }
 
@@ -984,10 +949,10 @@ public class HxpStockServiceImpl implements IHxpStockService {
 
         List<Long> stockIds = expiredStock.stream().filter(i -> 1 == i.getStatus()).map(HxpStockVO::getId).collect(Collectors.toList());
         List<Long> joinIds = expiredStock.stream().filter(i-> 1 == i.getStatus()).map(HxpStockVO::getJoinId).collect(Collectors.toList());
-        if(stockIds.size() > 0){
+        if(stockIds!=null && !stockIds.isEmpty()){
             hxpStockMapper.updateExpiredByIds(stockIds);
         }
-        if(joinIds.size() > 0){
+        if(joinIds!=null && !joinIds.isEmpty()){
             hxpChemicalJoinCabinetMapper.updateExpiredByIds(joinIds);
         }
     }
@@ -1042,16 +1007,15 @@ public class HxpStockServiceImpl implements IHxpStockService {
         List hxpIds = new ArrayList<>();
         List<HxpUserecord> hxpUserecordList = hxpUserecordMapper.selectByOvertime();
 
-        if(hxpUserecordList != null && hxpUserecordList.size() > 0){
+        if(hxpUserecordList != null && !hxpUserecordList.isEmpty()){
             hxpUserecordList.forEach(hxpUserecord -> {
                 HxpStock hxpStock = hxpStockMapper.selectHxpStockById(hxpUserecord.getStockId());
                 HxpChemicalJoinCabinet hxpChemicalJoinCabinet = hxpChemicalJoinCabinetMapper.selectHxpChemicalJoinCabinetById(hxpStock.getJoinId());
                 HxpChemical hxpChemical = hxpChemicalService.selectHxpChemicalById(hxpChemicalJoinCabinet.getChemicalId());
-//                Integer collectHour = hxpChemical.getCollectHour();
+                Integer collectHour = hxpChemical.getCollectHour();
                 Integer collectMinute = hxpChemical.getCollectMinute();
-//                Integer minute = (collectHour != null?collectHour:0) * 60 + (collectMinute != null?collectMinute:0);
-                Integer minute = collectMinute != null?collectMinute:0;
-                DateTime dateTime = DateUtil.offsetSecond(hxpUserecord.getCollectTime(), minute);
+                Integer minute = (collectHour != null?collectHour:0) * 60 + (collectMinute != null?collectMinute:0);
+                DateTime dateTime = DateUtil.offsetMinute(hxpUserecord.getCollectTime(), minute);
 
                 //过期时间在提醒天数内 并且在一天之内
                 WarningNoticeLogDto warningNoticeLogDto = new WarningNoticeLogDto();
@@ -1153,7 +1117,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
                         List<Map<String, Object>> terminalList = hxpSmartTerminalMapper.selectTerminalBySubId(8, hxpStock.getSubId());
                         Map<String, Object> smartTerminal = terminalList.get(0);
                         String terminalNum = String.valueOf(smartTerminal.get("hardwareNum"));
-                        //Integer dealTime = (Integer) smartTerminal.get("dealTime");
                         terminalList.get(0).get("ringTime");
                         ResultData<LabHardwareDto> hardwareByType = remoteLabHardwareService.findHardwareByType(hxpStock.getSubId(), 8, null, null);
                         if (HttpStatus.SUCCESS == hardwareByType.getCode()) {
@@ -1161,7 +1124,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
                             warningNoticeLogDto.setVoiceBroadcast(1);
                             remoteLaboratoryService.updateWarningNoticeLog(warningNoticeLogDto);
                             Long id = hardwareByType.getData().getId();
-                            logger.info("发送声光报警灯打开命令：{}",id);
                             remoteLaboratoryService.controlDevice(id, 1);
 
                             // 默认一个实验室只触发一个报警器
@@ -1179,15 +1141,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                             scheduledExecutorService.schedule(new TimerTask() {
                                 @Override
                                 public void run() {
-                                    logger.info("发送声光报警灯关闭命令：{}",id);
                                     remoteLaboratoryService.controlDevice(id, 0);
-                                    // 自动处理声光报警状态
-                                    //HxpAlarmRecord hxpAlarmRecord1 = new HxpAlarmRecord();
-                                    //hxpAlarmRecord1.setId(hxpAlarmRecord.getId());
-                                    //hxpAlarmRecord1.setHandlingStatus(2);
-                                    //hxpAlarmRecord1.setHandlingTime(DateUtils.getNowDate());
-                                    //hxpAlarmRecord1.setHandlingUserId(-2L);
-                                    //hxpAlarmRecordMapper.updateHxpAlarmRecord(hxpAlarmRecord1);
                                 }
                             }, Long.parseLong(terminalList.get(0).get("ringTime") + ""), TimeUnit.SECONDS);
                         }
@@ -1202,7 +1156,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                         logger.info("执行用户电话通知！");
                         DateTime date = DateUtil.date();
                         for (HxpAlarmConfig hxpAlarmConfig : hxpAlarmConfigList) {
-                            date = DateUtil.offsetSecond(date, Optional.ofNullable(hxpAlarmConfig.getTimeInterval()).orElse(1));
+                            date = DateUtil.offsetMinute(date, Optional.ofNullable(hxpAlarmConfig.getTimeInterval()).orElse(1));
                             HxpAlarmRecord hxpAlarmRecord = new HxpAlarmRecord();
                             hxpAlarmRecord.setAlarmContent(text);
                             hxpAlarmRecord.setAlarmType(2);
@@ -1213,7 +1167,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
                             hxpAlarmRecord.setStockId(hxpStock.getId());
                             hxpAlarmRecord.setParentId(hxpUserecord.getId());
                             hxpAlarmRecord.setUserecordId(alarmId);
-                            // hxpAlarmRecord.setTerminalNum();
                             hxpAlarmRecord.setHandlingStatus(1);
                             hxpAlarmRecord.setLiableUserIds(hxpAlarmConfig.getAlarmPhone());
                             hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpUserecordServiceImpl.java

@@ -107,7 +107,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
         oldUserecord.setStockId(hxpUserecord.getStockId());
         oldUserecord.setUseStatus(1);
         List<HxpUserecord> list = hxpUserecordMapper.selectHxpUserecordList(oldUserecord);
-        if(list.size() > 0){
+        if(list!=null && !list.isEmpty()){
             throw new ServiceException("该化学品已被领用，领用失败！");
         }
 
@@ -121,9 +121,6 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
             hxpUserecord.setOutOneUser(SecurityUtils.getUserId());
         }
 
-        /*if(!Objects.equals(hxpStock.getOutUsages(), hxpUserecord.getCollectStockNum())){
-            throw new ServiceException("当前库存量与实际不符，请联系管理员！");
-        }*/
         hxpUserecord.setCollectNowNum(hxpStock.getOutUsages());
         hxpUserecord.setLossAmount(hxpStock.getOutUsages().subtract(hxpUserecord.getCollectStockNum()));
 
@@ -233,8 +230,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
 
         // 查询用户信息
         logger.info("双卡验证，用户卡号：" + userValidationVo.getCardNum());
-//        String cardNum = Long.toHexString(Long.parseLong(userValidationVo.getCardNum())).toUpperCase();
-        // TODO 终端传参数据有问题，暂临时后端处理
+        //终端传参数据有问题，暂临时后端处理
         String cardNum = DESUtils.encrypt(DESUtils.completeMissing(userValidationVo.getCardNum()));
 
         R<SysUser> user = remoteUserService.getUserInfoByCardNum(cardNum, SecurityConstants.INNER);
@@ -250,12 +246,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
         SysUser sysUser = user.getData();
         // 判断是否是实验室安全责任人
         int count = hxpUserecordMapper.selectIsAdminOrSafeUser(userValidationVo.getSubId(), sysUser.getUserId());
-        if(count > 0){
-
-        }/*else if(){
-            // TODO 判断是否有申请门禁开锁
-        }*/
-        else {
+        if(count <= 0){
             throw new ServiceException("您当前无权限验证，请联系管理员！");
         }
 
@@ -270,10 +261,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
 
     @Override
     public boolean selectIsAdminOrSafeUser(Long subId, Long userId) {
-        if(hxpUserecordMapper.selectIsAdminOrSafeUser(subId, userId) > 0){
-            return true;
-        }
-        return false;
+        return hxpUserecordMapper.selectIsAdminOrSafeUser(subId, userId) > 0?true:false;
     }
 
     @Override
@@ -381,11 +369,11 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
 
             hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
         }
-        if(recordIds.size() > 0){
+        if(!recordIds.isEmpty()){
             hxpUserecordMapper.updateUserecordOvertimeByIds(recordIds);
         }
 
-        if(userMsgList.size() > 0){
+        if(!userMsgList.isEmpty()){
             // 领用超时进行通知
             remoteMessageContentService.addDynamicMessage(msgData);
         }
@@ -421,9 +409,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
 
     @Override
     public HxpUserecordDetailVo queryDetailById(Long id) {
-        HxpUserecordDetailVo userecordDetail = hxpUserecordMapper.queryDetailById(id);
-
-        return userecordDetail;
+        return hxpUserecordMapper.queryDetailById(id);
     }
 
     /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/SydSmsLogServiceImpl.java

@@ -49,7 +49,7 @@ public class SydSmsLogServiceImpl implements ISydSmsLogService {
 
     @Override
     public List<SydSmsLog> getListByIds(List<Long> ids) {
-        if (ids.isEmpty()) {
+        if (ids==null || ids.isEmpty()) {
             new ArrayList<>();
         }
         return sydSmsLogMapper.getListByIds(ids);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/util/ChemicalUtils.java

@@ -17,6 +17,8 @@ import java.util.regex.Pattern;
  */
 public class ChemicalUtils {
 
+    private  ChemicalUtils(){}
+
     /**
      * 去除小数点后多余的0
      *
@@ -34,7 +36,7 @@ public class ChemicalUtils {
                 list.add(group);
             }
             //取0处理
-            if (list.size() > 0) {
+            if (!list.isEmpty()) {
                 for (String str:list) {
                     String newStr = noZeros(str);
                     unit = unit.replace(str, newStr);
@@ -68,10 +70,5 @@ public class ChemicalUtils {
         BigDecimal noZeros = value.stripTrailingZeros();
         return noZeros.toPlainString();
     }
-    public static void main(String[] args) {
-        //String str = "武汉0.133300g；北京10.25001g, 是1.0000个，这个2";
-        //String str = "dasddsa11.10000";
-        String str = "J00036-申购:1.00000oz";
-        System.out.println("str = "+removeZeroForAfterPoint(str));
-    }
+
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/util/SmsSydUtil.java

@@ -156,11 +156,6 @@ public class SmsSydUtil {
         sydSmsLog.setReply(0);
         List<SydSmsLog> list = sydSmsLogService.selectSydSmsLogList(sydSmsLog);
 
-        // TODO 测试原因，咱注释掉
-        /*if(list.size() == 0){
-            return;
-        }*/
-
         Account account = new Account(USER_NAME, PASS_WORD);
         PostMsg UP_PM = new PostMsg(SMS_IP, UP_PORT);
         MOMsg[] mos = UP_PM.getMOMsgs(account, 10);
@@ -184,7 +179,7 @@ public class SmsSydUtil {
                     }
                 }
             }
-            if(mosList.size() > 0){
+            if(mosList!=null && !mosList.isEmpty()){
                 log.info("四医大短信上行查询遗漏数据：" + JSONUtil.toJsonStr(mosList));
             }
         }