增加权限申请接口

src/main/java/com/zy/bms/controller/BaseController.java

@@ -1,5 +1,7 @@
 package com.zy.bms.controller;
 
+import com.zy.bms.common.exception.ApiRuntimeException;
+import com.zy.bms.utils.AesUtil;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
@@ -31,7 +33,9 @@ public class BaseController {
     /**
      * 获取微信小程序登录User
      */
-    public String userId() {
-        return request.getHeader("wx_user");
+    public Integer userId() {
+        String userId = AesUtil.decrypt(request.getHeader("wx_user"));
+        if (userId == null) throw new ApiRuntimeException("用户ID解析失败!");
+        return Integer.parseInt(userId);
     }
 }

src/main/java/com/zy/bms/controller/PrivilegeApplyRecordController.java

@@ -0,0 +1,62 @@
+package com.zy.bms.controller;
+
+
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.entity.PrivilegeApplyRecord;
+import com.zy.bms.pojo.io.PrivilegeApplyIO;
+import com.zy.bms.service.IGroupService;
+import com.zy.bms.service.IPrivilegeApplyRecordService;
+import com.zy.bms.service.IUserPrivilegeService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+/**
+ * 权限申请记录 前端控制器
+ *
+ * @author chenyi
+ * @since 2021-07-12
+ */
+@RestController
+@RequestMapping("/bms/privilegeApply")
+public class PrivilegeApplyRecordController extends BaseController {
+
+    @Resource
+    private IPrivilegeApplyRecordService privilegeApplyRecordService;
+    @Resource
+    private IUserPrivilegeService userPrivilegeService;
+
+    /**
+     * 分页查询
+     */
+    @PostMapping("listPage.do")
+    public ServerResponse listPage(PrivilegeApplyIO io) {
+        return ServerResponse.createBySuccess(privilegeApplyRecordService.listPage(io));
+    }
+
+    /**
+     * 审核
+     */
+    @PostMapping("audit.do")
+    public ServerResponse audit(PrivilegeApplyRecord entity, String[] groups) {
+        //审核时间
+        entity.setAuditTime(LocalDateTime.now());
+        //保存有权限的设备组
+        userPrivilegeService.saveBatch(userId(), groups);
+        //更新申请记录
+        privilegeApplyRecordService.updateById(entity);
+        return ServerResponse.createBySuccess();
+    }
+
+    /**
+     * 申请权限
+     */
+    @PostMapping("apply.do")
+    public ServerResponse apply(PrivilegeApplyRecord entity) {
+        entity.setUserId(userId());
+        return ServerResponse.createBySuccess(privilegeApplyRecordService.save(entity));
+    }
+}

src/main/java/com/zy/bms/controller/UserPrivilegeController.java

@@ -0,0 +1,32 @@
+package com.zy.bms.controller;
+
+
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.service.IUserPrivilegeService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 用户查看手机设备权限表 前端控制器
+ *
+ * @author chenyi
+ * @since 2021-07-13
+ */
+@RestController
+@RequestMapping("/builder/user-privilege")
+public class UserPrivilegeController extends BaseController {
+
+    @Resource
+    private IUserPrivilegeService userPrivilegeService;
+
+    /**
+     * 获取用户未有权限的设备组
+     */
+    @GetMapping("getGroupByUserId.do")
+    public ServerResponse getGroupByUserId() {
+        return ServerResponse.createBySuccess(userPrivilegeService.getGroupByUserId(userId()));
+    }
+}

src/main/java/com/zy/bms/controller/ubi/UbiDeviceController.java

@@ -48,8 +48,7 @@ public class UbiDeviceController extends BaseController {
      */
     @GetMapping("listPageWx.do")
     public ServerResponse listPageWx(PageIO io) {
-        Integer userId = Integer.parseInt(userId());
-        return ServerResponse.createBySuccess(ubiInfoStateService.listPageWx(io, userId));
+        return ServerResponse.createBySuccess(ubiInfoStateService.listPageWx(io, userId()));
     }
 
     /**

src/main/java/com/zy/bms/entity/DeviceBase.java

@@ -1,5 +1,6 @@
 package com.zy.bms.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
@@ -19,7 +20,7 @@ public class DeviceBase implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/zy/bms/entity/Group.java

@@ -3,6 +3,8 @@ package com.zy.bms.entity;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -23,6 +25,7 @@ public class Group implements Serializable {
     /**
      * 项目组编号
      */
+    @TableId(type = IdType.INPUT)
     private String id;
 
     /**

src/main/java/com/zy/bms/entity/Logs.java

@@ -1,5 +1,6 @@
 package com.zy.bms.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Builder;
@@ -17,7 +18,8 @@ import java.time.LocalDateTime;
 @Builder
 @TableName("logs")
 public class Logs {
-    @TableId
+
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/zy/bms/entity/PrivilegeApplyRecord.java

@@ -0,0 +1,63 @@
+package com.zy.bms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 权限申请记录
+ * </p>
+ *
+ * @author chenyi
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PrivilegeApplyRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 1通过 -1拒绝 0待审核
+     */
+    private Integer status;
+
+    /**
+     * 审核时间
+     */
+    private LocalDateTime auditTime;
+
+    /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+}

src/main/java/com/zy/bms/entity/UserPrivilege.java

@@ -0,0 +1,42 @@
+package com.zy.bms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户查看手机设备权限表
+ *
+ * @author chenyi
+ * @since 2021-07-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class UserPrivilege implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 设备组ID
+     */
+    private String groupId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+}

