From a1a2cddba3a1eeb32bace70b96fc565e1c00a491 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 11 Sep 2019 09:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiItemController.java | 16 +++- .../esua/epdc/feign/ItemFeignClient.java | 12 +++ .../fallback/ItemFeignClientFallback.java | 7 ++ .../elink/esua/epdc/service/ItemService.java | 10 +++ .../epdc/service/impl/ItemServiceImpl.java | 10 +++ .../issue/result/IssueDetailResultDTO.java | 10 ++- .../epdc/dto/item/form/ItemDetailFormDTO.java | 27 ++++++ .../dto/item/result/ItemDetailResultDTO.java | 90 +++++++++++++++++++ .../controller/EpdcAppItemController.java | 15 ++++ .../esua/epdc/modules/item/dao/ItemDao.java | 11 +++ .../epdc/modules/item/entity/ItemEntity.java | 10 ++- .../modules/item/service/ItemService.java | 11 +++ .../item/service/impl/ItemServiceImpl.java | 14 ++- .../main/resources/mapper/issue/IssueDao.xml | 12 ++- .../main/resources/mapper/item/ItemDao.xml | 82 +++++++++++++++++ 15 files changed, 328 insertions(+), 9 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemDetailFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.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 3eba47044..99857402e 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 @@ -4,10 +4,12 @@ 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.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; 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; @@ -33,7 +35,19 @@ public class ApiItemController { * @Date: 2019/9/9 16:34 */ @GetMapping("list") - public Result> listIssues(@LoginUser TokenDto userDetail, ItemFormDTO formDto) { + public Result> listItems(@LoginUser TokenDto userDetail, ItemFormDTO formDto) { return itemService.listItems(userDetail, formDto); } + + /** + * 项目详情 + * @Params: [userDetail, itemId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/10 20:42 + */ + @GetMapping("detail/{itemId}") + public Result itemDetail(@LoginUser TokenDto userDetail, @PathVariable String itemId) { + return itemService.getItemDetail(userDetail, 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 f16321dd4..2b1174396 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,7 +2,9 @@ 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.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; @@ -28,4 +30,14 @@ public interface ItemFeignClient { */ @GetMapping(value = "events/epdc-app/item/list", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listItems(ItemFormDTO formDto); + + /** + * 项目详情 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/10 20:46 + */ + @GetMapping(value = "events/epdc-app/item/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getItemDetail(ItemDetailFormDTO 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 45e1aad82..2f2daa9bd 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,7 +3,9 @@ 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.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; import org.springframework.stereotype.Component; @@ -21,4 +23,9 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result> listItems(ItemFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItems", formDto); } + + @Override + public Result getItemDetail(ItemDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", 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 aac5b63a5..7b3594574 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 @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service; 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.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import java.util.List; @@ -22,4 +23,13 @@ public interface ItemService { * @Date: 2019/9/9 16:37 */ Result> listItems(TokenDto userDetail, ItemFormDTO formDto); + + /** + * 项目详情 + * @Params: [userDetail, itemId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/10 20:42 + */ + Result getItemDetail(TokenDto userDetail, 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 e56538f40..da272fac3 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,7 +2,9 @@ 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.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; import com.elink.esua.epdc.service.ItemService; @@ -27,4 +29,12 @@ public class ItemServiceImpl implements ItemService { formDto.setDeptId(userDetail.getGridId()); return itemFeignClient.listItems(formDto); } + + @Override + public Result getItemDetail(TokenDto userDetail, String itemId) { + ItemDetailFormDTO formDto = new ItemDetailFormDTO(); + formDto.setUserId(userDetail.getUserId()); + formDto.setItemId(itemId); + return itemFeignClient.getItemDetail(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java index 2b4acee91..f47f5cf57 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java @@ -30,7 +30,7 @@ public class IssueDetailResultDTO implements Serializable { /** * 创建时间 */ - private Date createdTime; + private Date distributeTime; /** * 是否党员 0否；1是 */ @@ -43,6 +43,10 @@ public class IssueDetailResultDTO implements Serializable { * 头像地址 */ private String avatar; + /** + * 议题地址 + */ + private String address; /** * 浏览量 */ @@ -67,6 +71,10 @@ public class IssueDetailResultDTO implements Serializable { * 用户是否踩过，true踩 */ private boolean userDislike; + /** + * 是否可操作 true 可评论、回复、表态议题、表态评论 + */ + private boolean isOperational; /** * 议事图片 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemDetailFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemDetailFormDTO.java new file mode 100644 index 000000000..2d9371e85 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemDetailFormDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 项目详情FormDTO + * @Author LC + * @Date 2019/9/10 20:23 + */ +@Data +public class ItemDetailFormDTO implements Serializable { + private static final long serialVersionUID = -7871958578795227805L; + + /** + * 项目ID + */ + @NotBlank(message = "项目ID不能为空") + private String itemId; + /** + * 用户ID + */ + @NotBlank(message = "用户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/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java new file mode 100644 index 000000000..2e49f4d57 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java @@ -0,0 +1,90 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 项目详情result DTO + * @Author LC + * @Date 2019/9/10 20:25 + */ +@Data +public class ItemDetailResultDTO implements Serializable { + private static final long serialVersionUID = 2279022962345210851L; + + /** + * 项目ID + */ + private String id; + /** + * 事件ID + */ + private String eventId; + /** + * 项目内容 + */ + private String content; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 是否党员 0否；1是 + */ + private Integer partyFlag; + /** + * 昵称 + */ + private String nickname; + /** + * 头像地址 + */ + private String avatar; + /** + * 项目地址 + */ + private String address; + /** + * 浏览量 + */ + private Integer browseNum; + /** + * 赞数 + */ + private Integer approveNum; + /** + * 踩数 + */ + private Integer opposeNum; + /** + * 所属类别ID + */ + private String categoryId; + /** + * 用户是否赞过，false未赞 + */ + private boolean userLike; + /** + * 用户是否踩过，true踩 + */ + private boolean userDislike; + /** + * 是否可操作 true 可评论、回复、表态议题、表态评论 + */ + private boolean isOperational; + /** + * 是否可以满意度评价 + */ + private boolean isSatisfactionEvaluation; + /** + * 是否显示满意度评价按钮 + */ + private boolean isShowSatisfactionEvaluation; + /** + * 议事图片 + */ + private List images; +} 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 dbfce9432..1536db132 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,7 +3,9 @@ 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.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; 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; @@ -38,4 +40,17 @@ public class EpdcAppItemController { ValidatorUtils.validateEntity(formDto); return this.itemService.listItems(formDto); } + + /** + * 项目详情 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/10 20:48 + */ + @GetMapping("detail") + public Result getIssueDetail(@RequestBody ItemDetailFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return this.itemService.getItemDetail(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 38fb5b5c7..7b2d116f2 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 @@ -19,7 +19,9 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.item.ItemDTO; +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.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import org.apache.ibatis.annotations.Mapper; @@ -54,4 +56,13 @@ public interface ItemDao extends BaseDao { */ List selectListOfItems(ItemFormDTO formDto); + /** + * 移动端-项目详情 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO + * @Author: liuchuang + * @Date: 2019/9/10 20:57 + */ + ItemDetailResultDTO selectOneItemDetail(ItemDetailFormDTO 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 84f146392..3a7ca1064 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 @@ -145,12 +145,16 @@ public class ItemEntity extends BaseEpdcEntity { private String friendlyCommunityId; /** - * 评价打分 + * 满意度评价得分 */ - private Integer itemScore; + private Integer evaluationScore; + /** + * 满意度评价内容 + */ + private String evaluationContent; /** - * 项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题 + * 项目状态 0-处理中，5-已关闭，10-已结案 */ private Integer itemState; 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 10958cb54..9ef285e05 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 @@ -21,7 +21,9 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.ItemDTO; +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.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -113,4 +115,13 @@ public interface ItemService extends BaseService { * @Date: 2019/9/9 16:47 */ Result> listItems(ItemFormDTO formDto); + + /** + * 移动端-项目详情 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/10 20:54 + */ + Result getItemDetail(ItemDetailFormDTO 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 56ed7b6ed..981ac9924 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 @@ -27,11 +27,13 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.ItemDTO; +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.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.item.dao.ItemDao; import com.elink.esua.epdc.modules.item.entity.ItemEntity; -import com.elink.esua.epdc.modules.item.redis.ItemRedis; import com.elink.esua.epdc.modules.item.service.ItemService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +55,7 @@ import java.util.Map; public class ItemServiceImpl extends BaseServiceImpl implements ItemService { @Autowired - private ItemRedis itemRedis; + private EpdcEventsService epdcEventsService; @Override public PageData page(Map params) { @@ -123,4 +125,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().ok(data); } + @Override + public Result getItemDetail(ItemDetailFormDTO formDto) { + ItemDetailResultDTO resultDTO = baseDao.selectOneItemDetail(formDto); + // 更新浏览数 + epdcEventsService.modifyBrowseNumById(resultDTO.getEventId()); + return new Result().ok(resultDTO); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 21bdeecd5..d9f870cf2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -199,14 +199,16 @@ - + + + @@ -220,14 +222,20 @@ issue.ID, issue.EVENT_ID, issue.ISSUE_CONTENT, - issue.CREATED_TIME, + issue.DISTRIBUTE_TIME, issue.IS_PARTY_MEMBER, issue.NICK_NAME, issue.USER_FACE, + issue.ISSUE_ADDRESS, issue.ISSUE_CATEGORY_ID, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.BROWSE_NUM, + CASE + issue.ISSUE_STATE + WHEN 0 THEN + true ELSE false + END AS isOperational, img.IMG_URL FROM epdc_issue issue 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 01f776dc9..b2a9ec37a 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 @@ -87,4 +87,86 @@ img.CREATED_TIME LIMIT #{pageIndex},#{pageSize} + + + + + + + + + + + + + + + + + + + + + + + +