jiangjiazhi / regional-platform

Commit 0dc22fb319c72b8bdbeedb90401a0554bfc7628a

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

推送修改

Showing 4 changed files with 74 additions and 19 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IMsgGenerateService.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
platform-msg-generate/src/main/resources/spring/applicationContext-quartz.xml

...	...	@@ -110,7 +110,9 @@
110	110	@ResponseBody
111	111	public String generaterAllMsg()
112	112	{
113		- msgGenerateService.generaterAllMsg();
	113	+ msgGenerateService.generaterAllAmsMsg();
	114	+ msgGenerateService.generaterAllTmpMsg();
	115	+ msgGenerateService.generaterAllCourseMsg();
114	116	return "";
115	117	}
116	118

...	...	@@ -32,15 +32,15 @@
32	32
33	33
34	34	/**
35		- * 生成所有
36		- * @param
37		- */
38		- void generaterAllMsg();
39		-
40		- /**
41	35	* 生成课程推送
42	36	* @param generateHospitalId
43	37	*/
44	38	void generateCourseMsg(String generateHospitalId);
	39	+
	40	+ void generaterAllCourseMsg();
	41	+
	42	+ void generaterAllTmpMsg();
	43	+
	44	+ void generaterAllAmsMsg();
45	45	}

...	...	@@ -133,7 +133,7 @@
133	133	@Override
134	134	public void generateChanAmsMsg(String generateHospitalId) {
135	135	List<SmsConfigModel> configModels = baseService.getHospitalConfigsByWeek(generateHospitalId);
136		- logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size());
	136	+ logger.info("The generateChanAmsMsg configs hospital size is {}", configModels.size());
137	137	if (CollectionUtils.isNotEmpty(configModels))
138	138	{
139	139	int end = 0;
...	...	@@ -158,7 +158,7 @@
158	158	public void generateTemplateMsg(String generateHospitalId) {
159	159	List<SmsConfigModel> configModels = baseService.getHospitalConfigs(generateHospitalId);
160	160
161		- logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size());
	161	+ logger.info("The generateChanAmsMsg configs hospital size is {}", configModels.size());
162	162	if (CollectionUtils.isNotEmpty(configModels))
163	163	{
164	164	int end = 0;
165	165
166	166
167	167
...	...	@@ -228,14 +228,31 @@
228	228	}
229	229
230	230	/**
231		- * 总的方法调用
	231	+ * 模板短信生成
232	232	*/
233	233	@Override
234		- public void generaterAllMsg() {
	234	+ public void generaterAllTmpMsg() {
235	235	generateTemplateMsg(null);
236		- generateChanAmsMsg(null);
237		- generateBabyAmsMsg(null);
	236	+ }
	237	+
	238	+
	239	+ /**
	240	+ * ams生成
	241	+ */
	242	+ @Override
	243	+ public void generaterAllAmsMsg() {
238	244	generatePatAmsMsg(null);
	245	+ generateBabyAmsMsg(null);
	246	+ generateChanAmsMsg(null);
	247	+ }
	248	+
	249	+
	250	+ /**
	251	+ * 孕妇课程
	252	+ */
	253	+ @Override
	254	+ public void generaterAllCourseMsg() {
	255	+ generateCourseMsg(null);
239	256	}
240	257	}

...	...	@@ -9,27 +9,63 @@
9	9	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.1.xsd
10	10	http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
11	11
12		- <!-- 配置任务的具体类和方法 -->
13		- <bean id="generateMsgWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	12	+ <!-- ams消息生成 -->
	13	+ <bean id="generateAmsWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
14	14	<!-- 要调用的bean -->
15	15	<property name="targetObject" ref="msgGenerateService"></property>
16	16	<!-- 要调用的Method -->
17		- <property name="targetMethod" value="generaterAllMsg"></property>
	17	+ <property name="targetMethod" value="generaterAllAmsMsg"></property>
18	18	<!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
19	19	<property name="concurrent" value="false"></property>
20	20	</bean>
21	21
22	22	<!--<!– 配置一个触发器 –>-->
23		- <bean id="msgGenerateWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
24		- <property name="jobDetail" ref="generateMsgWorkTask"></property>
	23	+ <bean id="genAmsWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	24	+ <property name="jobDetail" ref="generateAmsWorkTask"></property>
25	25	<property name="cronExpression" value="0 0 1 * * ?"></property>
26	26	</bean>
27	27
	28	+
	29	+ <!-- 模板消息 -->
	30	+ <bean id="generateTmpWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	31	+ <!-- 要调用的bean -->
	32	+ <property name="targetObject" ref="msgGenerateService"></property>
	33	+ <!-- 要调用的Method -->
	34	+ <property name="targetMethod" value="generaterAllTmpMsg"></property>
	35	+ <!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
	36	+ <property name="concurrent" value="false"></property>
	37	+ </bean>
	38	+
	39	+ <!--<!– 配置一个触发器 –>-->
	40	+ <bean id="genTmpWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	41	+ <property name="jobDetail" ref="generateTmpWorkTask"></property>
	42	+ <property name="cronExpression" value="0 0 3 * * ?"></property>
	43	+ </bean>
	44	+
	45	+
	46	+ <!-- 孕妇课程 -->
	47	+ <bean id="generateCourseWorkTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	48	+ <!-- 要调用的bean -->
	49	+ <property name="targetObject" ref="msgGenerateService"></property>
	50	+ <!-- 要调用的Method -->
	51	+ <property name="targetMethod" value="generaterAllCourseMsg"></property>
	52	+ <!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
	53	+ <property name="concurrent" value="false"></property>
	54	+ </bean>
	55	+
	56	+ <!--一个小时生成一次-->
	57	+ <bean id="genCourseWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	58	+ <property name="jobDetail" ref="generateCourseWorkTask"></property>
	59	+ <property name="cronExpression" value="0 0 0/1 * * ?"></property>
	60	+ </bean>
	61	+
28	62	<!-- 总调度,用于启动定时器 -->
29	63	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
30	64	<property name="triggers" >
31	65	<list>
32		- <!--<ref bean="msgGenerateWorkTrigger"/>-->
	66	+ <!--<ref bean="genAmsWorkTrigger"/>-->
	67	+ <!--<ref bean="genTmpWorkTrigger"/>-->
	68	+ <!--<ref bean="genCourseWorkTrigger"/>-->
33	69	</list>
34	70	</property>
35	71	</bean>