src/main/java/com/zy/bms/entity/lp/LpInfoState.java

@@ -1,5 +1,6 @@
 package com.zy.bms.entity.lp;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,7 +21,7 @@ public class LpInfoState implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/zy/bms/entity/ubi/UbiInfoRecord.java

@@ -1,6 +1,7 @@
 package com.zy.bms.entity.ubi;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
@@ -18,7 +19,7 @@ public class UbiInfoRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/zy/bms/entity/ubi/UbiInfoState.java

@@ -3,6 +3,7 @@ package com.zy.bms.entity.ubi;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableId;
 
@@ -17,7 +18,7 @@ public class UbiInfoState implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/zy/bms/entity/ubi/UbiNtrip.java

@@ -1,5 +1,6 @@
 package com.zy.bms.entity.ubi;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
@@ -17,7 +18,7 @@ public class UbiNtrip implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/zy/bms/entity/ubi/UbiTcp.java

@@ -1,5 +1,6 @@
 package com.zy.bms.entity.ubi;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
@@ -17,7 +18,7 @@ public class UbiTcp implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/zy/bms/mapper/GroupMapper.java

@@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * 项目组 Mapper 接口
@@ -28,4 +30,9 @@ public interface GroupMapper extends BaseMapper<Group> {
      * @param io   查询条件
      */
     IPage<GroupListVo> listPage(Page<GroupListVo> page, @Param("io") GroupIO io);
+
+    /**
+     * 获取全部的设备组
+     */
+    List<GroupListVo> getAllList();
 }

src/main/java/com/zy/bms/mapper/PrivilegeApplyRecordMapper.java

@@ -0,0 +1,25 @@
+package com.zy.bms.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.bms.entity.PrivilegeApplyRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.bms.pojo.io.PrivilegeApplyIO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 权限申请记录 Mapper 接口
+ *
+ * @author chenyi
+ * @since 2021-07-12
+ */
+@Mapper
+@Repository
+public interface PrivilegeApplyRecordMapper extends BaseMapper<PrivilegeApplyRecord> {
+    /**
+     * 分页查询
+     */
+    IPage<PrivilegeApplyRecord> listPage(Page<PrivilegeApplyRecord> page, @Param("io") PrivilegeApplyIO io);
+}

src/main/java/com/zy/bms/mapper/UserMapper.java

@@ -3,11 +3,8 @@ package com.zy.bms.mapper;
 import com.zy.bms.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 /**
  * <p>
  * 用户表 Mapper 接口
@@ -20,10 +17,4 @@ import java.util.List;
 @Repository
 public interface UserMapper extends BaseMapper<User> {
 
-    /**
-     * 通过用户Id 查询用户拥有权限的设备组
-     *
-     * @param userId 用户ID
-     */
-    List<String> ownGroupIds(@Param("userId") Integer userId);
 }

