From a555010d1957dd964abe1d621689e45c308a5cfe Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 17 Sep 2019 14:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiItemController.java | 13 +++++++ .../esua/epdc/feign/ItemFeignClient.java | 15 +++++-- .../fallback/ItemFeignClientFallback.java | 10 +++-- .../elink/esua/epdc/service/ItemService.java | 10 +++++ .../epdc/service/impl/ItemServiceImpl.java | 16 ++++++-- .../esua/epdc/dto/item/form/ItemFormDTO.java | 4 ++ .../epdc/dto/item/form/ItemOfMineFormDTO.java | 39 +++++++++++++++++++ .../controller/EpdcAppItemController.java | 18 +++++++-- .../modules/item/service/ItemService.java | 9 +++++ .../item/service/impl/ItemServiceImpl.java | 14 ++++++- .../main/resources/mapper/item/ItemDao.xml | 26 ++++++------- 11 files changed, 144 insertions(+), 30 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java 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 ebd6529ef..b62ac4a78 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 @@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; 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.form.ItemOfMineFormDTO; 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; @@ -80,4 +81,16 @@ public class ApiItemController { public Result> itemHandleProgress(@PathVariable String itemId) { return itemService.getItemHandleProgress(itemId); } + + /** + * 我的项目列表 + * @Params: [userDetail, formDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 13:27 + */ + @GetMapping("listByUserId") + public Result> listItemsOfMine(@LoginUser TokenDto userDetail, @RequestBody ItemOfMineFormDTO formDTO) { + return itemService.listItemsOfMine(userDetail, formDTO); + } } 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 52c52ae78..0d67b707c 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 @@ -2,10 +2,7 @@ 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.item.form.ItemCategoryStatisticsFormDTO; -import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; -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.form.*; 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; @@ -70,4 +67,14 @@ public interface ItemFeignClient { */ @GetMapping(value = "events/epdc-app/item/progress/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result> itemHandleProgress(@PathVariable String itemId); + + /** + * 我的项目列表 + * @Params: [formDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 13:33 + */ + @GetMapping(value = "events/epdc-app/item/listByUserId", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listItemsOfMine(ItemOfMineFormDTO formDTO); } 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 74ac5b1cb..60ef4beb8 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 @@ -3,10 +3,7 @@ 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.item.form.EvaluationFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; -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.form.*; 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; @@ -48,4 +45,9 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result> itemHandleProgress(@PathVariable String itemId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemHandleProgress", itemId); } + + @Override + public Result> listItemsOfMine(ItemOfMineFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItemsOfMine", formDTO); + } } 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 008a0613f..e3a0bf1db 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 @@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; 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.form.ItemOfMineFormDTO; 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; @@ -56,4 +57,13 @@ public interface ItemService { * @Date: 2019/9/17 11:08 */ Result> getItemHandleProgress(String itemId); + + /** + * 我的项目列表 + * @Params: [userDetail, formDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 13:27 + */ + Result> listItemsOfMine(TokenDto userDetail, ItemOfMineFormDTO formDTO); } 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 4783dcf82..d87b2ba49 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 @@ -2,16 +2,14 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; -import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; -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.form.*; 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; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,4 +59,14 @@ public class ItemServiceImpl implements ItemService { public Result> getItemHandleProgress(String itemId) { return itemFeignClient.itemHandleProgress(itemId); } + + @Override + public Result> listItemsOfMine(TokenDto userDetail, ItemOfMineFormDTO formDTO) { + if (null == userDetail || null == userDetail.getGridId() || StringUtils.isEmpty(userDetail.getUserId())) { + return new Result>().error("获取用户信息失败"); + } + formDTO.setDeptId(userDetail.getGridId()); + formDTO.setUserId(userDetail.getUserId()); + return itemFeignClient.listItemsOfMine(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java index d28e9df99..49074d91a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java @@ -47,4 +47,8 @@ public class ItemFormDTO implements Serializable { * 议题分类ID */ private String categoryId; + /** + * 用户ID + */ + private String userId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java new file mode 100644 index 000000000..b928a3072 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemOfMineFormDTO.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 我的项目 + * @Author LC + * @Date 2019/9/17 13:23 + */ +@Data +public class ItemOfMineFormDTO implements Serializable { + private static final long serialVersionUID = 4909843726873904544L; + + /** + * 用户所属网格ID + */ + @NotNull(message = "用户网格ID不能为空") + private Long deptId; + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空") + private String userId; + /** + * 页码,从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private int pageIndex; + /** + * 页容量,默认20页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private int pageSize = 20; +} 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 00df737ee..3f76d3002 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 @@ -3,10 +3,7 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; -import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; -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.form.*; 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; @@ -85,4 +82,17 @@ public class EpdcAppItemController { List data = this.itemService.listOfItemHandleProgress(itemId, 1); return new Result>().ok(data); } + + /** + * 我的项目列表 + * @Params: [formDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 13:35 + */ + @GetMapping("listByUserId") + public Result> listItemsOfMine(@RequestBody ItemOfMineFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return this.itemService.listItemsOfMine(formDTO); + } } 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 8b4c89ee1..a0cef6373 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 @@ -199,4 +199,13 @@ public interface ItemService extends BaseService { * @Date: 2019/9/7 10:22 */ Result modifyCommentById(String[] commentIds); + + /** + * 我的项目列表 + * @Params: [formDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/17 13:37 + */ + Result> listItemsOfMine(ItemOfMineFormDTO formDTO); } 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 a4d37d15b..76a679178 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 @@ -161,7 +161,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 查询半年内的数据 formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6)); List data = baseDao.selectListOfItems(formDto); - return new Result().ok(data); + return new Result>().ok(data); } @Override @@ -472,4 +472,16 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result modifyCommentById(String[] commentIds) { return issueService.modifyCommentById(commentIds); } + + @Override + public Result> listItemsOfMine(ItemOfMineFormDTO formDTO) { + int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); + ItemFormDTO formDto = new ItemFormDTO(); + formDto.setDeptId(formDTO.getDeptId()); + formDto.setPageIndex(pageIndex); + formDto.setPageSize(formDTO.getPageSize()); + formDto.setUserId(formDTO.getUserId()); + List data = baseDao.selectListOfItems(formDto); + return new Result>().ok(data); + } } 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 a103ad46f..a09b8bac9 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 @@ -47,19 +47,12 @@ hp.CREATED_TIME AS handleTime, hp.ADVICE CASE - - WHEN ( - item.ITEM_STATE = 0 - OR item.ITEM_STATE = 5 - OR item.ITEM_STATE = 10 - OR item.ITEM_STATE = 15 - OR item.ITEM_STATE = 20 - OR item.ITEM_STATE = 25 - ) THEN + item.ITEM_STATE + WHEN 0 THEN '处理中' - WHEN item.ITEM_STATE = 30 THEN + WHEN 5 THEN '已关闭' - WHEN item.ITEM_STATE = 35 THEN + WHEN 10 THEN '已结案' ELSE '' END ) AS stateName @@ -86,14 +79,21 @@ AND t2.DEL_FLAG = '0' WHERE t1.DEL_FLAG = '0' AND t1.GRID_ID = #{deptId} - = ]]> #{someMonthsAgo} - #{timestamp} + + = ]]> #{someMonthsAgo} + + + #{timestamp} + AND t1.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%') AND t1.ISSUE_CATEGORY_ID = #{categoryId} + + AND t1.USER_ID = #{userId} + ORDER BY t1.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize}