feat: 东区缴费分支初始化

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/dto/ListLogDTO.java

@@ -18,11 +18,6 @@ public class ListLogDTO extends BaseDTO {
 
     private String method;
 
-    /**
-     * 操作时请求参数
-     */
-    private String operateParams;
-
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/dto/QywxCallbackHandleDTO.java

@@ -1,58 +0,0 @@
-package com.yida.data.system.dto;
-
-import com.yida.data.common.core.entity.system.Dept;
-import com.yida.data.common.core.entity.system.EduQywxServiceProvider;
-import com.yida.data.common.core.entity.system.EduQywxServiceProviderSchool;
-import com.yida.data.common.core.enums.QywxCallbackTypeEnum;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.w3c.dom.Element;
-
-import java.io.Serializable;
-
-/**
- * 企业微信回调处理类
- *
- * @author ZYJ
- * @date 2023/10/27 16:25
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class QywxCallbackHandleDTO implements Serializable {
-
-    private static final long serialVersionUID = 820667804126969451L;
-
-    /**
-     * 回调返回的节点信息
-     */
-    private Element root;
-
-    /**
-     * 对应的企业微信corpId
-     */
-    private String corpId;
-
-    /**
-     * 学校信息
-     */
-    private Dept school;
-
-    /**
-     * 企业微信服务商信息
-     */
-    private EduQywxServiceProvider eduQywxServiceProvider;
-
-    /**
-     * 企业微信服务商-学校密文corpId对照信息
-     */
-    private EduQywxServiceProviderSchool providerSchool;
-
-    /**
-     * 回调类型枚举
-     */
-    private QywxCallbackTypeEnum qywxCallbackTypeEnum;
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/dto/SchoolInformationDTO.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Data
 public class SchoolInformationDTO {
 
-    @ApiModelProperty("")
+    @ApiModelProperty("主键id")
     private Long id;
 
     @ApiModelProperty("学校id")

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteAppServiceFallback.java

@@ -3,8 +3,6 @@ package com.yida.data.system.fallback;
 import com.yida.data.common.core.annotation.Fallback;
 import com.yida.data.common.core.common.ResultBean;
 import com.yida.data.common.core.entity.system.EduApp;
-import com.yida.data.common.core.entity.system.EduAppTemplate;
-import com.yida.data.common.core.entity.system.EduQywxServiceProvider;
 import com.yida.data.system.feign.RemoteAppService;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -28,16 +26,6 @@ public class RemoteAppServiceFallback implements FallbackFactory<RemoteAppServic
             public ResultBean<EduApp> getAppBySchoolOrCorpIdAndCode(Long schoolId, String corpId, String code) {
                 return null;
             }
-
-            @Override
-            public ResultBean<EduAppTemplate> getAppTemplateByTemplateId(String templateId, String serviceCorpId) {
-                return null;
-            }
-
-            @Override
-            public ResultBean<EduQywxServiceProvider> getServiceProviderByServiceCorpId(String serviceCorpId) {
-                return null;
-            }
         };
     }
 }

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteBaiDuApiConfigServiceFallback.java

