zjh
2023-12-14 74a005b2c0ef4247d8915c20daea80649abb5b80
zjh 2023/12/14--1
6个文件已修改
132 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
                    }
                }
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();
    }
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);
}
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);
}
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);
    }
}
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>