From 34161e36b6cbc36dcd10168a90b300691dc2c159 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 十二月 2023 20:24:47 +0800
Subject: [PATCH] zjh 2023/12/15--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 264 +++++++++++++++++++++++++++-------------------------
1 files changed, 137 insertions(+), 127 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 46a23d7..071f60c 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
@@ -96,7 +96,6 @@
private LtkjHysqdService ltkjHysqdService;
-
@GetMapping("/getOperationPermissionsByTjNum")
@ApiOperation(value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
public AjaxResult getOperationPermissionsByTjNum(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
@@ -275,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("鎿嶄綔澶辫触");
@@ -286,45 +287,47 @@
/**
- * 鍚屾鏁版嵁鎺ュ彛
+ * 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
@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);
+ @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();
+ }
+ }
}
- 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);
+ 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();
+ }
+ }
}
- DynamicDataSourceContextHolder.clearDataSourceType();
-
}
- DynamicDataSourceContextHolder.clearDataSourceType();
-
- return AjaxResult.success();
+ return AjaxResult.success("鍚屾鎴愬姛");
}
+
/**
* 鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃
@@ -341,95 +344,102 @@
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
@ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
- String config = configService.selectConfigByKey("tj_confirm");
- DateTime beginTimes = null;
- DateTime endTimes = null;
- if (null != beginTime && null != endTime) {
- beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
- endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
- }
- asyncService.checkSetCustomerLisByRedis(config);
- //鍒濆鍖栦綋妫�璁㈠崟琛�
- List<TjOrder> orderList = null;
- List<TjCustomer> customerList = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
-
- //濮撳悕鏌ヨ
- if (null != name && !"".equals(name)) {
- List<TjCustomer> list = customerService.getTjCustomerList(name);
- if (null != list && list.size() > 0) {
- List<TjCustomer> lists = new ArrayList<>();
- for (TjCustomer customer : list) {
- if ("Y".equals(config)) {
- orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId());
- } else {
- orderList = orderService.getTjOrderListByCusId(customer.getCusId());
- }
- if (null != orderList && orderList.size() > 0) {
- for (TjOrder tjOrder : orderList) {
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getFinishTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- 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 {
- customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
- }
- lists.add(customer);
- }
- }
- }
- List<TjCustomer> customers = null;
- if (lists.size() > 0) {
- customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- map.put("customers", customers);
- map.put("total", lists.size());
- return AjaxResult.success(map);
- }
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
-
- //鏉′欢鏌ヨ
- if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
- //鍒ゆ柇鏄惁寮�鍚垵瀹�
- if ("Y".equals(config)) {
- orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
- } else {
- orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
- }
- return getResult(page, pageSize, orderList, customerList, map);
- }
-
- List<TjCustomer> customers = null;
- if (null != checkStatus && checkStatus == 0) {
- customers = redisCache.getCacheMapValue("check", "ws");
- }
- if (null != checkStatus && checkStatus == 1) {
- 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());
- return AjaxResult.success(map);
- } else {
- //鍒ゆ柇鏄惁寮�鍚垵瀹�
- if ("Y".equals(config)) {
- orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
- } else {
- orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
- }
- return getResult(page, pageSize, orderList, customerList, map);
- }
+// String config = configService.selectConfigByKey("tj_confirm");
+// DateTime beginTimes = null;
+// DateTime endTimes = null;
+// if (null != beginTime && null != endTime) {
+// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
+// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
+// }
+// asyncService.checkSetCustomerLisByRedis(config);
+// //鍒濆鍖栦綋妫�璁㈠崟琛�
+// List<TjOrder> orderList = null;
+// List<TjCustomer> customerList = new ArrayList<>();
+// Map<String, Object> map = new HashMap<>();
+//
+// //濮撳悕鏌ヨ
+// if (null != name && !"".equals(name)) {
+// List<TjCustomer> list = customerService.getTjCustomerList(name);
+// if (null != list && list.size() > 0) {
+// List<TjCustomer> lists = new ArrayList<>();
+// for (TjCustomer customer : list) {
+// if ("Y".equals(config)) {
+// orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId());
+// } else {
+// orderList = orderService.getTjOrderListByCusId(customer.getCusId());
+// }
+// if (null != orderList && orderList.size() > 0) {
+// for (TjOrder tjOrder : orderList) {
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getFinishTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+// 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 {
+// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
+// }
+// lists.add(customer);
+// }
+// }
+// }
+// List<TjCustomer> customers = null;
+// if (lists.size() > 0) {
+// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// map.put("customers", customers);
+// map.put("total", lists.size());
+// return AjaxResult.success(map);
+// }
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+//
+// //鏉′欢鏌ヨ
+// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
+// //鍒ゆ柇鏄惁寮�鍚垵瀹�
+// if ("Y".equals(config)) {
+// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// } else {
+// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// }
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+//
+// List<TjCustomer> customers = null;
+// if (null != checkStatus && checkStatus == 0) {
+// customers = redisCache.getCacheMapValue("check", "ws");
+// }
+// if (null != checkStatus && checkStatus == 1) {
+// 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());
+// return AjaxResult.success(map);
+// } else {
+// //鍒ゆ柇鏄惁寮�鍚垵瀹�
+// if ("Y".equals(config)) {
+// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// } else {
+// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// }
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+ String value = String.valueOf(compId);
+ if(tjNumber==null)tjNumber="";
+ if(compId==null)value="";
+ if(name==null)name="";
+ if(beginTime==null)beginTime="";
+ if(endTime==null)endTime="";
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
}
/**
@@ -493,7 +503,7 @@
@GetMapping("/updateCheckType")
@ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
- if(redisCache.hasKey("updateCheckType"+tjNumber)) {
+ if (redisCache.hasKey("updateCheckType" + tjNumber)) {
List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
return AjaxResult.success(cacheMapValue);
}
@@ -526,9 +536,9 @@
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
- if(null==byId){
+ if (null == byId) {
detailService.removeById(tjOrderDetail.getOrderDetailId());
- }else {
+ } else {
tjOrderDetail.setProject(byId);
}
List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
@@ -538,13 +548,13 @@
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(";");
+ String[] split = summary.split(";");
// List<Long> longList = new ArrayList<>();
// for (String str : split) {
// if(!"".equals(str)){
--
Gitblit v1.8.0