区域添加id路径

whyclxw

2024-12-30 642602bd940de295cbf22c186d10622fd4deadac

区域添加id路径

 src/main/java/com/whyc/controller/UserInfController.java

@@ -19,9 +19,9 @@

    @ApiOperation(value = "查询所有用户信息",notes = "排除uid在100以内的(100以内默认是管理员)")
    @GetMapping("getAllUser")
    public Response getAllUser(@RequestParam(required = false) String uname,@RequestParam(required = false) String realName,@RequestParam(required = false) Integer urole
    public Response getAllUser(@RequestParam(required = false) String uname,@RequestParam(required = false) String realName
            ,@RequestParam int areaId ,@RequestParam int pageCurr, @RequestParam int pageSize){
        return service.getAllUser(uname,realName,urole,areaId,pageCurr,pageSize);
        return service.getAllUser(uname,realName,areaId,pageCurr,pageSize);
    }

    @ApiOperation(value = "查询所有用户信息(不分页除内置用户外用于下拉)")

 src/main/java/com/whyc/mapper/UserInfMapper.java

@@ -11,7 +11,7 @@
    //判断是否存在普通用户(uid>100)，若无,初始为1001
    int judgeUname();
    //查询所有用户信息
    List<UserInf> getAllUser(@Param("uname")String uname,@Param("realName")String realName,@Param("urole")Integer urole,@Param("areaId")Integer areaId);
    List<UserInf> getAllUser(@Param("uname")String uname,@Param("realName")String realName,@Param("urole")Integer urole,@Param("areaList")List areaList);
    //查询100~1000中最大的uid
    String getIn10000();
    //创建100~1000的id表,不存在则创建

 src/main/java/com/whyc/service/UserInfService.java

@@ -44,6 +44,9 @@
    private AreaInfMapper ainfMapper;

    @Autowired(required = false)
    private AreaInfService areaInfService;

    @Autowired(required = false)
    private AuthiruzeInfMapper authMapper;

    @Autowired(required = false)
@@ -51,15 +54,19 @@


    //查询所有用户信息
    public Response getAllUser(String uname, String realName, Integer urole, int areaId, int pageCurr, int pageSize) {
    public Response getAllUser(String uname, String realName, int areaId, int pageCurr, int pageSize) {
        PageHelper.startPage(pageCurr,pageSize);
        List<UserInf> list=mapper.getAllUser(uname,realName,urole,areaId);
        for (UserInf uinf:list) {
        UserInf uinf= ActionUtil.getUser();
        List areaList=new ArrayList();
        areaList.add(areaId);
        areaInfService.getAllAreaId(areaId,areaList);
        List<UserInf> list=mapper.getAllUser(uname,realName,uinf.getUrole(),areaList);
        for (UserInf u:list) {
            QueryWrapper wrapper=new QueryWrapper();
            wrapper.eq("area_uname",uinf.getUname());
            wrapper.eq("id",u.getAreaId());
            wrapper.last("limit 1");
            AreaInf ainf=ainfMapper.selectOne(wrapper);
            uinf.setAinf(ainf);
            u.setAinf(ainf);
        }
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"数据返回");

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

@@ -66,7 +66,7 @@
  alarm:
    task.switch: off
  #允许跨域的白名单 http://192.168.10.132:8080,http://192.168.10.109:8080
  cors: http://localhost:5173,http://192.168.10.86:5173,http://localhost:8001
  cors: http://192.168.10.86:8001,http://localhost:8001
  rsa:
    #publicKey: ENC(ZCCRYK0TIFYCrdHZprQS0I8hWFD1uXKIRYcfwDkh3V87FjFePAWlWIzi6tJFcswo525c+m5UGmkt+eq/wCIIabjbcbt6l+18hz6ogtGXHTalaEATqjbrjWmbdzc92A6dYmoNI5Rdpi+jqBKciXZhDKWDNPY2M3/WyejcPGDOeo9CWOvR1hdmLX8iTlcuPRS6k7YzybGZwP9cOHfcAyt6QN+GSuNRzapo5pUmQdT7aUwF3P73qcoxHpRO1li6kYF9KVOMgVix8a3h6TyFMMuJdPGboRV8DL9wLK3bnJT6s0Ei35niYv4ePJ7IzHiEa4J1x0wo8pNU0CfdhylySWLsnxgFjzbhMWjmoQhwQjjnTj+DgyvRrZqaE3R0cLpSwxT4x2ceHzKm1KUzF7OhGgnmc3lPN3H8UyVHy+l3GyejGpRnqFtABHqIlbM2nbsTA8lT/sAeN/AVlBORNgd5Rai7upWk43pvd2qG9ykSW+t/++ZiKBXfAZOBgrcWhPseEG94e3bHhM62nwcgHZ5HzFCZ8PEwXn0053vbxdM6LxVIqCAIzrWoOgBWoaRRBqfSUTvJf2tdc5m9NncXRmYEzZOg3f1wOvVGDJeyKC3OuyhlJnD2VWYVwNsorDkI+dT9mPAMMTZaPeqwPGxtkjaaFSgB5RDHcBfeEIMNdAVOqMCA9qOLFX+zr9mHvjV1kpiDKb5JZFhLHlXObROUtqMndTQDRCATBjutLB4QS0/0BCOvSLnDTA39e/nVKBwTHPqnlz4N)
    #privateKey: ENC(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)
@@ -76,12 +76,5 @@
#Config文件读取 涉及License和FGCDFileDownload
configFile:
  type: 1 #1:本地测试；2：打包jar


minio:
  endpoint: http://127.0.0.1:9002
  accessKey: minioadmin
  secretKey: minioadmin
  bucketName: test



 src/main/resources/mapper/UserInfMapper.xml

@@ -31,8 +31,11 @@
            <if test="realName!=null">
                and realName LIKE CONCAT('%',#{realName},'%')
            </if>
            <if test="areaId!=null">
                and area_id=#{areaId}
            <if test="areaList!=null">
                and area_id in
                <foreach collection="areaList" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>

            <choose>
@@ -40,9 +43,9 @@
                    and urole=0
                </when>
                <when test="urole == 1">
                    and urole=1
                    and urole!=2
                </when>
                <when test="urole == -1">
                <when test="urole == 2">
                    and urole!=2
                </when>
            </choose>