修改小程序部分界面

src/main/java/com/zy/bms/common/enums/DeviceType.java

@@ -0,0 +1,24 @@
+package com.zy.bms.common.enums;
+
+/**
+ * 设备类型
+ */
+public enum DeviceType {
+    UBI("普适型", "gnss"),
+    LP("路牌", "lupai");
+
+    /**
+     * 名称
+     */
+    public final String name;
+
+    /**
+     * 值
+     */
+    public final String value;
+
+    DeviceType(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+}

src/main/java/com/zy/bms/controller/UbiLpWxController.java → src/main/java/com/zy/bms/controller/WxApiController.java

@@ -31,7 +31,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/bms/api/wx_app")
-public class UbiLpWxController extends BaseController {
+public class WxApiController extends BaseController {
     @Resource
     private IUserService userService;
     @Resource
@@ -46,6 +46,8 @@ public class UbiLpWxController extends BaseController {
     private ILpInfoStateService lpInfoStateService;
     @Resource
     private ILpInfoRecordService lpInfoRecordService;
+    @Resource
+    private IWxApiService wxApiService;
 
     /**
      * 微信登录
@@ -76,7 +78,7 @@ public class UbiLpWxController extends BaseController {
      * 查看当前在线设备 rabbitMQ
      */
     @AdminAuthorWx
-    @GetMapping("connections.do")
+    @GetMapping("rabbit/connections.do")
     public ServerResponse connections() {
         return ServerResponse.success(RabbitMQApi.connections());
     }
@@ -85,7 +87,7 @@ public class UbiLpWxController extends BaseController {
      * 查看当前注册的用户 rabbitMQ
      */
     @AdminAuthorWx
-    @GetMapping("users.do")
+    @GetMapping("rabbit/users.do")
     public ServerResponse users() {
         return ServerResponse.success(RabbitMQApi.users());
     }
@@ -94,26 +96,26 @@ public class UbiLpWxController extends BaseController {
      * 查看用户拥有权限的设备组列表
      */
     @GetMapping("getGroups.do")
-    public ServerResponse getGroupsByUserId() {
-        return ServerResponse.success(groupService.getByUserId(userId()));
+    public ServerResponse listGroupsByUserId() {
+        return ServerResponse.success(groupService.listByUserId(userId()));
     }
 
     /**
+     * 设备分布页面,需要完整的数据信息
      * 通过设备组ID查询设备列表
      */
-    @GetMapping("getDevicesByGroupId.do")
+    @GetMapping("listFullByGroupId.do")
     public ServerResponse getDevicesByGroupId(String groupId) {
-        Set<String> groupIds = new HashSet<>(userPrivilegeService.getGroupIdsByUserId(userId()));
-        if (!groupIds.contains(groupId)) return ServerResponse.warning("无权限");
-        return ServerResponse.success(deviceBaseService.listByGroupIdWx(groupId));
+        return ServerResponse.success(wxApiService.listFullInfoByGroupId(userId(), groupId));
     }
 
     /**
-     * 分组查询设备列表
+     * 设备管理页面,仅需要简单信息
+     * 通过设备组ID查询设备列表
      */
-    @GetMapping("getDevicesByUserId.do")
-    public ServerResponse getDevicesByUserId() {
-        return ServerResponse.success(deviceBaseService.listByUserIdWx(userId()));
+    @GetMapping("listSimpleByGroupId.do")
+    public ServerResponse listDevicesByGroupId(String groupId) {
+        return ServerResponse.success(wxApiService.listSimpleInfoByGroupId(userId(), groupId));
     }
 
     /**
@@ -134,7 +136,7 @@ public class UbiLpWxController extends BaseController {
      */
     @GetMapping("getDeviceDetail.do")
     public ServerResponse getDeviceDetail(String openNum) {
-        return ServerResponse.success(deviceBaseService.getDetailWx(openNum));
+        return ServerResponse.success(wxApiService.getDeviceByOpenNum(openNum));
     }
 
     /**

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

@@ -24,7 +24,7 @@ public class Group implements Serializable {
      * 主键
      */
     @TableId(type = IdType.AUTO)
-    private String id;
+    private Integer id;
 
     /**
      * 设备组编号

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 设备静态信息 Mapper 接口
  *
@@ -17,9 +19,11 @@ import org.springframework.stereotype.Repository;
 public interface DeviceBaseMapper extends BaseMapper<DeviceBase> {
 
     /**
-     * 通过设备组查询类型
+     * 通过设备组查询该设备组的所有设备
      *
-     * @param groupId 设备组
+     * @param groupId 设备组ID
+     * @param type    设备类型
+     * @return openNum 集合
      */
-    String getTypeByGroupId(@Param("groupId") String groupId);
+    List<String> listOpenNumByGroupId(@Param("groupId") String groupId, @Param("type") String type);
 }

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

@@ -6,7 +6,7 @@ import com.zy.bms.entity.Group;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zy.bms.pojo.io.GroupIO;
 import com.zy.bms.pojo.vo.GroupListVo;
-import com.zy.bms.pojo.vo.GroupListWxVo;
+import com.zy.bms.pojo.vo.wx.GroupsVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -36,10 +36,10 @@ public interface GroupMapper extends BaseMapper<Group> {
     List<GroupListVo> getAllList();
 
     /**
-     * 通过userId 查询设备组
+     * 通过userId查询设备组集合
      *
      * @param userId 用户ID
      */
-    List<GroupListWxVo> getByUserId(@Param("userId") Integer userId);
+    List<GroupsVO> listByUserId(@Param("userId") Integer userId);
 
 }

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
+import java.util.Set;
 
 /**
  * 用户查看手机设备权限表 Mapper 接口
@@ -23,7 +23,7 @@ public interface UserPrivilegeMapper extends BaseMapper<UserPrivilege> {
      *
      * @param userId 用户ID
      */
-    List<String> getGroupIdsByUserId(@Param("userId") Integer userId);
+    Set<String> getGroupIdsByUserId(@Param("userId") Integer userId);
 
     /**
      * 批量保存实体类

src/main/java/com/zy/bms/mapper/lp/LpInfoStateMapper.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.bms.entity.lp.LpInfoState;
 import com.zy.bms.pojo.io.DeviceIO;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 import com.zy.bms.pojo.vo.LpDeviceListVo;
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -41,15 +41,15 @@ public interface LpInfoStateMapper extends BaseMapper<LpInfoState> {
      *
      * @param groupId 设备组
      */
-    List<LpInfoState> listByGroupId(@Param("groupId") String groupId);
+    List<LpInfoState> listFullByGroupId(@Param("groupId") String groupId);
 
     /**
      * 微信端
-     * 通过用户ID 查询设备集合
+     * 通过设备组ID 查询设备集合
      *
-     * @param userId 用户ID
+     * @param groupId 设备组ID
      */
-    List<DeviceWxListVo> listByUserId(@Param("userId") Integer userId);
+    List<SimpleDevicesVO> listSimpleByGroupId(@Param("groupId") String groupId);
 
     /**
      * 更新唤醒时间和阈值

src/main/java/com/zy/bms/mapper/ubi/UbiInfoStateMapper.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.bms.entity.ubi.UbiInfoState;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zy.bms.pojo.io.DeviceIO;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 import com.zy.bms.pojo.vo.UbiDeviceDetailVo;
 import com.zy.bms.pojo.vo.UbiDeviceListVo;
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -45,12 +45,13 @@ public interface UbiInfoStateMapper extends BaseMapper<UbiInfoState> {
      *
      * @param groupId 设备组
      */
-    List<UbiInfoState> listByGroupId(@Param("groupId") String groupId);
+    List<UbiInfoState> listFullByGroupId(@Param("groupId") String groupId);
 
     /**
-     * 通过用户ID 查询设备集合
+     * 微信端
+     * 通过设备组ID 查询设备集合
      *
-     * @param userId 用户ID
+     * @param groupId 设备组ID
      */
-    List<DeviceWxListVo> listByUserId(@Param("userId") Integer userId);
+    List<SimpleDevicesVO> listSimpleByGroupId(@Param("groupId") String groupId);
 }

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

@@ -14,18 +14,5 @@ import java.time.LocalDateTime;
 @Data
 public class GroupListWxVo {
 
-    /**
-     * 项目组编号
-     */
-    private String code;
 
-    /**
-     * 项目组名称
-     */
-    private String name;
-
-    /**
-     * 设备数量
-     */
-    private Integer num;
 }

src/main/java/com/zy/bms/pojo/vo/wx/GroupsVO.java

@@ -0,0 +1,27 @@
+package com.zy.bms.pojo.vo.wx;
+
+import lombok.Data;
+
+/**
+ * 设备组列表视图
+ *
+ * @author chen_yi
+ * Create on 2022/6/13
+ */
+@Data
+public class GroupsVO {
+    /**
+     * 项目组编号
+     */
+    private String code;
+
+    /**
+     * 项目组名称
+     */
+    private String name;
+
+    /**
+     * 设备数量
+     */
+    private Integer num;
+}

src/main/java/com/zy/bms/pojo/vo/DeviceWxListVo.java → src/main/java/com/zy/bms/pojo/vo/wx/SimpleDevicesVO.java

@@ -1,4 +1,4 @@
-package com.zy.bms.pojo.vo;
+package com.zy.bms.pojo.vo.wx;
 
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
  * create on 2021/8/30
  */
 @Data
-public class DeviceWxListVo {
+public class SimpleDevicesVO {
     /**
      * 设备码
      */

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

@@ -1,11 +1,10 @@
 package com.zy.bms.service;
 
+import com.zy.bms.common.enums.DeviceType;
 import com.zy.bms.entity.DeviceBase;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 设备静态信息 服务类
@@ -16,31 +15,17 @@ import java.util.Map;
 public interface IDeviceBaseService extends IService<DeviceBase> {
 
     /**
-     * 更新设备备注
-     */
-    void updateRemark(DeviceBase deviceBase);
-
-    /**
-     * 微信
-     * 通过设备组查询设备集合
+     * 通过设备组查询该设备组的所有设备
      *
-     * @param groupId 设备组
+     * @param groupId 设备组ID
+     * @param type    设备类型
+     * @return openNum 集合
      */
-    List listByGroupIdWx(String groupId);
+    List<String> listOpenNumByGroupId(String groupId, DeviceType type);
 
     /**
-     * 微信
-     * 通过设备组集合查询全部设备
-     *
-     * @param userId 用户ID
+     * 更新设备备注
      */
-    Map<String, List<DeviceWxListVo>> listByUserIdWx(Integer userId);
+    void updateRemark(DeviceBase deviceBase);
 
-    /**
-     * 微信
-     * 获取设备详情
-     *
-     * @param openNum 设备码
-     */
-    Object getDetailWx(String openNum);
 }

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

@@ -5,7 +5,7 @@ import com.zy.bms.entity.Group;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zy.bms.pojo.io.GroupIO;
 import com.zy.bms.pojo.vo.GroupListVo;
-import com.zy.bms.pojo.vo.GroupListWxVo;
+import com.zy.bms.pojo.vo.wx.GroupsVO;
 
 import java.util.List;
 
@@ -16,6 +16,11 @@ import java.util.List;
  * @since 2021-06-03
  */
 public interface IGroupService extends IService<Group> {
+    /**
+     * 通过设备组编号查询
+     */
+    Group getByCode(String code);
+
     /**
      * 分页查询
      *
@@ -33,5 +38,5 @@ public interface IGroupService extends IService<Group> {
      *
      * @param userId 用户ID
      */
-    List<GroupListWxVo> getByUserId(Integer userId);
+    List<GroupsVO> listByUserId(Integer userId);
 }

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

@@ -6,6 +6,7 @@ import com.zy.bms.pojo.vo.GroupListVo;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 用户查看手机设备权限表 服务类
@@ -20,7 +21,7 @@ public interface IUserPrivilegeService extends IService<UserPrivilege> {
      *
      * @param userId 用户ID
      */
-    List<String> getGroupIdsByUserId(Integer userId);
+    Set<String> getGroupIdsByUserId(Integer userId);
 
     /**
      * 通过用户Id 查询全部的设备组

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

@@ -0,0 +1,36 @@
+package com.zy.bms.service;
+
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
+
+import java.util.List;
+
+/**
+ * 微信小程序接口 服务类
+ *
+ * @author yangxiaokun
+ * @since 2021-06-01
+ */
+public interface IWxApiService {
+
+    /**
+     * 通过设备组查询设备集合
+     *
+     * @param groupId 设备组
+     */
+    List listFullInfoByGroupId(Integer userId, String groupId);
+
+    /**
+     * 设备列表页面
+     * 通过设备组查询全部设备
+     *
+     * @param userId 用户ID
+     */
+    List<SimpleDevicesVO> listSimpleInfoByGroupId(Integer userId, String groupId);
+
+    /**
+     * 获取设备详情
+     *
+     * @param openNum 设备码
+     */
+    Object getDeviceByOpenNum(String openNum);
+}

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

@@ -1,24 +1,14 @@
 package com.zy.bms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.zy.bms.common.Constant;
+import com.zy.bms.common.enums.DeviceType;
 import com.zy.bms.entity.DeviceBase;
-import com.zy.bms.entity.lp.LpInfoState;
-import com.zy.bms.entity.ubi.UbiInfoState;
 import com.zy.bms.mapper.DeviceBaseMapper;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 import com.zy.bms.service.IDeviceBaseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.service.lp.ILpInfoStateService;
-import com.zy.bms.service.ubi.IUbiInfoStateService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 设备静态信息 服务实现类
@@ -29,11 +19,10 @@ import java.util.stream.Collectors;
 @Service
 public class DeviceBaseServiceImpl extends ServiceImpl<DeviceBaseMapper, DeviceBase> implements IDeviceBaseService {
 
-    @Resource
-    private IUbiInfoStateService ubiInfoStateService;
-
-    @Resource
-    private ILpInfoStateService lpInfoStateService;
+    @Override
+    public List<String> listOpenNumByGroupId(String groupId, DeviceType type) {
+        return baseMapper.listOpenNumByGroupId(groupId, type.value);
+    }
 
     @Override
     public void updateRemark(DeviceBase deviceBase) {
@@ -43,42 +32,4 @@ public class DeviceBaseServiceImpl extends ServiceImpl<DeviceBaseMapper, DeviceB
         this.update(updateWrapper);
     }
 
-    @Override
-    public List listByGroupIdWx(String groupId) {
-        String type = baseMapper.getTypeByGroupId(groupId);
-        if (type == null) return null;
-        //普适型设备
-        if (type.equals(Constant.DEVICE_TYPE.UBI)) {
-            return ubiInfoStateService.listByGroupId(groupId);
-        }
-        //路牌设备
-        if (type.equals(Constant.DEVICE_TYPE.LP)) {
-            return lpInfoStateService.listByGroupId(groupId);
-        }
-        return null;
-    }
-
-    @Override
-    public Map<String, List<DeviceWxListVo>> listByUserIdWx(Integer userId) {
-        List<DeviceWxListVo> result = new ArrayList<>();
-        //路牌
-        List<DeviceWxListVo> lpList = lpInfoStateService.listByUserId(userId);
-        if (lpList != null) result.addAll(lpList);
-        //普适型
-        List<DeviceWxListVo> ubiList = ubiInfoStateService.listByUserId(userId);
-        if (ubiList != null) result.addAll(ubiList);
-        return result.isEmpty() ? null : result.stream().collect(Collectors.groupingBy(DeviceWxListVo::getGroupId));
-    }
-
-    @Override
-    public Object getDetailWx(String openNum) {
-        String type = baseMapper.selectOne(new QueryWrapper<DeviceBase>().eq("open_num", openNum)).getType();
-        if (type.equals(Constant.DEVICE_TYPE.UBI)) {
-            return ubiInfoStateService.getOne(new QueryWrapper<UbiInfoState>().eq("open_num", openNum));
-        }
-        if (type.equals(Constant.DEVICE_TYPE.LP)) {
-            return lpInfoStateService.getOne(new QueryWrapper<LpInfoState>().eq("open_num", openNum));
-        }
-        return null;
-    }
 }

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

@@ -1,12 +1,13 @@
 package com.zy.bms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.mapper.GroupMapper;
 import com.zy.bms.pojo.io.GroupIO;
 import com.zy.bms.pojo.vo.GroupListVo;
-import com.zy.bms.pojo.vo.GroupListWxVo;
+import com.zy.bms.pojo.vo.wx.GroupsVO;
 import com.zy.bms.service.IGroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -22,6 +23,11 @@ import java.util.List;
 @Service
 public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements IGroupService {
 
+    @Override
+    public Group getByCode(String code) {
+        return getOne(new QueryWrapper<Group>().eq("code", code));
+    }
+
     @Override
     public IPage<GroupListVo> listPage(GroupIO io) {
         Page<GroupListVo> page = new Page<>(io.getCurrent(), io.getSize());
@@ -34,7 +40,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     }
 
     @Override
-    public List<GroupListWxVo> getByUserId(Integer userId) {
-        return baseMapper.getByUserId(userId);
+    public List<GroupsVO> listByUserId(Integer userId) {
+        return baseMapper.listByUserId(userId);
     }
 }

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

@@ -10,9 +10,9 @@ 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.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -29,7 +29,7 @@ public class UserPrivilegeServiceImpl extends ServiceImpl<UserPrivilegeMapper, U
 
 
     @Override
-    public List<String> getGroupIdsByUserId(Integer userId) {
+    public Set<String> getGroupIdsByUserId(Integer userId) {
         return baseMapper.getGroupIdsByUserId(userId);
     }
 
@@ -38,7 +38,7 @@ public class UserPrivilegeServiceImpl extends ServiceImpl<UserPrivilegeMapper, U
         //全部的设备组
         List<GroupListVo> allGroup = groupService.getAllList();
         //用户已拥有权限的设备组ID
-        HashSet<String> ownGroup = new HashSet<>(getGroupIdsByUserId(userId));
+        Set<String> ownGroup = getGroupIdsByUserId(userId);
         //过滤掉已拥有权限的设备组后按项目ID分组
         return allGroup.stream().filter(item -> !ownGroup.contains(item.getCode()))
                 .collect(Collectors.groupingBy(GroupListVo::getItem));

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.bms.common.Constant;
-import com.zy.bms.entity.DeviceBase;
 import com.zy.bms.entity.User;
 import com.zy.bms.mapper.UserMapper;
 import com.zy.bms.pojo.io.SearchIO;

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

@@ -0,0 +1,95 @@
+package com.zy.bms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.bms.common.Constant;
+import com.zy.bms.common.enums.DeviceType;
+import com.zy.bms.entity.DeviceBase;
+import com.zy.bms.entity.Group;
+import com.zy.bms.entity.lp.LpInfoState;
+import com.zy.bms.entity.ubi.UbiInfoState;
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
+import com.zy.bms.service.IDeviceBaseService;
+import com.zy.bms.service.IGroupService;
+import com.zy.bms.service.IUserPrivilegeService;
+import com.zy.bms.service.IWxApiService;
+import com.zy.bms.service.lp.ILpInfoStateService;
+import com.zy.bms.service.ubi.IUbiInfoStateService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 设备静态信息 服务实现类
+ *
+ * @author yangxiaokun
+ * @since 2021-06-01
+ */
+@Service
+public class WxApiServiceImpl implements IWxApiService {
+
+    @Resource
+    private IDeviceBaseService deviceBaseService;
+
+    @Resource
+    private IUbiInfoStateService ubiInfoStateService;
+
+    @Resource
+    private ILpInfoStateService lpInfoStateService;
+
+    @Resource
+    private IUserPrivilegeService userPrivilegeService;
+
+    @Resource
+    private IGroupService groupService;
+
+
+    @Override
+    public List listFullInfoByGroupId(Integer userId, String groupId) {
+        //是否有权限
+        boolean flag = userPrivilegeService.hasPrivilege(userId, groupId);
+        if (!flag) return new ArrayList<>();
+        //设备组
+        Group group = groupService.getByCode(groupId);
+        //普适型设备
+        if (DeviceType.UBI.value.equals(group.getType())) {
+            return ubiInfoStateService.listFullByGroupId(groupId);
+        }
+        //路牌设备
+        if (DeviceType.LP.value.equals(group.getType())) {
+            return lpInfoStateService.listFullByGroupId(groupId);
+        }
+        return new ArrayList();
+    }
+
+    @Override
+    public List<SimpleDevicesVO> listSimpleInfoByGroupId(Integer userId, String groupId) {
+        //是否有权限
+        boolean flag = userPrivilegeService.hasPrivilege(userId, groupId);
+        if (!flag) return new ArrayList<>();
+        //设备组
+        Group group = groupService.getByCode(groupId);
+        //普适型设备
+        if (DeviceType.UBI.value.equals(group.getType())) {
+            return ubiInfoStateService.listSimpleByGroupId(groupId);
+        }
+        //路牌设备
+        if (DeviceType.LP.value.equals(group.getType())) {
+            return lpInfoStateService.listSimpleByGroupId(groupId);
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
+    public Object getDeviceByOpenNum(String openNum) {
+        String type = deviceBaseService.getOne(new QueryWrapper<DeviceBase>().eq("open_num", openNum)).getType();
+        if (DeviceType.UBI.value.equals(type)) {
+            return ubiInfoStateService.getOne(new QueryWrapper<UbiInfoState>().eq("open_num", openNum));
+        }
+        if (DeviceType.LP.value.equals(type)) {
+            return lpInfoStateService.getOne(new QueryWrapper<LpInfoState>().eq("open_num", openNum));
+        }
+        return null;
+    }
+}

src/main/java/com/zy/bms/service/lp/ILpInfoStateService.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zy.bms.entity.lp.LpInfoState;
 import com.zy.bms.pojo.io.DeviceIO;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 import com.zy.bms.pojo.vo.LpDeviceListVo;
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
 
 import java.util.List;
 
@@ -35,14 +35,14 @@ public interface ILpInfoStateService extends IService<LpInfoState> {
      *
      * @param groupId 设备组
      */
-    List<LpInfoState> listByGroupId(String groupId);
+    List<LpInfoState> listFullByGroupId(String groupId);
 
     /**
-     * 通过用户ID 查询设备集合
+     * 通过设备组ID 查询设备集合
      *
-     * @param userId 用户ID
+     * @param groupId 设备组ID
      */
-    List<DeviceWxListVo> listByUserId(Integer userId);
+    List<SimpleDevicesVO> listSimpleByGroupId(String groupId);
 
     /**
      * 通过设备ID获取设备信息

src/main/java/com/zy/bms/service/lp/impl/LpInfoStateServiceImpl.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.bms.entity.lp.LpInfoState;
 import com.zy.bms.mapper.lp.LpInfoStateMapper;
 import com.zy.bms.pojo.io.DeviceIO;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 import com.zy.bms.pojo.vo.LpDeviceListVo;
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
 import com.zy.bms.service.lp.ILpInfoStateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -37,13 +37,13 @@ public class LpInfoStateServiceImpl extends ServiceImpl<LpInfoStateMapper, LpInf
     }
 
     @Override
-    public List<LpInfoState> listByGroupId(String groupId) {
-        return baseMapper.listByGroupId(groupId);
+    public List<LpInfoState> listFullByGroupId(String groupId) {
+        return baseMapper.listFullByGroupId(groupId);
     }
 
     @Override
-    public List<DeviceWxListVo> listByUserId(Integer userId) {
-        return baseMapper.listByUserId(userId);
+    public List<SimpleDevicesVO> listSimpleByGroupId(String groupId) {
+        return baseMapper.listSimpleByGroupId(groupId);
     }
 
     @Override

src/main/java/com/zy/bms/service/ubi/IUbiInfoStateService.java

@@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zy.bms.entity.ubi.UbiInfoState;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zy.bms.pojo.io.DeviceIO;
-import com.zy.bms.pojo.io.PageIO;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 import com.zy.bms.pojo.vo.UbiDeviceDetailVo;
 import com.zy.bms.pojo.vo.UbiDeviceListVo;
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
 
 import java.util.List;
 
@@ -41,12 +40,13 @@ public interface IUbiInfoStateService extends IService<UbiInfoState> {
      *
      * @param groupId 设备组
      */
-    List<UbiInfoState> listByGroupId(String groupId);
+    List<UbiInfoState> listFullByGroupId(String groupId);
 
     /**
-     * 通过用户ID 查询设备集合
+     * 通过设备组ID 查询设备集合
      *
-     * @param userId 用户ID
+     * @param groupId 设备组ID
      */
-    List<DeviceWxListVo> listByUserId(Integer userId);
+    List<SimpleDevicesVO> listSimpleByGroupId(String groupId);
+
 }

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

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.bms.entity.ubi.UbiInfoState;
 import com.zy.bms.mapper.ubi.UbiInfoStateMapper;
 import com.zy.bms.pojo.io.DeviceIO;
-import com.zy.bms.pojo.vo.DeviceWxListVo;
 import com.zy.bms.pojo.vo.UbiDeviceDetailVo;
 import com.zy.bms.pojo.vo.UbiDeviceListVo;
+import com.zy.bms.pojo.vo.wx.SimpleDevicesVO;
 import com.zy.bms.service.ubi.IUbiInfoStateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zy.bms.service.ubi.IUbiNtripService;
@@ -47,13 +47,13 @@ public class UbiInfoStateServiceImpl extends ServiceImpl<UbiInfoStateMapper, Ubi
     }
 
     @Override
-    public List<UbiInfoState> listByGroupId(String groupId) {
-        return baseMapper.listByGroupId(groupId);
+    public List<UbiInfoState> listFullByGroupId(String groupId) {
+        return baseMapper.listFullByGroupId(groupId);
     }
 
     @Override
-    public List<DeviceWxListVo> listByUserId(Integer userId) {
-        return baseMapper.listByUserId(userId);
+    public List<SimpleDevicesVO> listSimpleByGroupId(String groupId) {
+        return baseMapper.listSimpleByGroupId(groupId);
     }
 
 }

src/main/resources/mapper/DeviceBaseMapper.xml

@@ -2,8 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.DeviceBaseMapper">
 
-    <select id="getTypeByGroupId" resultType="java.lang.String">
-        SELECT type FROM device_base WHERE group_id = #{groupId} LIMIT 1
+    <select id="listOpenNumByGroupId" resultType="java.lang.String">
+        SELECT
+            open_num
+        FROM
+            device_base
+        WHERE
+            type = #{type}
+            AND group_id = #{groupId}
     </select>
 
 </mapper>

src/main/resources/mapper/GroupMapper.xml

@@ -39,15 +39,25 @@
                  LEFT JOIN item t2 ON t1.item_id = t2.id
     </select>
 
-    <select id="getByUserId" resultType="com.zy.bms.pojo.vo.GroupListWxVo">
-        SELECT any_value(t1.code)          AS code,
-               any_value(t1.name)          AS name,
-               COUNT(DISTINCT t2.open_num) AS num
-        FROM item_group t1
-                 LEFT JOIN device_base t2 ON t1.code = t2.group_id
-        WHERE t1.code IN (SELECT group_id FROM user_privilege WHERE user_id = #{userId})
-          AND t1.status = 1
-        GROUP BY t1.code
+    <select id="listByUserId" resultType="com.zy.bms.pojo.vo.wx.GroupsVO">
+        SELECT
+            t1.code,
+            t1.name,
+            t2.num
+        FROM
+            item_group t1
+        LEFT JOIN (
+            SELECT
+                group_id,
+                COUNT(DISTINCT open_num) AS num
+            FROM
+                device_base
+            GROUP BY
+                group_id
+            ) t2 ON t1.code = t2.group_id
+        WHERE
+            t1.code IN (SELECT group_id FROM user_privilege WHERE user_id = #{userId})
+            AND t1.status = 1
     </select>
 
 </mapper>

src/main/resources/mapper/LpInfoStateMapper.xml

@@ -34,33 +34,30 @@
         WHERE t1.type = 'lupai'
     </select>
 
-    <select id="listByUserId" resultType="com.zy.bms.pojo.vo.DeviceWxListVo">
+    <select id="listFullByGroupId" resultType="com.zy.bms.entity.lp.LpInfoState">
+        SELECT *
+        FROM lp_info_state
+        WHERE open_num IN (SELECT open_num FROM device_base WHERE type = 'lupai' AND group_id = #{groupId})
+    </select>
+
+    <select id="listSimpleByGroupId" resultType="com.zy.bms.pojo.vo.wx.SimpleDevicesVO">
         SELECT
             t1.open_num,
             t1.group_id,
             t1.type,
             t2.update_time,
-            IF(TIMESTAMPDIFF(SECOND, t2.update_time, NOW()) > t2.wake_int * 3600 + 180,0,1) AS `status`
-        FROM
-            device_base t1
+            IF(t2.open_num IS NULL,-1,IF(TIMESTAMPDIFF(SECOND, t2.update_time, NOW()) > t2.wake_int * 3600 + 180, 0, 1)) AS `status`
+        FROM device_base t1
         LEFT JOIN lp_info_state t2 ON t1.open_num = t2.open_num
         WHERE
             t1.type = 'lupai'
-            AND t1.group_id IN (SELECT group_id FROM user_privilege WHERE user_id = #{userId})
-    </select>
-
-    <select id="listByGroupId" resultType="com.zy.bms.entity.lp.LpInfoState">
-        SELECT *
-        FROM lp_info_state
-        WHERE open_num IN (SELECT open_num FROM device_base WHERE type = 'lupai' AND group_id = #{groupId})
+            AND t1.group_id = #{groupId}
     </select>
 
     <update id="updateWakeAndThresh">
         UPDATE
             lp_info_state
-        SET wake_int             = #{entity.wakeInt},
-            thresh               = #{entity.thresh},
-            update_location_flag = #{entity.updateLocationFlag}
+        SET wake_int = #{entity.wakeInt},thresh = #{entity.thresh}, update_location_flag = #{entity.updateLocationFlag}
         WHERE open_num = #{entity.openNum}
     </update>
 </mapper>

src/main/resources/mapper/UbiInfoStateMapper.xml

@@ -40,25 +40,23 @@
         SELECT * FROM ubi_info_state WHERE open_num = #{openNum}
     </select>
 
-    <select id="listByGroupId" resultType="com.zy.bms.entity.ubi.UbiInfoState">
+    <select id="listFullByGroupId" resultType="com.zy.bms.entity.ubi.UbiInfoState">
         SELECT *
         FROM ubi_info_state
         WHERE open_num IN (SELECT open_num FROM device_base WHERE type = 'gnss' AND group_id = #{groupId})
     </select>
 
-    <select id="listByUserId" resultType="com.zy.bms.pojo.vo.DeviceWxListVo">
-        SELECT
-        t1.open_num,
-        t1.group_id,
-        t1.type,
-        t2.update_time,
-        IF(TIMESTAMPDIFF(SECOND, t2.update_time, NOW()) > IFNULL(t2.freq, 0) + 180,0,1) AS `status`
-        FROM
-        device_base t1
+    <select id="listSimpleByGroupId" resultType="com.zy.bms.pojo.vo.wx.SimpleDevicesVO">
+        SELECT t1.open_num,
+               t1.group_id,
+               t1.type,
+               t2.update_time,
+               IF(t2.open_num IS NULL,-1,IF(TIMESTAMPDIFF(SECOND, t2.update_time, NOW()) > IFNULL(t2.freq, 0) + 180,0,1)) AS `status`
+        FROM device_base t1
         LEFT JOIN ubi_info_state t2 ON t1.open_num = t2.open_num
         WHERE
-        t1.type = 'gnss'
-        AND t1.group_id IN (SELECT group_id FROM user_privilege WHERE user_id = #{userId})
+            t1.type = 'gnss'
+            AND t1.group_id = #{groupId}
     </select>
 
 </mapper>