src/main/java/com/zy/bms/mapper/UserPrivilegeMapper.java

@@ -0,0 +1,31 @@
+package com.zy.bms.mapper;
+
+import com.zy.bms.entity.UserPrivilege;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户查看手机设备权限表 Mapper 接口
+ *
+ * @author chenyi
+ * @since 2021-07-13
+ */
+public interface UserPrivilegeMapper extends BaseMapper<UserPrivilege> {
+
+    /**
+     * 通过用户Id 查询用户拥有权限的设备组
+     *
+     * @param userId 用户ID
+     */
+    List<String> ownGroupIds(@Param("userId") Integer userId);
+
+    /**
+     * 批量保存实体类
+     *
+     * @param userId 用户ID
+     * @param groups 用户组
+     */
+    void saveBatch(@Param("userId") Integer userId, @Param("groups") String[] groups);
+}

src/main/java/com/zy/bms/pojo/io/PrivilegeApplyIO.java

@@ -0,0 +1,28 @@
+package com.zy.bms.pojo.io;
+
+import lombok.Data;
+
+/**
+ * 权限申请记录IO
+ *
+ * @author yang xiao kun
+ * create on 2021/7/13
+ */
+@Data
+public class PrivilegeApplyIO extends PageIO {
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 1通过 -1拒绝 0待审核
+     */
+    private Integer status;
+}

src/main/java/com/zy/bms/service/IGroupService.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zy.bms.pojo.io.GroupIO;
 import com.zy.bms.pojo.vo.GroupListVo;
 
+import java.util.List;
+
 /**
  * <p>
  * 项目组 服务类
@@ -21,4 +23,10 @@ public interface IGroupService extends IService<Group> {
      * @param io 查询条件
      */
     IPage<GroupListVo> listPage(GroupIO io);
+
+
+    /**
+     * 获取全部的设备组
+     */
+    List<GroupListVo> getAllList();
 }

src/main/java/com/zy/bms/service/IPrivilegeApplyRecordService.java

@@ -0,0 +1,21 @@
+package com.zy.bms.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zy.bms.entity.PrivilegeApplyRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.bms.pojo.io.PrivilegeApplyIO;
+
+/**
+ * 权限申请记录 服务类
+ *
+ * @author chenyi
+ * @since 2021-07-12
+ */
+public interface IPrivilegeApplyRecordService extends IService<PrivilegeApplyRecord> {
+
+    /**
+     * 分页查询
+     */
+    IPage<PrivilegeApplyRecord> listPage(PrivilegeApplyIO io);
+
+}

src/main/java/com/zy/bms/service/IUserPrivilegeService.java

@@ -0,0 +1,42 @@
+package com.zy.bms.service;
+
+import com.zy.bms.entity.UserPrivilege;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.bms.pojo.vo.GroupListVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户查看手机设备权限表 服务类
+ * </p>
+ *
+ * @author chenyi
+ * @since 2021-07-13
+ */
+public interface IUserPrivilegeService extends IService<UserPrivilege> {
+
+    /**
+     * 查询用户拥有权限的设备组
+     *
+     * @param userId 用户ID
+     */
+    List<String> ownGroupIds(Integer userId);
+
+    /**
+     * 通过用户Id 查询全部的设备组
+     * 滤掉用户已有权限的设备组
+     *
+     * @param userId 用户ID
+     */
+    Map<String, List<GroupListVo>> getGroupByUserId(Integer userId);
+
+    /**
+     * 批量保存实体类
+     *
+     * @param userId 用户ID
+     * @param groups 用户组
+     */
+    void saveBatch(Integer userId, String[] groups);
+}

src/main/java/com/zy/bms/service/IUserService.java

@@ -15,10 +15,4 @@ import java.util.List;
  */
 public interface IUserService extends IService<User> {
 
-    /**
-     * 通过用户Id 查询用户拥有权限的设备组
-     *
-     * @param userId 用户ID
-     */
-    List<String> ownGroupIds(Integer userId);
 }

src/main/java/com/zy/bms/service/impl/GroupServiceImpl.java

@@ -10,6 +10,8 @@ import com.zy.bms.service.IGroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 项目组 服务实现类
  *
