了解锦水 硬核、模块接口开发

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java

@@ -0,0 +1,50 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
+import com.elink.esua.epdc.service.CustomService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 移动端接口-自定义模块   \com\elink\esua\epdc\controller\ApiCustomInfoController.java
+ * @author zhangyong
+ * @Date 2020/05/20
+ */
+@RestController
+@RequestMapping("custom")
+public class ApiCustomInfoController {
+
+    @Autowired
+    private CustomService customService;
+
+    /*
+     * 移动端获取 了解锦水-模块管理接口
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+     * @Author zhangyong
+     * @Date 13:37 2020-05-20
+     **/
+    @GetMapping("module/list")
+    public Result<List<EpdcModuleResultDTO>> listModule() {
+        return customService.listModule();
+    }
+
+    /**
+     *  移动端获取 了解锦水-硬核管理接口
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO>>
+     * @Author zhangyong
+     * @Date 13:41 2020-05-20
+     **/
+    @GetMapping("deptinfo/list")
+    public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO) {
+        return customService.listDeptInfo(formDTO);
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@@ -2,12 +2,18 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import java.util.List;
+
 /**
  * @author yzm
  * @Date: 2020/1/28 13:24
@@ -24,4 +30,25 @@ public interface CustomFeignClient {
 	 **/
 	@PostMapping(value = "custom/epidemic/report", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result report(EpiDemicReportFormDTO formDTO);
+
+	/*
+	 * 移动端获取 了解锦水-模块管理接口
+	 *
+	 * @param
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+	 * @Author zhangyong
+	 * @Date 10:42 2020-05-20
+	 **/
+	@GetMapping(value = "custom/epdc-app/module/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<EpdcModuleResultDTO>> selectListModule();
+
+	/**
+	 *  移动端获取 了解锦水-硬核管理接口
+	 * @param formDTO
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO>>
+	 * @Author zhangyong
+	 * @Date 13:41 2020-05-20
+	 **/
+	@GetMapping(value = "custom/epdc-app/deptinfo/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<EpdcDeptInfoResultDTO>> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@@ -3,10 +3,15 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description 定制化功能模块fegin
  * @Author yinzuomei
@@ -19,4 +24,14 @@ public class CustomFeignClientFallback implements CustomFeignClient {
 	public Result report(EpiDemicReportFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "report", formDTO);
 	}
+
+	@Override
+	public Result<List<EpdcModuleResultDTO>> selectListModule() {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListModule", null);
+	}
+
+	@Override
+	public Result<List<EpdcDeptInfoResultDTO>> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListDeptInfo", formDTO);
+	}
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java

@@ -2,7 +2,12 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
+
+import java.util.List;
 
 /**
  * @Description 疫情管理
@@ -27,4 +32,23 @@ public interface CustomService {
 	 * @Date 2020/1/28 13:23
 	 **/
 	Result report(EpiDemicReportFormDTO formDTO);
+
+	/*
+	 * 移动端获取 了解锦水-模块管理接口
+	 *
+	 * @param
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+	 * @Author zhangyong
+	 * @Date 10:42 2020-05-20
+	 **/
+	Result<List<EpdcModuleResultDTO>> listModule();
+
+	/**
+	 *  移动端获取 了解锦水-硬核管理接口
+	 * @param formDTO
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO>>
+	 * @Author zhangyong
+	 * @Date 13:41 2020-05-20
+	 **/
+	Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@@ -4,7 +4,10 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import com.elink.esua.epdc.redis.AppUserRedis;
@@ -13,6 +16,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description 疫情管理实现
  * @Author yinzuomei
@@ -77,4 +82,14 @@ public class CustomServiceImpl implements CustomService {
 			throw new RenException("手机验证码错误");
 		}
 	}
+
+	@Override
+	public Result<List<EpdcModuleResultDTO>> listModule() {
+		return customFeignClient.selectListModule();
+	}
+
+	@Override
+	public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO) {
+		return customFeignClient.selectListDeptInfo(formDTO);
+	}
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcModuleResultDTO.java

@@ -21,7 +21,7 @@ public class EpdcModuleResultDTO implements Serializable {
     private String id;
 
     /**
-     * 模块编码
+     * 模块编码（0-政策导航，1-印象，2-味道，3-硬核，4-档案）
      */
     private String moduleCode;