From a28c894d35b5ca697bfe455c2d584c7f28ec3722 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 15 十二月 2023 15:51:59 +0800
Subject: [PATCH] 优化项目列表
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 19 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 051fd14..7332e0d 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,24 @@
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,10 +246,9 @@
*/
@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,
+ @ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
@ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘瀹℃牳!");
@@ -241,6 +264,7 @@
tjOrder.setConfirmStatus(remark);
if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
+ asyncService.updateCheckType(tjNumber);
} else {
tjOrder.setStatus(TjConstants.TJ_REFUSED);
}
@@ -250,6 +274,8 @@
confirmLog.setTjNum(tjNumber);
confirmLog.setStatus(status);
confirmLogService.save(confirmLog);
+ asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
+ asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
@@ -261,16 +287,50 @@
/**
+ * 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
+ */
+ @GetMapping("/dataSynchronization")
+ @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ if ("Y".equals(getInfoFromSqlData)) {
+ List<LtkjHysqd> one = testMapper.getHysqdByTmh(tjNumber);
+ if (one != null) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHysqdService.saveBatch(one);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ for (LtkjHysqd ltkjHysqd : one) {
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
+ if (one1 != null) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHybgdService.saveBatch(one1);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ }
+ }
+
+ List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
+ if (one2 != null) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjExamJcsqdService.saveBatch(one2);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ for (LtkjExamJcsqd ltkjExamJcsqd : one2) {
+ List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(ltkjExamJcsqd.getTmh());
+ if (one3 != null) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjExamJcbgdService.saveBatch(one3);
+ 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宸�
@@ -319,6 +379,7 @@
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ customer.setTjCategory(tjOrder.getTjCategory());
if (tjOrder.getFirmId().equals("0")) {
customer.setTjCompName(null);
} else {
@@ -358,6 +419,7 @@
customers = redisCache.getCacheMapValue("check", "ys");
}
if (customers != null && customers.size() > 0) {
+// asyncService.addRedis(customers);
List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
map.put("customers", customerLists);
map.put("total", customers.size());
@@ -411,6 +473,7 @@
LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
transitionService.remove(wqq);
+ asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
@@ -432,9 +495,17 @@
*/
@GetMapping("/updateCheckType")
@ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
-// @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
- final long l = System.currentTimeMillis();
+ if (redisCache.hasKey("updateCheckType" + tjNumber)) {
+ List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
+ return AjaxResult.success(cacheMapValue);
+ }
+ return getAjaxResult(tjNumber);
+ }
+
+ private AjaxResult getAjaxResult(String tjNumber) {
+
+ asyncService.updateCheckType(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNumber);
@@ -458,7 +529,11 @@
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
- tjOrderDetail.setProject(byId);
+ if (null == byId) {
+ detailService.removeById(tjOrderDetail.getOrderDetailId());
+ } else {
+ tjOrderDetail.setProject(byId);
+ }
List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
if (list2.size() == 0) {
tjOrderDetail.setStandard(new TjStandard());
@@ -466,14 +541,20 @@
tjOrderDetail.setStandard(list2.get(0));
} else {
final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
- TjStandard tjStandard1=tjStandardService.getListBySexAndType(customer.getCusSex(),ageType, String.valueOf(tjOrderDetail.getProId()));
+ TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
tjOrderDetail.setStandard(tjStandard1);
}
}
String summary = remark.getSummary();
if (null != summary) {
- String[] split = summary.split(";");
- parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));
+ String[] split = summary.split(";");
+// List<Long> longList = new ArrayList<>();
+// for (String str : split) {
+// if(!"".equals(str)){
+// longList.add(Long.valueOf(str));
+// }
+// }
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
@@ -489,8 +570,6 @@
}
// }
}
- final long l1 = System.currentTimeMillis();
- System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
return AjaxResult.success(list);
}
return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
@@ -544,6 +623,7 @@
customer.setTjTime(tjOrder.getCreateTime());
customer.setFinishTime(tjOrder.getFinishTime());
customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ customer.setTjCategory(tjOrder.getTjCategory());
if (tjOrder.getFirmId() == null) {
customer.setTjCompName("鏃�");
} else {
--
Gitblit v1.8.0