数据管理，站点编排改造

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

@@ -70,13 +70,13 @@ public interface IApiAreaFeign extends IFeign {
     @PostMapping(value = "/site/getFlatSitesByAreaIds")
     String getFlatSitesByAreaIds(@RequestBody SitePdu query);
 
-    /**
-     * 根据条件查询站点列表
-     * @param query
-     * @return
-     */
-    @PostMapping(value = "/site/list")
-    String getSitesByQuery(@RequestBody SitePdu query);
+//    /**
+//     * 根据条件查询站点列表
+//     * @param query
+//     * @return
+//     */
+//    @PostMapping(value = "/site/list")
+//    String getSitesByQuery(@RequestBody SitePdu query);
 }
 
 
@@ -132,13 +132,13 @@ class AreaFeignFallbackFactory implements FallbackFactory<IApiAreaFeign> {
                 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);
-            }
+//            @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

@@ -2,20 +2,18 @@ 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.*;
+import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.StringUtils;
 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.model.IApiModelFeign;
 import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.menu.model.MenuEntity;
 import com.mortals.xhx.module.menu.service.MenuService;
@@ -23,14 +21,14 @@ import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @Slf4j
@@ -46,7 +44,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     @Autowired
     private IAuthTokenService authTokenService;
     @Autowired
-    private IApiAreaFeign apiAreaFeign;
+    private IApiModelFeign apiModelFeign;
 
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
@@ -81,7 +79,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
                 }
                 sitePdu.setIdList(siteIdList);
                 sitePdu.setSize(-1);
-                String resp = apiAreaFeign.getSitesByQuery(sitePdu);
+                String resp = apiModelFeign.getSitesByQuery(sitePdu);
                 ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
                 if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
                     throw new AppException("获取用户站点列表树数据失败：" + apiResp.getMsg());

portal-manager/src/main/java/com/mortals/xhx/module/apps/dao/AppsCensusDao.java

-package com.mortals.xhx.module.apps.dao;
-
-import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.apps.model.AppsCensusEntity;
-import java.util.List;
-/**
-* 系统应用数据统计Dao
-* 系统应用数据统计 DAO接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-public interface  AppsCensusDao extends ICRUDDao<AppsCensusEntity,Long>{
-
-
-}

portal-manager/src/main/java/com/mortals/xhx/module/apps/dao/AppsDao.java

-package com.mortals.xhx.module.apps.dao;
-
-import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.apps.model.AppsEntity;
-import java.util.List;
-/**
-* 系统应用列Dao
-* 系统应用列 DAO接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-public interface  AppsDao extends ICRUDDao<AppsEntity,Long>{
-
-
-}

portal-manager/src/main/java/com/mortals/xhx/module/apps/dao/ibatis/AppsCensusDaoImpl.java

-package com.mortals.xhx.module.apps.dao.ibatis;
-
-
-import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.apps.dao.AppsCensusDao;
-import com.mortals.xhx.module.apps.model.AppsCensusEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
-/**
-* 系统应用数据统计DaoImpl DAO接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Repository("appsCensusDao")
-public class AppsCensusDaoImpl extends BaseCRUDDaoMybatis<AppsCensusEntity,Long> implements AppsCensusDao {
-
-
-
-}

portal-manager/src/main/java/com/mortals/xhx/module/apps/dao/ibatis/AppsDaoImpl.java

-package com.mortals.xhx.module.apps.dao.ibatis;
-
-
-import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.apps.dao.AppsDao;
-import com.mortals.xhx.module.apps.model.AppsEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
-/**
-* 系统应用列DaoImpl DAO接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Repository("appsDao")
-public class AppsDaoImpl extends BaseCRUDDaoMybatis<AppsEntity,Long> implements AppsDao {
-
-
-
-}

portal-manager/src/main/java/com/mortals/xhx/module/apps/model/AppsCensusEntity.java

-package com.mortals.xhx.module.apps.model;
-
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.apps.model.vo.AppsCensusVo;
-/**
-* 系统应用数据统计实体对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-
-public class AppsCensusEntity extends AppsCensusVo {
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 应用ID，主键
-    */
-    private Long appId;
-    /**
-    * 数据统计名称
-    */
-    private String censusName;
-    /**
-    * 链接地址
-    */
-    private String censusUrl;
-    /**
-    * 统计类型， 1：服务，2：协同，3：监管，4：数据，5：运营。默认1
-    */
-    private Integer censusType;
-    /**
-    * 状态，0暂未开通，1已开通
-    */
-    private Integer status;
-    /**
-    * 创建用户名称
-    */
-    private String createUserName;
-    /**
-    * 更新用户名称
-    */
-    private String updateUserName;
-
-
-
-    public AppsCensusEntity(){}
-    /**
-    * 获取 应用ID，主键
-    * @return Long
-    */
-    public Long getAppId(){
-        return appId;
-    }
-    /**
-    * 设置 应用ID，主键
-    * @param appId
-    */
-    public void setAppId(Long appId){
-        this.appId = appId;
-    }
-    /**
-    * 获取 数据统计名称
-    * @return String
-    */
-    public String getCensusName(){
-        return censusName;
-    }
-    /**
-    * 设置 数据统计名称
-    * @param censusName
-    */
-    public void setCensusName(String censusName){
-        this.censusName = censusName;
-    }
-    /**
-    * 获取 链接地址
-    * @return String
-    */
-    public String getCensusUrl(){
-        return censusUrl;
-    }
-    /**
-    * 设置 链接地址
-    * @param censusUrl
-    */
-    public void setCensusUrl(String censusUrl){
-        this.censusUrl = censusUrl;
-    }
-    /**
-    * 获取 统计类型， 1：服务，2：协同，3：监管，4：数据，5：运营。默认1
-    * @return Integer
-    */
-    public Integer getCensusType(){
-        return censusType;
-    }
-    /**
-    * 设置 统计类型， 1：服务，2：协同，3：监管，4：数据，5：运营。默认1
-    * @param censusType
-    */
-    public void setCensusType(Integer censusType){
-        this.censusType = censusType;
-    }
-    /**
-    * 获取 状态，0暂未开通，1已开通
-    * @return Integer
-    */
-    public Integer getStatus(){
-        return status;
-    }
-    /**
-    * 设置 状态，0暂未开通，1已开通
-    * @param status
-    */
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-    /**
-    * 获取 创建用户名称
-    * @return String
-    */
-    public String getCreateUserName(){
-        return createUserName;
-    }
-    /**
-    * 设置 创建用户名称
-    * @param createUserName
-    */
-    public void setCreateUserName(String createUserName){
-        this.createUserName = createUserName;
-    }
-    /**
-    * 获取 更新用户名称
-    * @return String
-    */
-    public String getUpdateUserName(){
-        return updateUserName;
-    }
-    /**
-    * 设置 更新用户名称
-    * @param updateUserName
-    */
-    public void setUpdateUserName(String updateUserName){
-        this.updateUserName = updateUserName;
-    }
-
-
-
-
-    @Override
-    public int hashCode() {
-         return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (obj instanceof AppsCensusEntity) {
-            AppsCensusEntity tmp = (AppsCensusEntity) obj;
-            if (this.getId() == tmp.getId()) {
-                 return true;
-            }
-        }
-        return false;
-    }
-
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",appId:").append(getAppId());
-        sb.append(",censusName:").append(getCensusName());
-        sb.append(",censusUrl:").append(getCensusUrl());
-        sb.append(",censusType:").append(getCensusType());
-        sb.append(",status:").append(getStatus());
-        sb.append(",createUserName:").append(getCreateUserName());
-        sb.append(",updateUserName:").append(getUpdateUserName());
-        return sb.toString();
-    }
-
-    public void initAttrValue(){
-
-            this.appId = null;
-
-            this.censusName = "";
-
-            this.censusUrl = "";
-
-            this.censusType = 1;
-
-            this.status = 0;
-
-            this.createUserName = "";
-
-            this.updateUserName = "";
-    }
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/model/AppsEntity.java