@@ -24,4 +26,9 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         Page<GroupListVo> page = new Page<>(io.getCurrent(), io.getSize());
         return baseMapper.listPage(page, io);
     }
+
+    @Override
+    public List<GroupListVo> getAllList() {
+        return baseMapper.getAllList();
+    }
 }

src/main/java/com/zy/bms/service/impl/PrivilegeApplyRecordServiceImpl.java

@@ -0,0 +1,34 @@
+package com.zy.bms.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.bms.entity.Group;
+import com.zy.bms.entity.PrivilegeApplyRecord;
+import com.zy.bms.mapper.PrivilegeApplyRecordMapper;
+import com.zy.bms.pojo.io.PrivilegeApplyIO;
+import com.zy.bms.service.IPrivilegeApplyRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 权限申请记录 服务实现类
+ *
+ * @author chenyi
+ * @since 2021-07-12
+ */
+@Service
+public class PrivilegeApplyRecordServiceImpl extends ServiceImpl<PrivilegeApplyRecordMapper, PrivilegeApplyRecord> implements IPrivilegeApplyRecordService {
+
+    @Override
+    public IPage<PrivilegeApplyRecord> listPage(PrivilegeApplyIO io) {
+        Page<PrivilegeApplyRecord> page = new Page<>(io.getCurrent(), io.getSize());
+        return baseMapper.listPage(page, io);
+    }
+
+    @Override
+    public Map<String, Group> getGroupByUserId(String userId) {
+        return null;
+    }
+}

src/main/java/com/zy/bms/service/impl/UserPrivilegeServiceImpl.java

@@ -0,0 +1,49 @@
+package com.zy.bms.service.impl;
+
+import com.zy.bms.entity.UserPrivilege;
+import com.zy.bms.mapper.UserPrivilegeMapper;
+import com.zy.bms.pojo.vo.GroupListVo;
+import com.zy.bms.service.IGroupService;
+import com.zy.bms.service.IUserPrivilegeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 用户查看手机设备权限表 服务实现类
+ * </p>
+ *
+ * @author chenyi
+ * @since 2021-07-13
+ */
+@Service
+public class UserPrivilegeServiceImpl extends ServiceImpl<UserPrivilegeMapper, UserPrivilege> implements IUserPrivilegeService {
+
+    @Resource
+    private IGroupService groupService;
+
+
+    @Override
+    public List<String> ownGroupIds(Integer userId) {
+        return baseMapper.ownGroupIds(userId);
+    }
+
+    @Override
+    public Map<String, List<GroupListVo>> getGroupByUserId(Integer userId) {
+        List<GroupListVo> allGroup = groupService.getAllList();
+        HashSet<String> ownGroup = new HashSet<>(baseMapper.ownGroupIds(userId));
+        return allGroup.stream().filter(item -> !ownGroup.contains(item.getId()))
+                .collect(Collectors.groupingBy(GroupListVo::getItem));
+    }
+
+    @Override
+    public void saveBatch(Integer userId, String[] groups) {
+        baseMapper.saveBatch(userId, groups);
+    }
+}

src/main/java/com/zy/bms/service/impl/UserServiceImpl.java

