修改微信小程序接口

src/main/java/com/zy/bms/common/Constant.java

@@ -17,8 +17,8 @@ public class Constant {
         /**
          * 微信小程序登录相关配置
          */
-        public static final String wxAppId = "wxe90699b45e28a0b6";// 小程序唯一标识
-        public static final String wxSecret = "66690a1ffcfe7f1d85a6dcfa38791f25";//小程序的 app secret
+        public static final String wxAppId = "wx89a5cebcd67332a9";// 小程序唯一标识
+        public static final String wxSecret = "78339636119ccde2e4c18bcbd6e63c75";//小程序的 app secret
         public static final String grant_type = "authorization_code"; // 授权（必填）
     }
 

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

@@ -3,15 +3,15 @@ package com.zy.bms.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.entity.DeviceBase;
+import com.zy.bms.entity.User;
 import com.zy.bms.entity.UserPrivilege;
 import com.zy.bms.entity.lp.LpInfoState;
 import com.zy.bms.pojo.io.LpInfoRecordIO;
-import com.zy.bms.service.IDeviceBaseService;
-import com.zy.bms.service.IGroupService;
-import com.zy.bms.service.IPostMqttMsgService;
-import com.zy.bms.service.IUserPrivilegeService;
+import com.zy.bms.service.*;
 import com.zy.bms.service.lp.ILpInfoRecordService;
 import com.zy.bms.service.lp.ILpInfoStateService;
