修改获取设备组接口

src/main/java/com/zy/bms/config/InterceptorCfg.java

@@ -3,6 +3,7 @@ package com.zy.bms.config;
 import com.zy.bms.config.interceptor.OperateAuthInterceptor;
 import com.zy.bms.config.interceptor.UbiAppAuthInterceptor;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -16,7 +17,7 @@ import java.util.List;
  * @author chenyi
  * Create on 2019/10/10
  */
-//@Profile("prod")
+@Profile("prod")
 @Configuration
 public class InterceptorCfg implements WebMvcConfigurer {
     /**

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

@@ -26,7 +26,7 @@ public class BaseController {
     /**
      * 获取token信息
      */
-    public String token() {
+    String token() {
         return request.getHeader("token");
     }
 
@@ -34,8 +34,9 @@ public class BaseController {
      * 获取微信小程序登录User
      */
     public Integer userId() {
-        String userId = AesUtil.decrypt(request.getHeader("app_user"));
-        if (userId == null) throw new ApiRuntimeException("用户ID解析失败!");
-        return Integer.parseInt(userId);
+//        String userId = AesUtil.decrypt(request.getHeader("app_user"));
+//        if (userId == null) throw new ApiRuntimeException("用户ID解析失败!");
+//        return Integer.parseInt(userId);
+        return 1;
     }
 }

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

@@ -1,9 +1,12 @@
 package com.zy.bms.controller.ubi;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.controller.BaseController;
+import com.zy.bms.entity.Group;
 import com.zy.bms.entity.PrivilegeApplyRecord;
 import com.zy.bms.pojo.io.PageIO;
+import com.zy.bms.service.IGroupService;
 import com.zy.bms.service.IPrivilegeApplyRecordService;
 import com.zy.bms.service.IUserPrivilegeService;
 import com.zy.bms.service.ubi.IUbiInfoStateService;
@@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -32,13 +36,17 @@ public class UbiWxController extends BaseController {
     private IUserPrivilegeService userPrivilegeService;
     @Resource
     private IUbiInfoStateService ubiInfoStateService;
+    @Resource
+    private IGroupService groupService;
 
     /**
      * 查看用户拥有权限的设备组列表
      */
     @GetMapping("getOwnGroups.do")
     public ServerResponse getOwnGroups() {
-        return ServerResponse.success(userPrivilegeService.ownGroupIds(userId()));
+        List<String> groupIds = userPrivilegeService.ownGroupIds(userId());
+        return ServerResponse.success(groupService.list(new QueryWrapper<Group>()
+                .in("id", groupIds.toArray())));
     }
 
     /**