@@ -6,7 +6,6 @@ import com.zy.bms.service.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 
 /**
  * <p>
@@ -19,8 +18,4 @@ import java.util.List;
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
 
-    @Override
-    public List<String> ownGroupIds(Integer userId) {
-        return baseMapper.ownGroupIds(userId);
-    }
 }

src/main/java/com/zy/bms/service/ubi/impl/UbiInfoStateServiceImpl.java

@@ -8,6 +8,7 @@ import com.zy.bms.pojo.io.DeviceIO;
 import com.zy.bms.pojo.io.PageIO;
 import com.zy.bms.pojo.vo.UbiDeviceDetailVo;
 import com.zy.bms.pojo.vo.UbiDeviceListVo;
+import com.zy.bms.service.IUserPrivilegeService;
 import com.zy.bms.service.IUserService;
 import com.zy.bms.service.ubi.IUbiInfoStateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,7 +31,7 @@ import java.util.List;
 public class UbiInfoStateServiceImpl extends ServiceImpl<UbiInfoStateMapper, UbiInfoState> implements IUbiInfoStateService {
 
     @Resource
-    private IUserService userService;
+    private IUserPrivilegeService userPrivilegeService;
 
     @Resource
     private IUbiTcpService tcpSetService;
@@ -58,7 +59,7 @@ public class UbiInfoStateServiceImpl extends ServiceImpl<UbiInfoStateMapper, Ubi
 
     @Override
     public IPage<UbiDeviceListVo> listPageWx(PageIO io, Integer userId) {
-        List<String> groupIds = userService.ownGroupIds(userId);
+        List<String> groupIds = userPrivilegeService.ownGroupIds(userId);
         if (groupIds.isEmpty()) return null;
         Page<UbiDeviceListVo> page = new Page<>(io.getCurrent(), io.getSize());
         return baseMapper.listPageWx(page, groupIds);

src/main/resources/application-dev.yml

@@ -25,7 +25,4 @@ mybatis-plus:
   type-aliases-package: com.zy.bms.entity
   mapper-locations: classpath:mapper/*.xml
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  global-config:
-    db-config:
-      id-type: auto
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

src/main/resources/application-prod.yml

@@ -25,7 +25,4 @@ spring:
 # mybatis-plus
 mybatis-plus:
   type-aliases-package: com.zy.bms.entity
-  mapper-locations: classpath:mapper/*.xml
-  global-config:
-    db-config:
-      id-type: auto
+  mapper-locations: classpath:mapper/*.xml

src/main/resources/mapper/GroupMapper.xml

@@ -24,4 +24,13 @@
         ORDER BY t1.create_time DESC
     </select>
 
+    <select id="getAllList" resultType="com.zy.bms.pojo.vo.GroupListVo">
+        SELECT
+            t1.id,
+            t1.name,
+            t2.name AS item
+        FROM item_group t1
+        LEFT JOIN item t2 ON t1.item_id = t2.id
+    </select>
+
 </mapper>

src/main/resources/mapper/PrivilegeApplyRecordMapper.xml

@@ -0,0 +1,25 @@
+<?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="com.zy.bms.mapper.PrivilegeApplyRecordMapper">
+
+    <select id="listPage" resultType="com.zy.bms.entity.PrivilegeApplyRecord">
+        SELECT
+            *
+        FROM
+            privilege_apply_record
+        <where>
+            <if test="io.phone != null and io.phone != ''">
+                AND phone LIKE CONCAT('%',#{io.phone},'%')
+            </if>
+
+            <if test="io.remark != null and io.remark != ''">
+                AND remark LIKE CONCAT('%',#{io.phone},'%')
+            </if>
+
+            <if test="io.status != null">
+                AND status = #{io.status}
+            </if>
+        </where>
+    </select>
+
+</mapper>

src/main/resources/mapper/UserMapper.xml

@@ -2,12 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.UserMapper">
 
-    <select id="ownGroupIds" resultType="java.lang.String">
-        SELECT
-            group_id
-        FROM
-            user_privilege
-        WHERE
-            user_id = #{userId}
-    </select>
 </mapper>

src/main/resources/mapper/UserPrivilegeMapper.xml

@@ -0,0 +1,22 @@
+<?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="com.zy.bms.mapper.UserPrivilegeMapper">
+
+    <select id="ownGroupIds" resultType="java.lang.String">
+        SELECT
+            group_id
+        FROM
+            user_privilege
+        WHERE
+            user_id = #{userId}
+    </select>
+
+    <insert id="saveBatch">
+        INSERT INTO
+            user_privilege(user_id,group_id)
+        VALUES
+        <foreach collection="groups" separator="," item="group">
+            (#{userId},#{group})
+        </foreach>
+    </insert>
+</mapper>

src/test/java/com/zy/bms/MybatisPlusGenerator.java

@@ -18,7 +18,7 @@ public class MybatisPlusGenerator {
     private static final String username = "useryxk";
     private static final String password = "CHENyi406@";
     private static final String moduleName = "builder";
-    private static final String[] tables = {"lp_info_state"};
+    private static final String[] tables = {"user_privilege"};
 
 
     public static void main(String[] args) {