From 5931c2e6c45452e05b46b00ed5f35ebace24e799 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 31 一月 2024 14:31:38 +0800
Subject: [PATCH] zjh 本地 2024/01/31 -2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java | 7 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java | 2 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 26 +++++++-----
ltkj-admin/src/main/resources/application.yml | 13 ++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 55 +++++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java | 9 ++++
6 files changed, 96 insertions(+), 16 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 34c0ce9..bc74ee9 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
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
+import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
@@ -351,4 +353,57 @@
}
return AjaxResult.success();
}
+
+
+
+
+ @GetMapping("/dataSynchronization")
+ @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @RepeatSubmit
+ public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+// if ("Y".equals(getInfoFromSqlData)) {
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
+ if (one != null && one.size() > 0) {
+ for (LtkjHysqd ltkjHysqd : one) {
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ if(hysqd==null){
+ ltkjHysqdService.save(ltkjHysqd);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
+ if (one1 != null && one1.size() > 0) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHybgdService.saveBatch(one1);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ }
+ }
+ }
+
+// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
+// if (one2 != null && one2.size() > 0) {
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// ltkjExamJcsqdService.saveBatch(one2);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// for (LtkjExamJcsqd ltkjExamJcsqd : one2) {
+// List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(ltkjExamJcsqd.getTmh());
+// if (one3 != null && one3.size() > 0) {
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// ltkjExamJcbgdService.saveBatch(one3);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// }
+// }
+// }
+ //鍚屾鍖栭獙椤圭洰
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(), "1");
+ //鍚屾妫�鏌ラ」鐩�
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1");
+ }
+// }
+ return AjaxResult.success("鍚屾鎴愬姛");
+ }
}
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 8715071..5314803 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
@@ -316,15 +316,18 @@
if (null != order) {
List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
if (one != null && one.size() > 0) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjHysqdService.saveBatch(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
for (LtkjHysqd ltkjHysqd : one) {
- List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
- if (one1 != null && one1.size() > 0) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjHybgdService.saveBatch(one1);
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ if(hysqd==null){
+ ltkjHysqdService.save(ltkjHysqd);
DynamicDataSourceContextHolder.clearDataSourceType();
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
+ if (one1 != null && one1.size() > 0) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHybgdService.saveBatch(one1);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
}
}
}
@@ -347,6 +350,7 @@
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),UserHoder.getLoginUser().getUserId());
//鍚屾妫�鏌ラ」鐩�
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),UserHoder.getLoginUser().getUserId());
+ asyncService.updateCheckType(order.getTjNumber());
}
}
return AjaxResult.success("鍚屾鎴愬姛");
@@ -527,10 +531,10 @@
@GetMapping("/updateCheckType")
@ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
- if (redisCache.hasKey("updateCheckType" + tjNumber)) {
- List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
- return AjaxResult.success(cacheMapValue);
- }
+// if (redisCache.hasKey("updateCheckType" + tjNumber)) {
+// List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
+// return AjaxResult.success(cacheMapValue);
+// }
return getAjaxResult(tjNumber);
}
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 581be6d..8cb4587 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -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:
@@ -226,3 +226,8 @@
size:
- 40
- 60
+# ip = 101.42.27.146
+# prot = 3306
+# name = ltkjpeis10
+# username = root
+# password = Root_ltkj123
\ No newline at end of file
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
index 18de882..da70f28 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
@@ -6,6 +6,8 @@
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -13,6 +15,9 @@
* @Date: 2023/12/11 17:56
*/
@Mapper
-@DataSource(value = DataSourceType.MASTER)
+//@DataSource(value = DataSourceType.MASTER)
public interface LtkjHysqdMapper extends BaseMapper<LtkjHysqd> {
+
+ @Select("SELECT * FROM ltkj_hysqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
+ LtkjHysqd getLtkjHysqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
index ccc37ac..10a4451 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
@@ -10,4 +10,6 @@
* @Date: 2023/12/11 17:57
*/
public interface LtkjHysqdService extends IService<LtkjHysqd> {
+
+ LtkjHysqd getLtkjHysqdByTjhAndTmh(String tjh,String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
index 6ba7799..c493b74 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
@@ -9,6 +9,8 @@
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
/**
* 鐥呯+鎰忚Service涓氬姟灞傚鐞�
*
@@ -18,4 +20,11 @@
@Service
public class LtkjHysqdServiceImpl extends ServiceImpl<LtkjHysqdMapper, LtkjHysqd> implements LtkjHysqdService {
+ @Resource
+ private LtkjHysqdMapper mapper;
+
+ @Override
+ public LtkjHysqd getLtkjHysqdByTjhAndTmh(String tjh, String tmh) {
+ return mapper.getLtkjHysqdByTjhAndTmh(tjh,tmh);
+ }
}
--
Gitblit v1.8.0