-package com.mortals.xhx.module.apps.model;
-
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.apps.model.vo.AppsVo;
-/**
- * 系统应用列实体对象
- *
- * @author zxfei
- * @date 2022-06-23
- */
-
-public class AppsEntity extends AppsVo {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 应用名称
-     */
-    private String name;
-    /**
-     * 图标
-     */
-    private String imgPath;
-    /**
-     * 连接地址
-     */
-    private String url;
-    /**
-     * 状态，0暂未开通，1已开通
-     */
-    private Integer status;
-    /**
-     * 排序号
-     */
-    private Integer sortNum;
-    /**
-     * 描述
-     */
-    private String remark;
-    /**
-     * 创建用户名称
-     */
-    private String createUserName;
-    /**
-     * 更新用户名称
-     */
-    private String updateUserName;
-
-
-
-    public AppsEntity(){}
-    /**
-     * 获取 应用名称
-     * @return String
-     */
-    public String getName(){
-        return name;
-    }
-    /**
-     * 设置 应用名称
-     * @param name
-     */
-    public void setName(String name){
-        this.name = name;
-    }
-    /**
-     * 获取 图标
-     * @return String
-     */
-    public String getImgPath(){
-        return imgPath;
-    }
-    /**
-     * 设置 图标
-     * @param imgPath
-     */
-    public void setImgPath(String imgPath){
-        this.imgPath = imgPath;
-    }
-    /**
-     * 获取 连接地址
-     * @return String
-     */
-    public String getUrl(){
-        return url;
-    }
-    /**
-     * 设置 连接地址
-     * @param url
-     */
-    public void setUrl(String url){
-        this.url = url;
-    }
-    /**
-     * 获取 状态，0暂未开通，1已开通
-     * @return Integer
-     */
-    public Integer getStatus(){
-        return status;
-    }
-    /**
-     * 设置 状态，0暂未开通，1已开通
-     * @param status
-     */
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-    /**
-     * 获取 排序号
-     * @return Integer
-     */
-    public Integer getSortNum(){
-        return sortNum;
-    }
-    /**
-     * 设置 排序号
-     * @param sortNum
-     */
-    public void setSortNum(Integer sortNum){
-        this.sortNum = sortNum;
-    }
-    /**
-     * 获取 描述
-     * @return String
-     */
-    public String getRemark(){
-        return remark;
-    }
-    /**
-     * 设置 描述
-     * @param remark
-     */
-    public void setRemark(String remark){
-        this.remark = remark;
-    }
-    /**
-     * 获取 创建用户名称
-     * @return String
-     */
-    public String getCreateUserName(){
-        return createUserName;
-    }
-    /**
-     * 设置 创建用户名称
-     * @param createUserName
-     */
-    public void setCreateUserName(String createUserName){
-        this.createUserName = createUserName;
-    }
-    /**
-     * 获取 更新用户名称
-     * @return String
-     */
-    public String getUpdateUserName(){
-        return updateUserName;
-    }
-    /**
-     * 设置 更新用户名称
-     * @param updateUserName
-     */
-    public void setUpdateUserName(String updateUserName){
-        this.updateUserName = updateUserName;
-    }
-
-
-
-
-    @Override
-    public int hashCode() {
-        return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (obj instanceof AppsEntity) {
-            AppsEntity tmp = (AppsEntity) obj;
-            if (this.getId() == tmp.getId()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",name:").append(getName());
-        sb.append(",imgPath:").append(getImgPath());
-        sb.append(",url:").append(getUrl());
-        sb.append(",status:").append(getStatus());
-        sb.append(",sortNum:").append(getSortNum());
-        sb.append(",remark:").append(getRemark());
-        sb.append(",createUserName:").append(getCreateUserName());
-        sb.append(",updateUserName:").append(getUpdateUserName());
-        return sb.toString();
-    }
-
-    public void initAttrValue(){
-
-        this.name = "";
-
-        this.imgPath = "";
-
-        this.url = "";
-
-        this.status = 0;
-
-        this.sortNum = 0;
-
-        this.remark = "";
-
-        this.createUserName = "";
-
-        this.updateUserName = "";
-    }
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/model/vo/AppsCensusVo.java

-package com.mortals.xhx.module.apps.model.vo;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.apps.model.AppsCensusEntity;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-/**
-* 系统应用数据统计视图对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Data
-public class AppsCensusVo extends BaseEntityLong {
-
-    /** 所属站点 */
-    private Long siteId;
-
-    private List<Long> appIdList;
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/model/vo/AppsVo.java

-package com.mortals.xhx.module.apps.model.vo;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.apps.model.AppsEntity;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-/**
-* 系统应用列视图对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Data
-public class AppsVo extends BaseEntityLong {
-
-    /** 所属站点 */
-    private Long siteId;
-
-    private List<Long> idList;
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/service/AppsCensusService.java

-package com.mortals.xhx.module.apps.service;
-import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.apps.model.AppsCensusEntity;
-/**
-* AppsCensusService
-*
-* 系统应用数据统计 service接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-public interface AppsCensusService extends ICRUDService<AppsCensusEntity,Long>{
-
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/service/AppsService.java

-package com.mortals.xhx.module.apps.service;
-import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.apps.model.AppsEntity;
-/**
-* AppsService
-*
-* 系统应用列 service接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-public interface AppsService extends ICRUDService<AppsEntity,Long>{
-
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/service/impl/AppsCensusServiceImpl.java

-package com.mortals.xhx.module.apps.service.impl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.util.DataUtil;
-import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.module.apps.model.AppsEntity;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-import com.mortals.xhx.module.site.model.SiteAppsQuery;
-import com.mortals.xhx.module.site.service.SiteAppsService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.xhx.module.apps.dao.AppsCensusDao;
-import com.mortals.xhx.module.apps.model.AppsCensusEntity;
-import com.mortals.xhx.module.apps.service.AppsCensusService;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* AppsCensusService
-* 系统应用数据统计 service实现
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Service("appsCensusService")
-public class AppsCensusServiceImpl extends AbstractCRUDServiceImpl<AppsCensusDao, AppsCensusEntity, Long> implements AppsCensusService {
-
-    @Autowired
-    private SiteAppsService siteAppsService;
-
-    @Override
-    protected AppsCensusEntity findBefore(AppsCensusEntity params, PageInfo pageInfo, Context context) throws AppException {
-        pageInfo.setPrePageResult(-1);
-        List<Long> appIds = new ArrayList<>();
-        appIds.add(0L);
-        if(params.getSiteId()!=null){
-            SiteAppsQuery siteAppsQuery = new SiteAppsQuery();
-            siteAppsQuery.setSiteId(params.getSiteId());
-            List<SiteAppsEntity> siteAppsList = siteAppsService.find(siteAppsQuery);
-            if(CollectionUtils.isNotEmpty(siteAppsList)){
-                SiteAppsEntity siteAppsEntity = siteAppsList.get(0);
-                if(StringUtils.isNotEmpty(siteAppsEntity.getIncludApps())){
-                    for(String idStr:siteAppsEntity.getIncludApps().split(",")){
-                        Long appId = DataUtil.converStr2Long(idStr,0);
-                        appIds.add(appId);
-                    }
-                }
-            }
-        }
-        params.setAppIdList(appIds);
-        return super.findBefore(params, pageInfo, context);
-    }
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/service/impl/AppsServiceImpl.java

-package com.mortals.xhx.module.apps.service.impl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.util.DataUtil;
-import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.module.apps.model.AppsCensusEntity;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-import com.mortals.xhx.module.site.model.SiteAppsQuery;
-import com.mortals.xhx.module.site.service.SiteAppsService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.xhx.module.apps.dao.AppsDao;
-import com.mortals.xhx.module.apps.model.AppsEntity;
-import com.mortals.xhx.module.apps.service.AppsService;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* AppsService
-* 系统应用列 service实现
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Service("appsService")
-public class AppsServiceImpl extends AbstractCRUDServiceImpl<AppsDao, AppsEntity, Long> implements AppsService {
-
-    @Autowired
-    private SiteAppsService siteAppsService;
-
-    @Override
-    protected AppsEntity findBefore(AppsEntity params, PageInfo pageInfo, Context context) throws AppException {
-        pageInfo.setPrePageResult(-1);
-        List<Long> appIds = new ArrayList<>();
-        appIds.add(0L);
-        if(params.getSiteId()!=null){
-            SiteAppsQuery siteAppsQuery = new SiteAppsQuery();
-            siteAppsQuery.setSiteId(params.getSiteId());
-            List<SiteAppsEntity> siteAppsList = siteAppsService.find(siteAppsQuery);
-            if(CollectionUtils.isNotEmpty(siteAppsList)){
-                SiteAppsEntity siteAppsEntity = siteAppsList.get(0);
-                if(StringUtils.isNotEmpty(siteAppsEntity.getIncludApps())){
-                    for(String idStr:siteAppsEntity.getIncludApps().split(",")){
-                        Long appId = DataUtil.converStr2Long(idStr,0);
-                        appIds.add(appId);
-                    }
-                }
-            }
-        }
-        params.setIdList(appIds);
-        Map<String,String> orderCols = new HashMap<>();
-        orderCols.put("sortNum","DESC");
-        params.setOrderCols(orderCols);
-        return super.findBefore(params, pageInfo, context);
-    }
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/web/AppsCensusController.java

-package com.mortals.xhx.module.apps.web;
-
-import com.mortals.framework.common.IBaseEnum;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.framework.util.DateUtils;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.common.code.AppCensusType;
-import com.mortals.xhx.common.code.AppStatusEnum;
-import com.mortals.xhx.module.apps.model.AppsCensusEntity;
-import com.mortals.xhx.module.apps.service.AppsCensusService;
-import com.mortals.xhx.module.param.service.ParamService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-/**
-*
-* 系统应用数据统计
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@RestController
-@RequestMapping("apps/census")
-public class AppsCensusController extends BaseCRUDJsonBodyMappingController<AppsCensusService,AppsCensusEntity,Long> {
-
-    @Autowired
-    private ParamService paramService;
-
-    public AppsCensusController(){
-        super.setModuleDesc( "系统应用数据统计");
-    }
-
-    @Override
-    protected void init(Map<String, Object> model, Context context) {
-//        this.addDict(model, "censusType", paramService.getParamBySecondOrganize("AppsCensus","censusType"));
-//        this.addDict(model, "status", paramService.getParamBySecondOrganize("AppsCensus","status"));
-        this.addDict(model,"status", IBaseEnum.getEnumMap(AppStatusEnum.class));
-        this.addDict(model,"censusType", IBaseEnum.getEnumMap(AppCensusType.class));
-        super.init(model, context);
-    }
-
-    @Override
-    protected int doListAfter(AppsCensusEntity query, Map<String, Object> model, Context context) throws AppException {
-        List<AppsCensusEntity> resultList = (List<AppsCensusEntity>) model.get("data");
-        List<AppsCensusEntity> fuwu = new ArrayList<>();
-        List<AppsCensusEntity> xietong = new ArrayList<>();
-        List<AppsCensusEntity> jianguan = new ArrayList<>();
-        List<AppsCensusEntity> shuju = new ArrayList<>();
-        List<AppsCensusEntity> yunying = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(resultList)){
-            resultList.stream().forEach(item->{
-
-                if(item.getCensusType()==AppCensusType.FU_WU.getValue()){
-                    fuwu.add(item);
-                }else if(item.getCensusType()==AppCensusType.XIE_TONG.getValue()){
-                    xietong.add(item);
-                }else if(item.getCensusType()==AppCensusType.JIAN_GUAN.getValue()){
-                    jianguan.add(item);
-                }else if(item.getCensusType()==AppCensusType.SHU_JU.getValue()){
-                    shuju.add(item);
-                }else {
-                    yunying.add(item);
-                }
-
-            });
-        }
-        Map<String, Object> map = new HashMap<>();
-        map.put("censusType_1",fuwu);
-        map.put("censusType_2",xietong);
-        map.put("censusType_3",jianguan);
-        map.put("censusType_4",xietong);
-        map.put("censusType_5",shuju);
-        model.put("data",map);
-        return 1;
-    }
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/web/AppsController.java

-package com.mortals.xhx.module.apps.web;
-
-import com.mortals.framework.common.IBaseEnum;
-import com.mortals.framework.model.Context;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.common.code.AppStatusEnum;
-import com.mortals.xhx.module.apps.model.AppsEntity;
-import com.mortals.xhx.module.apps.service.AppsService;
-import com.mortals.xhx.module.param.service.ParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-/**
-*
-* 系统应用列
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@RestController
-@RequestMapping("apps")
-public class AppsController extends BaseCRUDJsonBodyMappingController<AppsService,AppsEntity,Long> {
-
-    @Autowired
-    private ParamService paramService;
-
-    public AppsController(){
-        super.setModuleDesc( "系统应用列");
-    }
-
-    @Override
-    protected void init(Map<String, Object> model, Context context) {
-        //this.addDict(model, "status", paramService.getParamBySecondOrganize("Apps","status"));
-        this.addDict(model,"status", IBaseEnum.getEnumMap(AppStatusEnum.class));
-        super.init(model, context);
-    }
-
-
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/menu/service/MenuService.java

@@ -4,6 +4,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.framework.service.IUser;
 import com.mortals.xhx.module.menu.model.MenuEntity;
+import com.mortals.xhx.module.menu.model.vo.MenuNodeVO;
 
 import java.util.List;
 import java.util.Set;
@@ -41,4 +42,6 @@ public interface MenuService extends ICRUDService<MenuEntity, Long> {
      * @param type
      */
     void upOrDown(Long id, Integer type);
+
+    List<MenuNodeVO> getMenuList() throws AppException;
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/menu/service/impl/MenuServiceImpl.java

@@ -8,7 +8,15 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.ModelPdu;
+import com.mortals.xhx.feign.model.IApiModelFeign;
+import com.mortals.xhx.feign.model.vo.ModelCensusFeignVO;
+import com.mortals.xhx.feign.model.vo.ModelFeignVO;
+import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.menu.model.MenuQuery;
+import com.mortals.xhx.module.menu.model.vo.MenuNodeVO;
+import com.mortals.xhx.module.role.service.RoleModelService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.menu.dao.MenuDao;
@@ -17,6 +25,7 @@ import com.mortals.xhx.module.menu.service.MenuService;
 import org.springframework.util.ObjectUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * MenuService
@@ -28,6 +37,10 @@ import java.util.*;
 @Service("menuService")
 public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity, Long> implements MenuService {
 
+    @Autowired
+    private IApiModelFeign apiModelFeign;
+    @Autowired
+    private RoleModelService roleModelService;
 
     @Override
     public int remove(Long[] ids, Context context) throws AppException {
@@ -242,4 +255,67 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
     private boolean hasChild(List<MenuEntity> list, MenuEntity t) {
         return getChildList(list, t).size() > 0 ? true : false;
     }
+
+
+    @Override
+    public List<MenuNodeVO> getMenuList() throws AppException {
+        MenuQuery query = new MenuQuery();
+        query.setStatus(YesNo.YES.getValue());
+        List<OrderCol> orderColList = new ArrayList<OrderCol>();
+        orderColList.add(new OrderCol("parentId"));
+        orderColList.add(new OrderCol("orderId"));
+        query.setOrderColList(orderColList);
+        List<MenuEntity> menuEntityList = this.find(query);
+        List<MenuNodeVO> nodeList = new ArrayList<>();
+        for (MenuEntity menuEntity:menuEntityList){
+            MenuNodeVO nodeVO = new MenuNodeVO(menuEntity.getName(),menuEntity.getId(),menuEntity.getParentId());
+            nodeList.add(nodeVO);
+        }
+        List<MenuNodeVO> tree = creatMenuNodeTree(nodeList);
+        tree.forEach(item->{
+            if(item.getNodeName()=="数据管理"){
+                item.setChildList(creatCensus(item.getNodeId()));
+            }
+            if(item.getNodeName()=="站点编排"){
+                item.setChildList(creatModel(item.getNodeId()));
+            }
+        });
+
+        return tree;
+    }
+
+    private List<MenuNodeVO> creatMenuNodeTree(List<MenuNodeVO> list){
+        Map<Long, List<MenuNodeVO>> sub = list.stream().filter(node -> node.getParentId() != -1).collect(Collectors.groupingBy(node -> node.getParentId()));
+        list.forEach(node -> node.setChildList(sub.get(node.getNodeId())));
+        return list.stream().filter(node -> node.getParentId() == -1).collect(Collectors.toList());
+    }
+
+    private List<MenuNodeVO> creatModel(Long nodeId){
+        ModelPdu modelPdu = new ModelPdu();
+        ApiResp<List<ModelFeignVO>> apiResp = apiModelFeign.getModelByQuery(modelPdu);
+        if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
+            throw new AppException("获取站点列表信息失败：" + apiResp.getMsg());
+        }
+        List<MenuNodeVO> nodeList = new ArrayList<>();
+        apiResp.getData().stream().forEach(item->{
+            MenuNodeVO nodeVO = new MenuNodeVO(item.getModelName(),item.getId(),nodeId);
+            nodeList.add(nodeVO);
+        });
+        return nodeList;
+    }
+
+    private List<MenuNodeVO> creatCensus(Long nodeId){
+        ModelPdu modelPdu = new ModelPdu();
+        ApiResp<List<ModelCensusFeignVO>> apiResp = apiModelFeign.getModelCensusByQuery(modelPdu);
+        if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
+            throw new AppException("获取所有数据管理列表信息失败：" + apiResp.getMsg());
+        }
+        List<MenuNodeVO> nodeList = new ArrayList<>();
+        apiResp.getData().stream().forEach(item->{
+            MenuNodeVO nodeVO = new MenuNodeVO(item.getCensusName(),item.getId(),nodeId);
+            nodeList.add(nodeVO);
+        });
+        return nodeList;
+    }
+
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/menu/web/MenuController.java

@@ -7,6 +7,7 @@ import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.module.menu.model.MenuEntity;
+import com.mortals.xhx.module.menu.model.vo.MenuNodeVO;
 import com.mortals.xhx.module.menu.service.MenuService;
 import com.mortals.xhx.module.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -129,5 +130,23 @@ public class MenuController extends BaseCRUDJsonBodyMappingController<MenuServic
     }
 
 
+    /**
+     * 查询所有可用菜单（树）
+     */
+    @PostMapping(value = "list/tree")
+    public String getMenuList() {
+        JSONObject ret = new JSONObject();
+        ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+        try {
+            List<MenuNodeVO> menuEntityList = this.service.getMenuList();
+            ret.put(KEY_RESULT_DATA,menuEntityList);
+        } catch (Exception e) {
+            log.error("更新错误", e);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, e.getMessage());
+        }
+        return ret.toJSONString();
+    }
+
 
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/role/model/vo/RoleAuthVo.java

