From 2f9691b8de0e2800f22ce96768aacfd129f02b3c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 19 七月 2024 17:08:50 +0800
Subject: [PATCH] zjh 2024/07/19-2
---
ltkj-hosp/src/main/resources/mapper/hosp/LtkjExamJcsqdMapper.xml | 18 ++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java | 77 ++++++++++++++++++++------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 11 +++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 9 +---
4 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 2213707..5aac19d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -320,8 +320,11 @@
@GetMapping ("/dataSynchronization")
@ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
- @Transactional
+// @Transactional
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
+
+
+
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -377,10 +380,7 @@
return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
}
JSONArray data = object.getJSONArray("ResultData");
-// int size = data.size();
-// if(size>0){
-//
-// }
+
for (Object datum : data) {
JSONObject jsonObject = (JSONObject) datum;
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
@@ -549,6 +549,7 @@
asyncService.updateCheckType(order.getTjNumber());
}
return AjaxResult.success("鍚屾鎴愬姛");
+// return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
}
return AjaxResult.error();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index e29e1a5..0bf99e3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -8,6 +8,7 @@
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import org.apache.ibatis.annotations.*;
+import org.springframework.beans.factory.annotation.Qualifier;
import java.util.List;
import java.util.Map;
@@ -39,13 +40,7 @@
@DataSource(value = DataSourceType.SLAVE_HIS)
- @Select(" exec usp_his_getexamreportinfo\n" +
- " ${ksmc},\n" +
- " ${brid},\n" +
- " ${str_in},\n" +
- " ${pagecount},\n" +
- " ${page},\n" +
- " ${status}")
+ @Qualifier (value = "slaveHisDataSource")
List<Map<String, Object>> getTjJcProByHisCall(@Param("ksmc") String ksmc,
@Param("str_in")String strIn,
@Param("brid")String brid,
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
index 24c35cf..946e51a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
@@ -5,6 +5,7 @@
import com.ltkj.hosp.mapper.LtkjExamJcsqdMapper;
import com.ltkj.hosp.service.LtkjExamJcsqdService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -28,6 +29,7 @@
* @date 2023-08-30
*/
@Service
+@Slf4j
public class LtkjExamJcsqdServiceImpl extends ServiceImpl<LtkjExamJcsqdMapper, LtkjExamJcsqd> implements LtkjExamJcsqdService {
@Resource
@@ -58,43 +60,46 @@
mapper.saveLtkjExamJcsqd(tjh);
}
-// @Override
-// public AjaxResult getTjJcProByHisCall(String ksmc,String strIn,String brid,int pagecount,int page,String status) {
-// List<Map<String, Object>> tjJcProByHisCall = mapper.getTjJcProByHisCall(ksmc,strIn,brid,pagecount,page,status);
-// return AjaxResult.success().put("data",tjJcProByHisCall);
-// }
-
-
@Override
public AjaxResult getTjJcProByHisCall(String ksmc,String strIn,String brid,int pagecount,int page,String status) {
- String sql="{exec usp_his_getexamreportinfo(?,?,?,?,?,?)}";
- Connection connection = null;
- List<Map<String,Object>> list=new ArrayList<>();
- try {
- connection = dataSource.getConnection();
- CallableStatement call = connection.prepareCall(sql);
- call.setString(1,ksmc);
- call.setString(2,strIn);
- call.setString(3,brid);
- call.setInt(4,pagecount);
- call.setInt(5,page);
- call.setString(6,status);
- call.execute();
- ResultSet query = call.executeQuery();
- ResultSetMetaData data = query.getMetaData();
- int count = data.getColumnCount();
- while (query.next()) {
- Map<String,Object>map=new HashMap<>();
- for (int i = 0; i < count; i++) {
- String s = data.getColumnLabel(i);
- Object object = query.getObject(i);
- map.put(s,object);
- }
- list.add(map);
- }
- } catch (SQLException throwables) {
- throwables.printStackTrace();
- }
- return AjaxResult.success().put("data",list);
+ List<Map<String, Object>> tjJcProByHisCall = mapper.getTjJcProByHisCall(ksmc,strIn,brid,pagecount,page,status);
+ return AjaxResult.success().put("data",tjJcProByHisCall);
}
+
+
+// @Override
+// public AjaxResult getTjJcProByHisCall(String ksmc,String strIn,String brid,int pagecount,int page,String status) {
+// String sql="{exec usp_his_getexamreportinfo(?,?,?,?,?,?)}";
+// Connection connection = null;
+// List<Map<String,Object>> list=new ArrayList<>();
+// try {
+// connection = dataSource.getConnection();
+// CallableStatement call = connection.prepareCall(sql);
+// call.setString(1,ksmc);
+// call.setString(2,strIn);
+// call.setString(3,brid);
+// call.setInt(4,pagecount);
+// call.setInt(5,page);
+// call.setString(6,status);
+// call.execute();
+// ResultSet query = call.executeQuery();
+// log.info("鏌ヨ妫�鏌ユ姤鍛� ResultSet: "+query.toString());
+// ResultSetMetaData data = query.getMetaData();
+// log.info("鏌ヨ妫�鏌ユ姤鍛� ResultSetMetaData: "+data.toString());
+// int count = data.getColumnCount();
+// while (query.next()) {
+// Map<String,Object>map=new HashMap<>();
+// for (int i = 0; i < count; i++) {
+// String s = data.getColumnLabel(i);
+// Object object = query.getObject(i);
+// map.put(s,object);
+// }
+// list.add(map);
+// }
+// } catch (SQLException throwables) {
+// throwables.printStackTrace();
+// }
+// log.info("鏌ヨ妫�鏌ユ姤鍛婅繑鍥炲��: "+list.toString());
+// return AjaxResult.success().put("data",list);
+// }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/LtkjExamJcsqdMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/LtkjExamJcsqdMapper.xml
index b4e78cc..3dd44b2 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/LtkjExamJcsqdMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/LtkjExamJcsqdMapper.xml
@@ -4,15 +4,15 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ltkj.hosp.mapper.LtkjExamJcsqdMapper">
-<!-- <select id="getTjJcProByHisCall" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">-->
-<!-- exec usp_his_getexamreportinfo-->
-<!-- #{ksmc},-->
-<!-- #{brid},-->
-<!-- #{str_in},-->
-<!-- #{pagecount},-->
-<!-- #{page},-->
-<!-- #{status}-->
-<!-- </select>-->
+ <select id="getTjJcProByHisCall" parameterType="java.lang.String" statementType="CALLABLE" resultType="java.util.Map">
+ exec usp_his_getexamreportinfo
+ ${ksmc},
+ ${brid},
+ ${str_in},
+ ${pagecount},
+ ${page},
+ ${status}
+ </select>
<!-- <select id="getTjJcProByHisCall" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">-->
--
Gitblit v1.8.0