From 0dc22fb319c72b8bdbeedb90401a0554bfc7628a Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 4 May 2018 00:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msg/controller/MsgGenerateController.java      |  4 +-
 .../platform/msg/service/IMsgGenerateService.java  | 12 +++---
 .../msg/service/impl/MsgGenerateServiceImpl.java   | 29 ++++++++++---
 .../resources/spring/applicationContext-quartz.xml | 48 +++++++++++++++++++---
 4 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
index f0c2fd6..4aa6125 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
@@ -110,7 +110,9 @@ public class MsgGenerateController extends BaseController {
     @ResponseBody
     public String generaterAllMsg()
     {
-        msgGenerateService.generaterAllMsg();
+        msgGenerateService.generaterAllAmsMsg();
+        msgGenerateService.generaterAllTmpMsg();
+        msgGenerateService.generaterAllCourseMsg();
         return "";
     }
 
diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IMsgGenerateService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IMsgGenerateService.java
index 3d027f9..f50cee5 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IMsgGenerateService.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IMsgGenerateService.java
@@ -32,14 +32,14 @@ public interface IMsgGenerateService {
 
 
     /**
-     * 生成所有
-     * @param
-     */
-    void generaterAllMsg();
-
-    /**
      * 生成 课程推送
      * @param generateHospitalId
      */
     void generateCourseMsg(String generateHospitalId);
+
+    void generaterAllCourseMsg();
+
+    void generaterAllTmpMsg();
+
+    void generaterAllAmsMsg();
 }
diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
index 64f5c51..cd7c670 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
@@ -133,7 +133,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService {
     @Override
     public void generateChanAmsMsg(String generateHospitalId) {
         List<SmsConfigModel> configModels =  baseService.getHospitalConfigsByWeek(generateHospitalId);
-        logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size());
+        logger.info("The generateChanAmsMsg configs hospital size is {}", configModels.size());
         if (CollectionUtils.isNotEmpty(configModels))
         {
             int end = 0;
@@ -158,7 +158,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService {
     public void generateTemplateMsg(String generateHospitalId) {
         List<SmsConfigModel> configModels =  baseService.getHospitalConfigs(generateHospitalId);
 
-        logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size());
+        logger.info("The generateChanAmsMsg configs hospital size is {}", configModels.size());
         if (CollectionUtils.isNotEmpty(configModels))
         {
             int end = 0;
@@ -228,13 +228,30 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService {
     }
 
     /**
-     * 总的方法调用
+     * 模板短信生成
      */
     @Override
-    public void generaterAllMsg() {
+    public void generaterAllTmpMsg() {
         generateTemplateMsg(null);
-        generateChanAmsMsg(null);
-        generateBabyAmsMsg(null);
+    }
+
+
+    /**
+     * ams生成
+     */
+    @Override
+    public void generaterAllAmsMsg() {
         generatePatAmsMsg(null);
+        generateBabyAmsMsg(null);
+        generateChanAmsMsg(null);
+    }
+
+
+    /**
+     * 孕妇课程
+     */
+    @Override
+    public void generaterAllCourseMsg() {
+        generateCourseMsg(null);
     }
 }
diff --git a/platform-msg-generate/src/main/resources/spring/applicationContext-quartz.xml b/platform-msg-generate/src/main/resources/spring/applicationContext-quartz.xml
index 23a14ca..dc4fb6a 100644
--- a/platform-msg-generate/src/main/resources/spring/applicationContext-quartz.xml
+++ b/platform-msg-generate/src/main/resources/spring/applicationContext-quartz.xml
@@ -9,27 +9,63 @@
                            http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.1.xsd
                            http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
-	<!-- 配置任务的具体类和方法 -->
-	<bean id="generateMsgWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+	<!-- ams消息生成 -->
+	<bean id="generateAmsWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<!-- 要调用的bean -->
 		<property name="targetObject" ref="msgGenerateService"></property>
 		<!-- 要调用的Method -->
-		<property name="targetMethod" value="generaterAllMsg"></property>
+		<property name="targetMethod" value="generaterAllAmsMsg"></property>
 		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
 		<property name="concurrent" value="false"></property>
 	</bean>
 
 	<!--&lt;!&ndash; 配置一个触发器 &ndash;&gt;-->
-	<bean id="msgGenerateWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-		<property name="jobDetail" ref="generateMsgWorkTask"></property>
+	<bean id="genAmsWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="generateAmsWorkTask"></property>
 		<property name="cronExpression" value="0 0 1 * * ?"></property>
 	</bean>
 
+
+	<!-- 模板消息 -->
+	<bean id="generateTmpWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="msgGenerateService"></property>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="generaterAllTmpMsg"></property>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"></property>
+	</bean>
+
+	<!--&lt;!&ndash; 配置一个触发器 &ndash;&gt;-->
+	<bean id="genTmpWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="generateTmpWorkTask"></property>
+		<property name="cronExpression" value="0 0 3 * * ?"></property>
+	</bean>
+
+
+	<!-- 孕妇课程 -->
+	<bean id="generateCourseWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="msgGenerateService"></property>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="generaterAllCourseMsg"></property>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"></property>
+	</bean>
+
+	<!--一个小时生成一次-->
+	<bean id="genCourseWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="generateCourseWorkTask"></property>
+		<property name="cronExpression" value="0 0 0/1 * * ?"></property>
+	</bean>
+
 	<!-- 总调度,用于启动定时器 -->
 	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
 		<property name="triggers" >
 			<list>
-				<!--<ref bean="msgGenerateWorkTrigger"/>-->
+				<!--<ref bean="genAmsWorkTrigger"/>-->
+				<!--<ref bean="genTmpWorkTrigger"/>-->
+				<!--<ref bean="genCourseWorkTrigger"/>-->
 			</list>
 		</property>
 	</bean>
-- 
1.8.3.1