diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml index cd05504..aaaa0cd 100644 --- a/epdc-cloud-api/pom.xml +++ b/epdc-cloud-api/pom.xml @@ -174,21 +174,21 @@ 9040 - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 + 8 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 - + - epdcyushan - elink833066 + yushan_epdc_test + elink-epdc@yushan false - 47.104.224.45:8848 + 115.29.142.202:8848 - de000340-5fc4-45aa-bdbc-dd96852012ad + 8831513c-2f72-42e8-899f-eb6c2c5ae110 wx3ef8f2cd12a19fcb @@ -219,21 +219,21 @@ 17024 - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 + 8 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 - + - epdcyushan - elink833066 + yushan_epdc_test + elink-epdc@yushan true - 47.104.224.45:8848 - 47.104.85.99 - de000340-5fc4-45aa-bdbc-dd96852012ad + 115.29.142.202:8848 + 115.29.142.202 + 8831513c-2f72-42e8-899f-eb6c2c5ae110 wx3ef8f2cd12a19fcb diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java new file mode 100644 index 0000000..7eb51e2 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.service.EpdcScreenService; +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; + +/** + * 202108版大屏接口 + * + * @Author：liuchuang + * @Date：2021/8/10 11:02 + */ +@RestController +@RequestMapping("screen") +public class ApiScreenController { + + @Autowired + private EpdcScreenService epdcScreenService; + + /** + * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表） + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/10 13:46 + */ + @GetMapping("gridGovernance/itemList") + public Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.gridGovernanceItemList(formDto); + } +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index c206e8a..a6b5364 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -2,11 +2,15 @@ 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.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; +import java.util.List; + /** * 数据分析模块调用 * @@ -26,5 +30,15 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/workLog/getCustomId", consumes = MediaType.APPLICATION_JSON_VALUE) Result getCustomId(); + /** + * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表） + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/10 13:57 + */ + @GetMapping(value = "analysis/screen/gridGovernance/itemList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index bb6072e..6e28662 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -3,9 +3,13 @@ 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.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author：songyunpeg * @Date：2020/9/9 15:42 @@ -17,4 +21,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result getCustomId() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCustomId"); } + + @Override + public Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridGovernanceItemList", formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java new file mode 100644 index 0000000..50f2bb9 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; + +import java.util.List; + +/** + * 202108版大屏接口 + * + * @Author：liuchuang + * @Date：2021/8/10 13:47 + */ +public interface EpdcScreenService { + + /** + * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表） + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/10 13:49 + */ + Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java new file mode 100644 index 0000000..e45bae9 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.service.EpdcScreenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 202108版大屏接口 + * + * @Author：liuchuang + * @Date：2021/8/10 13:48 + */ +@Service +public class EpdcScreenServiceImpl implements EpdcScreenService { + + @Autowired + private AnalysisFeignClient analysisFeignClient; + + @Override + public Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) { + return analysisFeignClient.gridGovernanceItemList(formDto); + } +}