+import com.zy.bms.utils.AesUtil;
+import com.zy.bms.utils.RandomCode;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -27,6 +27,8 @@ import java.util.Set;
  * create on 2021/8/24
  */
 public class UbiLpWxController extends BaseController {
+    @Resource
+    private IUserService userService;
     @Resource
     private IUserPrivilegeService userPrivilegeService;
     @Resource
@@ -40,6 +42,26 @@ public class UbiLpWxController extends BaseController {
     @Resource
     private ILpInfoRecordService lpInfoRecordService;
 
+    /**
+     * 微信登录
+     *
+     * @return 用户 加密userId
+     */
+    @PostMapping("login.do")
+    public ServerResponse login(String code) {
+        String openId = userService.getWxAppId(code);
+        if (openId == null) return ServerResponse.error();
+        User user = userService.getOne(new QueryWrapper<User>().eq("open_id", openId));
+        //保存新用户
+        if (user == null) {
+            user = new User();
+            user.setOpenId(openId);
+            user.setRandomCode(RandomCode.UUID_8());
+            userService.save(user);
+        }
+        return ServerResponse.success(AesUtil.encrypt(user.getId().toString()));
+    }
+
     /**
      * 查看用户拥有权限的设备组列表
      */

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

@@ -1,13 +1,9 @@
 package com.zy.bms.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zy.bms.common.ServerResponse;
-import com.zy.bms.entity.User;
 import com.zy.bms.pojo.io.UserIO;
 import com.zy.bms.service.IUserService;
-import com.zy.bms.utils.AesUtil;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -25,24 +21,6 @@ public class UserController {
     @Resource
     private IUserService userService;
 
-    /**
-     * 微信登录
-     *
-     * @return 用户 加密openId
-     */
-    @PostMapping("login.do")
-    public ServerResponse login(String code) {
-        String openId = userService.getWxAppId(code);
-        if (openId == null) return ServerResponse.error();
-        //保存新用户
-        if (userService.getOne(new QueryWrapper<User>().eq("open_id", openId)) == null) {
-            User user = new User();
-            user.setOpenId(openId);
-            userService.save(user);
-        }
-        return ServerResponse.success(AesUtil.encrypt(openId));
-    }
-
     /**
      * 分页查询用户列表
      */

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

@@ -79,4 +79,8 @@ public class User implements Serializable {
      */
     private LocalDateTime createTime;
 
+    /**
+     * 随机码
+     */
+    private String randomCode;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zy.bms.common.Constant;
 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;
@@ -40,13 +41,13 @@ public class DeviceBaseServiceImpl extends ServiceImpl<DeviceBaseMapper, DeviceB
     @Override
     public List listByGroupIdWx(String groupId) {
         String type = baseMapper.getTypeByGroupId(groupId);
-        switch (type) {
-            case Constant.DEVICE_TYPE.UBI: {
-                return ubiInfoStateService.listByGroupIdWx(groupId);
-            }
-            case Constant.DEVICE_TYPE.LP: {
-                return lpInfoStateService.listByGroupIdWx(groupId);
-            }
+        //普适型设备
+        if (type.equals(Constant.DEVICE_TYPE.UBI)) {
+            return ubiInfoStateService.listByGroupIdWx(groupId);
+        }
+        //路牌设备
+        if (type.equals(Constant.DEVICE_TYPE.LP)) {
+            return lpInfoStateService.listByGroupIdWx(groupId);
         }
         return null;
     }
@@ -61,13 +62,11 @@ public class DeviceBaseServiceImpl extends ServiceImpl<DeviceBaseMapper, DeviceB
     @Override
     public Object getDetailWx(String openNum) {
         String type = baseMapper.selectOne(new QueryWrapper<DeviceBase>().eq("open_num", openNum)).getType();
-        switch (type) {
-            case Constant.DEVICE_TYPE.UBI: {
-                return ubiInfoStateService.getDetailWx(openNum);
-            }
-            case Constant.DEVICE_TYPE.LP: {
-                return lpInfoStateService.getOne(new QueryWrapper<LpInfoState>().eq("open_num", openNum));
-            }
+        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/lp/ILpInfoStateService.java

@@ -23,13 +23,6 @@ public interface ILpInfoStateService extends IService<LpInfoState> {
      */
     IPage<LpDeviceListVo> listPage(DeviceIO io);
 
-    /**
-     * 通过用户ID 查询用户设备
-     *
-     * @param userId 用户ID
-     */
-    List<LpInfoState> listByUserId(Integer userId);
-
     /**
      * 微信端
      * 通过设备组查询设备

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

@@ -7,12 +7,10 @@ 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.LpDeviceListVo;
-import com.zy.bms.service.IPostMqttMsgService;
 import com.zy.bms.service.lp.ILpInfoStateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -26,20 +24,12 @@ import java.util.List;
 @Service
 public class LpInfoStateServiceImpl extends ServiceImpl<LpInfoStateMapper, LpInfoState> implements ILpInfoStateService {
 
-    @Resource
-    private IPostMqttMsgService postMqttMsgService;
-
     @Override
     public IPage<LpDeviceListVo> listPage(DeviceIO io) {
         Page<LpDeviceListVo> page = new Page<>(io.getCurrent(), io.getSize());
         return baseMapper.listPage(page, io);
     }
 
-    @Override
-    public List<LpInfoState> listByUserId(Integer userId) {
-        return baseMapper.listByUserId(userId);
-    }
-
     @Override
     public List<LpDeviceListVo> listByGroupIdWx(String groupId) {
         return baseMapper.listByGroupIdWx(groupId);

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

@@ -34,7 +34,6 @@ public interface IUbiInfoStateService extends IService<UbiInfoState> {
      */
     UbiDeviceDetailVo getDetail(String openNum);
 
-
     /**
      * 微信端
      * 通过设备组查询设备
@@ -43,12 +42,4 @@ public interface IUbiInfoStateService extends IService<UbiInfoState> {
      */
     List<UbiDeviceListVo> listByGroupIdWx(String groupId);
 
-    /**
-     * 微信端
-     * 获取设备详情信息
-     *
-     * @param openNum 设备公开码
-     */
-    UbiDeviceDetailVo getDetailWx(String openNum);
-
 }

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

@@ -50,9 +50,4 @@ public class UbiInfoStateServiceImpl extends ServiceImpl<UbiInfoStateMapper, Ubi
         return baseMapper.listByGroupIdWx(groupId);
     }
 
-    @Override
-    public UbiDeviceDetailVo getDetailWx(String openNum) {
-        return baseMapper.getDetail(openNum);
-    }
-
 }