2/21 lrj 新增pas调用查询人员接口

PCS/src/main/java/cn/cslg/permission/common/model/dto/PasUserDTO.java

@@ -0,0 +1,35 @@
+package cn.cslg.permission.common.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PasUserDTO {
+    /**
+     * 每页条数
+     */
+    private Long size;
+
+    /**
+     * 当前页数
+     */
+    private Long current;
+
+    /**
+     * 数据总数
+     */
+    private Long total;
+    /**
+     * Front:姓名
+     * Back:人员名称
+     */
+    private String name;
+    /**
+     * Front:账号
+     * Back:人员账号
+     */
+    private String username;
+
+     private List<Integer> userIds;
+}

PCS/src/main/java/cn/cslg/permission/common/model/vo/PasUserVO.java

@@ -0,0 +1,22 @@
+package cn.cslg.permission.common.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PasUserVO {
+
+    /**
+     * Front:姓名
+     * Back:人员名称
+     */
+    private String name;
+    /**
+     * Front:账号
+     * Back:人员账号
+     */
+    private String username;
+
+   private Integer id;
+}

PCS/src/main/java/cn/cslg/permission/controller/PersonnelController.java

@@ -93,4 +93,5 @@ public class PersonnelController {
         return personnelService.getByTenantId(tenantId);
     }
 
+
 }

PCS/src/main/java/cn/cslg/permission/controller/SystemController.java

@@ -2,6 +2,8 @@ package cn.cslg.permission.controller;
 
 import cn.cslg.permission.common.config.MailConstants;
 import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.dto.PasUserDTO;
+import cn.cslg.permission.common.model.vo.PasUserVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.domain.Personnel;
@@ -10,6 +12,7 @@ import cn.cslg.permission.service.DepartmentService;
 import cn.cslg.permission.service.PersonnelService;
 import cn.cslg.permission.service.SystemService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -141,4 +144,10 @@ public class SystemController {
         return systemService.getDutyDeparts(personId);
     }
 
+
+    @PostMapping("/getPASAssignedUser")
+    @Operation(summary = "获取专题库分配人员信息")
+    public IPage<PasUserVO> getPASAssignedUser(@RequestBody  PasUserDTO pasUserDTO) {
+        return systemService.getPASAssignedUser(pasUserDTO);
+    }
 }

PCS/src/main/java/cn/cslg/permission/mapper/PersonnelMapper.java

@@ -1,7 +1,11 @@
 package cn.cslg.permission.mapper;
 
+import cn.cslg.permission.common.model.dto.PasUserDTO;
+import cn.cslg.permission.common.model.vo.PasUserVO;
 import cn.cslg.permission.domain.Personnel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,4 +19,5 @@ import java.util.List;
 
 @Mapper
 public interface PersonnelMapper extends BaseMapper<Personnel> {
+    IPage<PasUserVO> getPasUser(Page<PasUserVO> page, @Param("params") PasUserDTO params);
 }

PCS/src/main/java/cn/cslg/permission/service/SystemService.java

@@ -1,5 +1,7 @@
 package cn.cslg.permission.service;
 
+import cn.cslg.permission.common.model.dto.PasUserDTO;
+import cn.cslg.permission.common.model.vo.PasUserVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.CacheUtils;
 import cn.cslg.permission.common.utils.DataUtils;
@@ -297,5 +299,10 @@ public class SystemService {
         return Response.success(personnelService.setPersonnelToVO(personnelList), DataUtils.setPageColumn(personnelVO.getSize(), personnelVO.getCurrent(), Math.toIntExact(count)));
 
     }
+    public  IPage<PasUserVO>   getPASAssignedUser(PasUserDTO pasUserDTO){
+        IPage<PasUserVO> personnelList = personnelService.getBaseMapper().getPasUser(new Page<>(pasUserDTO.getCurrent(), pasUserDTO.getSize()),pasUserDTO);
+
+        return  personnelList;
+    }
 
 }

PCS/src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   redis:
-    host: 47.101.137.223
+    host: 192.168.1.24
     port: 6379
-    database: 9
+    database: 3
     password: Xx0GWxdWQJxx6Swe
     lettuce:
       pool:
@@ -12,9 +12,9 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/PCS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.24:3306/PCS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
-    password: TU5x6IeBi7rl
+    password: rrzTwWAYX8Gxh5JH
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     druid:

PCS/src/main/resources/application.yml

@@ -40,7 +40,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: local
   jackson:
     default-property-inclusion: non_null
     serialization:

PCS/src/main/resources/mapper/PersonnelMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.cslg.permission.mapper.PersonnelMapper">
+  <select id="getPasUser" resultType="cn.cslg.permission.common.model.vo.PasUserVO"  parameterType="cn.cslg.permission.common.model.dto.PasUserDTO"
+  >
+select id ,PERSONNEL_NAME as name,PERSONNEL_USERNAME as username from PERSONNEL
+<where>
+<if test="params.username!=null">
+ and PERSONNEL_USERNAME like  concat('%', #{params.username}, '%')
+</if>
+<if test="params.name!=null">
+    and PERSONNEL_NAME like  concat('%', #{params.name}, '%')
+</if>
+<if test="params.userIds.size()!=0">
+  and id in
+    <foreach collection="params.userIds" index="index" item="item" open="(" separator="," close=")">
+
+        #{item}
+    </foreach>
+</if>
+</where>
+  </select>
+
+</mapper>