扫描空指针漏洞修复

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/WordTemplateUtils.java

@@ -195,7 +195,9 @@ public class WordTemplateUtils {
             e.printStackTrace();
         } finally {
             try {
-                in.close();
+                if (null != in) {
+                    in.close();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -282,15 +282,17 @@ public class ConfigureController extends AbstractBaseController {
                     unit = fireFightingSystemMapper.getWaterlevelUnit(s, "FHS_WirelessliquidDetector_WaterLevel");
                 }
             }
-            if (!ObjectUtils.isEmpty(unit) && ("CM".equals(unit.get("unit")) || "cm".equals(unit.get("unit")) || "厘米".equals(unit.get("unit")))){
-                BigDecimal divide = new BigDecimal(100);
-                if (!ObjectUtils.isEmpty(record.get("nowLevel")) && !"--".equals(record.get("nowLevel"))){
-                    BigDecimal nowLevel = new BigDecimal(String.valueOf(record.get("nowLevel")));
-                    record.put("nowLevel", nowLevel.divide(divide, 2, BigDecimal.ROUND_HALF_UP));
-                }
-                if (!ObjectUtils.isEmpty(record.get("levelAbs")) && !"--".equals(record.get("nowLevel"))){
-                    BigDecimal levelAbs = new BigDecimal(String.valueOf(record.get("levelAbs")));
-                    record.put("levelAbs", levelAbs.divide(divide, 2, BigDecimal.ROUND_HALF_UP));
+            if (!ObjectUtils.isEmpty(unit)){
+                if (("CM".equals(unit.get("unit")) || "cm".equals(unit.get("unit")) || "厘米".equals(unit.get("unit")))) {
+                    BigDecimal divide = new BigDecimal(100);
+                    if (!ObjectUtils.isEmpty(record.get("nowLevel")) && !"--".equals(record.get("nowLevel"))){
+                        BigDecimal nowLevel = new BigDecimal(String.valueOf(record.get("nowLevel")));
+                        record.put("nowLevel", nowLevel.divide(divide, 2, BigDecimal.ROUND_HALF_UP));
+                    }
+                    if (!ObjectUtils.isEmpty(record.get("levelAbs")) && !"--".equals(record.get("nowLevel"))){
+                        BigDecimal levelAbs = new BigDecimal(String.valueOf(record.get("levelAbs")));
+                        record.put("levelAbs", levelAbs.divide(divide, 2, BigDecimal.ROUND_HALF_UP));
+                    }
                 }
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -389,9 +389,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     }
                 }
                 if (isBatch == 1 && CollectionUtils.isNotEmpty(list)) {
-                    list.stream().forEach(x ->{
-                        webMqttHandler.publish(TopicEnum.EQYQR.getTopic(), JSON.parseObject(JSON.toJSONString(x), HashMap.class));
-                        x.setAlarmReason(ent.getAlarmReason());
+                    list.forEach(x ->{
+                        if (!ObjectUtils.isEmpty(x)) {
+                            webMqttHandler.publish(TopicEnum.EQYQR.getTopic(), JSON.parseObject(JSON.toJSONString(x), HashMap.class));
+                            x.setAlarmReason(ent.getAlarmReason());
+                        }
 //                        syncConfirmAlarmMsgToSystemctl(x);
                     });
                 } else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -629,17 +629,17 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             besidesMap.put(alterId, String.valueOf(alertCalled.getSequenceNbr()));
         }
 
-        if(alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
+        if(alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode()) && alertCalled != null && alertCalled.getCallTime() != null) {
             alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
             besidesMap.put(sendTime, DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
             pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情初报.getCode(),besidesMap,smsParams,usIds, null);
         } else {
-            if(alertWay.equals(AlertBusinessTypeEnum.警情续报.getCode())) {
+            if(alertWay.equals(AlertBusinessTypeEnum.警情续报.getCode()) && alertCalled != null && alertCalled.getCallTime() != null) {
                 besidesMap.put(sendTime, DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
                 pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情续报.getCode(),besidesMap,smsParams,usIds, null);
             }
 
-            if(alertWay.equals(AlertBusinessTypeEnum.警情结案.getCode())) {
+            if(alertWay.equals(AlertBusinessTypeEnum.警情结案.getCode()) && alertCalled != null && alertCalled.getCallTime() != null && alertCalled.getRecDate() != null) {
                 besidesMap.put("startTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
                 besidesMap.put("endTime", DateUtils.dateFormat(alertCalled.getRecDate(), DateUtils.DATE_TIME_PATTERN));
                 pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情结案.getCode(),besidesMap,smsParams,usIds, null);