jiangjiazhi / regional-platform | GitLab

Commit 3265f9fb3c31ca56671a54886bebfac9505e25f1

Authored by liquanyu about 5 years ago

1 parent fc58427c27

Exists in master and in 6 other branches

lis修改

Showing 10 changed files with 18 additions and 9 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
platform-job-index/src/main/resources/spring/applicationContext-quartz.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java

...	...	@@ -2,7 +2,6 @@
2	2
3	3	import com.lyms.platform.permission.dao.master.MasterCheckItemMapper;
4	4	import com.lyms.platform.permission.model.CheckItem;
5		-import com.lyms.platform.permission.model.CheckItemManage;
6	5	import com.lyms.platform.permission.service.CheckItemService;
7	6	import org.springframework.beans.factory.annotation.Autowired;
8	7	import org.springframework.stereotype.Service;
...	...	@@ -10,7 +9,7 @@
10	9	import java.util.List;
11	10	import java.util.Map;
12	11
13		-@Service
	12	+@Service("cfCheckItemService")
14	13	public class CheckItemServiceImpl implements CheckItemService {
15	14
16	15	@Autowired

...	...	@@ -1686,14 +1686,14 @@
1686	1686	return getYmdDate(calendar.getTime());
1687	1687	}
1688	1688
1689		-/* public static void main(String[] args) {
	1689	+ public static void main(String[] args) {
1690	1690
1691	1691	Date bir = parseYMD("2017-03-08");
1692		- Date bir1 = parseYMD("2019-03-08");
1693		- int i = DateUtil.getAge2(bir, bir1);
1694		- System.out.println(i);
	1692	+ Date bir1 = parseYMD("2020-09-01");
	1693	+ //int i = DateUtil.getAge2(bir, bir1);
	1694	+ System.out.println(bir1.getTime());
1695	1695
1696		- }*/
	1696	+ }
1697	1697
1698	1698	}

...	...	@@ -48,6 +48,7 @@
48	48	configBuilder.setSocketTimeout(MAX_TIMEOUT);
49	49	// 设置从连接池获取连接实例的超时
50	50	configBuilder.setConnectionRequestTimeout(MAX_TIMEOUT);
	51	+
51	52	// 在提交请求之前测试连接是否可用
52	53	configBuilder.setStaleConnectionCheckEnabled(true);
53	54	requestConfig = configBuilder.build();
...	...	@@ -223,6 +224,7 @@
223	224	StringEntity stringEntity = new StringEntity(json.toString(),"UTF-8");//解决中文乱码问题
224	225	stringEntity.setContentEncoding("UTF-8");
225	226	stringEntity.setContentType("application/json");
	227	+ httpPost.setHeader("connection", "Keep-Alive");
226	228	httpPost.setEntity(stringEntity);
227	229	response = httpClient.execute(httpPost);
228	230	int statusCode = response.getStatusLine().getStatusCode();

...	...	@@ -22,7 +22,7 @@
22	22	<!-- 配置一个触发器 -->
23	23	<bean id="startWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
24	24	<property name="jobDetail" ref="startWorkTask"></property>
25		- <property name="cronExpression" value="0 0 1 * * ?"></property>
	25	+ <property name="cronExpression" value="0 0/5 * * * ?"></property>
26	26	</bean>
27	27
28	28	<!-- 总调度,用于启动定时器 -->

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.permission.model.CheckItem;
8	8	import com.lyms.platform.permission.service.CheckItemService;
9	9	import org.springframework.beans.factory.annotation.Autowired;
	10	+import org.springframework.beans.factory.annotation.Qualifier;
10	11	import org.springframework.stereotype.Controller;
11	12	import org.springframework.web.bind.annotation.*;
12	13
...	...	@@ -23,6 +24,7 @@
23	24	@RequestMapping("/checkitem")
24	25	public class CheckItemController extends BaseController {
25	26	@Autowired
	27	+ @Qualifier("cfCheckItemService")
26	28	private CheckItemService checkItemService;
27	29
28	30	@RequestMapping(value = "/getCheckItemList", method = RequestMethod.GET)

...	...	@@ -13,6 +13,7 @@
13	13	import com.lyms.platform.permission.service.CheckItemService;
14	14	import com.lyms.platform.permission.service.OrganizationService;
15	15	import org.springframework.beans.factory.annotation.Autowired;
	16	+import org.springframework.beans.factory.annotation.Qualifier;
16	17	import org.springframework.stereotype.Controller;
17	18	import org.springframework.web.bind.annotation.*;
18	19
...	...	@@ -28,6 +29,7 @@
28	29	private CheckItemManageService checkItemManageService;
29	30
30	31	@Autowired
	32	+ @Qualifier("cfCheckItemService")
31	33	private CheckItemService checkItemService;
32	34
33	35	@Autowired

...	...	@@ -107,6 +107,7 @@
107	107	private DzfyHisService dzfyHisService;
108	108
109	109	@Autowired
	110	+ @Qualifier("cfCheckItemService")
110	111	private CheckItemService checkItemService;
111	112
112	113

...	...	@@ -31,6 +31,7 @@
31	31	import org.apache.commons.collections.CollectionUtils;
32	32	import org.apache.commons.lang.*;
33	33	import org.springframework.beans.factory.annotation.Autowired;
	34	+import org.springframework.beans.factory.annotation.Qualifier;
34	35	import org.springframework.data.domain.Sort;
35	36	import org.springframework.data.mongodb.core.MongoTemplate;
36	37	import org.springframework.data.mongodb.core.aggregation.Aggregation;
...	...	@@ -128,6 +129,7 @@
128	129
129	130
130	131	@Autowired
	132	+ @Qualifier("cfCheckItemService")
131	133	private CheckItemService checkItemService;
132	134
133	135	public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");

...	...	@@ -38,6 +38,7 @@
38	38	import org.dom4j.DocumentHelper;
39	39	import org.dom4j.Element;
40	40	import org.springframework.beans.factory.annotation.Autowired;
	41	+import org.springframework.beans.factory.annotation.Qualifier;
41	42	import org.springframework.data.domain.Sort;
42	43	import org.springframework.data.mongodb.core.MongoTemplate;
43	44	import org.springframework.data.mongodb.core.query.Criteria;
...	...	@@ -203,6 +204,7 @@
203	204	private QhdfyHisService qhdfyHisService;
204	205
205	206	@Autowired
	207	+ @Qualifier("cfCheckItemService")
206	208	private CheckItemService checkItemService;
207	209
208	210	/**

...	...	@@ -98,7 +98,6 @@
98	98	String json = "";
99	99	try {
100	100	json = JsonUtil.obj2Str(list);
101		- System.out.println(json);
102	101	String result = HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push", json);
103	102	if (StringUtils.isNotEmpty(result)) {
104	103	Map<String, Integer> map = JsonUtil.str2Obj(result, Map.class);