@@ -1,33 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.system.BaiduApiConfig;
-import com.yida.data.common.core.entity.system.ConstructionPayConfig;
-import com.yida.data.system.feign.RemoteBaiDuApiConfigService;
-import com.yida.data.system.feign.RemoteConstructionPayConfigService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * RemoteBaiDuApiConfigService fallback处理类
- *
- * @author ZYJ
- * @date 2023/6/20
- */
-@Slf4j
-@Fallback
-public class RemoteBaiDuApiConfigServiceFallback implements FallbackFactory<RemoteBaiDuApiConfigService> {
-
-    @Override
-    public RemoteBaiDuApiConfigService create(Throwable throwable) {
-        log.error("RemoteBaiDuApiConfigService fallback reason:{}", throwable.getMessage());
-
-        return new RemoteBaiDuApiConfigService() {
-            @Override
-            public ResultBean<BaiduApiConfig> getBaiDuApiConfigByDept(Long deptId, String moduleName) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteBaseAppServiceFallback.java

@@ -1,24 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.system.EduBaseApp;
-import com.yida.data.system.feign.RemoteBaseAppService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Fallback
-public class RemoteBaseAppServiceFallback implements FallbackFactory<RemoteBaseAppService> {
-
-    @Override
-    public RemoteBaseAppService create(Throwable throwable) {
-        log.error("RemoteBaseAppService fallback reason:{}", throwable.getMessage());
-        return new RemoteBaseAppService() {
-            @Override
-            public ResultBean<EduBaseApp> getById(Long id) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteConstructionPayConfigServiceFallback.java

@@ -1,33 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.system.ConstructionPayConfig;
-import com.yida.data.common.core.entity.system.UnionPayConfig;
-import com.yida.data.system.feign.RemoteConstructionPayConfigService;
-import com.yida.data.system.feign.RemoteUnionPayConfigService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * RemoteConstructionPayConfigService fallback处理类
- *
- * @author ZYJ
- * @date 2023/6/19
- */
-@Slf4j
-@Fallback
-public class RemoteConstructionPayConfigServiceFallback implements FallbackFactory<RemoteConstructionPayConfigService> {
-
-    @Override
-    public RemoteConstructionPayConfigService create(Throwable throwable) {
-        log.error("RemoteConstructionPayConfigService fallback reason:{}", throwable.getMessage());
-
-        return new RemoteConstructionPayConfigService() {
-            @Override
-            public ResultBean<ConstructionPayConfig> getConstructionPayConfigByDept(Long deptId) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteConsumeConfigServiceFallback.java

@@ -1,31 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.consume.EduConsumeConfig;
-import com.yida.data.system.feign.RemoteConsumeConfigService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * RemoteConsumeConfigService fallback处理类
- *
- * @author ZYJ
- * @date 2023/4/6
- */
-@Slf4j
-@Fallback
-public class RemoteConsumeConfigServiceFallback implements FallbackFactory<RemoteConsumeConfigService> {
-
-    @Override
-    public RemoteConsumeConfigService create(Throwable throwable) {
-        log.error("RemoteConsumeConfigService fallback reason:{}", throwable.getMessage());
-
-        return new RemoteConsumeConfigService() {
-            @Override
-            public ResultBean<EduConsumeConfig> getConsumeConfigByDept(Long deptId) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteDeptFunctionServiceFallback.java

@@ -1,31 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.system.EduDeptFunction;
-import com.yida.data.system.feign.RemoteDeptFunctionService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * RemoteDeptFunctionService fallback处理类
- *
- * @author ZYJ
- * @date 2023/2/21
- */
-@Slf4j
-@Fallback
-public class RemoteDeptFunctionServiceFallback implements FallbackFactory<RemoteDeptFunctionService> {
-
-    @Override
-    public RemoteDeptFunctionService create(Throwable throwable) {
-        log.error("RemoteDeptFunctionService fallback reason:{}", throwable.getMessage());
-
-        return new RemoteDeptFunctionService() {
-            @Override
-            public ResultBean<EduDeptFunction> getDeptFunction(String functionName, Long deptId) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteDeptUserviceFallback.java

@@ -122,16 +122,6 @@ public class RemoteDeptUserviceFallback implements FallbackFactory<RemoteDeptSer
             public ResultBean<List<Dept>> listDept(List<Long> ids) {
                 return null;
             }
-
-            @Override
-            public ResultBean<List<Dept>> listParentDeptByChild(List<Long> ids) {
-                return null;
-            }
-
-            @Override
-            public ResultBean<List> getDeptTree(List<Long> deptIds) {
-                return null;
-            }
         };
     }
 }

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteQywxServiceFallback.java

@@ -1,38 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.system.EduDeptPayType;
-import com.yida.data.common.core.entity.system.EduQywxServiceProviderSchool;
-import com.yida.data.system.feign.RemotePayTypeService;
-import com.yida.data.system.feign.RemoteQywxService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * RemoteQywxService fallback处理类
- *
- * @author ZYJ
- * @date 2023/8/26
- */
-@Slf4j
-@Fallback
-public class RemoteQywxServiceFallback implements FallbackFactory<RemoteQywxService> {
-
-    @Override
-    public RemoteQywxService create(Throwable throwable) {
-        log.error("RemoteQywxService fallback reason:{}", throwable.getMessage());
-
-        return new RemoteQywxService() {
-            @Override
-            public ResultBean<EduQywxServiceProviderSchool> getCorpByOriginalData(String providerCorpId, String deptOriginalCorpId) {
-                return null;
-            }
-
-            @Override
-            public ResultBean<EduQywxServiceProviderSchool> getCorpByEncryptionData(String providerCorpId, String deptEncryptionCorpId) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteUPayConfigServiceFallback.java

@@ -1,31 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.system.UPayConfig;
-import com.yida.data.system.feign.RemoteUPayConfigService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * RemoteUPayConfigService fallback处理类
- *
- * @author ZYJ
- * @date 2023/3/21
- */
-@Slf4j
-@Fallback
-public class RemoteUPayConfigServiceFallback implements FallbackFactory<RemoteUPayConfigService> {
-
-    @Override
-    public RemoteUPayConfigService create(Throwable throwable) {
-        log.error("RemoteUPayConfigService fallback reason:{}", throwable.getMessage());
-
-        return new RemoteUPayConfigService() {
-            @Override
-            public ResultBean<UPayConfig> getUPayConfigByDept(Long deptId) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/fallback/RemoteWhiteListServiceFallback.java

@@ -1,31 +0,0 @@
-package com.yida.data.system.fallback;
-
-import com.yida.data.common.core.annotation.Fallback;
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.system.WhiteList;
-import com.yida.data.system.feign.RemoteWhiteListService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * RemoteWhiteListService fallback处理类
- *
- * @author ZYJ
- * @date 2022/8/26
- */
-@Slf4j
-@Fallback
-public class RemoteWhiteListServiceFallback implements FallbackFactory<RemoteWhiteListService> {
-
-    @Override
-    public RemoteWhiteListService create(Throwable throwable) {
-        log.error("RemoteWhiteListService fallback reason:{}", throwable.getMessage());
-
-        return new RemoteWhiteListService() {
-            @Override
-            public ResultBean<WhiteList> getWhiteList(String functionName) {
-                return null;
-            }
-        };
-    }
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteAppService.java

@@ -3,8 +3,6 @@ package com.yida.data.system.feign;
 import com.yida.data.common.core.common.ResultBean;
 import com.yida.data.common.core.entity.constant.FebsServerConstant;
 import com.yida.data.common.core.entity.system.EduApp;
-import com.yida.data.common.core.entity.system.EduAppTemplate;
-import com.yida.data.common.core.entity.system.EduQywxServiceProvider;
 import com.yida.data.system.fallback.RemoteAppServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,11 +16,4 @@ public interface RemoteAppService {
     ResultBean<EduApp> getAppBySchoolOrCorpIdAndCode(@RequestParam("schoolId") Long schoolId,
                                                      @RequestParam("corpId") String corpId,
                                                      @RequestParam("code") String code);
-
-    @GetMapping("/in/app/getAppTemplateByTemplateId")
-    ResultBean<EduAppTemplate> getAppTemplateByTemplateId(@RequestParam("templateId") String templateId,
-                                                          @RequestParam("serviceCorpId") String serviceCorpId);
-
-    @GetMapping("/in/app/getServiceProviderByServiceCorpId")
-    ResultBean<EduQywxServiceProvider> getServiceProviderByServiceCorpId(@RequestParam("serviceCorpId") String serviceCorpId);
 }

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteBaiDuApiConfigService.java

@@ -1,23 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.system.BaiduApiConfig;
-import com.yida.data.common.core.entity.system.ConstructionPayConfig;
-import com.yida.data.system.fallback.RemoteBaiDuApiConfigServiceFallback;
-import com.yida.data.system.fallback.RemoteConstructionPayConfigServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "baiDuApiConfigServiceClient",
-        fallbackFactory = RemoteBaiDuApiConfigServiceFallback.class)
-public interface RemoteBaiDuApiConfigService {
-
-    /**
-     * 根据学校id查询百度api配置
-     */
-    @GetMapping("/in/baiDuApiConfig/getBaiDuApiConfigByDept")
-    ResultBean<BaiduApiConfig> getBaiDuApiConfigByDept(@RequestParam("deptId") Long deptId,
-                                                       @RequestParam("moduleName") String moduleName);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteBaseAppService.java

@@ -1,17 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.system.EduBaseApp;
-import com.yida.data.system.fallback.RemoteBaseAppServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "baseAppServiceClient",
-    fallbackFactory = RemoteBaseAppServiceFallback.class)
-public interface RemoteBaseAppService {
-
-    @GetMapping("/in/deptHomeApp/getById")
-    ResultBean<EduBaseApp> getById(@RequestParam("id") Long id);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteConstructionPayConfigService.java

@@ -1,19 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.system.ConstructionPayConfig;
-import com.yida.data.common.core.entity.system.UnionPayConfig;
-import com.yida.data.system.fallback.RemoteConstructionPayConfigServiceFallback;
-import com.yida.data.system.fallback.RemoteUnionPayConfigServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "constructionPayConfigServiceClient",
-        fallbackFactory = RemoteConstructionPayConfigServiceFallback.class)
-public interface RemoteConstructionPayConfigService {
-
-    @GetMapping("/in/constructionPayConfig/getConstructionPayConfigByDept")
-    ResultBean<ConstructionPayConfig> getConstructionPayConfigByDept(@RequestParam("deptId") Long deptId);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteConsumeConfigService.java

@@ -1,17 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.consume.EduConsumeConfig;
-import com.yida.data.system.fallback.RemoteConsumeConfigServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "consumeConfigServiceClient",
-        fallbackFactory = RemoteConsumeConfigServiceFallback.class)
-public interface RemoteConsumeConfigService {
-
-    @GetMapping("/in/consumeConfig/getConsumeConfigByDept")
-    ResultBean<EduConsumeConfig> getConsumeConfigByDept(@RequestParam("deptId") Long deptId);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteDeptFunctionService.java

@@ -1,27 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.system.EduDeptFunction;
-import com.yida.data.system.fallback.RemoteDeptFunctionServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "deptFunctionServiceClient", fallbackFactory =
-        RemoteDeptFunctionServiceFallback.class)
-public interface RemoteDeptFunctionService {
-
-    /**
-     * 获取部门是否开通当前功能
-     *
-     * @param functionName 功能名称
-     * @param deptId       部门id
-     * @return com.yida.data.common.core.common.ResultBean<com.yida.data.common.core.entity.system.EduDeptFunction>
-     * @author ZYJ
-     * @date 2023/2/21 15:06
-     */
-    @GetMapping("/in/function/getDeptFunction")
-    ResultBean<EduDeptFunction> getDeptFunction(@RequestParam("functionName") String functionName,
-                                                @RequestParam("deptId") Long deptId);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteDeptService.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "deptServiceClient", fallbackFactory =
-    RemoteDeptUserviceFallback.class)
+        RemoteDeptUserviceFallback.class)
 public interface RemoteDeptService {
 
     /**
@@ -50,7 +50,7 @@ public interface RemoteDeptService {
      */
     @GetMapping("/dept/getSchoolByArea")
     ResultBean<List<Dept>> getSchoolByArea(@RequestParam("areaId") Long areaId,
-        @RequestParam("schoolName") String schoolName);
+                                           @RequestParam("schoolName") String schoolName);
 
     /**
      * 根据corpid获取学校
@@ -78,7 +78,7 @@ public interface RemoteDeptService {
      */
     @GetMapping("/in/dept/getDeptBySchoolAndName")
     ResultBean<Dept> getDeptBySchoolAndName(@RequestParam("schoolId") Long schoolId,
-        @RequestParam("deptName") String deptName);
+                                            @RequestParam("deptName") String deptName);
 
     /**
      * 获取学校和区域信息
@@ -91,9 +91,9 @@ public interface RemoteDeptService {
      */
     @GetMapping("/dept/getPageSchoolByArea")
     ResultBean<IPage<Dept>> getPageSchoolByArea(@ApiParam("类型") @RequestParam(required = false) Long areaId,
-        @ApiParam("搜索关键词 学校名") @RequestParam(required = false) String schoolName,
-        @ApiParam("当前页码") @RequestParam(defaultValue = "1") Integer pageNum,
-        @ApiParam("页面大小") @RequestParam(defaultValue = "10") Integer pageSize);
+                                                @ApiParam("搜索关键词 学校名") @RequestParam(required = false) String schoolName,
+                                                @ApiParam("当前页码") @RequestParam(defaultValue = "1") Integer pageNum,
+                                                @ApiParam("页面大小") @RequestParam(defaultValue = "10") Integer pageSize);
 
     /**
      * 获取学校地区
@@ -106,7 +106,7 @@ public interface RemoteDeptService {
 
     @GetMapping("/dept/findChildByParent")
     ResultBean<List<Dept>> findChildByParent(@RequestParam("deptId") Long deptId,
-        @RequestParam("type") Integer type);
+                                             @RequestParam("type") Integer type);
 
     /**
      * 根据学校类型查询学校
@@ -135,7 +135,7 @@ public interface RemoteDeptService {
      */
     @GetMapping("/in/dept/getDeptBySchoolAndWxId")
     ResultBean<Dept> getDeptBySchoolAndWxId(@RequestParam("schoolId") Long schoolId,
-        @RequestParam("wxId") Long wxId);
+                                            @RequestParam("wxId") Long wxId);
 
     /**
      * 查询部门列表
@@ -145,17 +145,4 @@ public interface RemoteDeptService {
      */
     @PostMapping("/in/dept/listDept")
     ResultBean<List<Dept>> listDept(@RequestBody List<Long> ids);
-
-    /**
-     * 向上查询父级部门集合，包含子部门
-     *
-     * @param ids
-     * @return
-     */
-    @PostMapping("/in/dept/findParentDeptByChilds")
-    ResultBean<List<Dept>> listParentDeptByChild(@RequestBody List<Long> ids);
-
-
-    @PostMapping("/in/dept/getDeptTree")
-    ResultBean<List> getDeptTree(@RequestBody List<Long> deptIds);
 }

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteDictService.java

@@ -1,24 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.Dict;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.system.fallback.RemoteAreaServiceFallback;
-import java.util.List;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "dictServiceClient",
-    fallbackFactory = RemoteAreaServiceFallback.class)
-public interface RemoteDictService {
-
-    @GetMapping("/in/dict/selectDict")
-    ResultBean<List<Dict>> selectDict(@RequestParam String type);
-
-
-    @GetMapping("/in/dict/getDictByTypeAndValueOrLabel")
-    ResultBean<Dict> getDictByTypeAndValueOrLabel(@RequestParam String type, @RequestParam String value,
-        @RequestParam String label);
-
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteQywxService.java

@@ -1,40 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.system.EduQywxServiceProviderSchool;
-import com.yida.data.system.fallback.RemoteQywxServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "qywxServiceClient",
-        fallbackFactory = RemoteQywxServiceFallback.class)
-public interface RemoteQywxService {
-
-    /**
-     * 服务商对应学校加密corpId数据(原始值为key)
-     *
-     * @param providerCorpId     服务商corpId
-     * @param deptOriginalCorpId 部门原始corpId
-     * @return com.yida.data.common.core.common.ResultBean<com.yida.data.common.core.entity.system.EduQywxServiceProviderSchool>
-     * @author ZYJ
-     * @date 2023/9/25 17:48
-     */
-    @GetMapping("/in/qywx/getCorpByOriginalData")
-    ResultBean<EduQywxServiceProviderSchool> getCorpByOriginalData(@RequestParam("providerCorpId") String providerCorpId,
-                                                                   @RequestParam("deptOriginalCorpId") String deptOriginalCorpId);
-
-    /**
-     * 服务商对应学校加密corpId数据(加密值为key)
-     *
-     * @param providerCorpId       服务商corpId
-     * @param deptEncryptionCorpId 部门加密corpId
-     * @return com.yida.data.common.core.common.ResultBean<com.yida.data.common.core.entity.system.EduQywxServiceProviderSchool>
-     * @author ZYJ
-     * @date 2023/9/25 17:48
-     */
-    @GetMapping("/in/qywx/getCorpByEncryptionData")
-    ResultBean<EduQywxServiceProviderSchool> getCorpByEncryptionData(@RequestParam("providerCorpId") String providerCorpId,
-                                                                     @RequestParam("deptEncryptionCorpId") String deptEncryptionCorpId);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteUPayConfigService.java

@@ -1,17 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.system.UPayConfig;
-import com.yida.data.system.fallback.RemoteUnionPayConfigServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "uPayConfigServiceClient",
-        fallbackFactory = RemoteUnionPayConfigServiceFallback.class)
-public interface RemoteUPayConfigService {
-
-    @GetMapping("/in/uPayConfig/getUPayConfigByDept")
-    ResultBean<UPayConfig> getUPayConfigByDept(@RequestParam("deptId") Long deptId);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/java/com/yida/data/system/feign/RemoteWhiteListService.java

@@ -1,25 +0,0 @@
-package com.yida.data.system.feign;
-
-import com.yida.data.common.core.common.ResultBean;
-import com.yida.data.common.core.entity.constant.FebsServerConstant;
-import com.yida.data.common.core.entity.system.WhiteList;
-import com.yida.data.system.fallback.RemoteWhiteListServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "whiteListServiceClient", fallbackFactory =
-        RemoteWhiteListServiceFallback.class)
-public interface RemoteWhiteListService {
-
-    /**
-     * 根据功能名称获取对应的白名单信息
-     *
-     * @param functionName 功能名称
-     * @return com.yida.data.common.core.common.ResultBean<com.yida.data.common.core.entity.system.WhiteList>
-     * @author ZYJ
-     * @date 2023/2/21 15:05
-     */
-    @GetMapping("/in/whiteList/getWhiteList")
-    ResultBean<WhiteList> getWhiteList(@RequestParam("functionName") String functionName);
-}

febs-server/febs-server-system/febs-server-system-api/src/main/resources/META-INF/spring.factories

@@ -11,12 +11,5 @@ com.yida.data.system.fallback.RemotePayWxConfigServiceFallback,\
 com.yida.data.system.fallback.RemoteRoleServiceFallback,\
 com.yida.data.system.fallback.RemoteUnionPayConfigServiceFallback,\
 com.yida.data.system.fallback.RemoteUserUserviceFallback,\
-com.yida.data.system.fallback.RemoteWhiteListServiceFallback,\
 com.yida.data.system.fallback.RemoteYidaAppAccountServiceFallback,\
-com.yida.data.system.fallback.RemoteYidaAppServiceFallback,\
-com.yida.data.system.fallback.RemoteDeptFunctionServiceFallback,\
-com.yida.data.system.fallback.RemoteUPayConfigServiceFallback,\
-com.yida.data.system.fallback.RemoteConsumeConfigServiceFallback,\
-com.yida.data.system.fallback.RemoteConstructionPayConfigServiceFallback,\
-com.yida.data.system.fallback.RemoteBaiDuApiConfigServiceFallback,\
-com.yida.data.system.fallback.RemoteQywxServiceFallback
+com.yida.data.system.fallback.RemoteYidaAppServiceFallback