裂解巡检 - 测温模块温度超过1080推送APP提醒

裂解巡检 - 测压模块压差超过0.9推送APP提醒

master/src/main/java/com/ruoyi/project/production/controller/TFurnancePressureController.java

@@ -10,6 +10,7 @@ import java.util.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.stuxuhai.jpinyin.PinyinException;
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.sendEmail.IMailService;
 import com.ruoyi.common.thread.furnance.FurnancePressureThread;
 import com.ruoyi.common.utils.StringUtils;
@@ -29,6 +30,7 @@ import com.ruoyi.project.production.mapper.TFurnancePressureMapper;
 import com.ruoyi.project.production.service.ITFurnanceTemperatureService;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysConfigService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import com.ruoyi.project.system.service.ISysUserService;
 import net.sf.jsqlparser.statement.select.ExceptOp;
@@ -95,6 +97,12 @@ public class TFurnancePressureController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
+
+    @Autowired
+    private ISysConfigService configService;
+
     /**
      * 删除裂解炉Pass图片（APP）
      */
@@ -3800,7 +3808,7 @@ public class TFurnancePressureController extends BaseController {
                 msg = msg.substring(0, msg.length() - 1);
                 msg += "压差<0.45或>0.9，请注意处理。";
                 // 发邮件
-                String mailMsg = furnanceName + msg;
+                String mailMsg = furnanceName + "：" + msg;
                 List<SysDictData> furnanceRecipientDict = iSysDictTypeService.selectDictDataByType("FURNANCE_RECIPIENT");
                 for (SysDictData sysDictData : furnanceRecipientDict) {
                     String dictValue = sysDictData.getDictValue();
@@ -3810,6 +3818,14 @@ public class TFurnancePressureController extends BaseController {
                     Thread thread = new Thread(mailThread);
                     thread.start();
                 }
+                // APP推送
+                String pushList = configService.selectConfigByKey("production.furnance.pushList");
+                String[] staffIds = pushList.split(",");
+                String[] userIds = new String[staffIds.length];
+                for (int i = 0; i < staffIds.length; i++) {
+                    userIds[i] = userService.selectUserByStaffId(staffIds[i]).getUserId().toString();
+                }
+                jiGuangPushService.send("裂解炉压差预警", mailMsg, userIds);
             }
         }
         //更新

master/src/main/java/com/ruoyi/project/production/controller/TFurnanceTemperatureController.java

@@ -7,6 +7,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.github.stuxuhai.jpinyin.PinyinException;
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.sendEmail.IMailService;
 import com.ruoyi.common.thread.furnance.FurnancePressureThread;
 import com.ruoyi.common.thread.furnance.FurnanceTemperatureThread;
@@ -20,6 +21,7 @@ import com.ruoyi.project.production.domain.TFurnanceTemperature;
 import com.ruoyi.project.production.service.ITFurnancePressureService;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysConfigService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -68,6 +70,12 @@ public class TFurnanceTemperatureController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
+
+    @Autowired
+    private ISysConfigService configService;
+
     /**
      * 裂解炉测温列表Summary（APP）
      */
@@ -1397,7 +1405,7 @@ public class TFurnanceTemperatureController extends BaseController
                 message = message.substring(0, message.length() - 1);
                 message += "温度>1080，请注意处理。";
                 // 发邮件
-                String mailMsg = furnanceName + message;
+                String mailMsg = furnanceName + "：" + message;
                 List<SysDictData> furnanceRecipientDict = iSysDictTypeService.selectDictDataByType("FURNANCE_RECIPIENT");
                 for (SysDictData sysDictData : furnanceRecipientDict) {
                     String dictValue = sysDictData.getDictValue();
@@ -1407,6 +1415,14 @@ public class TFurnanceTemperatureController extends BaseController
                     Thread thread = new Thread(mailThread);
                     thread.start();
                 }
+                // APP推送
+                String pushList = configService.selectConfigByKey("production.furnance.pushList");
+                String[] staffIds = pushList.split(",");
+                String[] userIds = new String[staffIds.length];
+                for (int j = 0; j < staffIds.length; j++) {
+                    userIds[j] = userService.selectUserByStaffId(staffIds[j]).getUserId().toString();
+                }
+                jiGuangPushService.send("裂解炉高温预警", mailMsg, userIds);
             }
         }
         return toAjax(i);