From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 118 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 87 insertions(+), 31 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index 1e12342..88568db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -1,5 +1,6 @@
package com.ltkj.web.controller.his;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -11,7 +12,9 @@
import com.ltkj.web.wxUtils.HttpClientUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.io.FileInputStream;
@@ -32,8 +35,10 @@
@Slf4j
@Component
public class HisApiGetMethodService {
+
+
// 鏁版嵁搴撻厤缃枃浠惰矾寰�
- private static final String CONFIG_PATH = "D:\\ltkjprojectconf\\config.properties";
+// private static final String CONFIG_PATH = url;
// private static final String CONFIG_PATH = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkj_peis/ltkj-admin/src/main/resources/config.properties";
// 鏁版嵁搴撳悕
private static String DB_NAME = "";
@@ -46,27 +51,51 @@
@Autowired
private HisApiConfigService hisApiConfigService;
+ private static String url;
+
+
+ @Value ("${config.properties}")
+ public void set(String urls){
+ url=urls;
+ FileInputStream inputStream = null;
+ try {
+ inputStream = new FileInputStream(url);
+ Properties props = new Properties();
+ props.load(inputStream);
+ DB_NAME = props.getProperty("name");
+ DATA_URL = "jdbc:mysql://" + props.getProperty("ip") + ":" + props.getProperty("prot") + "/" + DB_NAME + "" +
+ "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
+ DATA_USER = props.getProperty("username");
+ DATA_PASS = props.getProperty("password");
+ String apiUrl = props.getProperty("his_api_url");
+ String apiPort = props.getProperty("his_api_port");
+ HIS_URL = apiUrl+":"+apiPort;
+ } catch (IOException e) {
+ System.out.println("鍒濆鍖栨暟鎹簱寮傚父 ->"+e.getMessage());
+ }
+ }
+
static {
try {
Class.forName("com.mysql.cj.jdbc.Driver");
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
- try {
- InputStreamReader reader = new InputStreamReader(new FileInputStream(CONFIG_PATH), StandardCharsets.UTF_8);
- Properties props = new Properties();
- props.load(reader);
- String api_url = props.getProperty("his_api_url");
- String port = props.getProperty("his_api_port");
- DB_NAME = props.getProperty("name");
- DATA_URL = "jdbc:mysql://" + props.getProperty("ip") + ":" + props.getProperty("prot") + "/" + DB_NAME +
- "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
- DATA_USER = props.getProperty("username");
- DATA_PASS = props.getProperty("password");
- HIS_URL=api_url+":"+port;
- } catch (IOException throwables) {
- throwables.printStackTrace();
- }
+// try {
+// InputStreamReader reader = new InputStreamReader(new FileInputStream(url), StandardCharsets.UTF_8);
+// Properties props = new Properties();
+// props.load(reader);
+// String api_url = props.getProperty("his_api_url");
+// String port = props.getProperty("his_api_port");
+// DB_NAME = props.getProperty("name");
+// DATA_URL = "jdbc:mysql://" + props.getProperty("ip") + ":" + props.getProperty("prot") + "/" + DB_NAME +
+// "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8";
+// DATA_USER = props.getProperty("username");
+// DATA_PASS = props.getProperty("password");
+// HIS_URL=api_url+":"+port;
+// } catch (IOException throwables) {
+// throwables.printStackTrace();
+// }
}
@@ -173,8 +202,8 @@
return AjaxResult.error().put("result", JSONUtil.parseObj(json));
}
}
-
- @Transactional
+
+// @Transactional
public AjaxResult getHISDataNew(String type, Map<String, Object> params){
LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, type);
@@ -236,10 +265,11 @@
} catch (SQLException e) {
e.printStackTrace();
return AjaxResult.error();
- }
- try {
- connection.close();
- } catch (SQLException ignored) {
+ }finally {
+ try {
+ connection.close();
+ } catch (SQLException ignored) {
+ }
}
return AjaxResult.success();
}
@@ -257,6 +287,13 @@
String key = entry.getKey().trim().toLowerCase();
responseColums.add(key);
}
+ Map<String, Object> beanToMap = BeanUtil.beanToMap(JSONUtil.parseObj(paramsJson));
+ Set<Map.Entry<String, Object>> entries = beanToMap.entrySet();
+ for (Map.Entry<String, Object> entry : entries) {
+ String key = "request_params_"+entry.getKey().trim().toLowerCase();
+ if (!columns.contains(key))
+ responseColums.add(key);
+ }
responseColums.removeAll(columns);
if (!responseColums.isEmpty()) {
for (String colum : responseColums) {
@@ -265,13 +302,9 @@
statement.executeUpdate(sql);
statement.close();
}
- if (hisApiConfig == null)
- insertData(hisApiConfig, connection, jsonObject);
- else insertDataNew(connection, jsonObject,hisApiConfig,paramsJson);
+ insertDataNew(connection, jsonObject,hisApiConfig,paramsJson);
} else {
- if (hisApiConfig == null)
- insertData(hisApiConfig, connection, jsonObject);
- else insertDataNew(connection, jsonObject,hisApiConfig,paramsJson);
+ insertDataNew(connection, jsonObject,hisApiConfig,paramsJson);
}
}
@@ -342,6 +375,7 @@
* @param jsonObject
* @throws SQLException
*/
+ @Transactional
private void insertDataNew(Connection connection, JSONObject jsonObject,HisApiConfig hisApiConfig,String paramsJson) throws SQLException {
List<String> primaryKesList = Arrays.stream(hisApiConfig.getPrimaryKeys().split(",")).map(String::toLowerCase).collect(Collectors.toList());
StringBuilder deleteSqlBuilder = new StringBuilder();
@@ -376,9 +410,9 @@
}
deleteSqlBuilder.delete(deleteSqlBuilder.length() - 5, deleteSqlBuilder.length());
Statement statement = connection.prepareStatement(deleteSqlBuilder.toString());
-// log.info("鎵ц鍒犻櫎 ->{}",deleteSqlBuilder.toString());
+ log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鍒犻櫎 ->{}",deleteSqlBuilder.toString());
int i = statement.executeUpdate(deleteSqlBuilder.toString());
-// log.info("鍒犻櫎鏉℃暟 ->{}",i);
+ log.info("HIS鏁版嵁淇濆瓨绫� 鍒犻櫎鏉℃暟 ->{}",i);
statement.close();
insertSqlBuilder.append("insert_time, ");
insertSqlBuilder.append("request_params, ");
@@ -393,13 +427,35 @@
String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
valueBuilder.append("'").append(time).append("'").append(", ");
valueBuilder.append("'").append(paramsJson).append("'").append(", ");
+ Map<String, Object> beanToMap = BeanUtil.beanToMap(JSONUtil.parseObj(paramsJson));
+ Set<Map.Entry<String, Object>> entries = beanToMap.entrySet();
+ for (Map.Entry<String, Object> entry : entries) {
+ String key = "request_params_"+entry.getKey().trim().toLowerCase();
+ insertSqlBuilder.append(key).append(", ");
+ valueBuilder.append("'").append(entry.getValue().toString()).append("', ");
+ }
insertSqlBuilder.delete(insertSqlBuilder.length() - 2, insertSqlBuilder.length());
valueBuilder.delete(valueBuilder.length() - 2, valueBuilder.length());
insertSqlBuilder.append(") values (").append(valueBuilder).append(")");
// log.info("鎵ц鎻掑叆 ->{}",insertSqlBuilder.toString());
// 鎻掑叆鏁版嵁
+// boolean execute = statement.execute(insertSqlBuilder.toString());
+// for (int j = 0; j < 10; j++) {
+// statement = connection.createStatement();
+// log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆 ->{}",insertSqlBuilder.toString());
+// boolean execute = statement.execute(insertSqlBuilder.toString());
+// log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆鐘舵�� ->{},娆℃暟->{}",execute,(j+1));
+// statement.close();
+// if (execute)
+// break;
+// }
statement = connection.createStatement();
- statement.execute(insertSqlBuilder.toString());
+ log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆 ->{}",insertSqlBuilder.toString());
+ boolean execute = statement.execute(insertSqlBuilder.toString());
+ if (!execute){
+ int updateCount = statement.getUpdateCount();
+ log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆鎴愬姛 褰卞搷琛屾暟->{}",updateCount);
+ }
statement.close();
}
--
Gitblit v1.8.0