获取用户站点列表树

sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstBasicController.java

@@ -11,6 +11,7 @@ import com.mortals.xhx.common.key.ParamKey;
 import com.mortals.xhx.feign.base.IApiBaseManagerFeign;
 import com.mortals.xhx.feign.base.pdu.SitePdu;
 import com.mortals.xhx.feign.rsp.ApiResp;
+import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.sst.model.SstAppsEntity;
 import com.mortals.xhx.module.sst.service.SstAppsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,9 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
     @Autowired
     private SstAppsService sstAppsService;
 
+    @Autowired
+    private ISiteFeign iSiteFeign;
+
     public SstBasicController(){
         super.setModuleDesc( "基础配置");
     }
@@ -120,37 +124,21 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
         return ret;
     }
 
-    @PostMapping({"site/list"})
-    public Rest<Object> list() {
-        IUser user = this.getCurUser();
-        if (user == null) {
-            throw new AppException("用户未登录");
-        }
+    @PostMapping({"site/siteTree"})
+    public Rest<Object> list(@RequestHeader("Authorization") String authorization) {
         Rest<Object> ret = new Rest();
         Map<String, Object> model = new HashMap();
         String busiDesc = "查询用户站点列表";
 
         int code = 1;
         try {
-
-            if (StringUtils.isNotEmpty(user.getSiteIds())) {
-                SitePdu sitePdu = new SitePdu();
-                List<String> siteIds = Arrays.asList(user.getSiteIds().split(","));
-                List<Long> idList = new ArrayList<>();
-                siteIds.forEach(s -> {
-                    idList.add(DataUtil.converStr2Long(s, 0));
-                });
-                sitePdu.setIdList(idList);
-                String resp = iApiBaseManagerFeign.getSitesByQuery(sitePdu);
-                ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
-                if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
-                    throw new AppException("获取用户站点列表树数据失败：" + apiResp.getMsg());
-                }
-                if (apiResp.getData().get("data") != null) {
-                    model.put("data", apiResp.getData().get("data"));
-                } else {
-                    model.put("data", Collections.emptyList());
-                }
+            String resp = iSiteFeign.siteTree(authorization);
+            ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
+            if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
+                throw new AppException("获取用户站点列表树数据失败：" + apiResp.getMsg());
+            }
+            if (apiResp.getData().get("siteTree") != null) {
+                model.put("data", apiResp.getData().get("siteTree"));
             } else {
                 model.put("data", Collections.emptyList());
             }