jiangjiazhi / regional-platform

Authored by hujiaqi over 8 years ago

Exists in master and in 6 other branches

Showing 9 changed files

...	...	@@ -4,6 +4,6 @@
4	4	platform-dal 模型定义
5	5	platfrom-data-api 交互数据接口
6	6	platfrom-operate-api api接口
7		-platfrom-report-api 统计报表的接口
	7	+platform-reportData 统计报表的接口
8	8	platform-resource 公共的配置信息

...	...	@@ -9,6 +9,8 @@
9	9	import com.mongodb.Mongo;
10	10	import org.apache.commons.codec.binary.Base64;
11	11	import org.apache.commons.lang.StringUtils;
	12	+import org.slf4j.Logger;
	13	+import org.slf4j.LoggerFactory;
12	14	import org.springframework.beans.factory.annotation.Autowired;
13	15	import org.springframework.data.mongodb.core.MongoTemplate;
14	16	import org.springframework.data.mongodb.core.query.Criteria;
...	...	@@ -27,6 +29,8 @@
27	29	@Service("mongoSyncService")
28	30	public class MongoSyncService {
29	31
	32	+ private static Logger logger = LoggerFactory.getLogger("SYNC_DATA");
	33	+
30	34	/**
31	35	* spring mongodb　集成操作类
32	36	*/
...	...	@@ -41,11 +45,8 @@
41	45	public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0");
42	46
43	47	public boolean syncData(String action, String id, String className, String json) {
44		- System.out.println(mongo_crypto_key);
45		- System.out.println(action);
46		- System.out.println(id);
47		- System.out.println(className);
48		- System.out.println(json);
	48	+
	49	+ logger.info("action:" + action + ",id:"+id+",className:"+className+",json:"+json);
49	50	try {
50	51	if ("UPDATEMULTI".equals(action)) {
51	52	Class cla = Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key));
...	...	@@ -129,7 +130,7 @@
129	130	}
130	131	return false;
131	132	} catch (Exception e) {
132		- e.printStackTrace();
	133	+ ExceptionUtils.catchException(e,"syncData Error.");
133	134	return false;
134	135	}
135	136	}

...	...	@@ -19,6 +19,7 @@
19	19	CommunityConfig("CommunityConfig", 97531000130L),
20	20	CommunityModel("CommunityModel", 97531000140L),
21	21	DataPermissionsModel("DataPermissionsModel", 97531000150L),
	22	+ SimplePermission("SimplePermission", 97531000151L),
22	23	DischargeAbstractBabyModel("DischargeAbstractBabyModel", 97531000160L),
23	24	DischargeAbstractMotherModel("DischargeAbstractMotherModel", 97531000170L),
24	25	EmergenceTreatmentModel("EmergenceTreatmentModel", 97531000180L),
...	...	@@ -30,6 +31,8 @@
30	31	LisReport("LisReport", 97531000240L),
31	32	MaternalDeliverModel("MaternalDeliverModel", 97531000250L),
32	33	Patients("Patients", 97531000260L),
	34	+ Placenta("Placenta", 97531000261L),
	35	+ ExtPlacenta("ExtPlacenta", 97531000263L),
33	36	PersonModel("PersonModel", 97531000270L),
34	37	PostReviewModel("PostReviewModel", 97531000280L),
35	38	PredictedStatisticsCountModel("PredictedStatisticsCountModel", 97531000290L),

...	...	@@ -75,6 +75,7 @@
75	75	}
76	76
77	77	public static class SimplePermission implements Serializable{
	78	+ private static final long serialVersionUID = SerialIdEnum.SimplePermission.getCid();
78	79	//1 自己 2 自己科室 3 全部科室 4
79	80	private Integer type=PermissionTypeEnums.ONLY_SELF.getId();
80	81

...	...	@@ -5,6 +5,7 @@
5	5	import org.apache.commons.lang.math.NumberUtils;
6	6	import org.springframework.data.mongodb.core.mapping.Document;
7	7
	8	+import java.io.Serializable;
8	9	import java.util.Date;
9	10	import java.util.List;
10	11	import java.util.Map;
...	...	@@ -324,7 +325,8 @@
324	325	}
325	326	}
326	327
327		- public static class ExtPlacenta {
	328	+ public static class ExtPlacenta implements Serializable {
	329	+ private static final long serialVersionUID = SerialIdEnum.ExtPlacenta.getCid();
328	330	//胎盘娩出方式
329	331	private String tpmcType;
330	332	//娩出方式

...	...	@@ -25,6 +25,10 @@
25	25	@RequestMapping(method = RequestMethod.POST,value = "/syncmongo")
26	26	public String syncmongo(String action, String token, String className, String jsonData, String id){
27	27	if (StringUtils.isNotBlank(token) && mongo_sync_token.equals(token)) {
	28	+ //如果为空直接返回成功
	29	+ if(StringUtils.isEmpty(jsonData)){
	30	+ return "success";
	31	+ }
28	32	boolean boo = mongoSyncService.syncData(action,id, className, jsonData);
29	33	if (boo) {
30	34	return "success";

1	1	package com.lyms.platform.operate.web.request;
2	2
	3	+import com.lyms.platform.beans.SerialIdEnum;
3	4	import com.lyms.platform.common.base.IBasicRequestConvert;
4	5	import com.lyms.platform.common.core.annotation.form.Form;
5	6	import com.lyms.platform.common.enums.SexTypeEnums;
...	...	@@ -10,6 +11,7 @@
10	11	import com.lyms.platform.pojo.BabyModel;
11	12	import com.lyms.platform.pojo.MaternalDeliverModel;
12	13
	14	+import java.io.Serializable;
13	15	import java.util.ArrayList;
14	16	import java.util.Date;
15	17	import java.util.List;
...	...	@@ -396,7 +398,8 @@
396	398	this.totalprocess = totalprocess;
397	399	}
398	400
399		- public static class Placenta{
	401	+ public static class Placenta implements Serializable{
	402	+ private static final long serialVersionUID = SerialIdEnum.Placenta.getCid();
400	403	//心率
401	404	private Double heartRate;
402	405	//胎方位

...	...	@@ -69,6 +69,18 @@
69	69	</layout>
70	70	</appender>
71	71
	72	+ <appender name="SYNC_DATA" class="org.apache.log4j.RollingFileAppender">
	73	+ <param name="Append" value="true" />
	74	+ <param name="File" value="${catalina.base}/logs/sync-data.log" />
	75	+ <param name="maxBackupIndex" value="3"/>
	76	+ <layout class="org.apache.log4j.PatternLayout">
	77	+ <param name="ConversionPattern" value="%d %p - %m%n" />
	78	+ </layout>
	79	+ </appender>
	80	+ <logger name="SYNC_DATA">
	81	+ <level value="info" />
	82	+ <appender-ref ref="DAL-SYNC_DATA" />
	83	+ </logger>
72	84	<logger name="DAL-MONITOR">
73	85	<level value="debug" />
74	86	<appender-ref ref="DAL-MONITOR" />

...	...	@@ -4,11 +4,11 @@
4	4
5	5	mongo.db.username=platform
6	6	mongo.db.password=platform123
7		-mongo.socketTimeout=2500
	7	+mongo.socketTimeout=25000
8	8	mongo.connectionsPerHost=20
9	9	mongo.threadsAllowedToBlockForConnectionMultiplier=10
10		-mongo.connectTimeout=3000
11		-mongo.maxWaitTime=4000
	10	+mongo.connectTimeout=30000
	11	+mongo.maxWaitTime=40000
12	12	mongo.autoConnectRetry=true
13	13	mongo.socketKeepAlive=true
14	14