消息推送模板

huimv-env-common/src/main/java/com/huimv/env/common/config/WeChatMessage.java

@@ -29,11 +29,11 @@ public class WeChatMessage {
     private static  final  String  secret= "cf69d556bbc962fa60a59b0fece3fa95";
     private static  final  String  templateId= "w95K45G9-2xGocleqrtGoHwEGF6ocqSu8EbDBxCQSR0";
 
-    public void sendMsg(String deviceCode,String warningContent, Date uploadDate,String location,String openId){
+    public void sendMsg(String deviceName,String deviceCode,String warningContent, Date uploadDate,String location,String openId){
         //1:获取token（接口调用凭证）
         String token = queryToken();
         //2:发送订阅消息
-        send(token,warningContent,deviceCode,uploadDate,location,openId);
+        send(token,deviceName,warningContent,deviceCode,uploadDate,location,openId);
     }
 
     // 1: 获取 access_token  (2h过期)
@@ -47,7 +47,7 @@ public class WeChatMessage {
         return token;
     }
 
-    public void send(String token,String warningContent,String deviceCode, Date uploadDate,String location,String openId){
+    public void send(String token,String deviceName,String warningContent,String deviceCode, Date uploadDate,String location,String openId){
         String msgUrl="https://api.weixin.qq.com/cgi-bin/message/subscribe/send";
         msgUrl = msgUrl + "?access_token=" + token;
         // 设置模板参数
@@ -58,7 +58,7 @@ public class WeChatMessage {
         // 设置data 模板内容
         HashMap<String, Object> data = new HashMap<>();
         //报警设备
-        data.put("thing1", formatParam(deviceCode));
+        data.put("thing1", formatParam(deviceName));
         //报警类型
         data.put("thing2", formatParam(warningContent));
         //报警时间

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWarningServiceImpl.java

@@ -54,7 +54,7 @@ public class EnvWarningServiceImpl extends ServiceImpl<EnvWarningMapper, EnvWarn
         for (SysAccountMultilevel sysAccountMultilevel : userList) {
             sysAccountMultilevel.setSubscribe(0);
             sysAccountMultilevelMapper.updateById(sysAccountMultilevel);
-            weChatMessage.sendMsg(envDevice.getDeviceSortCode(),envDeviceRecentlyData.getChipName()+"传感器异常",date,device.getBuildLocation(),sysAccountMultilevel.getWechatId());
+            weChatMessage.sendMsg(envDevice.getDeviceName(),envDevice.getDeviceSortCode(),envDeviceRecentlyData.getChipName()+"传感器异常",date,device.getBuildLocation(),sysAccountMultilevel.getWechatId());
         }
         this.save(envWarning);
     }
@@ -75,7 +75,9 @@ public class EnvWarningServiceImpl extends ServiceImpl<EnvWarningMapper, EnvWarn
         for (SysAccountMultilevel sysAccountMultilevel : userList) {
             sysAccountMultilevel.setSubscribe(0);
             sysAccountMultilevelMapper.updateById(sysAccountMultilevel);
-            weChatMessage.sendMsg(envDevice.getDeviceSortCode(),getWarning(ordeNumber,actType),uploadDate,device.getBuildLocation(),sysAccountMultilevel.getWechatId());
+            if (sysAccountMultilevel.getSubscribe() == 1){
+                weChatMessage.sendMsg(envDevice.getDeviceName(),envDevice.getDeviceSortCode(),getWarning(ordeNumber,actType),uploadDate,device.getBuildLocation(),sysAccountMultilevel.getWechatId());
+            }
         }
         this.save(envWarning);
     }