From 16842091a973ce54db94104d9ea8af1da3d0118c Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 24 Dec 2019 10:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6V2=E7=89=88=E6=9C=AC=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v2/ApiIssueV2Controller.java | 47 +++++++++++++++++++ .../controller/v2/ApiItemV2Controller.java | 44 +++++++++++++++++ .../esua/epdc/feign/ItemFeignClient.java | 12 +++++ .../fallback/ItemFeignClientFallback.java | 5 ++ .../elink/esua/epdc/service/ItemService.java | 11 +++++ .../epdc/service/impl/ItemServiceImpl.java | 5 ++ .../epdc-events/epdc-events-server/pom.xml | 6 +++ .../controller/AppEventCommentController.java | 2 +- .../v2/EpdcAppItemV2Controller.java | 45 ++++++++++++++++++ .../esua/epdc/modules/item/dao/ItemDao.java | 11 +++++ .../modules/item/service/ItemService.java | 11 +++++ .../item/service/impl/ItemServiceImpl.java | 5 ++ .../main/resources/mapper/item/ItemDao.xml | 42 +++++++++++++++++ 13 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiIssueV2Controller.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiItemV2Controller.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppItemV2Controller.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiIssueV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiIssueV2Controller.java new file mode 100644 index 000000000..91a98c860 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiIssueV2Controller.java @@ -0,0 +1,47 @@ +package com.elink.esua.epdc.controller.v2; + +import com.elink.esua.epdc.commons.api.version.ApiVersion; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.issue.form.WorkProcessListFormDTO; +import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; +import com.elink.esua.epdc.service.WorkIssueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * + * 议题管理-V2 + * + * @Author：liuchuang + * @Date：2019/12/23 19:44 + */ +@ApiVersion(2) +@RestController("ApiIssueV2Controller") +@RequestMapping("events/issue" + Constant.VERSION_CONTROL) +public class ApiIssueV2Controller { + + @Autowired + private WorkIssueService workIssueService; + + /** + * + * 议题处理进度 + * + * @params [issueId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/12/23 19:46 + */ + @GetMapping("progress/{issueId}") + public Result> issueHandleProgress(@PathVariable String issueId) { + WorkProcessListFormDTO formDto = new WorkProcessListFormDTO(); + formDto.setIssueId(issueId); + return workIssueService.processList(formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiItemV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiItemV2Controller.java new file mode 100644 index 000000000..10745b42b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiItemV2Controller.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.controller.v2; + +import com.elink.esua.epdc.commons.api.version.ApiVersion; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; +import com.elink.esua.epdc.service.ItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * + * 移动端-项目模块-V2 + * + * @Author：liuchuang + * @Date：2019/12/24 9:15 + */ +@ApiVersion(2) +@RestController("ApiItemV2Controller") +@RequestMapping("events/item" + Constant.VERSION_CONTROL) +public class ApiItemV2Controller { + + @Autowired + private ItemService itemService; + + /** + * + * 项目处理进度 + * + * @params [itemId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/12/24 9:17 + */ + @GetMapping("progress/{itemId}") + public Result> itemHandleProgress(@PathVariable String itemId) { + return itemService.getItemHandleV2Progress(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 0d67b707c..715739794 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 @@ -77,4 +77,16 @@ public interface ItemFeignClient { */ @GetMapping(value = "events/epdc-app/item/listByUserId", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listItemsOfMine(ItemOfMineFormDTO formDTO); + + /** + * + * 项目处理进度-V2 + * + * @params [itemId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/12/24 9:19 + */ + @GetMapping(value = "events/epdc-app/item/v2/progress/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> itemHandleV2Progress(@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 60ef4beb8..02959101e 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 @@ -50,4 +50,9 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result> listItemsOfMine(ItemOfMineFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItemsOfMine", formDTO); } + + @Override + public Result> itemHandleV2Progress(String itemId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemHandleV2Progress", 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 e8647c122..f1f8b0e36 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 @@ -66,4 +66,15 @@ public interface ItemService { * @Date: 2019/9/17 13:27 */ Result> listItemsOfMine(TokenDto userDetail, ItemOfMineFormDTO formDTO); + + /** + * + * 项目处理进度 + * + * @params [itemId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/12/24 9:18 + */ + Result> getItemHandleV2Progress(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 e52036e01..ffb624f2b 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 @@ -81,4 +81,9 @@ public class ItemServiceImpl implements ItemService { formDTO.setUserId(userDetail.getUserId()); return itemFeignClient.listItemsOfMine(formDTO); } + + @Override + public Result> getItemHandleV2Progress(String itemId) { + return itemFeignClient.itemHandleV2Progress(itemId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 819627e0e..bfa5b5522 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -62,6 +62,12 @@ 1.0.0 compile + + + com.esua.epdc + epdc-commons-api-version-control + ${project.version} + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java index 66e4921f2..a0dd8ef59 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java @@ -95,7 +95,7 @@ public class AppEventCommentController { * 事件评论回复列表接口 */ @GetMapping("commentReplyList") - public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){ + public Result commentReplyList(@RequestBody WorkCommentReplyFormDTO workCommentReplyFormDTO){ return eventCommentService.commentReplyList(workCommentReplyFormDTO); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppItemV2Controller.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppItemV2Controller.java new file mode 100644 index 000000000..04629e33d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppItemV2Controller.java @@ -0,0 +1,45 @@ +package com.elink.esua.epdc.modules.item.controller.v2; + +import com.elink.esua.epdc.commons.api.version.ApiVersion; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; +import com.elink.esua.epdc.modules.item.service.ItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * + * 移动端-项目管理-V2 + * + * @Author：liuchuang + * @Date：2019/12/24 9:08 + */ +@ApiVersion(2) +@RestController("EpdcAppItemV2Controller") +@RequestMapping(Constant.EPDC_APP + "item" + Constant.VERSION_CONTROL) +public class EpdcAppItemV2Controller { + + @Autowired + private ItemService itemService; + + /** + * + * 项目处理进度 + * + * @params [itemId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/12/24 9:12 + */ + @GetMapping("progress/{itemId}") + public Result> itemHandleProgress(@PathVariable String itemId) { + List data = this.itemService.listOfItemHandleProgressByMobile(itemId); + return new Result>().ok(data); + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index bfb29ce65..67a893971 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -144,6 +144,17 @@ public interface ItemDao extends BaseDao { */ List selectListOfItemHandleProgressByWork(String itemId); + /** + * + * 居民端项目处理进度 + * + * @params [itemId] + * @return java.util.List + * @author liuchuang + * @since 2019/12/23 20:08 + */ + List selectListOfItemHandleProgressByMobile(String itemId); + /** * 项目内容详情 * @Params: [itemId] diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 7c73c05d9..dfab55000 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -279,4 +279,15 @@ public interface ItemService extends BaseService { * @Date: 2019/11/18 13:32 */ List listOfItemHandleProgressByWork(String itemId); + + /** + * + * 项目处理进度-居民端 + * + * @params [itemId] + * @return java.util.List + * @author liuchuang + * @since 2019/12/24 9:03 + */ + List listOfItemHandleProgressByMobile(String itemId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c59cf4e12..497f7aafd 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -497,11 +497,16 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemEntity entity = this.selectById(itemId); return baseDao.selectListOfItemHandleProgress(entity.getIssueId(), itemId, outOrInside); } + @Override public List listOfItemHandleProgressByWork(String itemId) { return baseDao.selectListOfItemHandleProgressByWork(itemId); } + @Override + public List listOfItemHandleProgressByMobile(String itemId) { + return baseDao.selectListOfItemHandleProgressByMobile(itemId); + } @Override @Transactional(rollbackFor = Exception.class) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index c66f30c68..32d7dc639 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -600,6 +600,48 @@ createdTime DESC + +