From 294d3e535210ca2e543328c7c819ff1c77367f29 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 05 三月 2024 14:45:59 +0800
Subject: [PATCH] zjh 本地 2024/03/5 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 16 +---------------
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 22 +---------------------
2 files changed, 2 insertions(+), 36 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 4794803..f563a38 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
@@ -101,28 +101,9 @@
@ApiOperation(value = "A------鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
@RequestParam(required = false)String pacName,
- @RequestParam(required = false)String pacRemark, HttpServletRequest request,
- HttpSession session) {
-
-// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName);
+ @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 = 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()
@@ -130,7 +111,6 @@
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/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index eb0584e..d0b0365 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
@@ -806,21 +806,7 @@
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
- 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("=============================閲嶅浜�");
- }
-
-
+ public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
--
Gitblit v1.8.0