Ver código fonte

LY 苯乙烯 邮件抄送

ly 2 anos atrás
pai
commit
599af7dd0e

+ 9 - 5
master/src/main/java/com/ruoyi/framework/task/TrainingRegularTask.java

@@ -20,7 +20,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-@Component
+@Component("trainingRegularTask")
 public class TrainingRegularTask extends BaseController {
 
     @Autowired
@@ -35,12 +35,12 @@ public class TrainingRegularTask extends BaseController {
     @Autowired
     private ITAlarmPrincipalService alarmPrincipalService;
 
-    public void execute() {
+    public void execute(Long deptId) {
         try {
             TTrainingRegular tTrainingRegular = new TTrainingRegular();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
             tTrainingRegular.setPlanDate(sdf.format(new Date()));
-            tTrainingRegular.setDeptId(10010l);
+            tTrainingRegular.setDeptId(deptId);
             List<TTrainingRegular> list = tTrainingRegularService.selectTTrainingRegularByPlanDate(tTrainingRegular);
             IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
             logger.info("=====================本次装置培训计划清单:{}", list);
@@ -97,8 +97,12 @@ public class TrainingRegularTask extends BaseController {
                         //拼接html
                         String html = start + result + end;
                         logger.info("html:" + html);
-                        String emailCc = alarmPrincipal.getPrincipalEmail();
-                        mailService.sendHtmlMail(email, "您本月有装置培训计划 You have a device training plan for this month", html,emailCc);
+                        if (deptId == 10010) {
+                            String emailCc = alarmPrincipals.get(0).getPrincipalEmail();
+                            mailService.sendHtmlMail(email, "您本月有装置培训计划 You have a device training plan for this month", html,emailCc);
+                        }else if (deptId == 1003){
+                            mailService.sendHtmlMail(email, "您本月有装置培训计划 You have a device training plan for this month", html);
+                        }
                     } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                     }

+ 2 - 1
master/src/main/resources/logback.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/u03/logs" />
+<!--	<property name="log.path" value="/u03/logs" />-->
+    <property name="log.path" value="D:/u03/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />