From 35492c6595e9585e54e25a97eda08e679efa1c12 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 19 七月 2024 18:08:10 +0800
Subject: [PATCH] zjh 2024/07/19-2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 2213707..f66af80 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
@@ -34,6 +34,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.aspectj.weaver.AjAttribute;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,7 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;
@@ -56,6 +58,7 @@
@RestController
@RequestMapping ("/check")
@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@Slf4j
public class TjCheckController {
@Resource
private ITjOrderService orderService;
@@ -320,8 +323,11 @@
@GetMapping ("/dataSynchronization")
@ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
- @Transactional
+// @Transactional
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
+
+
+
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -377,10 +383,7 @@
return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
}
JSONArray data = object.getJSONArray("ResultData");
-// int size = data.size();
-// if(size>0){
-//
-// }
+
for (Object datum : data) {
JSONObject jsonObject = (JSONObject) datum;
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
@@ -483,16 +486,19 @@
AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績",order.getCardId(),"''",100,1,"'1'");
DynamicDataSourceContextHolder.clearDataSourceType();
+ log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: "+results.toString());
if (Integer.parseInt(results.get("code").toString()) == 200) {
List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
if(null !=datas && datas.size()>0){
+ jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+ jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
for (Map<String, Object> objectMap : datas) {
- LtkjExamJcsqd jybgid = jcsqdService.getLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
- if (null != jybgid) {
- jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
- jcbgdService.deletedLtkjJcbgdByTjhAndTmh(jybgid.getTmh());
- }
+// LtkjExamJcsqd jybgid = jcsqdService.getLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
+// if (null != jybgid) {
+// jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
+// jcbgdService.deletedLtkjJcbgdByTjhAndTmh(jybgid.getTmh());
+// }
LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
jcbgd.setTjh(order.getCardId());
if(null !=objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals(""))
@@ -549,6 +555,7 @@
asyncService.updateCheckType(order.getTjNumber());
}
return AjaxResult.success("鍚屾鎴愬姛");
+// return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
}
return AjaxResult.error();
}
--
Gitblit v1.8.0