党建园地-模板代码提交

epmet-module/resi-home/resi-home-server/pom.xml

@@ -50,6 +50,18 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-project-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-issue-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -0,0 +1,18 @@
+package com.epmet.constant;
+
+/**
+ * @dscription 党建园地-项目Constant
+ * @author sun
+ */
+public interface ProjectConstant {
+
+	/**
+	 * 调用gov-project服务，查询项目数据失败
+	 */
+	String SELECT_PROJECT_EXCEPTION = "获取项目数据失败";
+	/**
+	 * 调用gov-issue服务，查询议题数据失败
+	 */
+	String SELECT_ISSUE_EXCEPTION = "获取议题数据失败";
+
+}

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java

@@ -0,0 +1,28 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.DemoTestFormDTO;
+import com.epmet.service.GroupService;
+import com.epmet.service.IssueService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @dscription 党建园地-小组Controller
+ * @author sun
+ */
+@RestController
+@RequestMapping("group")
+public class GroupController {
+
+	@Autowired
+	private GroupService groupService;
+
+
+}

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java

@@ -1,28 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.DemoTestFormDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author zhaoqifeng
- * @dscription
- * @date 2020/5/21 10:24
- */
-@RestController
-@RequestMapping("/")
-public class ResiHomeController {
-	private static final Logger logger = LoggerFactory.getLogger(ResiHomeController.class);
-	@PostMapping("test")
-	public Result test(@RequestBody DemoTestFormDTO formDTO) {
-		ValidatorUtils.validateEntity(formDTO);
-		logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
-		return new Result().ok("resi-home-server请求成功");
-	}
-}

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@@ -1,8 +1,18 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
+import com.epmet.dto.form.LatestIssueListFormDTO;
+import com.epmet.dto.result.LatestIssueListResultDTO;
+import com.epmet.dto.result.LatestListResultDTO;
 import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 
 /**
@@ -13,4 +23,23 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER , fallback = GovIssueFeignClientFallBack.class)
 public interface GovIssueFeignClient {
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 获取客户网格下已转项目且项目已结案的议题列表
+     **/
+    @PostMapping(value = "gov/issue/issue/getclosedprojectissuelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<LatestListResultDTO>> getClosedProjectIssueList(@RequestBody ClosedProjectIssueListFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 获取客户网格下最新议题列表
+     **/
+    @PostMapping(value = "gov/issue/issue/getnewestissuelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<LatestIssueListResultDTO>> getNewestIssueList(@RequestBody LatestIssueListFormDTO formDTO);
+
 }

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java

@@ -1,8 +1,16 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.LatestListFormDTO;
+import com.epmet.dto.result.LatestListResultDTO;
 import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * @author zhaoqifeng
@@ -12,4 +20,13 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class)
 public interface GovProjectFeignClient {
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 获取客户下已结案项目列表，按结案时间倒序
+     **/
+    @PostMapping(value = "gov/project/project/getclosedprojectlist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<LatestListResultDTO>> getClosedProjectList(@RequestBody LatestListFormDTO formDTO);
+
 }

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java

@@ -1,8 +1,18 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
+import com.epmet.dto.form.LatestIssueListFormDTO;
+import com.epmet.dto.form.LatestListFormDTO;
+import com.epmet.dto.result.LatestIssueListResultDTO;
+import com.epmet.dto.result.LatestListResultDTO;
 import com.epmet.feign.GovIssueFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  *
  * @author zhaoqifeng
@@ -11,4 +21,14 @@ import org.springframework.stereotype.Component;
 @Component
 public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
 
+    @Override
+    public Result<List<LatestListResultDTO>> getClosedProjectIssueList(ClosedProjectIssueListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getClosedProjectIssueList", formDTO);
+    }
+
+    @Override
+    public Result<List<LatestIssueListResultDTO>> getNewestIssueList(LatestIssueListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getNewestIssueList", formDTO);
+    }
+
 }

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java

@@ -1,5 +1,10 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.LatestListFormDTO;
+import com.epmet.dto.result.LatestListResultDTO;
 import com.epmet.feign.GovProjectFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -12,4 +17,9 @@ import java.util.List;
  */
 @Component
 public class GovProjectFeignClientFallBack implements GovProjectFeignClient {
+
+    @Override
+    public Result<List<LatestListResultDTO>> getClosedProjectList(LatestListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getClosedProjectList", formDTO);
+    }
 }

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java

@@ -0,0 +1,8 @@
+package com.epmet.service;
+
+/**
+ * @dscription 党建园地-小组Service
+ * @author sun
+ */
+public interface GroupService {
+}

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java

@@ -0,0 +1,12 @@
+package com.epmet.service.impl;
+
+import com.epmet.service.GroupService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @dscription 党建园地-小组ServiceImpl
+ * @author sun
+ */
+@Service
+public class GroupServiceImpl implements GroupService {
+}