通过站点id列表查询

base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteVo.java

@@ -13,5 +13,5 @@ import java.util.List;
 */
 @Data
 public class SiteVo extends BaseEntityLong {
-
+    private List<Long> idList;
 }
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/common/pdu/SitePdu.java

@@ -13,4 +13,7 @@ import java.util.List;
 public class SitePdu {
     /** 区域IdList */
     private List<String> areaCodeList;
+    private List<Long> idList;
+    private Integer page;
+    private Integer size;
 }

common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java

@@ -70,6 +70,9 @@ public interface IApiAreaFeign extends IFeign {
     @PostMapping(value = "/site/getFlatSitesByAreaIds")
     String getFlatSitesByAreaIds(@RequestBody SitePdu query);
 
+    @PostMapping(value = "/site/list")
+    String getSitesByQuery(@RequestBody SitePdu query);
+
 
 }
 
@@ -125,6 +128,14 @@ class AreaFeignFallbackFactory implements FallbackFactory<IApiAreaFeign> {
                 failResp.setMsg("暂时无法获取站点列表，请稍后再试!");
                 return JSON.toJSONString(failResp);
             }
+
+            @Override
+            public String getSitesByQuery(SitePdu query) {
+                ApiResp<String> failResp = new ApiResp<>();
+                failResp.setCode(ApiRespCodeEnum.FAILED.getValue());
+                failResp.setMsg("暂时无法获取站点列表，请稍后再试!");
+                return JSON.toJSONString(failResp);
+            }
         };
     }
 }

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

 package com.mortals.xhx.base.login.web;
 
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.ap.SysConstains;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
-import com.mortals.framework.util.AESUtil;
-import com.mortals.framework.util.DateUtils;
-import com.mortals.framework.util.HttpUtil;
-import com.mortals.framework.util.StringUtils;
+import com.mortals.framework.util.*;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.pdu.SitePdu;
+import com.mortals.xhx.feign.area.IApiAreaFeign;
+import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.menu.model.MenuEntity;
 import com.mortals.xhx.module.menu.service.MenuService;
 import com.mortals.xhx.module.user.model.UserEntity;
@@ -26,10 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @RestController
 @Slf4j
@@ -44,6 +45,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     private ICacheService cacheService;
     @Autowired
     private IAuthTokenService authTokenService;
+    @Autowired
+    private IApiAreaFeign apiAreaFeign;
 
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
@@ -70,6 +73,24 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             String token = authTokenService.createToken(userEntity);
             data.put("token", token);
             data.put("user", userEntity);
+            if(StringUtils.isNotEmpty(userEntity.getSiteIds())){
+                SitePdu sitePdu = new SitePdu();
+                List<Long> siteIdList = new ArrayList<>();
+                for(String idStr:userEntity.getSiteIds().split(",")){
+                    siteIdList.add(DataUtil.converStr2Long(idStr,0));
+                }
+                sitePdu.setIdList(siteIdList);
+                sitePdu.setSize(-1);
+                String resp = apiAreaFeign.getSitesByQuery(sitePdu);
+                ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
+                if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
+                    throw new AppException("获取用户站点列表树数据失败：" + apiResp.getMsg());
+                }
+
+                data.put("siteList", apiResp.getData().get("data"));
+            }
+
+
             recordSysLog(request, userEntity, "用户登录系统成功!");
             ret.put(KEY_RESULT_DATA, data);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);