From 74a005b2c0ef4247d8915c20daea80649abb5b80 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 14 十二月 2023 12:16:27 +0800 Subject: [PATCH] zjh 2023/12/14--1 --- ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java | 8 ++ ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java | 45 ++++++++++++++- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 2 ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml | 30 ++++++++++ ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java | 10 +++ ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 37 +++++++++-- 6 files changed, 120 insertions(+), 12 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index dd1839f..56c5fbd 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -1561,7 +1561,7 @@ customer.setNotCheckeds(String.valueOf(stringBuilder)); if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉"); } - redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"1",customer); +// redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"1",customer); redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"0",customer); } } 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 4173982..caeb0e6 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 @@ -11,6 +11,7 @@ import com.ltkj.hosp.service.*; import com.ltkj.hosp.sqlDomain.*; import com.ltkj.hosp.mapper.TestMapper; +import com.ltkj.system.service.ISysDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.checkerframework.checker.units.qual.A; @@ -23,6 +24,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -65,9 +68,16 @@ private ITjOrderRemarkService remarkService; @Resource private ITjOrderService orderService; + @Resource + private ISysDeptService deptService; @GetMapping("/getRedisValue") @ApiOperation(value = "娴嬭瘯redis妯$硦鏌ヨ") - public AjaxResult getRedisValue() { + public AjaxResult getRedisValue(@RequestParam int aa, + @RequestParam(defaultValue = "1") Integer page, + @RequestParam(defaultValue = "10") Integer pageSize, + @RequestParam(required = false) String deptId, + @RequestParam(required = false) String tjName, + @RequestParam(required = false) String tjNum) throws SQLException { // long start = System.currentTimeMillis(); // //闇�瑕佸尮閰嶇殑key // ScanOptions options = ScanOptions.scanOptions() @@ -88,13 +98,24 @@ // Map<String,Object>map=new HashMap<>(); // map.put("result",result); // map.put("scan鎵弿鍏辫�楁椂锛歿} ms key鏁伴噺锛歿}",System.currentTimeMillis()-start+result.size()); - List<TjOrderRemark> list = remarkService.list(new LambdaQueryWrapper<TjOrderRemark>().ne(TjOrderRemark::getType,2).groupBy(TjOrderRemark::getTjNumber)); - for (TjOrderRemark remark : list) { - TjOrder orderByTjNum = orderService.getOrderByTjNum(remark.getTjNumber()); - if(null !=orderByTjNum){ - asyncService.dockerSetWjCustomerByRedis(orderByTjNum.getOrderId(),remark.getDeptId()); - asyncService.dockerSetYjCustomerByRedis(orderByTjNum.getOrderId(),remark.getDeptId()); - } +// List<TjOrderRemark> list = remarkService.list(new LambdaQueryWrapper<TjOrderRemark>().ne(TjOrderRemark::getType,2).groupBy(TjOrderRemark::getTjNumber)); +// for (TjOrderRemark remark : list) { +// TjOrder orderByTjNum = orderService.getOrderByTjNum(remark.getTjNumber()); +// if(null !=orderByTjNum){ +// asyncService.dockerSetWjCustomerByRedis(orderByTjNum.getOrderId(),remark.getDeptId()); +// asyncService.dockerSetYjCustomerByRedis(orderByTjNum.getOrderId(),remark.getDeptId()); +// } +// } + if(null==deptId) deptId=""; + if(null==tjName) tjName=""; + if(null==tjNum) tjNum=""; + +// List<Map<String, Object>> map = deptService.getSysDeptYjWjCustomerList(deptId, tjName, tjNum, aa, page, pageSize); +// List<ResultSet> map = deptService.getSysDeptYjWjCustomerList1(deptId, tjName, tjNum, aa, page, pageSize); + ResultSet resultSet = deptService.getSysDeptYjWjCustomerList12(deptId, tjName, tjNum, aa, page, pageSize); + while (resultSet.next()){ + String anInt = resultSet.getString(1); + System.out.println(anInt); } return AjaxResult.success(); } diff --git a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java index b8ce296..755b73d 100644 --- a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java +++ b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java @@ -1,6 +1,8 @@ package com.ltkj.system.mapper; +import java.sql.ResultSet; import java.util.List; +import java.util.Map; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -122,4 +124,12 @@ @Select(" SELECT a.dept_id FROM sys_dept a WHERE a.deleted=0 AND a.dept_name like concat('%',#{deptName},'%')") List<String> getSysDeptId(String deptName); + + + @Select("call pro_tjhzlb_list(#{deptid,mode=IN},#{tjname,mode=IN},#{tjNumber,mode=IN},#{type,mode=IN},#{page,mode=IN},#{pageSize,mode=IN})") + ResultSet getSysDeptYjWjCustomerList(@Param("deptid")String deptid, @Param("tjname") String tjname, @Param("tjNumber") String tjNumber, + @Param("type")int type, @Param("page") int page , @Param("pageSize") int pageSize); + + List<Map<String, Object>> getSysDeptYjWjCustomerList1(Map<String,Object> map); + List<ResultSet> getSysDeptYjWjCustomerList2(Map<String,Object> map); } diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java index 1df1256..77a18d1 100644 --- a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java +++ b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java @@ -1,6 +1,8 @@ package com.ltkj.system.service; +import java.sql.ResultSet; import java.util.List; +import java.util.Map; import com.baomidou.mybatisplus.extension.service.IService; import com.ltkj.common.core.domain.TreeSelect; @@ -134,4 +136,10 @@ List<String> getSysDeptId(String deptName); + + List<Map<String, Object>> getSysDeptYjWjCustomerList(String deptid, String tjname, String tjNumber, int type, int page , int pageSize); + + List<ResultSet> getSysDeptYjWjCustomerList1(String deptid, String tjname, String tjNumber, int type, int page , int pageSize); + + ResultSet getSysDeptYjWjCustomerList12(String deptid, String tjname, String tjNumber, int type, int page , int pageSize); } diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java index ba54151..04b18b0 100644 --- a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java +++ b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java @@ -1,11 +1,11 @@ package com.ltkj.system.service.impl; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.sql.ResultSet; +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ltkj.common.constant.Constants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ltkj.common.annotation.DataScope; @@ -327,4 +327,43 @@ public List<String> getSysDeptId(String deptName) { return deptMapper.getSysDeptId(deptName); } + + @Override + public List<Map<String, Object>> getSysDeptYjWjCustomerList(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) { + Map<String, Object> map = new HashMap<>(); + map.put("deptid",deptid); + map.put("tjname",tjname); + map.put("tjNumber",tjNumber); + map.put("type",type); + map.put("page",page); + map.put("pageSize",pageSize); + return deptMapper.getSysDeptYjWjCustomerList1(map); +// return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize); + } + + @Override + public List<ResultSet> getSysDeptYjWjCustomerList1(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) { + Map<String, Object> map = new HashMap<>(); + map.put("deptid",deptid); + map.put("tjname",tjname); + map.put("tjNumber",tjNumber); + map.put("type",type); + map.put("page",page); + map.put("pageSize",pageSize); + return deptMapper.getSysDeptYjWjCustomerList2(map); +// return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize); + } + + @Override + public ResultSet getSysDeptYjWjCustomerList12(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) { +// Map<String, Object> map = new HashMap<>(); +// map.put("deptid",deptid); +// map.put("tjname",tjname); +// map.put("tjNumber",tjNumber); +// map.put("type",type); +// map.put("page",page); +// map.put("pageSize",pageSize); + return deptMapper.getSysDeptYjWjCustomerList( deptid, tjname, tjNumber, type, page, pageSize); +// return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize); + } } diff --git a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml index 7f32c2a..ef9ac8a 100644 --- a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -314,4 +314,34 @@ where dept_id = #{deptId} </update> + + <select id="getSysDeptYjWjCustomerList1" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map"> + {call pro_tjhzlb_list( + + #{deptid,mode=IN,jdbcType=VARCHAR}, + #{tjname,mode=IN,jdbcType=VARCHAR}, + #{tjNumber,mode=IN,jdbcType=VARCHAR}, + #{type,mode=IN,jdbcType=INTEGER}, + #{page,mode=IN,jdbcType=INTEGER}, + #{pageSize,mode=IN,jdbcType=INTEGER}, + #{totalRows,mode=OUT,jdbcType=INTEGER} + )} + </select> + + + + <select id="getSysDeptYjWjCustomerList2" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.EventObject"> + {call pro_tjhzlb_list( + + #{deptid,mode=IN,jdbcType=VARCHAR}, + #{tjname,mode=IN,jdbcType=VARCHAR}, + #{tjNumber,mode=IN,jdbcType=VARCHAR}, + #{type,mode=IN,jdbcType=INTEGER}, + #{page,mode=IN,jdbcType=INTEGER}, + #{pageSize,mode=IN,jdbcType=INTEGER}, + #{totalRows,mode=OUT,jdbcType=INTEGER} + )} + </select> + + </mapper> -- Gitblit v1.8.0