ly 3 jaren geleden
bovenliggende
commit
8d8d8d6efd

+ 4 - 1
master/src/main/java/com/ruoyi/framework/task/PlantproglistTask.java

@@ -1,5 +1,6 @@
 package com.ruoyi.framework.task;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.sendEmail.IMailService;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -75,6 +76,7 @@ public class PlantproglistTask extends BaseController
             //预警类型对应负责人
             alarmPrincipal.setTypeId(Long.parseLong("1050"));
             List<TAlarmPrincipal> alarmPrincipals = alarmPrincipalService.selectList(alarmPrincipal);
+            System.out.println(JSON.toJSONString(alarmPrincipals));
             String firstwarningContent = "";
             String secondwarningContent = "";
             String thirdwarningContent = "";
@@ -193,7 +195,8 @@ public class PlantproglistTask extends BaseController
         String email = "";
         for (TAlarmPrincipal a : alarmPrincipals) {
             username = a.getPrincipalName();
-            email = a.getPrincipalEmail();
+//            email = a.getPrincipalEmail();
+            email = "924846500@qq.com";
             //表html中间内容
             String prime = "";
             String firstcenter = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +

+ 14 - 14
master/src/main/resources/application.yml

@@ -93,24 +93,24 @@ spring:
         max-wait: -1ms
   # 邮箱配置
   mail:
-    host: smtpout.basf-it-services.com
-    protocol: smtp
-    default-encoding: UTF-8
-    password:
-    username:
-    port: 25
-    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-    properties.mail.debug: true
-    from: CPMS.byc@BASF-YPC.com.cn
-#    host: smtp.exmail.qq.com
+#    host: smtpout.basf-it-services.com
 #    protocol: smtp
 #    default-encoding: UTF-8
-#    password: vvTAT8hciG7FLk4C
-#    username: email@seashoreept.com
-#    port: 587
+#    password:
+#    username:
+#    port: 25
 #    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
 #    properties.mail.debug: true
-#    from: email@seashoreept.com
+#    from: CPMS.byc@BASF-YPC.com.cn
+    host: smtp.exmail.qq.com
+    protocol: smtp
+    default-encoding: UTF-8
+    password: vvTAT8hciG7FLk4C
+    username: email@seashoreept.com
+    port: 587
+    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+    properties.mail.debug: true
+    from: email@seashoreept.com
 # token配置
 token:
     # 令牌自定义标识

File diff suppressed because it is too large
+ 38 - 2
ui/src/views/plant/organization/index.vue


Some files were not shown because too many files changed in this diff