徐明浩

特种设备-预警检查定时任务

master/src/main/java/com/ruoyi/framework/task/TSpecdevAllTask.java

@@ -61,7 +61,7 @@ public class TSpecdevAllTask extends BaseController {
     private final String glAlarmType = "特种设备-锅炉-在用";
     private final String glUrlSuffix = "sems/devgl/specGl";
     private final String ccAlarmType = "特种设备-叉车-在用";
-    private final String ccUrlSuffix = "sems/devcc/specCc";
+    private final String ccUrlSuffix = "sems/decvcc/specCc";
     private final String dtAlarmType = "特种设备-电梯-在用";
     private final String dtUrlSuffix = "sems/devdt/specDt";
     private final String dzsbAlarmType = "特种设备-起重机械-在用";
@@ -78,6 +78,7 @@ public class TSpecdevAllTask extends BaseController {
     private final Long alarmtype = 1080L;//特种设备预警ID
 
     private final String contentFormat = "（装置名称，单元，位号，下次检查时间）";
+    private final String ccContentFormat = "（装置名称，车牌号，位号，下次检查时间）";
 
     /**
      * 检查预警标识状态
@@ -99,7 +100,6 @@ public class TSpecdevAllTask extends BaseController {
     }
 
     private void checkWarnFlagForGl(Long firstlevel, Long secondlevel, Long thirdlevel, SimpleDateFormat sdf) {
-
         //获取需要发送邮件的人员信息
         TAlarmPrincipal tAlarmPrincipal = new TAlarmPrincipal();
         tAlarmPrincipal.setTypeId(this.alarmtype);
@@ -495,7 +495,7 @@ public class TSpecdevAllTask extends BaseController {
     private void ccSendEmail(SimpleDateFormat sdf, List<TSpecdevCc> cc, TAlarmPrincipal o, String warningContent, String level) {
         if (cc.size() > 0) {
             this.sendEmail(o.getPrincipalName(), o.getPrincipalEmail(), this.ccAlarmType, level,
-                    this.contentFormat, this.ccWarningContent(cc, sdf), this.ccUrlSuffix);
+                    this.ccContentFormat, this.ccWarningContent(cc, sdf), this.ccUrlSuffix);
             insertHistory(o, level.substring(0, 1), warningContent, this.alarmtype + "", this.ccAlarmType);
         }
     }
@@ -561,7 +561,7 @@ public class TSpecdevAllTask extends BaseController {
     private String dtWarningContent(List<TSpecdevDt> list, SimpleDateFormat sdf) {
         String str = "";
         for (TSpecdevDt t : list) {
-            str += "<br>" + t.getPlantCode() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
+            str += "<br>" + t.getPlantCode() + "，" + t.getUnit() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
         }
         return str;
     }
@@ -576,7 +576,7 @@ public class TSpecdevAllTask extends BaseController {
     private String dzsbWarningContent(List<TSpecdevDzsb> list, SimpleDateFormat sdf) {
         String str = "";
         for (TSpecdevDzsb t : list) {
-            str += "<br>" + t.getPlantCode() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
+            str += "<br>" + t.getPlantCode() + "，" + t.getUnit() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
         }
         return str;
     }
@@ -591,7 +591,7 @@ public class TSpecdevAllTask extends BaseController {
     private String ccWarningContent(List<TSpecdevCc> list, SimpleDateFormat sdf) {
         String str = "";
         for (TSpecdevCc t : list) {
-            str += "<br>" + t.getPlantCode() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
+            str += "<br>" + t.getPlantCode() + "，" + t.getCarNo() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
         }
         return str;
     }
@@ -606,7 +606,7 @@ public class TSpecdevAllTask extends BaseController {
     private String ylgdWarningContent(List<TSpecdevYlgd> list, SimpleDateFormat sdf) {
         String str = "";
         for (TSpecdevYlgd t : list) {
-            str += "<br>" + t.getPlantCode() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
+            str += "<br>" + t.getPlantCode() + "，" + t.getUnit() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
         }
         return str;
     }
@@ -621,7 +621,7 @@ public class TSpecdevAllTask extends BaseController {
     private String ylrqWarningContent(List<TSpecdevYlrq> list, SimpleDateFormat sdf) {
         String str = "";
         for (TSpecdevYlrq t : list) {
-            str += "<br>" + t.getPlantCode() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
+            str += "<br>" + t.getPlantCode() + "，" + t.getUnit() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
         }
         return str;
     }
@@ -636,7 +636,7 @@ public class TSpecdevAllTask extends BaseController {
     private String glWarningContent(List<TSpecdevGl> list, SimpleDateFormat sdf) {
         String str = "";
         for (TSpecdevGl t : list) {
-            str += "<br>" + t.getPlantCode() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
+            str += "<br>" + t.getPlantCode() + "，" + t.getUnit() + "，" + t.getDevno() + "，" + sdf.format(t.getNextWarnDate());
         }
         return str;
     }