From d5393909a140c863a40cabb9bee43d8a324969e0 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 05 三月 2024 14:33:04 +0800
Subject: [PATCH] zjh 本地 2024/03/5 -1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 18 ++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 24 ++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 37 +++++++++++++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2 +
6 files changed, 83 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index 8e13670..4794803 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -28,12 +28,12 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+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;
@@ -98,14 +98,39 @@
@GetMapping("/newGetTjPat")
- @ApiOperation(value = "鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
+ @ApiOperation(value = "A------鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
@RequestParam(required = false)String pacName,
- @RequestParam(required = false)String pacRemark) {
+ @RequestParam(required = false)String pacRemark, HttpServletRequest request,
+ HttpSession session) {
+
// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName);
List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
+// List<Map<String, Object>> list=new ArrayList<>();
+// if(null !=maps && maps.size()>0){
+// for (Map<String, Object> map : maps) {
+// String pacCode1 = map.get("pacCode").toString();
+// List<String> s = orderService.selectTjOrderByCardId1();
+// if(null !=s && s.size()>0){
+// if(s.contains(pacCode1)){
+//// maps.remove(map);
+// continue;
+// }
+// list.add(map);
+// }
+// }
+// }
+// return AjaxResult.success(list);
+
+ List<String> strings = orderService.selectTjOrderByCardId1();
+ if(null !=strings && strings.size()>0){
+ List<Map<String, Object>> collect = maps.stream()
+ .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList());
+ return AjaxResult.success(collect);
+ }
return AjaxResult.success(maps);
+// return AjaxResult.success(collect);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index b46cc9d..162502c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -24,9 +24,12 @@
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
+
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -66,7 +69,28 @@
@RequestParam(required = false)String pacRemark) {
List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
+// List<Map<String, Object>> list=new ArrayList<>();
+// if(null !=maps && maps.size()>0){
+// for (Map<String, Object> map : maps) {
+// String pacCode1 = map.get("pacCode").toString();
+// List<String> s = tjOrderService.selectTjOrderByCardId1();
+// if(null !=s && s.size()>0){
+// if(s.contains(pacCode1)){
+//// maps.remove(map);
+// continue;
+// }
+// list.add(map);
+// }
+// }
+// }
+ List<String> strings = tjOrderService.selectTjOrderByCardId1();
+ if(null !=strings && strings.size()>0){
+ List<Map<String, Object>> collect = maps.stream()
+ .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList());
+ return AjaxResult.success(collect);
+ }
return AjaxResult.success(maps);
+// return AjaxResult.success(maps);
}
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 681d752..eb0584e 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
@@ -10,6 +10,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.codec.Base64;
@@ -53,6 +54,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -804,7 +806,21 @@
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
- public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
+ public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder, HttpServletRequest request) throws Exception {
+ // 鐢熸垚Token骞朵繚瀛樺埌Session涓�
+ String token = UUID.randomUUID().toString(); // 鐢熸垚涓�涓殢鏈哄瓧绗︿覆浣滀负Token
+ request.getSession().setAttribute("token", token);
+
+// 鑾峰彇琛ㄥ崟涓殑Token骞朵笌Session涓殑Token姣旇緝
+ String formToken = request.getParameter("token");
+ if (formToken != null && formToken.equals(request.getSession().getAttribute("token"))) {
+ System.out.printf("=================绗竴娆℃彁浜�");
+ } else {
+ // 閲嶅鎻愪氦浜嗚〃鍗曚俊鎭�
+ System.out.printf("=============================閲嶅浜�");
+ }
+
+
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 33cf20a..0cdbafc 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -198,4 +198,8 @@
@Select("SELECT count(*) FROM tj_order a WHERE a.deleted=0 and a.card_id=#{cardId}")
int selectTjOrderByCardId(String cardId);
+
+
+ @Select("SELECT a.card_id FROM tj_order a WHERE a.deleted=0")
+ List<String> selectTjOrderByCardId1();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 5c2371b..7c1a74c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -129,4 +129,6 @@
Integer checkStatus, String compId, String beginTime, String endTime,String tjname);
public int selectTjOrderByCardId(String cardId);
+
+ List<String> selectTjOrderByCardId1();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index e73a50c..cc91c96 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -263,4 +263,9 @@
public int selectTjOrderByCardId(String cardId) {
return tjOrderMapper.selectTjOrderByCardId(cardId);
}
+
+ @Override
+ public List<String> selectTjOrderByCardId1() {
+ return tjOrderMapper.selectTjOrderByCardId1();
+ }
}
--
Gitblit v1.8.0