feat: 东区缴费分支初始化

2025-05-15 15:08:15 +08:00
parent 39f3acc15f
commit bafd4aa3ab
261 changed files with 3751 additions and 9416 deletions
@@ -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;
@@ -12,7 +12,7 @@ import java.util.List;
@Data
 public class SchoolInformationDTO {

-    @ApiModelProperty("")
+    @ApiModelProperty("主键id")
    private Long id;

    @ApiModelProperty("学校id")
@@ -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;
-            }
        };
    }
 }
@@ -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;
-            }
        };
    }
 }
@@ -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);
 }
@@ -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);
 }
@@ -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