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 e9d320a25..f4e288116 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 @@ -3,10 +3,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; 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.form.SubmitItemFormDTO; +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; @@ -106,4 +103,20 @@ public class ApiItemController { public Result submitItem(@LoginUser TokenDto userDetail, @RequestBody SubmitItemFormDTO formDto) { return itemService.submitItem(userDetail, formDto); } + + /** + * @describe: 居民端-北尚诉办-我的上报 + * @author wangtong + * @date 2022/8/23 15:39 + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getItemListByUserId") + public Result> getItemListByUserId(@LoginUser TokenDto userDetail, PeopleItemFormDTO formDto) { + if (null == userDetail) { + return new Result>().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + return itemService.getItemListByUserId(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 2bf94b06f..5e54c5c05 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 @@ -111,4 +111,14 @@ public interface ItemFeignClient { */ @PostMapping(value = "events/epdc-app/item/people/submitItem", consumes = MediaType.APPLICATION_JSON_VALUE) Result submitItem(SubmitItemFormDTO formDto); + + /** + * @describe: 居民端-北尚诉办-我的上报 + * @author wangtong + * @date 2022/8/23 15:49 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping(value = "events/epdc-app/item/getItemListByUserId", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getItemListByUserId(PeopleItemFormDTO 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 690fabeed..7fa2bca60 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 @@ -65,4 +65,9 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result submitItem(SubmitItemFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submitItem", formDto); } + + @Override + public Result> getItemListByUserId(PeopleItemFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemListByUserId", 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 ea3106789..59e4c11e9 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 @@ -95,4 +95,13 @@ public interface ItemService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result submitItem(TokenDto userDetail, SubmitItemFormDTO formDto); + + /** + * @describe: 居民端-北尚诉办-我的上报 + * @author wangtong + * @date 2022/8/23 15:45 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + Result> getItemListByUserId(PeopleItemFormDTO 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 eb3ae958c..327462772 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 @@ -172,4 +172,31 @@ public class ItemServiceImpl implements ItemService { formDto.setMobile(userDetail.getMobile()); return itemFeignClient.submitItem(formDto); } + + @Override + public Result> getItemListByUserId(PeopleItemFormDTO formDto) { + Result> listResult = itemFeignClient.getItemListByUserId(formDto); + Optional.of(listResult.getData()).ifPresent( + itemList -> { + List userIdList = itemList.stream().filter(item -> YesOrNoEnum.YES.value().equals(item.getPartyFlag())).map(ItemResultDTO::getUserId).distinct().collect(Collectors.toList()); + if (CollUtil.isNotEmpty(userIdList)) { + EpdcUserMatchTagFormDTO form = new EpdcUserMatchTagFormDTO(); + form.setUserIdList(userIdList); + form.setUserTagValue(UserTagEnum.PARTY_STANDARD_BEARER.value()); + Result> filterByTagRes = userFeignClient.filterUserIdListByTag(form); + List filter = filterByTagRes.getData(); + if (filterByTagRes.success() && null != filter && CollUtil.isNotEmpty(filter)) { + itemList.forEach( + item -> { + if (filter.contains(item.getUserId())) { + item.setStandardBearerFlag(YesOrNoEnum.YES.value()); + } + } + ); + } + } + } + ); + return listResult; + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java new file mode 100644 index 000000000..c1416566f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author LC + * @Date 2019/9/9 16:24 + */ +@Data +public class PeopleItemFormDTO implements Serializable { + private static final long serialVersionUID = -3034807666143092535L; + + /** + * 用户id + */ + private String userId; + + /** + * 搜索内容 + */ + private String searchContent; + + /** + * 诉求分类:0民生 1发展 + */ + @NotBlank(message = "诉求分类不可为空") + private String peopleFlag; + /** + * 页码,从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-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java index 92d1a9718..81155feeb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java @@ -2,6 +2,8 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -41,10 +43,11 @@ public class SubmitItemFormDTO implements Serializable { /** * 议题内容 */ + @NotNull(message = "描述内容不可为空") private String itemContent; /** - * 网格 + * 网格名称 */ private String grid; @@ -54,18 +57,21 @@ public class SubmitItemFormDTO implements Serializable { private Long gridId; /** - * 议题位置地址 + * 详细地址 */ + @NotNull(message = "详细地址不可为空") private String issueAddress; /** * 议题位置纬度 */ + @NotNull(message = "纬度不能为空") private Double issueLatitude; /** * 议题位置经度 */ + @NotNull(message = "经度不能为空") private Double issueLongitude; @@ -86,10 +92,12 @@ public class SubmitItemFormDTO implements Serializable { /** * 诉求分类:0民生 1发展 */ + @NotBlank(message = "诉求分类不能为空") private String peopleFlag; /** - * 是否显示:0不显示 1显示 + * 是否公开:0不公开 1公开 */ + @NotBlank(message = "是否公开不能为空") private String showFlag; } 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 d8992be79..0a7b5abb6 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 @@ -39,6 +39,19 @@ public class EpdcAppItemController { return this.itemService.listItems(formDto); } + /** + * @describe: 居民端-北尚诉办-我的上报 + * @author wangtong + * @date 2022/8/23 15:51 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getItemListByUserId") + public Result> getItemListByUserId(@RequestBody PeopleItemFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return itemService.getItemListByUserId(formDto); + } + /** * 项目列表(问题采集使用) * @Params: [formDto] @@ -145,6 +158,7 @@ public class EpdcAppItemController { */ @PostMapping(value = "people/submitItem") public Result submitItem(@RequestBody SubmitItemFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); return itemService.submitItem(formDto); } 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 a947dc0cb..8c9df8033 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 @@ -63,6 +63,15 @@ public interface ItemDao extends BaseDao { */ List selectListOfItems(ItemFormDTO formDto, int[] states); + /** + * @describe: 居民端-北尚诉办-我的上报 + * @author wangtong + * @date 2022/8/23 15:52 + * @params [formDto] + * @return java.util.List + */ + List getItemListByUserId(PeopleItemFormDTO formDto); + /** * 移动端-项目列表(问题采集使用) * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 91e9604e1..be0f01dd0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -216,7 +216,7 @@ public class ItemEntity extends BaseEpdcEntity { private String peopleFlag; /** - * 是否显示:0不显示 1显示 + * 是否公开:0不公开 1公开 */ private String showFlag; 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 20ba0bd08..8c0f27a56 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 @@ -463,4 +463,13 @@ public interface ItemService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result submitItem(SubmitItemFormDTO formDto); + + /** + * @describe: 居民端-北尚诉办-我的上报 + * @author wangtong + * @date 2022/8/23 15:51 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + Result> getItemListByUserId(PeopleItemFormDTO 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 e847f783a..b0e02e1aa 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 @@ -279,6 +279,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result>().ok(data); } + @Override + public Result> getItemListByUserId(PeopleItemFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.getItemListByUserId(formDto); + return new Result>().ok(data); + } + + @Override public Result> getQuestionList(ItemByQuestionFormDTO formDto) { @@ -1943,6 +1952,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result(); } + /** * * @param params 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 630ad41a7..cc631ab81 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 @@ -80,6 +80,7 @@ AND t2.DEL_FLAG = '0' WHERE t1.DEL_FLAG = '0' AND t1.GRID_ID = #{formDto.deptId} + AND t1.SHOW_FLAG = '1' AND t1.ITEM_STATE IN @@ -1184,4 +1185,78 @@ t.id=#{id} and t.FIRST_CATEGORY_CODE!=t.category_code +