From bab73910b696d0d888fc241efc70fd8d23bcdb13 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Apr 2020 13:39:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiTopicController.java | 10 ++-- .../com/epmet/service/ResiTopicService.java | 11 ++-- .../service/impl/ResiTopicServiceImpl.java | 60 +++++++++++++++++-- .../comment/result/GovCommentResultDTO.java | 44 ++++++++++++++ .../topic/result/GovTopicInfoResultDTO.java | 56 +++++++++++++++++ 5 files changed, 164 insertions(+), 17 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/GovCommentResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java index 3f8cbbec7f..890c15008b 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java @@ -5,11 +5,11 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; -import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; +import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; -import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import com.epmet.service.ResiTopicService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -34,7 +34,7 @@ public class ResiTopicController { * @Date 2020.04.01 16:45 **/ @PostMapping("hiddenlist") - Result> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + Result> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ topicPageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(topicPageFormDTO); return resiTopicService.hiddenList(topicPageFormDTO); @@ -49,7 +49,7 @@ public class ResiTopicController { * @Date 2020.04.01 10:36 **/ @PostMapping("alltopics") - Result> allTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + Result> allTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicPageFormDTO topicPageFormDTO){ topicPageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(topicPageFormDTO); return resiTopicService.allTopics(topicPageFormDTO); @@ -78,7 +78,7 @@ public class ResiTopicController { * @Date 2020.04.01 23:49 **/ @PostMapping("topiccomments") - Result> topicComments(@LoginUser TokenDto tokenDto,@RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){ + Result> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){ ValidatorUtils.validateEntity(queryCommentFormDTO); return resiTopicService.topicComments(queryCommentFormDTO); } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java index af003cd5a4..b98abc1fc7 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java @@ -2,12 +2,11 @@ package com.epmet.service; import com.epmet.commons.tools.utils.Result; import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; -import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; +import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; -import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; -import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -21,7 +20,7 @@ public interface ResiTopicService { * @Author wangc * @Date 2020.04.01 16:45 **/ - Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO); + Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO); /** * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选) @@ -31,7 +30,7 @@ public interface ResiTopicService { * @Author wangc * @Date 2020.04.01 10:36 **/ - Result> allTopics(ResiTopicPageFormDTO topicPageFormDTO); + Result> allTopics(ResiTopicPageFormDTO topicPageFormDTO); /** * @Description 政府端群组管理-获取话题详情 @@ -51,7 +50,7 @@ public interface ResiTopicService { * @Author wangc * @Date 2020.04.01 23:49 **/ - Result> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO); + Result> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO); } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java index d4612fcb7e..2df8a3d933 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java @@ -4,15 +4,18 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.feign.ResiGroupFeignClient; import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; +import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import com.epmet.service.ResiTopicService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -30,10 +33,26 @@ public class ResiTopicServiceImpl implements ResiTopicService { * @Date 2020.04.01 16:45 **/ @Override - public Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) { + public Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) { topicPageFormDTO.setPageNo(NumConstant.ONE); topicPageFormDTO.setPageSize(NumConstant.MAX); - return resiGroupFeignClient.getHiddenTopicGov(topicPageFormDTO); + Result> topics = resiGroupFeignClient.getHiddenTopicGov(topicPageFormDTO); + List topicsResult = new ArrayList<>(); + if(topics.success() && null != topics.getData() && topics.getData().size() > NumConstant.ZERO) { + topics.getData().forEach(top -> { + GovTopicInfoResultDTO govTopic = new GovTopicInfoResultDTO(); + govTopic.setTopicContent(top.getTopicContent()); + govTopic.setUserId(top.getUserId()); + govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto()); + govTopic.setUserNickName(top.getReleaseUserName()); + govTopic.setTopicId(top.getTopicId()); + govTopic.setTopicRealseTime(top.getReleaseTime().getTime()); + govTopic.setTopicFirstPhoto(top.getFirstPhoto()); + topicsResult.add(govTopic); + }); + } + return new Result>().ok(topicsResult); + } /** @@ -45,8 +64,23 @@ public class ResiTopicServiceImpl implements ResiTopicService { * @Date 2020.04.01 10:36 **/ @Override - public Result> allTopics(ResiTopicPageFormDTO topicPageFormDTO) { - return resiGroupFeignClient.getPastTopicListGov(topicPageFormDTO); + public Result> allTopics(ResiTopicPageFormDTO topicPageFormDTO) { + Result> topics = resiGroupFeignClient.getPastTopicListGov(topicPageFormDTO); + List topicsResult = new ArrayList<>(); + if(topics.success() && null != topics.getData() && topics.getData().size() > NumConstant.ZERO) { + topics.getData().forEach(top -> { + GovTopicInfoResultDTO govTopic = new GovTopicInfoResultDTO(); + govTopic.setTopicContent(top.getTopicContent()); + govTopic.setUserId(top.getUserId()); + govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto()); + govTopic.setUserNickName(top.getReleaseUserName()); + govTopic.setTopicId(top.getTopicId()); + govTopic.setTopicRealseTime(top.getReleaseTime().getTime()); + govTopic.setTopicFirstPhoto(top.getFirstPhoto()); + topicsResult.add(govTopic); + }); + } + return new Result>().ok(topicsResult); } /** @@ -71,7 +105,21 @@ public class ResiTopicServiceImpl implements ResiTopicService { * @Date 2020.04.01 23:49 **/ @Override - public Result> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO) { - return resiGroupFeignClient.getCommentListOfTopicGov(queryCommentFormDTO); + public Result> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO) { + Result> comments = resiGroupFeignClient.getCommentListOfTopicGov(queryCommentFormDTO); + List commentsResult = new ArrayList<>(); + if(comments.success() && null != comments.getData() && comments.getData().size() > NumConstant.ZERO){ + comments.getData().forEach(com -> { + GovCommentResultDTO govComment = new GovCommentResultDTO(); + govComment.setCommentId(com.getCommentId()); + govComment.setCommentContent(com.getCommentContent()); + govComment.setCommentUserHeadPhoto(com.getCommentUserHeadPhoto()); + govComment.setCommentUserName(com.getCommentUserName()); + govComment.setCommentTime(com.getCommentTime()); + commentsResult.add(govComment); + }); + } + + return new Result>().ok(commentsResult); } } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/GovCommentResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/GovCommentResultDTO.java new file mode 100644 index 0000000000..35d0dc739e --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/GovCommentResultDTO.java @@ -0,0 +1,44 @@ +package com.epmet.resi.group.dto.comment.result; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description + * @ClassName GovCommentResultDTO + * @Auth wangc + * @Date 2020-04-30 13:07 + */ +@Data +public class GovCommentResultDTO implements Serializable { + private static final long serialVersionUID = -6141574797811146831L; + /** + * 评论Id + * */ + private String commentId; + + /** + * 评论内容 + * */ + private String commentContent; + + /** + * 评论者头像 + * */ + private String commentUserHeadPhoto; + + /** + * 评论者姓名 + * */ + private String commentUserName; + + /** + * 评论时间 yyyy-MM-dd HH:mm + * */ + @JSONField(format="yyyy-MM-dd HH:mm") + private Date commentTime; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java new file mode 100644 index 0000000000..296f4fcc36 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java @@ -0,0 +1,56 @@ +package com.epmet.resi.group.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName GovTopicInfoResultDTO + * @Auth wangc + * @Date 2020-04-30 13:08 + */ +@Data +public class GovTopicInfoResultDTO implements Serializable { + private static final long serialVersionUID = -3495808492616727671L; + + /** + * 作者的Id + * */ + private String userId; + + /** + * 用户头像 + * */ + private String userHeadPhoto; + + /** + * 用户昵称 + * */ + private String userNickName; + + /** + * 话题Id + * */ + private String topicId; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题发布时间 时间戳 + * */ + private Long topicRealseTime; + + /** + * 话题的第一张图片地址 + * */ + private String topicFirstPhoto; + + /** + * 话题的状态 + * */ + private String topicState; +} From 804dc29508a3ae3f8aba5261e4756b813f58528f Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Apr 2020 13:45:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E8=AF=9D=E9=A2=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiTopicController.java | 3 +- .../com/epmet/service/ResiTopicService.java | 3 +- .../service/impl/ResiTopicServiceImpl.java | 10 ++-- .../result/GovHiddenTopicInfoResultDTO.java | 51 +++++++++++++++++++ 4 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java index 890c15008b..f821df15c9 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java @@ -8,6 +8,7 @@ import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.service.ResiTopicService; @@ -34,7 +35,7 @@ public class ResiTopicController { * @Date 2020.04.01 16:45 **/ @PostMapping("hiddenlist") - Result> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + Result> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ topicPageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(topicPageFormDTO); return resiTopicService.hiddenList(topicPageFormDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java index b98abc1fc7..ac12a9fcfe 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java @@ -5,6 +5,7 @@ import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; @@ -20,7 +21,7 @@ public interface ResiTopicService { * @Author wangc * @Date 2020.04.01 16:45 **/ - Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO); + Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO); /** * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选) diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java index 2df8a3d933..9d5318b595 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; @@ -33,14 +34,14 @@ public class ResiTopicServiceImpl implements ResiTopicService { * @Date 2020.04.01 16:45 **/ @Override - public Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) { + public Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) { topicPageFormDTO.setPageNo(NumConstant.ONE); topicPageFormDTO.setPageSize(NumConstant.MAX); Result> topics = resiGroupFeignClient.getHiddenTopicGov(topicPageFormDTO); - List topicsResult = new ArrayList<>(); + List topicsResult = new ArrayList<>(); if(topics.success() && null != topics.getData() && topics.getData().size() > NumConstant.ZERO) { topics.getData().forEach(top -> { - GovTopicInfoResultDTO govTopic = new GovTopicInfoResultDTO(); + GovHiddenTopicInfoResultDTO govTopic = new GovHiddenTopicInfoResultDTO(); govTopic.setTopicContent(top.getTopicContent()); govTopic.setUserId(top.getUserId()); govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto()); @@ -51,7 +52,7 @@ public class ResiTopicServiceImpl implements ResiTopicService { topicsResult.add(govTopic); }); } - return new Result>().ok(topicsResult); + return new Result>().ok(topicsResult); } @@ -77,6 +78,7 @@ public class ResiTopicServiceImpl implements ResiTopicService { govTopic.setTopicId(top.getTopicId()); govTopic.setTopicRealseTime(top.getReleaseTime().getTime()); govTopic.setTopicFirstPhoto(top.getFirstPhoto()); + govTopic.setTopicState(top.getStatus()); topicsResult.add(govTopic); }); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java new file mode 100644 index 0000000000..ad5bcf4f61 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java @@ -0,0 +1,51 @@ +package com.epmet.resi.group.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName GovHiddenTopicInfoResultDTO + * @Auth wangc + * @Date 2020-04-30 13:42 + */ +@Data +public class GovHiddenTopicInfoResultDTO implements Serializable { + private static final long serialVersionUID = 6993547275260814680L; + + /** + * 作者的Id + * */ + private String userId; + + /** + * 用户头像 + * */ + private String userHeadPhoto; + + /** + * 用户昵称 + * */ + private String userNickName; + + /** + * 话题Id + * */ + private String topicId; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题发布时间 时间戳 + * */ + private Long topicRealseTime; + + /** + * 话题的第一张图片地址 + * */ + private String topicFirstPhoto; +} From 810f797708e4f5d8505861db9cf1fb7de0de0760 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Apr 2020 14:10:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=BC=E5=BC=8F=EF=BC=9A=E4=B8=8A=E7=BA=A7?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0-=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerGridDao.java | 6 ++++++ .../com/epmet/service/impl/CustomerGridServiceImpl.java | 5 +++++ .../src/main/resources/mapper/CustomerGridDao.xml | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 70f4361032..3451859f5c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -60,6 +60,12 @@ public interface CustomerGridDao extends BaseDao { **/ List selectRestGridWithoutGivenAreaCode(Map paramsMap); + /** + * @Description 通过gridId查询网格信息，网格名称格式： 上级组织名称-网格名称 + * @param customerGridFormDTO + * @author wangc + * @date 2020.04.30 13:57 + **/ CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO); /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 7004e084cf..1cb5a09223 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -166,6 +166,11 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) { return new Result().ok(baseDao.getCustomerGridByGridId(customerGridFormDTO)); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 335ff75f55..00174dd487 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -7,15 +7,19 @@ SELECT gr.id, gr.customer_id, - gr.grid_name, + CONCAT(ag.ORGANIZATION_NAME,'-',gr.grid_name) AS gridName, gr.pid, gr.pids, gr.longitude, gr.latitude, gr.area_code FROM customer_grid gr + LEFT JOIN customer_agency ag + ON gr.PID = ag.ID WHERE gr.del_flag = '0' + AND + ag.DEL_FLAG = '0' AND gr.id = #{gridId} From 55a97b0398f9ebcc96c6a03c3febc273fdb861a3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Apr 2020 14:20:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AE=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=88=97=E8=A1=A8-=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/CustomerGridDao.xml | 25 +++++++++++++------ .../main/resources/mapper/GridLatestDao.xml | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 210d0a1f55..0d8cd89636 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -265,16 +265,27 @@ \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml index b274779697..3dfe0f9939 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml @@ -80,5 +80,6 @@ WHERE del_flag = '0' AND customer_user_id = #{userId} + ORDER BY latest_time DESC