区域

whyclxw

2024-12-20 7fdc337e30daff98c55412318c1db31ffbadc81a

区域

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

@@ -25,8 +25,8 @@

    @ApiOperation(value = "添加区域")
    @GetMapping("addArea")
    public Response addArea(@RequestParam(required = false) Integer parentId,@RequestParam String areaName,@RequestParam(required = false) String areaUname,@RequestParam(required = false) String areaDescript){
        return service.addArea(parentId,areaName,areaUname,areaDescript);
    public Response addArea(@RequestParam(required = false) Integer parentId,@RequestParam String areaName,@RequestParam(required = false) String areaDescript){
        return service.addArea(parentId,areaName,areaDescript);
    }

    @ApiOperation(value = "删除区域")
@@ -37,30 +37,30 @@

    @ApiOperation(value = "修改区域")
    @GetMapping("updateArea")
    public Response updateArea(@RequestParam(required = false) Integer id,@RequestParam String areaName,@RequestParam(required = false) String areaUname,@RequestParam(required = false) String areaDescript){
        return service.updateArea(id,areaName,areaUname,areaDescript);
    public Response updateArea(@RequestParam(required = false) Integer id,@RequestParam String areaName,@RequestParam(required = false) String areaDescript){
        return service.updateArea(id,areaName,areaDescript);
    }
    @ApiOperation(value = "查询所在区域下所有用户信息")
    /*@ApiOperation(value = "查询所在区域下所有用户信息")
    @GetMapping("getUinfById")
    public Response getUinfById(@RequestParam Integer id, int pageNum, int pageSize){
        return service.getUinfById(id,pageNum,pageSize);
    }
    @ApiOperation(value = "查询所在区域下所有锁信息")
    }*/
   /* @ApiOperation(value = "查询所在区域下所有锁信息")
    @GetMapping("getLinfById")
    public Response getLinfById(@RequestParam Integer id, int pageNum, int pageSize){
        return service.getLinfById(id,pageNum,pageSize);
    }
    }*/

    @ApiOperation(value = "查询所在区域下所有钥匙信息")
    /*@ApiOperation(value = "查询所在区域下所有钥匙信息")
    @GetMapping("getKinfById")
    public Response getKinfById(@RequestParam Integer id, int pageNum, int pageSize){
        return service.getKinfById(id,pageNum,pageSize);
    }
    }*/

    @ApiOperation(value = "查询所在区域下所有开锁日志")
  /*  @ApiOperation(value = "查询所在区域下所有开锁日志")
    @GetMapping("getLogById")
    public Response getLogById(@RequestParam Integer id, int pageNum, int pageSize){
        return service.getLogById(id,pageNum,pageSize);
    }
    }*/

}

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

@@ -17,9 +17,9 @@

    @ApiOperation(value = "查询所有钥匙信息")
    @GetMapping("getAllKeyInf")
    public Response getAllKeyInf(@RequestParam(required = false) String keyName, @RequestParam(required = false) String uname
    public Response getAllKeyInf(@RequestParam(required = false) String keyName, @RequestParam(required = false) String uname,@RequestParam int areaId
            , int pageNum, int pageSize){
        return service.getAllKeyInf(keyName,uname,pageNum,pageSize);
        return service.getAllKeyInf(keyName,uname,areaId,pageNum,pageSize);
    }

    @ApiOperation(value = "授权时查询所有钥匙信息(不分页)")

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

@@ -19,11 +19,12 @@
    @Autowired
    private LockInfService service;


    @ApiOperation(value = "查询所有锁信息")
    @GetMapping("getAllLockInf")
    public Response getAllLockInf(@RequestParam(required = false) String lockName, @RequestParam(required = false) String lockType,@RequestParam(required = false) Integer lockState
                                 ,int pageNum,int pageSize){
        return service.getAllLockInf(lockName,lockType,lockState,pageNum,pageSize);
            ,@RequestParam int areaId,int pageNum,int pageSize){
        return service.getAllLockInf(lockName,lockType,lockState,areaId,pageNum,pageSize);
    }

    @ApiOperation(value = "授权时查询所有锁信息(不分页)")

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

@@ -20,8 +20,8 @@
    @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 role
            ,@RequestParam int pageCurr, @RequestParam int pageSize){
        return service.getAllUser(uname,realName,role,pageCurr,pageSize);
            ,@RequestParam int areaId ,@RequestParam int pageCurr, @RequestParam int pageSize){
        return service.getAllUser(uname,realName,role,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("role")Integer role);
    List<UserInf> getAllUser(@Param("uname")String uname,@Param("realName")String realName,@Param("role")Integer role,@Param("areaId")Integer areaId);
    //查询100~1000中最大的uid
    String getIn1000();
    //创建100~1000的id表,不存在则创建

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

@@ -66,15 +66,12 @@
        }
    }
    //添加区域
    public Response addArea(Integer parentId, String areaName,String areaUname,String areaDescript) {
    public Response addArea(Integer parentId, String areaName,String areaDescript) {
        AreaInf ainf=new AreaInf();
        ainf.setParentId(0);
        ainf.setAreaLevel(1);
        ainf.setAreaPath(areaName);
        ainf.setAreaName(areaName);
        if(areaUname!=null){
            ainf.setAreaUname(areaUname);
        }
        if(areaDescript!=null){
            ainf.setAreaDescript(areaDescript);
        }
@@ -112,12 +109,11 @@
        mapper.delete(wrapper1);
    }
    //修改区域
    public Response updateArea(Integer id, String areaName, String areaUname, String areaDescript) {
    public Response updateArea(Integer id, String areaName, String areaDescript) {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("id",id);
        wrapper.last("limit 1");
        AreaInf ainf=mapper.selectOne(wrapper);
        ainf.setAreaUname(areaUname);
        ainf.setAreaDescript(areaDescript);
        ainf.setAreaName(areaName);
        String oldPath=ainf.getAreaPath();
@@ -143,7 +139,7 @@
        wrapper2.eq("id",id);
        mapper.update(null,wrapper2);
    }
    //查询所有区域下所有锁信息
  /*  //查询所有区域下所有锁信息
    public Response getLinfById(Integer id, int pageNum, int pageSize) {
        //获取获取id下所有的区域id
        List areaList=new ArrayList();
@@ -154,7 +150,7 @@
        List<LockInf> list=linfMapper.selectList(wrapper);
        PageInfo pageInfo=PageInfoUtils.list2PageInfo(list,pageNum,pageSize);
        return new Response().setII(1,list!=null,pageInfo,"查询所有区域下所有锁信息");
    }
    }*/
    //获取获取id下所有的区域id
    public void getAllAreaId(Integer id,List areaList) {
        QueryWrapper wrapper=new QueryWrapper();
@@ -169,7 +165,7 @@
    }

    //查询所有区域下所有用户信息
    public Response getUinfById(Integer id, int pageNum, int pageSize) {
/*    public Response getUinfById(Integer id, int pageNum, int pageSize) {
        //获取获取id下所有的区域id
        List uinfList=new ArrayList();
        QueryWrapper wrapper=new QueryWrapper();
@@ -186,9 +182,9 @@
        List<UserInf> list=uInfMapper.selectList(wrapper1);
        PageInfo pageInfo=PageInfoUtils.list2PageInfo(list,pageNum,pageSize);
        return new Response().setII(1,list!=null,pageInfo,"查询所有区域下所有用户信息");
    }
    }*/

    //获取获取id下所有的区域用户名
   /* //获取获取id下所有的区域用户名
    private void getAllUinfId(Integer id,List uinfList) {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("parent_id",id);
@@ -199,9 +195,9 @@
                getAllUinfId(painf.getId(),uinfList);
            }
        }
    }
    }*/
   //查询所有区域下所有钥匙信息
    public Response getKinfById(Integer id, int pageNum, int pageSize) {
   /* public Response getKinfById(Integer id, int pageNum, int pageSize) {
        //获取获取id下所有的区域id
        List areaList=new ArrayList();
        areaList.add(id);
@@ -211,8 +207,8 @@
        List<KeyInf> list=kinfMapper.selectList(wrapper);
        PageInfo pageInfo=PageInfoUtils.list2PageInfo(list,pageNum,pageSize);
        return new Response().setII(1,list!=null,pageInfo,"查询所有区域下所有钥匙信息");
    }
    //查询所在区域下所有开锁日志
    }*/
   /* //查询所在区域下所有开锁日志
    public Response getLogById(Integer id, int pageNum, int pageSize) {
        //获取获取id下所有的区域id
        List areaList=new ArrayList();
@@ -227,5 +223,5 @@
        List<KeyInf> list=ctlLogMapper.selectList(logwrapper);
        PageInfo pageInfo=PageInfoUtils.list2PageInfo(list,pageNum,pageSize);
        return new Response().setII(1,list!=null,pageInfo,"查询所在区域下所有开锁日志");
    }
    }*/
}

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

@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@@ -18,8 +19,11 @@
public class KeyInfService {
    @Autowired(required = false)
    private KeyInfMapper mapper;

    @Autowired(required = false)
    private AreaInfService areaInfService;
    //查询所有钥匙信息
    public Response getAllKeyInf(String keyName, String uname, int pageNum, int pageSize) {
    public Response getAllKeyInf(String keyName, String uname,int areaId, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        QueryWrapper wrapper=new QueryWrapper();
        if(keyName!=null){
@@ -28,6 +32,13 @@
        if(uname!=null){
            wrapper.like("uname",uname);
        }
        List areaList=new ArrayList();
        areaList.add(areaId);
        areaInfService.getAllAreaId(areaId,areaList);
        if(areaList!=null){
            wrapper.in("area_id",areaList);
        }

        List<KeyInf> list=mapper.selectList(wrapper);
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"查询所有钥匙信息");

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

@@ -55,7 +55,7 @@
    }

    //查询所有锁信息
    public Response getAllLockInf(String lockName, String lockType, Integer lockState, int pageNum, int pageSize) {
    public Response getAllLockInf(String lockName, String lockType, Integer lockState,Integer areaId, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        QueryWrapper wrapper=new QueryWrapper();
        if(lockName!=null){
@@ -67,6 +67,12 @@
        if(lockState!=null){
            wrapper.eq("lock_state",lockState);
        }
        List areaList=new ArrayList();
        areaList.add(areaId);
        areaInfService.getAllAreaId(areaId,areaList);
        if(areaList!=null){
            wrapper.in("area_id",areaList);
        }
        List<LockInf> list=mapper.selectList(wrapper);
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"查询所有锁信息");

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

@@ -25,10 +25,12 @@
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -47,10 +49,11 @@
    @Autowired(required = false)
    private LockInfMapper linfMapper;


    //查询所有用户信息
    public Response getAllUser(String uname,String realName,Integer role, int pageCurr, int pageSize) {
    public Response getAllUser(String uname, String realName, Integer role, int areaId, int pageCurr, int pageSize) {
        PageHelper.startPage(pageCurr,pageSize);
        List<UserInf> list=mapper.getAllUser(uname,realName,role);
        List<UserInf> list=mapper.getAllUser(uname,realName,role,areaId);
        for (UserInf uinf:list) {
            QueryWrapper wrapper=new QueryWrapper();
            wrapper.eq("area_uname",uinf.getUname());
@@ -274,13 +277,13 @@
    }
    //查询未被指定区域的用户
    public Response getUnloadUinf() {
        List<AreaInf> ainfList=ainfMapper.selectList(null);
       /* List<AreaInf> ainfList=ainfMapper.selectList(null);
        List<String> unameList = ainfList.stream()
                .map(AreaInf::getAreaUname) // 提取名字
                .collect(Collectors.toList()); // 转换为列表
                .collect(Collectors.toList()); // 转换为列表*/
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.select("uname","uid","real_name","udownload_role","create_time");
        wrapper.notIn("uname",unameList);
        wrapper.eq("area)id",0);
        wrapper.gt("uid",100);
        List<UserInf> list=mapper.selectList(wrapper);
        return new Response().setII(1,list!=null,list,"查询未被指定区域的用户");

 src/main/resources/mapper/UserInfMapper.xml

@@ -31,6 +31,10 @@
            <if test="realName!=null">
                and realName LIKE CONCAT('%',#{realName},'%')
            </if>
            <if test="areaId!=null">
                and area_id=#{areaId}
            </if>

            <choose>
                <when test="role == 0">
                    and uid>100 and uid &lt;= 1000