@@ -13,5 +13,8 @@ import java.util.List;
 */
 @Data
 public class RoleAuthVo extends BaseEntityLong {
-
+    /**角色对应站点编排*/
+    private String modelIds;
+    /**角色对应数据管理*/
+    private String censusIds;
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/role/service/impl/RoleAuthServiceImpl.java

@@ -9,7 +9,9 @@ import com.mortals.xhx.module.menu.service.MenuService;
 import com.mortals.xhx.module.role.dao.RoleAuthDao;
 import com.mortals.xhx.module.role.model.RoleAuthEntity;
 import com.mortals.xhx.module.role.model.RoleAuthQuery;
+import com.mortals.xhx.module.role.model.RoleModelEntity;
 import com.mortals.xhx.module.role.service.RoleAuthService;
+import com.mortals.xhx.module.role.service.RoleModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -22,6 +24,9 @@ public class RoleAuthServiceImpl extends AbstractCRUDServiceImpl<RoleAuthDao, Ro
 
     @Autowired
     private MenuService menuService;
+    @Autowired
+    private RoleModelService roleModelService;
+
     @Override
     public void assignMenu(RoleAuthQuery query) {
         Map<Long, MenuEntity> menuEntityMap = menuService.find(new MenuQuery()).stream().collect(Collectors.toMap(x -> x.getId(), y -> y));
@@ -43,6 +48,12 @@ public class RoleAuthServiceImpl extends AbstractCRUDServiceImpl<RoleAuthDao, Ro
         }).collect(Collectors.toList());
 
         this.save(list);
