From 5e4d1aa4b27cfbcf1c4c8beb2ac05f3c7a0cf1bb Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 18 二月 2025 16:55:45 +0800
Subject: [PATCH] zjh20250218
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index c489848..4ac8e85 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -17,6 +17,7 @@
import com.ltkj.common.utils.IdUtils;
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.hisDto.*;
import com.ltkj.hosp.mapper.TjSamplingMapper;
@@ -248,7 +249,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
@@ -360,7 +361,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void collectFees(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList, SysUser sysUser, String discount) {
// orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
// redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber());
@@ -543,7 +544,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void abandonCheck(String tjNumber, TjOrder tjOrder, List<TjOrderDetail> list, SysUser sysUser) {
for (TjOrderDetail tjOrderDetail : list) {
LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
@@ -584,8 +585,11 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order,TjOrderRemark orderRemark) {
+ String currentDataSource = DynamicDataSourceContextHolder.getDataSourceType();
+ log.info("寮傛绾跨▼涓殑鏁版嵁婧�: {}", currentDataSource);
+
String deptname="";
TjProject tjProject = projectService.getById(orderRemark.getProId());
if(null !=tjProject){
@@ -614,10 +618,12 @@
if(null !=ycxm){
ycxm.setJcjg(detail.getProResult());
List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- ,"","",order.getTjNumber()
,detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","")
+ .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", ""),"",order.getTjNumber()
+ ,detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", "")
,detail.getProResult());
+
String[] split = detail.getProResult().split("銆倈,|锛�");
List<Map<String,Object>> mapList=new ArrayList<>();
@@ -651,7 +657,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void updateOrdeltile2(TjOrderDetail detail, SysUser sysUser) {
// for (TjOrderDetail detail : tjOrderDetailList) {
detail.setTjStatus(1L);
@@ -666,7 +672,7 @@
}
@Override
-// @Async("async")
+// //@Async("async")
// @Transactional
public Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser,String jxbz) {
Date dates = new Date();
@@ -2254,7 +2260,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void dockerSetCustomerLisByRedis(List<Long> ksproList, String ksId) {
List<TjCustomer> yjAjaxResult = getYjAjaxResult(ksproList);
@@ -2264,14 +2270,14 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void dockerSetYjCustomerByRedis(Long orderId, Long ksId) {
//宸叉(鍗曚釜瀛樺叆)0鏈,1宸叉
getDgYjAjaxResult(orderId, ksId);
}
@Override
- @Async("async")
+ //@Async("async")
public void dockerSetWjCustomerByRedis(Long orderId, Long ksId) {
//鏈(鍗曚釜瀛樺叆)0鏈,1宸叉
@@ -2279,7 +2285,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void checkSetCustomerLisByRedis(String config) {
List<TjCustomer> wsResult = getWsResult(config);
List<TjCustomer> ysResult = getYsResult(config);
@@ -2289,7 +2295,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void wCScheckSetCustomerLisByRedis(List<TjOrder> orderList) {
List<TjCustomer> customerList = new ArrayList<>();
if (null != orderList && orderList.size() > 0) {
@@ -2324,7 +2330,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void yCScheckSetCustomerLisByRedis(List<TjOrder> orderList) {
List<TjCustomer> customerList = new ArrayList<>();
if (null != orderList && orderList.size() > 0) {
@@ -2360,7 +2366,7 @@
@Override
- @Async("async")
+ //@Async("async")
public void tjRefund(List<TjProject> refundPros, String tjNum) {
for (TjProject refundPro : refundPros) {
LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
@@ -2381,14 +2387,14 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void saveSampling() {
redisCache.setCacheMapValue("sampling", "yqs", getYWqsResult(0));
redisCache.setCacheMapValue("sampling", "wqs", getYWqsResult(1));
}
@Override
- @Async("async")
+ //@Async("async")
public void tjGoutAsync(List<QjDomainVo> domainVos, SysUser sysUser, Set<String> list) {
Integer day = 0;
for (QjDomainVo domainVo : domainVos) {
@@ -2470,7 +2476,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void addRedisTransitionPac(String cusId, Long pacId, List<TjPackageProject> ppList) {
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getById(tjPackageProject.getProId());
@@ -2509,7 +2515,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId, List<Long> proIds) {
if (null != pacId) {
transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId);
@@ -2520,7 +2526,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void addRedisTransitionPro(String cusId, List<Long> proIds) {
for (Long proId : proIds) {
if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) && transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
@@ -2562,7 +2568,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void getTjPackageList() {
//鐢蜂汉
@@ -2576,7 +2582,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void addNewReservationConfirm(List<TjReservation> rightList) {
if (null != rightList && rightList.size() > 0) {
for (TjReservation reservation : rightList) {
@@ -2611,7 +2617,7 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void saveNewReservationConfirm(List<TjReservation> rightList) {
if (null != rightList && rightList.size() > 0) {
//鍒涘缓绾跨▼姹�
@@ -2638,14 +2644,14 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void updateCheckType(String tjNum) {
redisCache.setCacheMapValue("updateCheckType" + tjNum, tjNum, getAjaxResult(tjNum));
redisCache.setHashKeyExpireTime("updateCheckType" + tjNum, 7L, TimeUnit.DAYS);
}
@Override
- @Async("async")
+ //@Async("async")
public void getPrintOrderList(List<TjOrder> list) {
redisCache.setCacheMapValue("getPrintOrderList", "0", extracted(0, list));
@@ -2654,14 +2660,14 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void getDictSfxms() {
List<DictSfxm> dictSfxm = getDictSfxm();
redisCache.setCacheObject("getDictSfxms", dictSfxm);
}
@Override
- @Async("async")
+ //@Async("async")
public void getOrderDetailByProParentId(String tjNumber, Map<String, Object> map, String proParentId) {
if (null != map && !map.isEmpty()) {
redisCache.setCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId, map);
@@ -2673,13 +2679,13 @@
}
@Override
- @Async("async")
+ //@Async("async")
public void getLineChart() {
redisCache.setCacheObject("getLineChart", getLineCharts());
}
@Override
- @Async("async")
+ //@Async("async")
public void getPieChart() {
redisCache.setCacheObject("getPieChart", getPieCharts());
}
--
Gitblit v1.8.0