From 970148d4addbaecf2acd07b37ace37afc4ec6429 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 6 Feb 2017 15:36:10 +0800 Subject: [PATCH] 1 --- README | 2 +- .../com/lyms/platform/biz/service/MongoSyncService.java | 13 +++++++------ .../src/main/java/com/lyms/platform/beans/SerialIdEnum.java | 3 +++ .../java/com/lyms/platform/pojo/DataPermissionsModel.java | 1 + .../java/com/lyms/platform/pojo/MaternalDeliverModel.java | 4 +++- .../platform/operate/web/request/MatDeliverAddRequest.java | 5 ++++- platform-operate-api/src/main/resources/log4j_config.xml | 12 ++++++++++++ platform-resource/resources/config-dev.properties | 6 +++--- 8 files changed, 34 insertions(+), 12 deletions(-) diff --git a/README b/README index 471bd0a..6a8a126 100644 --- a/README +++ b/README @@ -4,5 +4,5 @@ platform-common 公共的类 platform-dal 模型定义 platfrom-data-api 交互数据接口 platfrom-operate-api api接口 -platfrom-report-api 统计报表的接口 +platform-reportData 统计报表的接口 platform-resource 公共的配置信息 \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java index 859db71..936a4c4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java @@ -9,6 +9,8 @@ import com.lyms.platform.pojo.*; import com.mongodb.Mongo; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -27,6 +29,8 @@ import java.util.List; @Service("mongoSyncService") public class MongoSyncService { + private static Logger logger = LoggerFactory.getLogger("SYNC_DATA"); + /** * spring mongodb　集成操作类 */ @@ -41,11 +45,8 @@ public class MongoSyncService { public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0"); public boolean syncData(String action, String id, String className, String json) { - System.out.println(mongo_crypto_key); - System.out.println(action); - System.out.println(id); - System.out.println(className); - System.out.println(json); + + logger.info("action:" + action + ",id:"+id+",className:"+className+",json:"+json); try { if ("UPDATEMULTI".equals(action)) { Class cla = Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key)); @@ -129,7 +130,7 @@ public class MongoSyncService { } return false; } catch (Exception e) { - e.printStackTrace(); + ExceptionUtils.catchException(e,"syncData Error."); return false; } } diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index ab5fb1a..1003efb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -19,6 +19,7 @@ public enum SerialIdEnum { CommunityConfig("CommunityConfig", 97531000130L), CommunityModel("CommunityModel", 97531000140L), DataPermissionsModel("DataPermissionsModel", 97531000150L), + SimplePermission("SimplePermission", 97531000151L), DischargeAbstractBabyModel("DischargeAbstractBabyModel", 97531000160L), DischargeAbstractMotherModel("DischargeAbstractMotherModel", 97531000170L), EmergenceTreatmentModel("EmergenceTreatmentModel", 97531000180L), @@ -30,6 +31,8 @@ public enum SerialIdEnum { LisReport("LisReport", 97531000240L), MaternalDeliverModel("MaternalDeliverModel", 97531000250L), Patients("Patients", 97531000260L), + Placenta("Placenta", 97531000261L), + ExtPlacenta("ExtPlacenta", 97531000263L), PersonModel("PersonModel", 97531000270L), PostReviewModel("PostReviewModel", 97531000280L), PredictedStatisticsCountModel("PredictedStatisticsCountModel", 97531000290L), diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java index 924f4d8..176d3db 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java @@ -75,6 +75,7 @@ public class DataPermissionsModel extends BaseModel { } public static class SimplePermission implements Serializable{ + private static final long serialVersionUID = SerialIdEnum.SimplePermission.getCid(); //1 自己 2 自己科室 3 全部科室 4 private Integer type=PermissionTypeEnums.ONLY_SELF.getId(); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 183ad1d..bcc1062 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.result.BaseModel; import org.apache.commons.lang.math.NumberUtils; import org.springframework.data.mongodb.core.mapping.Document; +import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Map; @@ -324,7 +325,8 @@ public class MaternalDeliverModel extends BaseModel { } } - public static class ExtPlacenta { + public static class ExtPlacenta implements Serializable { + private static final long serialVersionUID = SerialIdEnum.ExtPlacenta.getCid(); //胎盘娩出方式 private String tpmcType; //娩出方式 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index 2b3228f..e975188 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.request; +import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.enums.SexTypeEnums; @@ -10,6 +11,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.MaternalDeliverModel; +import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -396,7 +398,8 @@ public class MatDeliverAddRequest implements IBasicRequestConvert + + + + + + + + + + + + diff --git a/platform-resource/resources/config-dev.properties b/platform-resource/resources/config-dev.properties index 58fb8c2..e2b1d96 100644 --- a/platform-resource/resources/config-dev.properties +++ b/platform-resource/resources/config-dev.properties @@ -4,11 +4,11 @@ mongo.db.dbname=platform mongo.db.username=platform mongo.db.password=platform123 -mongo.socketTimeout=2500 +mongo.socketTimeout=25000 mongo.connectionsPerHost=20 mongo.threadsAllowedToBlockForConnectionMultiplier=10 -mongo.connectTimeout=3000 -mongo.maxWaitTime=4000 +mongo.connectTimeout=30000 +mongo.maxWaitTime=40000 mongo.autoConnectRetry=true mongo.socketKeepAlive=true -- 1.8.3.1