+        RoleModelEntity update = new RoleModelEntity();
+        update.setRoleId(roleId);
+        roleModelService.remove(update,null);
+        update.setModelIds(query.getModelIds());
+        update.setCensusIds(query.getCensusIds());
+        roleModelService.save(update);
     }
 
     private void buildMenus(Set<Long> curSet, MenuEntity menuEntity, Map<Long, MenuEntity> menuEntityMap) {

portal-manager/src/main/java/com/mortals/xhx/module/site/dao/SiteAppsDao.java

-package com.mortals.xhx.module.site.dao;
-
-import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-import java.util.List;
-/**
-* 站点应用对照列Dao
-* 站点应用对照列 DAO接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-public interface  SiteAppsDao extends ICRUDDao<SiteAppsEntity,Long>{
-
-
-}

portal-manager/src/main/java/com/mortals/xhx/module/site/dao/ibatis/SiteAppsDaoImpl.java

-package com.mortals.xhx.module.site.dao.ibatis;
-
-
-import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.site.dao.SiteAppsDao;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
-/**
-* 站点应用对照列DaoImpl DAO接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Repository("siteAppsDao")
-public class SiteAppsDaoImpl extends BaseCRUDDaoMybatis<SiteAppsEntity,Long> implements SiteAppsDao {
-
-
-
-}

portal-manager/src/main/java/com/mortals/xhx/module/site/model/SiteAppsEntity.java

-package com.mortals.xhx.module.site.model;
-
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.site.model.vo.SiteAppsVo;
-/**
-* 站点应用对照列实体对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-
-public class SiteAppsEntity extends SiteAppsVo {
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 站点ID，主键
-    */
-    private Long siteId;
-    /**
-    * 站点开通的应用
-    */
-    private String includApps;
-    /**
-    * 站点排除的应用
-    */
-    private String excludeApps;
-
-
-
-    public SiteAppsEntity(){}
-    /**
-    * 获取 站点ID，主键
-    * @return Long
-    */
-    public Long getSiteId(){
-        return siteId;
-    }
-    /**
-    * 设置 站点ID，主键
-    * @param siteId
-    */
-    public void setSiteId(Long siteId){
-        this.siteId = siteId;
-    }
-    /**
-    * 获取 站点开通的应用
-    * @return String
-    */
-    public String getIncludApps(){
-        return includApps;
-    }
-    /**
-    * 设置 站点开通的应用
-    * @param includApps
-    */
-    public void setIncludApps(String includApps){
-        this.includApps = includApps;
-    }
-    /**
-    * 获取 站点排除的应用
-    * @return String
-    */
-    public String getExcludeApps(){
-        return excludeApps;
-    }
-    /**
-    * 设置 站点排除的应用
-    * @param excludeApps
-    */
-    public void setExcludeApps(String excludeApps){
-        this.excludeApps = excludeApps;
-    }
-
-
-
-
-    @Override
-    public int hashCode() {
-         return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (obj instanceof SiteAppsEntity) {
-            SiteAppsEntity tmp = (SiteAppsEntity) obj;
-            if (this.getId() == tmp.getId()) {
-                 return true;
-            }
-        }
-        return false;
-    }
-
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",siteId:").append(getSiteId());
-        sb.append(",includApps:").append(getIncludApps());
-        sb.append(",excludeApps:").append(getExcludeApps());
-        return sb.toString();
-    }
-
-    public void initAttrValue(){
-
-            this.siteId = null;
-
-            this.includApps = "";
-
-            this.excludeApps = "";
-    }
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/site/model/SiteAppsQuery.java

