From 89a76bdbdfe8a48d4c3ee36705e05746640b5dfb Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 17 Sep 2019 11:17:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=BA=A6=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiItemController.java | 15 ++++++++++++++- .../elink/esua/epdc/feign/ItemFeignClient.java | 12 ++++++++++++ .../feign/fallback/ItemFeignClientFallback.java | 7 +++++++ .../com/elink/esua/epdc/service/ItemService.java | 10 ++++++++++ .../esua/epdc/service/impl/ItemServiceImpl.java | 6 ++++++ .../item/controller/EpdcAppItemController.java | 14 ++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index 12c2b3dfb..ebd6529ef 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -64,7 +65,19 @@ public class ApiItemController { * @Date: 2019/9/12 13:26 */ @GetMapping("statistics/{categoryId}") - public Result issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryId) { + public Result itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryId) { return itemService.getItemCategoryStatistics(userDetail, categoryId); } + + /** + * 项目处理进度 + * @Params: [itemId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 11:09 + */ + @GetMapping("progress/{itemId}") + public Result> itemHandleProgress(@PathVariable String itemId) { + return itemService.getItemHandleProgress(itemId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index 9ffae4a6d..52c52ae78 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -8,11 +8,13 @@ import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -58,4 +60,14 @@ public interface ItemFeignClient { */ @GetMapping(value = "events/epdc-app/item/statistics", consumes = MediaType.APPLICATION_JSON_VALUE) Result itemCategoryStatistics(ItemCategoryStatisticsFormDTO formDto); + + /** + * 项目处理进度 + * @Params: [itemId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 11:11 + */ + @GetMapping(value = "events/epdc-app/item/progress/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> itemHandleProgress(@PathVariable String itemId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java index 0e2a1c682..74ac5b1cb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -9,9 +9,11 @@ import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -41,4 +43,9 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result itemCategoryStatistics(ItemCategoryStatisticsFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemCategoryStatistics", formDto); } + + @Override + public Result> itemHandleProgress(@PathVariable String itemId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemHandleProgress", itemId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index af46bc983..008a0613f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import java.util.List; @@ -46,4 +47,13 @@ public interface ItemService { * @Date: 2019/9/12 13:27 */ Result getItemCategoryStatistics(TokenDto userDetail, String categoryId); + + /** + * 项目处理进度 + * @Params: [itemId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 11:08 + */ + Result> getItemHandleProgress(String itemId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 6197c25c2..4783dcf82 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; import com.elink.esua.epdc.service.ItemService; @@ -55,4 +56,9 @@ public class ItemServiceImpl implements ItemService { formDto.setGridId(userDetail.getGridId()); return itemFeignClient.itemCategoryStatistics(formDto); } + + @Override + public Result> getItemHandleProgress(String itemId) { + return itemFeignClient.itemHandleProgress(itemId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java index 219330835..00df737ee 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -9,6 +9,7 @@ import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -71,4 +72,17 @@ public class EpdcAppItemController { ValidatorUtils.validateEntity(formDto); return this.itemService.getItemCategoryStatistics(formDto); } + + /** + * 项目处理进度 + * @Params: [itemId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 11:15 + */ + @GetMapping("progress/{itemId}") + public Result> itemHandleProgress(@PathVariable String itemId) { + List data = this.itemService.listOfItemHandleProgress(itemId, 1); + return new Result>().ok(data); + } }