测试环境修改

大屏接口 init
4 years ago · e6a1d18e7b
6 changed files with 138 additions and 19 deletions
--- a/epdc-cloud-api/pom.xml
+++ b/epdc-cloud-api/pom.xml
@ -174,21 +174,21 @@

                <server.port>9040</server.port>

-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>

                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>

                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
                <nacos.ip></nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
+                <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>

                <!--公众号配置-->
                <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
@ -219,21 +219,21 @@

                <server.port>17024</server.port>

-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>

                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>

                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip>47.104.85.99</nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
+                <nacos.ip>115.29.142.202</nacos.ip>
+                <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>

                <!--公众号配置-->
                <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
--- 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
@ -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<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/10 13:46
+     */
+    @GetMapping("gridGovernance/itemList")
+    public Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.gridGovernanceItemList(formDto);
+    }
+}
--- 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<String> getCustomId();

+    /**
+     * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表）
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/10 13:57
+     */
+    @GetMapping(value = "analysis/screen/gridGovernance/itemList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);

 }
--- 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<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridGovernanceItemList", formDto);
+    }
 }
--- 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
@ -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<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/10 13:49
+     */
+    Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
+}
--- 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
@ -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<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) {
+        return analysisFeignClient.gridGovernanceItemList(formDto);
+    }
+}