From c67179c0487bc7bdb61078fc8dcdf2ce69a80574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Mon, 9 Sep 2019 17:05:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E6=88=96=E5=9B=9E=E5=A4=8D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bug修改 --- .../elink/esua/epdc/controller/ApiCommentController.java | 1 - .../com/elink/esua/epdc/feign/CommentFeignClient.java | 2 +- .../elink/esua/epdc/service/impl/CommentServiceImpl.java | 8 +++++--- .../comment/service/impl/EventCommentServiceImpl.java | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java index af0ac086b..caff437e7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java @@ -34,7 +34,6 @@ public class ApiCommentController { return commentService.submit(userDetail,commentFormDTO); } - /** * 评论（赞/踩） */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java index 49d86d790..03360d7e8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping; * @Author LC * @Date 2019/9/7 11:34 */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = CommentFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = CommentFeignClientFallback.class, url = "http://127.0.0.1:9066") public interface CommentFeignClient { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java index de6fabaf2..e755f6479 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java @@ -29,12 +29,14 @@ public class CommentServiceImpl implements CommentService { EventCommentDTO eventCommentDTO = new EventCommentDTO(); eventCommentDTO.setEventId(commentFormDTO.getIssueId()); eventCommentDTO.setUserId(userDetail.getUserId()); + eventCommentDTO.setUserName(userDetail.getNickname()); + eventCommentDTO.setUserFace(userDetail.getFaceImg()); eventCommentDTO.setContent(commentFormDTO.getContent()); eventCommentDTO.setCommentId(commentFormDTO.getFaCommentId()); - if (commentFormDTO.getFaCommentId().length() != 0){ - eventCommentDTO.setCommentType("1"); - }else { + if ("".equals(commentFormDTO.getFaCommentId()) || commentFormDTO.getFaCommentId() == null){ eventCommentDTO.setCommentType("0"); + }else { + eventCommentDTO.setCommentType("1"); } return commentFeignClient.submit(eventCommentDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index db7beb1f2..1886f0fec 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -120,7 +120,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl Date: Mon, 9 Sep 2019 17:41:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B9?= =?UTF-8?q?=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 | 39 +++++++++ .../esua/epdc/feign/ItemFeignClient.java | 31 +++++++ .../fallback/ItemFeignClientFallback.java | 22 +++++ .../elink/esua/epdc/service/ItemService.java | 25 ++++++ .../epdc/service/impl/ItemServiceImpl.java | 30 +++++++ .../esua/epdc/dto/item/form/ItemFormDTO.java | 46 +++++++++++ .../result/ItemHandleProgressResultDTO.java | 28 +++++++ .../epdc/dto/item/result/ItemResultDTO.java | 82 +++++++++++++++++++ .../controller/EpdcAppIssueController.java | 2 - .../controller/EpdcAppItemController.java | 41 ++++++++++ .../esua/epdc/modules/item/dao/ItemDao.java | 13 +++ .../modules/item/service/ItemService.java | 12 +++ .../item/service/impl/ItemServiceImpl.java | 16 ++++ .../main/resources/mapper/item/ItemDao.xml | 82 +++++++++++++++++++ 14 files changed, 467 insertions(+), 2 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.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 new file mode 100644 index 000000000..3eba47044 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -0,0 +1,39 @@ +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.ItemFormDTO; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 移动端接口-项目模块 + * @Author LC + * @Date 2019/9/9 16:32 + */ +@RestController +@RequestMapping("events/item") +public class ApiItemController { + + @Autowired + private ItemService itemService; + + /** + * 项目列表 + * @Params: [userDetail, formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 16:34 + */ + @GetMapping("list") + public Result> listIssues(@LoginUser TokenDto userDetail, ItemFormDTO formDto) { + return itemService.listItems(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 new file mode 100644 index 000000000..f16321dd4 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -0,0 +1,31 @@ +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.ItemFormDTO; +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 java.util.List; + +/** + * 项目模块调用 + * @Author LC + * @Date 2019/9/9 16:39 + */ +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = ItemFeignClientFallback.class) +public interface ItemFeignClient { + + /** + * 项目列表 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 16:42 + */ + @GetMapping(value = "events/epdc-app/item/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listItems(ItemFormDTO 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 new file mode 100644 index 000000000..32ef420f7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -0,0 +1,22 @@ +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.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.feign.ItemFeignClient; + +import java.util.List; + +/** + * @Author LC + * @Date 2019/9/9 16:39 + */ +public class ItemFeignClientFallback implements ItemFeignClient { + + @Override + public Result> listItems(ItemFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItems", 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 new file mode 100644 index 000000000..aac5b63a5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -0,0 +1,25 @@ +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.ItemResultDTO; + +import java.util.List; + +/** + * 项目模块 + * @Author LC + * @Date 2019/9/9 16:34 + */ +public interface ItemService { + + /** + * 项目列表 + * @Params: [userDetail, formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 16:37 + */ + Result> listItems(TokenDto userDetail, ItemFormDTO 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 new file mode 100644 index 000000000..e56538f40 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -0,0 +1,30 @@ +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.ItemFormDTO; +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.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目模块 + * @Author LC + * @Date 2019/9/9 16:34 + */ +@Service +public class ItemServiceImpl implements ItemService { + + @Autowired + private ItemFeignClient itemFeignClient; + + @Override + public Result> listItems(TokenDto userDetail, ItemFormDTO formDto) { + formDto.setDeptId(userDetail.getGridId()); + return itemFeignClient.listItems(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 new file mode 100644 index 000000000..16528165a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java @@ -0,0 +1,46 @@ +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; +import java.util.Date; + +/** + * @Author LC + * @Date 2019/9/9 16:24 + */ +@Data +public class ItemFormDTO implements Serializable { + private static final long serialVersionUID = -3034807666143092535L; + + /** + * 用户所属网格ID + */ + @NotBlank(message = "用户网格ID不能为空") + private Long deptId; + /** + * 搜索内容 + */ + private String searchContent; + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private int pageIndex; + /** + * 页容量，默认20页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private int pageSize = 20; + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + /** + * 只查询半年内的数据 + */ + private Date someMonthsAgo; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java new file mode 100644 index 000000000..6c866456c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目处理进展列表DTO + * @Author LC + * @Date 2019/9/9 16:29 + */ +@Data +public class ItemHandleProgressResultDTO implements Serializable { + private static final long serialVersionUID = -7709510043792716588L; + + /** + * 状态名称 + */ + private String progressName; + /** + * 时间 + */ + private String createdTime; + /** + * 意见 + */ + private String advice; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java new file mode 100644 index 000000000..28db78cea --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java @@ -0,0 +1,82 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 项目列表DTO + * @Author LC + * @Date 2019/9/9 16:25 + */ +@Data +public class ItemResultDTO implements Serializable { + private static final long serialVersionUID = -2494874960456321677L; + + /** + * 项目ID + */ + private String id; + /** + * 事件ID + */ + private String eventId; + /** + * 项目内容 + */ + private String itemContent; + /** + * 昵称 + */ + private String nickname; + /** + * 头像地址 + */ + private String avatar; + /** + * 是否党员 0否；1是 + */ + private String partyFlag; + /** + * 赞数 + */ + private Integer approveNum; + /** + * 踩数 + */ + private Integer opposeNum; + /** + * 评数 + */ + private Integer commentNum; + /** + * 项目状态 + */ + private String stateName; + /** + * 项目类别 + */ + private String categoryName; + /** + * 发布时间 + */ + private Date createdTime; + /** + * 表态数 + */ + private Integer statementNum; + /** + * 图片列表 + */ + private List images; + /** + * 项目位置地址 + */ + private String address; + /** + * 最新进展 + */ + private ItemHandleProgressResultDTO latestProgress; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java index 184e8546d..5e75d0dd6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java @@ -3,12 +3,10 @@ package com.elink.esua.epdc.modules.issue.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.issue.EventUserAttitudeDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.StatementFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; 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 new file mode 100644 index 000000000..dbfce9432 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -0,0 +1,41 @@ +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.ItemFormDTO; +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; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 移动端-项目表 + * @Author LC + * @Date 2019/9/9 16:44 + */ +@RestController +@RequestMapping(Constant.EPDC_APP + "item") +public class EpdcAppItemController { + + @Autowired + private ItemService itemService; + + /** + * 项目列表 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 16:46 + */ + @GetMapping("list") + public Result> listItems(@RequestBody ItemFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return this.itemService.listItems(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 a9738cdeb..38fb5b5c7 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,10 +19,14 @@ 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.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 项目表 项目表 * @@ -41,4 +45,13 @@ public interface ItemDao extends BaseDao { */ ItemDTO selectOneItemByIssueId(@Param("issueId") String issueId); + /** + * 移动端-项目列表 + * @Params: [formDto] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/9 16:50 + */ + List selectListOfItems(ItemFormDTO 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 b3c478e81..10958cb54 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 @@ -19,7 +19,10 @@ package com.elink.esua.epdc.modules.item.service; 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.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import java.util.List; @@ -101,4 +104,13 @@ public interface ItemService extends BaseService { * @Date: 2019/9/6 18:38 */ ItemEntity getItemByIssueId(String issueId); + + /** + * 移动端-项目列表 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 16:47 + */ + Result> listItems(ItemFormDTO 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 b5e590fcc..56ed7b6ed 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 @@ -21,9 +21,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; 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.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; 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; @@ -34,6 +39,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -107,4 +113,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem return ConvertUtils.sourceToTarget(dto, ItemEntity.class); } + @Override + public Result> listItems(ItemFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + // 查询半年内的数据 + formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6)); + 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 00515af99..a37224cae 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 @@ -5,4 +5,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + From ffc7ea3c737175c0b1d82021bcd79857827ee891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Mon, 9 Sep 2019 17:52:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/CommentFeignClient.java | 2 +- .../elink/esua/epdc/feign/IssueFeignClient.java | 2 +- .../modules/comment/dao/EventCommentDao.java | 5 ++++- .../service/impl/EventCommentServiceImpl.java | 6 +++++- .../epdc/modules/events/dao/EpdcEventsDao.java | 15 +++++++++++++-- .../service/impl/EpdcEventsServiceImpl.java | 6 +++++- .../mapper/comment/EventCommentDao.xml | 17 ++++++++++------- .../resources/mapper/events/EpdcEventsDao.xml | 17 ++++++++++------- 8 files changed, 49 insertions(+), 21 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java index 03360d7e8..49d86d790 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping; * @Author LC * @Date 2019/9/7 11:34 */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = CommentFeignClientFallback.class, url = "http://127.0.0.1:9066") +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = CommentFeignClientFallback.class) public interface CommentFeignClient { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java index a31b1f752..98c9072a1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java @@ -25,7 +25,7 @@ import java.util.List; * @Author LC * @Date 2019/9/7 11:34 */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = IssueFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = IssueFeignClientFallback.class, url = "http://127.0.0.1:9066") public interface IssueFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java index 1710816f1..d8fb68d15 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java @@ -34,7 +34,10 @@ import java.util.List; @Mapper public interface EventCommentDao extends BaseDao { - void updateApproveNumOrOpposeNum(String commentId, String attitudeFlag); + void updateApproveNum(String commentId); + + void updateOpposeNum(String commentId); + void updateReplyCount(String commentId); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 1886f0fec..c5824cfa1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -129,7 +129,11 @@ public class EventCommentServiceImpl extends BaseServiceImpl { * @Date: 2019/9/7 10:07 */ long selectCountOfComments(@Param("eventId") String eventId); + /** * 修改评论数+1 */ void updateCommentNum(String id); - //修改赞数或者踩数 - void updateApproveNumOrOpposeNum(String eventId, String attitudeFlag); + /** + * 修改赞数 + * @param eventId + */ + void updateApproveNum(String eventId); + + /** + * 修改踩数 + * @param eventId + */ + void updateOpposeNum(String eventId); + /** * 移动端-事件分类统计 * @Params: [formDTO] diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 22116d242..984438a0f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -242,6 +242,10 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl - + UPDATE epdc_event_comment - - SET LIKE_COUNT = LIKE_COUNT + 1 - - - SET UN_LIKE_COUNT = UN_LIKE_COUNT + 1 - + SET LIKE_COUNT = LIKE_COUNT + 1 WHERE ID = #{commentId} + + + UPDATE epdc_event_comment + SET UN_LIKE_COUNT = UN_LIKE_COUNT + 1 + WHERE ID = #{commentId} + + + UPDATE epdc_event_comment SET REPLY_COUNT = REPLY_COUNT + 1 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 92a2acc6b..41f621cde 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -164,17 +164,20 @@ UPDATE epdc_events SET COMMENT_NUM = COMMENT_NUM + 1 WHERE ID = #{id} - + UPDATE epdc_events - - SET APPROVE_NUM = APPROVE_NUM + 1 - - - SET OPPOSE_NUM = OPPOSE_NUM + 1 - + SET APPROVE_NUM = APPROVE_NUM + 1 WHERE ID = #{eventId} + + + UPDATE epdc_events + SET OPPOSE_NUM = OPPOSE_NUM + 1 + WHERE ID = #{eventId} + + +