From 55656cdf4c311d1e6a138173ba5e5bd09c23d340 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 13 十二月 2023 10:04:55 +0800
Subject: [PATCH] 1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 33 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 76 +++++++++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 2
ltkj-admin/src/main/resources/application.yml | 20 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 95 +++++-------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 32 ++++++
6 files changed, 171 insertions(+), 87 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index 3f94e80..9616161 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -15,6 +15,8 @@
import javax.annotation.Resource;
import java.util.List;
+import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
+
@RestController
@RequestMapping("/sqlserver/getdata")
@@ -128,76 +130,37 @@
}
- @GetMapping("/getLtkjTjPatById")
- public AjaxResult getLtkjTjPatById(String id) {
- LtkjTjPat one = testMapper.getTjPatById(id);
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- final boolean save = tjvLtkjvtjpatService.save(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(save);
- }
-
-
- @GetMapping("/getMiddleDetailById")
- public AjaxResult getMiddleDetailById(String id) {
- LtkjMiddleDetail one = testMapper.getMiddleDetailById(id);
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- final boolean save = middleDetailService.save(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(save);
- }
-
-
- @GetMapping("/getMiddleHeadById")
- public AjaxResult getMiddleHeadById(String id) {
- LtkjMiddleHead one = testMapper.getMiddleHeadById(id);
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- final boolean save = headService.save(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(save);
- }
-
-
- @GetMapping("/getExamJcbgdById")
- public AjaxResult getExamJcbgdById(String id) {
- LtkjExamJcbgd one = testMapper.getExamJcbgdById(id);
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- final boolean save = ltkjExamJcbgdService.save(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(save);
- }
-
- @GetMapping("/getExamJcsqdById")
- public AjaxResult getExamJcsqdById(String id) {
- LtkjExamJcsqd one = testMapper.getExamJcsqdById(id);
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- final boolean save = ltkjExamJcsqdService.save(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(save);
- }
-
- @GetMapping("/getHybgdById")
- public AjaxResult getHybgdById(String id) {
- LtkjHybgd one = testMapper.getHybgdById(id);
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- final boolean save = ltkjHybgdService.save(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(save);
- }
-
- @GetMapping("/getHysqdById")
- public AjaxResult getHysqdById(String id) {
- LtkjHysqd one = testMapper.getHysqdById(id);
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- final boolean save = ltkjHysqdService.save(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(save);
- }
-
@GetMapping("/getTjPatByCusId")
public AjaxResult getTjPatByCusId(String cusId) {
testMapper.getTjPatByCusId(cusId);
return AjaxResult.success();
}
+
+
+ @GetMapping("/saveMiddleHeadByPatId")
+ public AjaxResult saveMiddleHeadByPatId(String id) {
+ List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(id);
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ for (LtkjMiddleHead ltkjMiddleHead : one) {
+ final boolean save = headService.save(ltkjMiddleHead);
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ return AjaxResult.success(save);
+ }
+
+
+ @GetMapping("/getMiddleDetailByHeadId")
+ public AjaxResult getMiddleDetailByHeadId(String id) {
+ List<LtkjMiddleDetail> one = testMapper.getMiddleDetailByHeadId(id);
+ for (LtkjMiddleDetail ltkjMiddleDetail : one) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ final boolean save = middleDetailService.save(ltkjMiddleDetail);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ return AjaxResult.success(one);
+ }
+
+
+
}
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 342ba4b..46a23d7 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
@@ -8,11 +8,15 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.hosp.vodomain.UpdateOrderRemarkVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
@@ -31,6 +35,8 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
+
+import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -70,6 +76,25 @@
private ISysConfigService configService;
@Resource
private ISysDeptService deptService;
+ @Resource
+ private TestMapper testMapper;
+ @Resource
+ private TjvLtkjvtjpatService tjvLtkjvtjpatService;
+
+ @Resource
+ private LtkjMiddleDetailService middleDetailService;
+
+ @Resource
+ private LtkjMiddleHeadService headService;
+ @Resource
+ private LtkjExamJcbgdService ltkjExamJcbgdService;
+ @Resource
+ private LtkjExamJcsqdService ltkjExamJcsqdService;
+ @Resource
+ private LtkjHybgdService ltkjHybgdService;
+ @Resource
+ private LtkjHysqdService ltkjHysqdService;
+
@GetMapping("/getOperationPermissionsByTjNum")
@@ -222,7 +247,6 @@
*/
@GetMapping("/confirmOrder")
@ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
-// @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
@Transactional
public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
@ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
@@ -262,16 +286,48 @@
/**
+ * 鍚屾鏁版嵁鎺ュ彛
+ */
+ @GetMapping("/dataSynchronization")
+ @ApiOperation(value = "鍚屾鏁版嵁鎺ュ彛")
+ @Transactional
+ public AjaxResult dataSynchronization(@RequestParam String tjNumber){
+ List<LtkjHysqd> one = testMapper.getHysqdByTmh(tjNumber);
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ for (LtkjHysqd hysqd : one) {
+ ltkjHysqdService.save(hysqd);
+
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(hysqd.getTmh());
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ for (LtkjHybgd hybgd : one1) {
+ ltkjHybgdService.save(hybgd);
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+
+
+ List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ for (LtkjExamJcsqd examJcsqd : one2) {
+ ltkjExamJcsqdService.save(examJcsqd);
+
+ List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(examJcsqd.getTmh());
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ for (LtkjExamJcbgd examJcbgd : one3) {
+ ltkjExamJcbgdService.save(examJcbgd);
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+
+ return AjaxResult.success();
+ }
+
+ /**
* 鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃
- *
- * @param tjNumber
- * @param checkStatus
- * @param page
- * @param pageSize
- * @param compId
- * @param beginTime
- * @param endTime
- * @return
*/
@GetMapping("/getList")
@ApiOperation(value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index f605a18..fbb2ab9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -81,7 +81,7 @@
// LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
testMapper.getTjPatByCusId(cusIdcard);
}
- //end2023.12.12
+ //end====2023.12.12
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getIdCard, cusIdcard);
wq.eq(TjReservation::getIsExpire, 2);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index eed4072..4f65483 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -24,11 +24,16 @@
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.config.UserHoder;
+import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
+import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import com.ltkj.hosp.vodomain.BingZhongVO;
import com.ltkj.hosp.vodomain.HistoryTjOrder;
import com.ltkj.hosp.vodomain.QjDomainVo;
@@ -135,6 +140,15 @@
@Autowired
private ITjReportGetAddressService tjReportGetAddressService;
+
+ @Resource
+ private TestMapper testMapper;
+
+ @Resource
+ private LtkjMiddleDetailService middleDetailService;
+
+ @Resource
+ private LtkjMiddleHeadService headService;
/**
@@ -917,6 +931,25 @@
// asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
+
+ //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
+ List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
+ if (one!=null){
+ for (LtkjMiddleHead ltkjMiddleHead : one) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ headService.save(ltkjMiddleHead);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
+ if (detailList!=null){
+ for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ middleDetailService.save(ltkjMiddleDetail);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ }
+ }
+
+ }
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 7010ef4..2976724 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -11,8 +11,8 @@
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
# 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
#profile: D:/ltkj/uploadPath
-# profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
- profile: http://192.168.0.5:5502/uploadPath
+ profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+# profile: http://192.168.0.5:5502/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
@@ -73,15 +73,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
-# host: 101.42.27.146
- host: localhost
+ host: 101.42.27.146
+# host: localhost
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
-# password: 654321
- password: 123456
+ password: 654321
+# password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 120s
lettuce:
@@ -180,8 +180,8 @@
# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
photoPath: D:\AppPhoto\uploadPath\
# nginx鍥剧墖鏈嶅姟鍣�
-#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
-photoServer: http://192.168.0.5:5502/uploadPath/
+photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+#photoServer: http://192.168.0.5:5502/uploadPath/
# 寰俊灏忕▼搴廰ppid secret
xcx:
@@ -211,8 +211,8 @@
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
-# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
- path: http://192.168.0.5:5000/ltkj-admin
+ path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+# path: http://192.168.0.5:5000/ltkj-admin
# path: http://10.168.0.9:5011
# path: http://192.168.0.99:8081/ltkj-admin
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index 392195e..d742269 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -88,4 +88,36 @@
@DataSource(value = DataSourceType.SLAVE_HIS)
@Select("SELECT * FROM tjv_Ltkj_hysqd where tmh=#{id}")
public LtkjHysqd getHysqdById(String id);
+
+
+ //浣撴鐧昏鎺ュ彛 璋冪敤鍚� 鏌ヨ鏀惰垂鍗曟嵁鍜岃鎯�
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+ @Select("SELECT * FROM tjv_Ltkj_middle_head where pat_bar_code=#{id}")
+ public List<LtkjMiddleHead> saveMiddleHeadByPatId(String id);
+
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+ @Select("SELECT * FROM tjv_Ltkj_middle_detail where fead_id=#{id}")
+ public List<LtkjMiddleDetail> getMiddleDetailByHeadId(String id);
+
+
+ //鏍规嵁浣撴鍙� 瀵瑰簲鐨� 鍖栭獙椤圭洰 +鈥滆娓呪�濇爣鏈�
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+ @Select("SELECT * FROM tjv_Ltkj_hysqd where tjh=#{id}")
+ public List<LtkjHysqd> getHysqdByTmh(String id);
+ //鍖栭獙椤圭洰涓嬬殑瀛愰」 浼犱笂闈㈢殑鎺ュ彛鐨則mh
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+ @Select("SELECT * FROM tjv_Ltkj_hybgd where tmh=#{id}")
+ public List<LtkjHybgd> getHybgdByTmh(String id);
+
+
+ //鏍规嵁浣撴鍙� 瀵瑰簲鐨� 妫�鏌ラ」鐩�
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+ @Select("SELECT * FROM tjv_exam_jcsqd where tjh=#{id}")
+ public List<LtkjExamJcsqd> getExamJcsqdTmh(String id);
+
+ //妫�鏌ラ」鐩搴旂殑妫�鏌ョ粨鏋� 浼犱笂闈㈢殑鎺ュ彛鐨勭粨鏋渢mh
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+ @Select("SELECT * FROM tjv_exam_jcbgd where tmh=#{id}")
+ public List<LtkjExamJcbgd> getExamJcbgdByTjh(String id);
+
}
--
Gitblit v1.8.0