feature 代码提交

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/TrainingSendNotifyService.java

@@ -1,6 +1,10 @@
 package com.rongwei.trainingcommon.sys.service;
 
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.training.domain.TrainingDemandSurveyBackupsDo;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * SendNotifyService class
@@ -21,4 +25,9 @@ public interface TrainingSendNotifyService {
 
 
     void questionnaireSurvey();
+
+    void sendQuestionnaireSurveyNotify(List<TrainingDemandSurveyBackupsDo> doList);
+
+    void sendTrainingPlanCancelNotify(Map<String, List<String>> courseMap,
+                                      Map<String, List<String>> paperMap);
 }

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingDemandServiceImpl.java

@@ -11,6 +11,7 @@ import com.rongwei.training.vo.PreviewTrainDemandVo;
 import com.rongwei.training.vo.TrainingDemandVo;
 import com.rongwei.trainingcommon.sys.dao.*;
 import com.rongwei.trainingcommon.sys.service.TrainingDemandService;
+import com.rongwei.trainingcommon.sys.service.TrainingSendNotifyService;
 import com.rongwei.trainingcommon.sys.utils.TrainingListCopyUtils;
 import com.rongwei.trainingcommon.sys.utils.TrainingUtils;
 import org.slf4j.Logger;
@@ -73,7 +74,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
     @Autowired
     private DemandSurveyUserAnswerServiceImpl demandSurveyUserAnswerService;
     @Autowired
-    private TrainingSendNotifyServiceImpl sendNotifyService;
+    private TrainingSendNotifyService sendNotifyService;
 
     public static final String ERROR_MSG = "问卷调查发布失败";
     /**

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingSendNotifyServiceImpl.java

@@ -225,6 +225,7 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
      * @param
      */
     @Async
+    @Override
     public void sendQuestionnaireSurveyNotify(List<TrainingDemandSurveyBackupsDo> saveDemandSurveyBackupsDos) {
         // 获取用户id
         saveDemandSurveyBackupsDos.forEach((info) -> {
@@ -259,6 +260,7 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
      * @param courseMap
      * @param paperMap
      */
+    @Override
     public void sendTrainingPlanCancelNotify(Map<String, List<String>> courseMap,
                                              Map<String, List<String>> paperMap) {
         courseMap.forEach((k, v) -> {

rw-training/training-server/src/main/java/com/rongwei/training/controller/PlanController.java

@@ -53,7 +53,7 @@ public class PlanController {
     @Autowired
     private PlanCourseService planCourseService;
     @Autowired
-    private TrainingSendNotifyServiceImpl sendNotifyService;
+    private TrainingSendNotifyService sendNotifyService;
 
     /**
      * 列表

rw-training/training-server/src/main/java/com/rongwei/training/controller/SendNotifyController.java

@@ -1,6 +1,7 @@
 package com.rongwei.training.controller;
 
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.trainingcommon.sys.service.TrainingSendNotifyService;
 import com.rongwei.trainingcommon.sys.service.impl.TrainingSendNotifyServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class SendNotifyController {
     @Autowired
-    private TrainingSendNotifyServiceImpl sendNotifyService;
+    private TrainingSendNotifyService sendNotifyService;
 
     @Scheduled(cron = "0 0 0 ? * *")
     @PostMapping("/end/reminder-email")

rw-training/training-server/src/main/resources/bootstrap-dev.yml

@@ -3,11 +3,11 @@ spring:
     nacos:
       config:
         file-extension: yaml
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.205:8848
         namespace: cd047569-9470-4dfb-8663-b113d01cd30f
         ext-config[0]:
           data-id: common-config.yaml
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.205:8848
         namespace: cd047569-9470-4dfb-8663-b113d01cd30f