-package com.mortals.xhx.module.site.model;
-
-import java.util.List;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-/**
-* 站点应用对照列查询对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-public class SiteAppsQuery extends SiteAppsEntity {
-    /** 开始 主键,自增长 */
-    private Long idStart;
-
-    /** 结束 主键,自增长 */
-    private Long idEnd;
-
-    /** 增加 主键,自增长 */
-    private Long idIncrement;
-
-    /** 主键,自增长列表 */
-    private List <Long> idList;
-
-    /** 开始 站点ID，主键 */
-    private Long siteIdStart;
-
-    /** 结束 站点ID，主键 */
-    private Long siteIdEnd;
-
-    /** 增加 站点ID，主键 */
-    private Long siteIdIncrement;
-
-    /** 站点ID，主键列表 */
-    private List <Long> siteIdList;
-
-    /** 站点开通的应用 */
-    private List<String> includAppsList;
-
-    /** 站点排除的应用 */
-    private List<String> excludeAppsList;
-
-    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
-    private List<SiteAppsQuery> orConditionList;
-
-    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
-    private List<SiteAppsQuery> andConditionList;
-
-    public SiteAppsQuery(){}
-
-    /**
-    * 获取 开始 主键,自增长
-    * @return idStart
-    */
-    public Long getIdStart(){
-        return this.idStart;
-    }
-
-    /**
-    * 设置 开始 主键,自增长
-    * @param idStart
-    */
-    public void setIdStart(Long idStart){
-        this.idStart = idStart;
-    }
-
-    /**
-    * 获取 结束 主键,自增长
-    * @return $idEnd
-    */
-    public Long getIdEnd(){
-        return this.idEnd;
-    }
-
-    /**
-    * 设置 结束 主键,自增长
-    * @param idEnd
-    */
-    public void setIdEnd(Long idEnd){
-        this.idEnd = idEnd;
-    }
-
-    /**
-    * 获取 增加 主键,自增长
-    * @return idIncrement
-    */
-    public Long getIdIncrement(){
-        return this.idIncrement;
-    }
-
-    /**
-    * 设置 增加 主键,自增长
-    * @param idIncrement
-    */
-    public void setIdIncrement(Long idIncrement){
-        this.idIncrement = idIncrement;
-    }
-
-    /**
-    * 获取 主键,自增长
-    * @return idList
-    */
-    public List<Long> getIdList(){
-        return this.idList;
-    }
-
-    /**
-    * 设置 主键,自增长
-    * @param idList
-    */
-    public void setIdList(List<Long> idList){
-        this.idList = idList;
-    }
-
-    /**
-    * 获取 开始 站点ID，主键
-    * @return siteIdStart
-    */
-    public Long getSiteIdStart(){
-        return this.siteIdStart;
-    }
-
-    /**
-    * 设置 开始 站点ID，主键
-    * @param siteIdStart
-    */
-    public void setSiteIdStart(Long siteIdStart){
-        this.siteIdStart = siteIdStart;
-    }
-
-    /**
-    * 获取 结束 站点ID，主键
-    * @return $siteIdEnd
-    */
-    public Long getSiteIdEnd(){
-        return this.siteIdEnd;
-    }
-
-    /**
-    * 设置 结束 站点ID，主键
-    * @param siteIdEnd
-    */
-    public void setSiteIdEnd(Long siteIdEnd){
-        this.siteIdEnd = siteIdEnd;
-    }
-
-    /**
-    * 获取 增加 站点ID，主键
-    * @return siteIdIncrement
-    */
-    public Long getSiteIdIncrement(){
-        return this.siteIdIncrement;
-    }
-
-    /**
-    * 设置 增加 站点ID，主键
-    * @param siteIdIncrement
-    */
-    public void setSiteIdIncrement(Long siteIdIncrement){
-        this.siteIdIncrement = siteIdIncrement;
-    }
-
-    /**
-    * 获取 站点ID，主键
-    * @return siteIdList
-    */
-    public List<Long> getSiteIdList(){
-        return this.siteIdList;
-    }
-
-    /**
-    * 设置 站点ID，主键
-    * @param siteIdList
-    */
-    public void setSiteIdList(List<Long> siteIdList){
-        this.siteIdList = siteIdList;
-    }
-
-    /**
-    * 获取 站点开通的应用
-    * @return includAppsList
-    */
-    public List<String> getIncludAppsList(){
-        return this.includAppsList;
-    }
-
-    /**
-    * 设置 站点开通的应用
-    * @param includAppsList
-    */
-    public void setIncludAppsList(List<String> includAppsList){
-        this.includAppsList = includAppsList;
-    }
-    /**
-    * 获取 站点排除的应用
-    * @return excludeAppsList
-    */
-    public List<String> getExcludeAppsList(){
-        return this.excludeAppsList;
-    }
-
-    /**
-    * 设置 站点排除的应用
-    * @param excludeAppsList
-    */
-    public void setExcludeAppsList(List<String> excludeAppsList){
-        this.excludeAppsList = excludeAppsList;
-    }
-    /**
-    * 设置  主键,自增长
-    * @param id
-    */
-    public SiteAppsQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 主键,自增长
-    * @param idStart
-    */
-    public SiteAppsQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
-    }
-
-    /**
-    * 设置 结束 主键,自增长
-    * @param idEnd
-    */
-    public SiteAppsQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
-    }
-
-    /**
-    * 设置 增加 主键,自增长
-    * @param idIncrement
-    */
-    public SiteAppsQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
-    }
-
-    /**
-    * 设置 主键,自增长
-    * @param idList
-    */
-    public SiteAppsQuery idList(List<Long> idList){
-        this.idList = idList;
-		return this;
-        }
-
-    /**
-    * 设置  站点ID，主键
-    * @param siteId
-    */
-    public SiteAppsQuery siteId(Long siteId){
-	    setSiteId(siteId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 站点ID，主键
-    * @param siteIdStart
-    */
-    public SiteAppsQuery siteIdStart(Long siteIdStart){
-		this.siteIdStart = siteIdStart;
-		return this;
-    }
-
-    /**
-    * 设置 结束 站点ID，主键
-    * @param siteIdEnd
-    */
-    public SiteAppsQuery siteIdEnd(Long siteIdEnd){
-		this.siteIdEnd = siteIdEnd;
-		return this;
-    }
-
-    /**
-    * 设置 增加 站点ID，主键
-    * @param siteIdIncrement
-    */
-    public SiteAppsQuery siteIdIncrement(Long siteIdIncrement){
-		this.siteIdIncrement = siteIdIncrement;
-		return this;
-    }
-
-    /**
-    * 设置 站点ID，主键
-    * @param siteIdList
-    */
-    public SiteAppsQuery siteIdList(List<Long> siteIdList){
-        this.siteIdList = siteIdList;
-		return this;
-        }
-
-
-	/**
-    * 设置 站点开通的应用
-    * @param includApps
-    */
-    public SiteAppsQuery includApps(String includApps){
-        setIncludApps(includApps);
-		return this;
-    }
-
-    /**
-    * 设置 站点开通的应用
-    * @param includAppsList
-    */
-    public SiteAppsQuery includAppsList(List<String> includAppsList){
-        this.includAppsList = includAppsList;
-		return this;
-    }
-
-
-	/**
-    * 设置 站点排除的应用
-    * @param excludeApps
-    */
-    public SiteAppsQuery excludeApps(String excludeApps){
-        setExcludeApps(excludeApps);
-		return this;
-    }
-
-    /**
-    * 设置 站点排除的应用
-    * @param excludeAppsList
-    */
-    public SiteAppsQuery excludeAppsList(List<String> excludeAppsList){
-        this.excludeAppsList = excludeAppsList;
-		return this;
-    }
-
-    /**
-    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
-    public List<SiteAppsQuery> getOrConditionList(){
-    return this.orConditionList;
-    }
-
-    /**
-    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
-    public void setOrConditionList(List<SiteAppsQuery> orConditionList){
-        this.orConditionList = orConditionList;
-    }
-
-    /**
-    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
-    public List<SiteAppsQuery> getAndConditionList(){
-        return this.andConditionList;
-    }
-
-    /**
-    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
-    public void setAndConditionList(List<SiteAppsQuery> andConditionList){
-        this.andConditionList = andConditionList;
-    }
-
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteAppsVo.java

-package com.mortals.xhx.module.site.model.vo;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-/**
-* 站点应用对照列视图对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Data
-public class SiteAppsVo extends BaseEntityLong {
-
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/site/service/SiteAppsService.java

-package com.mortals.xhx.module.site.service;
-import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-/**
-* SiteAppsService
-*
-* 站点应用对照列 service接口
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-public interface SiteAppsService extends ICRUDService<SiteAppsEntity,Long>{
-
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteAppsServiceImpl.java

-package com.mortals.xhx.module.site.service.impl;
-import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.xhx.module.site.dao.SiteAppsDao;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-import com.mortals.xhx.module.site.service.SiteAppsService;
-/**
-* SiteAppsService
-* 站点应用对照列 service实现
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@Service("siteAppsService")
-public class SiteAppsServiceImpl extends AbstractCRUDServiceImpl<SiteAppsDao, SiteAppsEntity, Long> implements SiteAppsService {
-    
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/site/web/SiteAppsController.java

-package com.mortals.xhx.module.site.web;
-
-import com.mortals.framework.model.Context;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.param.service.ParamService;
-import com.mortals.xhx.module.site.model.SiteAppsEntity;
-import com.mortals.xhx.module.site.service.SiteAppsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-/**
-*
-* 站点应用对照列
-*
-* @author zxfei
-* @date 2022-06-22
-*/
-@RestController
-@RequestMapping("site/apps")
-public class SiteAppsController extends BaseCRUDJsonBodyMappingController<SiteAppsService,SiteAppsEntity,Long> {
-
-    @Autowired
-    private ParamService paramService;
-
-    public SiteAppsController(){
-        super.setModuleDesc( "站点应用对照列");
-    }
-
-    @Override
-    protected void init(Map<String, Object> model, Context context) {
-        super.init(model, context);
-    }
-
-
-}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -96,9 +96,9 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     }
 
     @Override
-    public Rest<Map<String, Object>> list(UserEntity query) {
+    public Rest<Object> list(UserEntity query) {
         Map<String, Object> model = new HashMap();
-        Rest<Map<String, Object>> ret = new Rest<>();
+        Rest<Object> ret = new Rest<>();
         Context context = this.getContext();
         String busiDesc = "查询" + this.getModuleDesc();
         int code;