From f0eca55f5108aca1222c9fc7356d9ee4e4a59478 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 19 五月 2025 16:50:38 +0800
Subject: [PATCH] 宝鸡西机医院改为从管理表动态取配置
---
src/main/java/com/example/service/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java | 101 +++++++++++++++---------
src/main/java/com/example/utils/synczd/DictionaryUtilShanXiWeiNanBjxjyy.java | 89 +++++++++++++--------
2 files changed, 118 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/example/service/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java b/src/main/java/com/example/service/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java
index 2e2c862..c679810 100644
--- a/src/main/java/com/example/service/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java
+++ b/src/main/java/com/example/service/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java
@@ -8,8 +8,10 @@
import cn.hutool.json.JSONUtil;
import com.example.config.ConfigValue;
import com.example.constant.ApiParamsConstants;
+import com.example.domain.DictCommonHisConfig;
import com.example.domain.HisSyncDict;
import com.example.domain.TjFlowingWaterHis;
+import com.example.service.DictCommonHisConfigService;
import com.example.service.HisService;
import com.example.utils.AjaxResult;
import com.example.utils.FieldNameConverter;
@@ -44,23 +46,25 @@
// client_secret:05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad
// http://oapi.xamjyy.com/OAPI
- @Autowired
- public BjxjyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
- this.applicationContext = applicationContext;
- this.configValue = configValue;
- HIS_URL = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.hisapiappend");
- TJ_URL = configValue.getConfigValue("tjUrl");
- CZY = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.czy");
- }
+// @Autowired
+// public BjxjyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
+// this.applicationContext = applicationContext;
+// this.configValue = configValue;
+// HIS_URL = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.hisapiappend");
+// TJ_URL = configValue.getConfigValue("tjUrl");
+// CZY = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.czy");
+// }
@Autowired
private RedisTemplate<Object ,Object> redisTemplate;
+ @Autowired
+ private DictCommonHisConfigService dictCommonHisConfigService;
- private final ApplicationContext applicationContext;
-
- private final String HIS_URL;
- private final String TJ_URL;
- private final String CZY;
+// private final ApplicationContext applicationContext;
+//
+// private final String HIS_URL;
+// private final String TJ_URL;
+// private final String CZY;
//鑾峰彇token
private JSONObject getToken () {
@@ -74,7 +78,8 @@
map.put("client_secret", CLIENT_SECRET);
// map.put("scope",SCOP);
// String post = sendPostTokenFormUrlencoded (HIS_URL+"/oauth/token", map);
- String post = HttpClientUtils.sendPostTokenFormUrlencoded(HIS_URL + "/oauth/token", map, null);
+ String his_url = dictCommonHisConfigService.getConfigValByHospitalAndKey("bjxjyy", "HIS_URL");
+ String post = HttpClientUtils.sendPostTokenFormUrlencoded(his_url + "/oauth/token", map, null);
if (StrUtil.isBlank(post)) return null;
return JSONUtil.parseObj(post);
}
@@ -101,7 +106,8 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("chongZhiJe","");
map.put ("yiBaoKh","");
map.put ("geRenBh","");
@@ -114,7 +120,7 @@
map.put ("minZuDm","");
map.put ("minZuMc","");
// 鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/jianDang", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/jianDang", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -131,11 +137,12 @@
@Override
public String getBingRenXxByShengFenZheng(Map<String, Object> params) {
Map<String, Object> map = new HashMap<> ();
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("shenFenZh", params.get(ApiParamsConstants.CUS_ID_CARD));
map.put ("danWeiBh",params.get(ApiParamsConstants.COMP_ID));
//鑱屼笟缂栫爜
- String string = sendPostTokenFormUrlencoded(HIS_URL + "/menZhenJz/getBingRenXxByShengFenZheng", map);
+ String string = sendPostTokenFormUrlencoded(config.getHisUrl() + "/menZhenJz/getBingRenXxByShengFenZheng", map);
JSONObject object = JSONUtil.createObj();
if (StrUtil.isBlank(string)){
object.putOpt("code",500);
@@ -183,9 +190,10 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ map.put ("caoZuoYuan",config.getCzyId());
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/saveBingRenXx", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/saveBingRenXx", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -206,7 +214,8 @@
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
map.put ("yuanQuId","1");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/getListDaiShouFei", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ String post = sendPost(config.getHisUrl() + "/shouFei/getListDaiShouFei", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -223,10 +232,11 @@
@Override
public String createMenZhenFy(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
Map<String, Object> map = new HashMap<> ();
map.put ("bingRenId",params.get(ApiParamsConstants.PATIONID));
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("yuanQuId","1");
map.put ("yingYongId","870101");
map.put ("kaiDanKs",params.get(ApiParamsConstants.kaiDanKeShi));
@@ -234,7 +244,7 @@
map.put ("shouTuiBz",params.get(ApiParamsConstants.SHOU_TUI_STATUS));
map.put ("feiYongMxList",params.get(ApiParamsConstants.FEI_YONG_INFO_LIST));
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/createMenZhenFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/createMenZhenFy", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getInt("returnCode") != 1) return AjaxResult.error(post);
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -272,8 +282,9 @@
ids.add(object);
});
map.put ("feiYongIdList",ids);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/cheXiaoMzFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/cheXiaoMzFy", map);
JSONObject entries = JSONUtil.parseObj(post);
if (entries.getStr("returnCode").equals("1"))
return AjaxResult.success();
@@ -288,7 +299,8 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShi", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getKeShi", map);
}
@Override
@@ -300,7 +312,8 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListYiShengZd", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getListYiShengZd", map);
}
@Override
@@ -311,7 +324,8 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getShouFeiXm", map);
}
@Override
@@ -324,7 +338,8 @@
map.put ("keShiIds",params.get(ApiParamsConstants.DEPT_IDS));
map.put ("ifPlus","");
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getKeShiByConditions", map);
}
@Override
@@ -334,7 +349,8 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getYangBen", map);
}
@Override
@@ -345,7 +361,8 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getListBingQuZd", map);
}
@Override
@@ -355,7 +372,8 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getZhiGongPage", map);
}
@Override
@@ -366,7 +384,8 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getJianChaXm", map);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getJianChaXm", map);
}
@Override
@@ -375,7 +394,8 @@
hashMap.put("queryCode",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("page",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("size",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getJianYanXm", hashMap);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getJianYanXm", hashMap);
}
@Override
@@ -383,7 +403,8 @@
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("shouFeiXmId",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("jiaGeTx",map.get(ApiParamsConstants.COMMON_QUERY_KEY2));
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getShouFeiXmJg", hashMap);
}
@Override
@@ -392,7 +413,8 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getRongQi", hashMap);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getRongQi", hashMap);
}
@Override
@@ -401,7 +423,8 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", hashMap);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ return sendPost(config.getHisUrl()+"/zhuShuJu/getYangBen", hashMap);
}
@Override
@@ -418,7 +441,8 @@
map.put("type","1");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","bjxjyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/pushZhiFuMsg", map,headers);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ String post = HttpClientUtils.sendPost(config.getTjUrl() + "/callBack/pushZhiFuMsg", map,headers);
JSONObject jsonObject = JSONUtil.parseObj(post);
JSONObject obj = JSONUtil.createObj();
if (jsonObject.getStr("code").equals("200")) {
@@ -549,7 +573,8 @@
map.put("hosp","shanxiqinbjxjyy");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","bjxjyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/getZdList", map,headers);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
+ String post = HttpClientUtils.sendPost(config.getTjUrl() + "/callBack/getZdList", map,headers);
JSONArray jsonArray = JSONUtil.parseObj(post).getJSONArray("data");
if (jsonArray != null && !jsonArray.isEmpty()) {
List<HisSyncDict> list = jsonArray.toList(HisSyncDict.class);
diff --git a/src/main/java/com/example/utils/synczd/DictionaryUtilShanXiWeiNanBjxjyy.java b/src/main/java/com/example/utils/synczd/DictionaryUtilShanXiWeiNanBjxjyy.java
index 22062ab..466ec2f 100644
--- a/src/main/java/com/example/utils/synczd/DictionaryUtilShanXiWeiNanBjxjyy.java
+++ b/src/main/java/com/example/utils/synczd/DictionaryUtilShanXiWeiNanBjxjyy.java
@@ -5,8 +5,10 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.example.config.ConfigValue;
+import com.example.domain.DictCommonHisConfig;
import com.example.domain.HisSyncDict;
import com.example.mapper.HisSyncDictMapper;
+import com.example.service.DictCommonHisConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -35,30 +37,33 @@
@Component
public class DictionaryUtilShanXiWeiNanBjxjyy {
- @Autowired
- private ConfigValue configValue;
+// @Autowired
+// private ConfigValue configValue;
@Autowired
private HisSyncDictMapper hisSyncDictMapper;
+ @Autowired
+ private DictCommonHisConfigService dictCommonHisConfigService;
- private static String CONFIG_PATH;
- private static String BASE_API_URL = "";
+// private static String CONFIG_PATH;
+// private static String BASE_API_URL = "";
private static final int SIZE = 100;
- private static String USER = "";
- private static String PASSWORD = "";
- private static String URL = "";
- private static String NAME = "";
- @Value("${config.path}")
- public void setConfigPath(String configPath) {
- CONFIG_PATH = configPath;
- NAME = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.name");
- URL = "jdbc:mysql://" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.ip") + ":" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.prot") + "/" + NAME +
- "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
- USER = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.username");
- PASSWORD = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.password");
- String apiUrl = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_url");
- String apiPort = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_port");
- BASE_API_URL = apiUrl+":"+apiPort+configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.hisapiappend");
- }
+// private static String USER = "";
+// private static String PASSWORD = "";
+// private static String URL = "";
+// private static String NAME = "";
+// @Value("${config.path}")
+// public void setConfigPath(String configPath) {
+// CONFIG_PATH = configPath;
+// NAME = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.name");
+// URL = "jdbc:mysql://" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.ip")
+// + ":" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.prot") + "/" + NAME +
+// "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
+// USER = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.username");
+// PASSWORD = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.password");
+// String apiUrl = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_url");
+// String apiPort = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_port");
+// BASE_API_URL = apiUrl+":"+apiPort+configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.hisapiappend");
+// }
/**
@@ -80,8 +85,9 @@
* 杩涜鍚屾
*/
public void exec(List<HisSyncDict> hisSyncDicts, String token){
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("bjxjyy");
log.info("寮�濮嬫墽琛屽悓姝�");
- Connection connection = getConnection();
+ Connection connection = getConnection(config);
if (connection == null)
return;
for (HisSyncDict hisSyncDict : hisSyncDicts) {
@@ -93,7 +99,7 @@
)
isFormatJson = true;
hisSyncDict.setDictName(hisSyncDict.getHospId()+"_"+hisSyncDict.getDictName());
- extracted(NAME, connection, hisSyncDict,token,isFormatJson);
+ extracted(config.getDbName(), connection, hisSyncDict,token,isFormatJson,config);
}
try {
connection.close();
@@ -102,7 +108,7 @@
log.info("鎵ц鍚屾瀹屾瘯");
}
- private void extracted(String name, Connection connection, HisSyncDict hisSyncDict,String token,Boolean isFormatJson) {
+ private void extracted(String name, Connection connection, HisSyncDict hisSyncDict,String token,Boolean isFormatJson,DictCommonHisConfig config) {
String method = hisSyncDict.getDictName();
log.info("寮�濮嬭姹備唬鐮� ->{}", method);
String tabName = "ltkj_" + method.toLowerCase();
@@ -116,8 +122,8 @@
if (hisSyncDict.getIsLimit() == 1) {
isLimit = true;
}
- log.info("璇锋眰鎺ュ彛 ->{}, 璇锋眰鍙傛暟 ->{}", BASE_API_URL+hisSyncDict.getUrl(), object);
- JSONObject entries = execRequest(object.toString(),hisSyncDict,token);
+ log.info("璇锋眰鎺ュ彛 ->{}, 璇锋眰鍙傛暟 ->{}", config.getHisUrl()+hisSyncDict.getUrl(), object);
+ JSONObject entries = execRequest(config,object.toString(),hisSyncDict,token);
log.info("璇锋眰杩斿洖 ->{}", entries.toString());
if (isFormatJson){
if ("1".equals(entries.getStr("returnCode"))) {
@@ -136,8 +142,8 @@
params = params.replace("${pageIndex}",String.valueOf(page));
params = params.replace("${pageSize}",String.valueOf(SIZE));
object = JSONUtil.parseObj(params);
- log.info("璇锋眰鎺ュ彛 ->{}, 璇锋眰鍙傛暟 ->{}", BASE_API_URL+hisSyncDict.getUrl(), object.toString());
- entries = execRequest(object.toString(),hisSyncDict,token);
+ log.info("璇锋眰鎺ュ彛 ->{}, 璇锋眰鍙傛暟 ->{}", config.getHisUrl()+hisSyncDict.getUrl(), object.toString());
+ entries = execRequest(config,object.toString(),hisSyncDict,token);
log.info("璇锋眰杩斿洖 ->{}", entries.toString());
response = entries.getJSONObject("returnData");
if ("1".equals(entries.getStr("returnCode"))) {
@@ -188,8 +194,8 @@
params = params.replace("${pageIndex}",String.valueOf(page));
params = params.replace("${pageSize}",String.valueOf(SIZE));
object = JSONUtil.parseObj(params);
- log.info("璇锋眰鎺ュ彛 ->{}, 璇锋眰鍙傛暟 ->{}", BASE_API_URL+hisSyncDict.getUrl(), object.toString());
- entries = execRequest(object.toString(),hisSyncDict,token);
+ log.info("璇锋眰鎺ュ彛 ->{}, 璇锋眰鍙傛暟 ->{}", config.getHisUrl()+hisSyncDict.getUrl(), object.toString());
+ entries = execRequest(config,object.toString(),hisSyncDict,token);
log.info("璇锋眰杩斿洖 ->{}", entries.toString());
response = entries.getJSONArray("returnData");
if (response.isEmpty())
@@ -272,14 +278,14 @@
* @param params 璇锋眰鍙傛暟 渚嬪锛� param1=val1¶m2=val2
* @return 璇锋眰杩斿洖鐨刯son杞崲鍚庣殑JSONObject瀵硅薄
*/
- private JSONObject execRequest(String params,HisSyncDict hisSyncDict,String token) {
+ private JSONObject execRequest(DictCommonHisConfig config,String params,HisSyncDict hisSyncDict,String token) {
java.net.URL url = null;
HttpURLConnection connection = null;
OutputStreamWriter writer = null;
BufferedReader reader = null;
StringBuilder response = new StringBuilder();
try {
- url = new URL(BASE_API_URL+hisSyncDict.getUrl());
+ url = new URL(config.getHisUrl()+hisSyncDict.getUrl());
connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("POST");
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
@@ -321,10 +327,25 @@
return null;
}
- public Connection getConnection() {
+ public Connection getConnection(DictCommonHisConfig config) {
+ // public void setConfigPath(String configPath) {
+// CONFIG_PATH = configPath;
+// NAME = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.name");
+// URL = "jdbc:mysql://" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.ip")
+// + ":" + configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.prot") + "/" + NAME +
+// "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
+// USER = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.username");
+// PASSWORD = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.password");
+// String apiUrl = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_url");
+// String apiPort = configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.his_api_port");
+// BASE_API_URL = apiUrl+":"+apiPort+configValue.getConfigValue("ShanXi_Qin_BaoJi_Bjxjyy.hisapiappend");
+// }
try {
- log.info("鏁版嵁搴撲俊鎭� ->{},{},{}",USER,PASSWORD,URL);
- return DriverManager.getConnection(URL,USER,PASSWORD);
+ String url = "jdbc:mysql://" + config.getDbIp()
+ + ":" + config.getDbPort() + "/" + config.getDbName() +
+ "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
+ log.info("鏁版嵁搴撲俊鎭� ->{},{},{}",config.getDbUser(),config.getDbPassword(),url);
+ return DriverManager.getConnection(url,config.getDbUser(),config.getDbPassword());
} catch (Exception throwables) {
log.error("鑾峰彇sql杩炴帴澶辫触");
throwables.printStackTrace();
--
Gitblit v1.8.0