Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/MaterialDefinitionSyncDaoImpl.java
===================================================================
diff -u -r38500 -r38511
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/MaterialDefinitionSyncDaoImpl.java (.../MaterialDefinitionSyncDaoImpl.java) (revision 38500)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/MaterialDefinitionSyncDaoImpl.java (.../MaterialDefinitionSyncDaoImpl.java) (revision 38511)
@@ -23,6 +23,12 @@
Logger logger = Logger.getLogger(this.getClass());
+ private String materialSyncUrl;
+
+ public void setMaterialSyncUrl(String materialSyncUrl) {
+ this.materialSyncUrl = materialSyncUrl;
+ }
+
private ExecutorService taskExecutor = Executors.newCachedThreadPool();
@Override
@@ -31,9 +37,12 @@
return;
}
try {
+ if(StringUtils.isBlank(materialSyncUrl)){
+ throw new SystemException("接口地址异常!");
+ }
JSONObject request = buildMaterialDefinitionRequest(materialDefinitionList);
logger.info("材料推送接口请求参数:" + request.toString());
- String result = HttpClientHelper.sendPost(DatasyncConstant.MATERIAL_PUSH_URL, "application/json", request.toString());
+ String result = HttpClientHelper.sendPost(materialSyncUrl, "application/json", request.toString());
//String result = "{'errorCode':'0','message':'成功'}";
logger.info("材料推送接口返回参数:" + result);
JSONObject resultJson = JSONObject.fromObject(result);
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/DisposableGoodsSyncDaoImpl.java
===================================================================
diff -u -r38500 -r38511
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/DisposableGoodsSyncDaoImpl.java (.../DisposableGoodsSyncDaoImpl.java) (revision 38500)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/DisposableGoodsSyncDaoImpl.java (.../DisposableGoodsSyncDaoImpl.java) (revision 38511)
@@ -23,6 +23,12 @@
Logger logger = Logger.getLogger(this.getClass());
+ private String disposableGoodsSyncUrl;
+
+ public void setDisposableGoodsSyncUrl(String disposableGoodsSyncUrl) {
+ this.disposableGoodsSyncUrl = disposableGoodsSyncUrl;
+ }
+
private ExecutorService taskExecutor = Executors.newCachedThreadPool();
@Override
@@ -31,9 +37,12 @@
return;
}
try {
+ if(StringUtils.isBlank(disposableGoodsSyncUrl)){
+ throw new SystemException("接口地址不能为空!");
+ }
JSONObject request = buildDisposableGoodsRequest(disposableGoodsList);
logger.info("一次性物品定义推送接口请求参数:" + request.toString());
- String result = HttpClientHelper.sendPost(DatasyncConstant.DISPOSABLE_GOODS_PUSH_URL, "application/json", request.toString());
+ String result = HttpClientHelper.sendPost(disposableGoodsSyncUrl, "application/json", request.toString());
logger.info("一次性物品定义推送接口返回参数:" + result);
JSONObject resultJson = JSONObject.fromObject(result);
String errorCode = resultJson.optString("errorCode");
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/HIS.xml
===================================================================
diff -u -r38500 -r38511
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/HIS.xml (.../HIS.xml) (revision 38500)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/HIS.xml (.../HIS.xml) (revision 38511)
@@ -90,9 +90,13 @@
-
+
+
+
-
+
+
+
\ No newline at end of file
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/DatasyncConstant.java
===================================================================
diff -u -r38500 -r38511
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/DatasyncConstant.java (.../DatasyncConstant.java) (revision 38500)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsetyy/DatasyncConstant.java (.../DatasyncConstant.java) (revision 38511)
@@ -24,16 +24,6 @@
public final static String queryURL = "http://gdbyway-platform-cluster.dbrmyy.com/hie/services/hieService/msgTransfer";
/**
- * 器械材料推送的接口地址DGSETYY-102
- */
- public final static String MATERIAL_PUSH_URL = "http://8.134.154.115:8091/api/public/sync/surgical-item/material";
-
- /**
- * 一次性物品定义推送的接口地址DGSETYY-102
- */
- public final static String DISPOSABLE_GOODS_PUSH_URL = "http://8.134.154.115:8091/api/public/sync/surgical-item/disposable-goods";
-
- /**
* 获取门诊病人信息的方法名称(入参)
*/
public final static String msgCode_MZ = "OpPatientInforCSSD";