From f78aea34f0cbdaba114723d6edadc3648669aa24 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 02 一月 2025 21:02:21 +0800
Subject: [PATCH] lis api服务
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 3 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6 ++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java | 1 -
4 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index 5e7b337..c8681df 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -55,6 +56,9 @@
private ITjOrderService orderService;
@Autowired
private TjProjectMapper tjProjectMapper;
+ @Autowired
+ private ISysConfigService sysConfigService;
+
/**
* 鏀堕��璐瑰洖璋冩帴鍙�
* @param params
@@ -106,7 +110,7 @@
if (order != null){
// 閫�璐�
String bldh = water.getJxbz();
- //TODO 鏄惁鍙戦�佷綔搴熺敵璇�
+// lisRevoke(water.getTjNumber(),bldh);
if (bldh != null){
remarkService.deleteTjOrderDetailByjxbz(bldh);
tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
@@ -132,6 +136,45 @@
return AjaxResult.success();
}
+ private void lisRevoke(String tjNum,String jxbz){
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getTjNum,tjNum);
+ if (StrUtil.isNotBlank(jxbz))
+ wrapper.eq(TjSampling::getJxbz,jxbz);
+ List<TjSampling> list = tjSamplingMapper.selectList(wrapper);
+ List<TjSampling> isMergeList = list.stream().filter(i -> i.getIsMerge() == 1).collect(Collectors.toList());
+ JSONArray array = JSONUtil.createArray();
+ for (TjSampling sampling : isMergeList) {
+ String[] proIds = sampling.getProId().split(",");
+ for (String proId : proIds) {
+ JSONObject object = JSONUtil.createObj();
+ TjProject project = tjProjectMapper.selectById(proId);
+ object.putOpt("txm",sampling.getJyxh());
+ object.putOpt("sfxmid",project.getProId());
+ object.putOpt("sfxmname",project.getProName());
+ object.putOpt("primaryKey",proId);
+ array.add(object);
+ }
+ list = list.stream().filter(i -> !i.getProId().equals(sampling.getProId())).collect(Collectors.toList());
+ }
+ for (TjSampling sampling : list) {
+ String proId = sampling.getProId();
+ JSONObject object = JSONUtil.createObj();
+ TjProject project = tjProjectMapper.selectById(proId);
+ object.putOpt("txm",sampling.getJyxh());
+ object.putOpt("sfxmid",project.getProId());
+ object.putOpt("sfxmname",project.getProName());
+ object.putOpt("primaryKey",proId);
+ array.add(object);
+ }
+ String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
+ String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("list",array);
+ String post = HttpClientUtils.sendPost(apiUrl + "/api/lis/"+ hospbm +"/revoke", hashMap);
+
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑His瀛楀吀闆嗗悎
* @param params
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
index 8d421ee..be83224 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
@@ -234,7 +234,6 @@
entries.putOpt("sfxmid",project.getProId());
entries.putOpt("sfxmname",project.getProName());
- // 鍙杢b琛�
QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
wrapper
.select("sum(now_price) as now_price")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index fd8b804..f79df97 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -248,7 +248,8 @@
}
String s = configService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
+// if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
+ if (null != s && s.equals("Y")) {
String apiUrl = configService.selectConfigByKey("common_api_url");
String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
HashMap<String, Object> map = new HashMap<>();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index bf2c9e8..8bee3cd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -3008,7 +3008,8 @@
if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
String s = configService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+ if (null != s && s.equals("Y")) {
String apiUrl = configService.selectConfigByKey("common_api_url");
String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
@@ -3357,7 +3358,8 @@
}
}
String s = configService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+ if (null != s && s.equals("Y")) {
ArrayList<TjFlowingWater> weizhifu = new ArrayList<>();
ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
for (String bldh : dto.getBldhs()) {
--
Gitblit v1.8.0