将火点消息通知用户

src/main/java/com/xkrs/helper/FirePointPushManager.java

@@ -35,9 +35,11 @@ public class FirePointPushManager {
     private PushHelper pushHelper;
 
     public void pushNotification(FirePointOrdinaryEntity firePoint) {
+
         //发送微信群聊消息
         sendWeChatGroupMessage(firePoint);
 
+        try {
             //过滤短信通知收件人
             List<SysUserEntity> sysUserList = sysUserDao.findAll();
             List<SysUserEntity> smsReceiverList = FirePointCodeUtils.filterSmsReceiver(firePoint.getTownCode(), sysUserList);
@@ -83,12 +85,18 @@ public class FirePointPushManager {
                 builder.append("结束统计发送短信").append(nowTime).append("\n");
                 log.info(builder.toString());
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info(e.getMessage());
+        }
+
     }
 
     /**
      * 发送微信消息
      */
     private void sendWeChatGroupMessage(FirePointOrdinaryEntity firePoint) {
+        try {
             List<CountyCodeWeiXinEntity> countyCodeWeiXinList = countyCodeWeiXinDao.findAll();
             if (countyCodeWeiXinList.isEmpty()) {
                 return;
@@ -127,6 +135,10 @@ public class FirePointPushManager {
                 stringBuilder.append("火情信息：").append(messageContent);
                 log.info(stringBuilder.toString());
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info(e.getMessage());
+        }
     }
 
 }

src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java

@@ -119,6 +119,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
             firePointOrdinaryEntity.setTownName(addressBean.getTownName());
             firePointOrdinaryEntity.setFirePointAddress(addressBean.getFirePointAddress());
             firePointOrdinaryDao.save(firePointOrdinaryEntity);
+            firePointPushManager.pushNotification(firePointOrdinaryEntity);//将火点消息通知用户
             return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功", locale);
         }
         ErrorInfoLogUtils.log("高德逆地理编码异常，出现问题的火点详情：" + firePointOrdinaryEntity.toString());
@@ -134,6 +135,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
         firePointOrdinaryEntity.setCountyName(countyName);
         firePointOrdinaryEntity.setTownCode(townCode);
         firePointOrdinaryDao.save(firePointOrdinaryEntity);
+        firePointPushManager.pushNotification(firePointOrdinaryEntity);//将火点消息通知用户
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功", locale);
     }
 
@@ -181,7 +183,6 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
                     FirePointOrdinaryEntity firePoint = firePointList.get(0);
                     firePoint.setFireStatus(status);//设置火点的研判标志属性
                     firePointOrdinaryDao.save(firePoint);//数据库保存
-                    firePointPushManager.pushNotification(firePoint);//将火点消息通知用户
                 } else {
                     ErrorInfoLogUtils.log("操作异常，审核系统发送的fireCode在秸秆系统中size() != 1：fireCode = " + fireCode + "，status = " + fireCode);
                 }