修复BUG

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

@@ -1,6 +1,5 @@
 package com.zy.bms.controller;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.entity.Group;
 import com.zy.bms.pojo.io.GroupIO;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 
 /**
- * 项目组 前端控制器
+ * 设备组 前端控制器
  *
  * @author yangxiaokun
  * @since 2021-06-03
@@ -21,11 +20,12 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/bms/api/operate/group")
 public class GroupController {
+
     @Resource
     private IGroupService groupService;
 
     /**
-     * 分页查询所有项目组
+     * 分页查询所有设备组
      */
     @GetMapping("listPage.do")
     public ServerResponse listPage(GroupIO io) {
@@ -33,38 +33,28 @@ public class GroupController {
     }
 
     /**
-     * 添加项目组
+     * 查询所有的设备组
+     */
+    @GetMapping("listAll.do")
+    public ServerResponse listAll() {
+        return ServerResponse.success(groupService.getAllList());
+    }
+
+    /**
+     * 添加设备组
      */
     @PostMapping("save.do")
     public ServerResponse save(Group group) {
         try {
             groupService.save(group);
         } catch (Exception e) {
-            return ServerResponse.warning("项目组编号重复!");
+            return ServerResponse.warning("设备组编号重复!");
         }
         return ServerResponse.success();
     }
 
     /**
-     * 禁用项目组
-     */
-    @GetMapping("forbidden.do")
-    public ServerResponse forbidden(Integer id) {
-        groupService.update(new UpdateWrapper<Group>().set("status", 0).eq("id", id));
-        return ServerResponse.success();
-    }
-
-    /**
-     * 启用项目组
-     */
-    @GetMapping("permit.do")
-    public ServerResponse permit(Integer id) {
-        groupService.update(new UpdateWrapper<Group>().set("status", 1).eq("id", id));
-        return ServerResponse.success();
-    }
-
-    /**
-     * 更新项目组信息
+     * 修改设备组信息
      */
     @PostMapping("update.do")
     public ServerResponse update(Group group) {

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

@@ -37,7 +37,7 @@ public class LogsController {
     /**
      * 获取全部的指令
      */
-    @GetMapping("getAllInstruction.do")
+    @GetMapping("instruction.do")
     public ServerResponse getAllInstruction() {
         return ServerResponse.success(instructionsService.list());
     }

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

@@ -58,10 +58,9 @@ public class UserController {
      *
      * @param userId 用户ID
      */
-    @PostMapping("saveAdminAccess.do")
-    public ServerResponse saveAdminAccess(Integer userId) {
-        userService.update(new UpdateWrapper<User>().set("admin", 1).eq("id", userId));
+    @PostMapping("adminAccess.do")
+    public ServerResponse setAdminAccess(Integer userId, Integer admin) {
+        userService.update(new UpdateWrapper<User>().set("admin", admin == 1 ? 1 : 0).eq("id", userId));
         return ServerResponse.success();
     }
-
 }

src/main/java/com/zy/bms/controller/lp/LpDeviceController.java

@@ -1,6 +1,8 @@
 package com.zy.bms.controller.lp;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zy.bms.common.ServerResponse;
+import com.zy.bms.entity.lp.LpInfoState;
 import com.zy.bms.pojo.io.DeviceIO;
 import com.zy.bms.service.lp.ILpInfoStateService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +32,17 @@ public class LpDeviceController {
         return ServerResponse.success(lpInfoStateService.listPage(io));
     }
 
+    /**
+     * 查询所有的设备
+     */
+    @GetMapping("list.do")
+    public ServerResponse list(DeviceIO io) {
+        return ServerResponse.success(
+                lpInfoStateService.list(new QueryWrapper<LpInfoState>()
+                .like("open_num", io.getOpenNum())
+                .eq("group_id", io.getGroupId())));
+    }
+
     /**
      * 查询设备详情
      */

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

@@ -4,7 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 项目组 入参
+ * 设备组 入参
  *
  * @author yang xiao kun
  * create on 2021/5/19
@@ -13,13 +13,15 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class GroupIO extends PageIO {
     /**
-     * 项目组名/项目组编号
+     * 设备组名/设备组编号
      */
-    private String name;
+    private String key;
+
     /**
      * 项目ID
      */
     private Integer itemId;
+
     /**
      * 状态
      */

src/main/java/com/zy/bms/pojo/vo/GroupListVo.java

@@ -19,12 +19,12 @@ public class GroupListVo {
     private Integer id;
 
     /**
-     * 项目组编号
+     * 设备组编号
      */
     private String code;
 
     /**
-     * 项目组名称
+     * 设备组名称
      */
     private String name;
 

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

@@ -10,9 +10,7 @@ import com.zy.bms.pojo.vo.GroupListWxVo;
 import java.util.List;
 
 /**
- * <p>
  * 项目组 服务类
- * </p>
  *
  * @author yangxiaokun
  * @since 2021-06-03
@@ -25,7 +23,6 @@ public interface IGroupService extends IService<Group> {
      */
     IPage<GroupListVo> listPage(GroupIO io);
 
-
     /**
      * 获取全部的设备组
      */

src/main/resources/mapper/GroupMapper.xml

@@ -16,8 +16,8 @@
         LEFT JOIN item t2 ON t1.item_id = t2.id
         <where>
             <if test="io.name != null and io.name != ''">
-                AND ( t1.code LIKE CONCAT("%",#{io.name},"%")
-                OR t1.name LIKE CONCAT("%",#{io.name},"%") )
+                AND ( t1.code LIKE CONCAT("%",#{io.key},"%")
+                OR t1.name LIKE CONCAT("%",#{io.key},"%") )
             </if>
             <if test="io.itemId != null and io.itemId != ''">
                 AND t1.item_id = #{io.itemId}

src/main/resources/mapper/LpInfoStateMapper.xml

@@ -4,6 +4,7 @@
 
     <select id="listPage" resultType="com.zy.bms.pojo.vo.LpDeviceListVo">
         SELECT
+        t1.open_num,
         t1.username,
         t1.password,
         t1.sn,

src/main/resources/mapper/UserMapper.xml

@@ -9,10 +9,11 @@
         user
         <where>
             <if test="io.key != null and io.key != ''">
-                AND (username LIKE('%',#{io.key},'%')
-                OR phone LIKE('%',#{io.key},'%')
-                OR random_code LIKE('%',#{io.key},'%')
-                OR nickname LIKE('%',#{io.key},'%'))
+                AND (
+                username LIKE CONCAT('%',#{io.key},'%')
+                OR phone LIKE CONCAT('%',#{io.key},'%')
+                OR random_code LIKE CONCAT('%',#{io.key},'%')
+                OR nickname LIKE CONCAT('%',#{io.key},'%'))
             </if>
             <if test="io.status != null">
                 AND status = #{io.status}