From 414eb9750956707dc105bcbbffc6abd6be801f50 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Apr 2020 17:22:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E3=80=81=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A1=A8=E7=9A=84=E5=AD=98=E5=9C=A8=E6=80=A7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/constant/TopicConstant.java | 2 +- .../controller/ResiCommentController.java | 11 ++++--- .../topic/controller/ResiTopicController.java | 29 +++++++++---------- .../service/impl/ResiTopicServiceImpl.java | 25 +++++++++++----- .../mapper/topic/ResiTopicAttachmentDao.xml | 4 ++- .../mapper/topic/ResiTopicCommentDao.xml | 4 ++- .../resources/mapper/topic/ResiTopicDao.xml | 21 ++++++++++---- .../mapper/topic/ResiTopicOperationDao.xml | 4 ++- .../epmet/constant/UserCustomerConstant.java | 21 ++++++++++++++ .../impl/RegisterRelationServiceImpl.java | 11 ++++++- 10 files changed, 94 insertions(+), 38 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserCustomerConstant.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 4910c2281b..72797d60e6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -56,7 +56,7 @@ public interface TopicConstant { /** * 构造queryWrapper 创建日期列名 * */ - String CREATED_DATE = "CREATED_DATE"; + String CREATED_DATE = "CREATED_TIME"; /** * 构造queryWrapper 逻辑删除标识列名 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java index ae4c96d67c..4b37c30352 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java @@ -5,10 +5,13 @@ 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.modules.topic.service.ResiTopicCommentService; +import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -35,8 +38,8 @@ public class ResiCommentController { * @Author wangc * @Date 2020.04.01 18:06 **/ - @RequestMapping("commenttopic") - public Result commentTopic(@LoginUser TokenDto tokenDto, ResiPublishCommentFormDTO publishCommentFormDTO){ + @PostMapping("commenttopic") + public Result commentTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiPublishCommentFormDTO publishCommentFormDTO){ ValidatorUtils.validateEntity(publishCommentFormDTO); return commentService.commentTopic(tokenDto,publishCommentFormDTO); } @@ -49,8 +52,8 @@ public class ResiCommentController { * @Author wangc * @Date 2020.04.01 23:49 **/ - @RequestMapping("getcommentlistoftopic") - public Result> getCommentListOfTopic(@LoginUser TokenDto tokenDto, ResiQueryCommentFormDTO queryCommentFormDTO){ + @PostMapping("getcommentlistoftopic") + public Result> getCommentListOfTopic(@LoginUser TokenDto tokenDto,@RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){ ValidatorUtils.validateEntity(queryCommentFormDTO); return commentService.getCommentList(tokenDto,queryCommentFormDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index e40cda746f..037c619647 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -11,10 +11,7 @@ import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -40,7 +37,7 @@ public class ResiTopicController { * @Author wangc * @Date 2020.03.31 13:15 **/ - @RequestMapping("createtopic") + @PostMapping("createtopic") public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPublishFormDTO topicPublishFormDTO){ ValidatorUtils.validateEntity(topicPublishFormDTO); @@ -55,7 +52,7 @@ public class ResiTopicController { * @Author wangc * @Date 2020.04.01 23:48 **/ - @RequestMapping("gettopicdetail") + @PostMapping("gettopicdetail") public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestParam("topicId")String topicId ){ return topicService.getTopicDetail(tokenDto,topicId); } @@ -68,7 +65,7 @@ public class ResiTopicController { * @Author wangc * @Date 2020.04.01 10:36 **/ - @RequestMapping("getpasttopiclist") + @PostMapping("getpasttopiclist") public Result> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ ValidatorUtils.validateEntity(topicPageFormDTO); return topicService.getPastTopicList(tokenDto,topicPageFormDTO); @@ -82,8 +79,8 @@ public class ResiTopicController { * @Author wangc * @Date 2020.04.02 00:01 **/ - @RequestMapping("getlatesttentopic") - Result> getLatestTenTopics(TokenDto tokenDto,String groupId){ + @PostMapping("getlatesttentopics") + Result> getLatestTenTopics(@LoginUser TokenDto tokenDto,@RequestParam("groupId") String groupId){ return topicService.getLatestTenTopics(tokenDto,groupId); } @@ -96,7 +93,7 @@ public class ResiTopicController { * @Date 2020.04.01 12:38 **/ @RequestMapping("hidetopic") - Result hideTopic(TokenDto tokenDto,ResiTopicOperationFormDTO hiddenFormDTO){ + Result hideTopic(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicOperationFormDTO hiddenFormDTO){ ValidatorUtils.validateEntity(hiddenFormDTO); return topicService.hideTopic(tokenDto,hiddenFormDTO); } @@ -109,8 +106,8 @@ public class ResiTopicController { * @Author wangc * @Date 2020.04.01 16:45 **/ - @RequestMapping("gethiddentopic") - Result> getHiddenTopic(TokenDto tokenDto,ResiTopicPageFormDTO topicPageFormDTO){ + @PostMapping("gethiddentopic") + Result> getHiddenTopic(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicPageFormDTO topicPageFormDTO){ ValidatorUtils.validateEntity(topicPageFormDTO); return topicService.getHiddenTopics(tokenDto,topicPageFormDTO); } @@ -123,8 +120,8 @@ public class ResiTopicController { * @Author wangc * @Date 2020.04.01 14:17 **/ - @RequestMapping("cancelhiddentopics") - Result cancelHiddenTopics(TokenDto tokenDto,List topicIds){ + @PostMapping("cancelhiddentopics") + Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestParam("topicIds") List topicIds){ return topicService.cancelHiddenTopics(tokenDto,topicIds); } @@ -136,8 +133,8 @@ public class ResiTopicController { * @Author wangc * @Date 2020.04.01 15:37 **/ - @RequestMapping("closetopic") - Result closeTopic(TokenDto tokenDto,ResiTopicOperationFormDTO closeFormDTO){ + @PostMapping("closetopic") + Result closeTopic(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicOperationFormDTO closeFormDTO){ ValidatorUtils.validateEntity(closeFormDTO); return topicService.closeTopic(tokenDto,closeFormDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 516f722bb2..e551acd16d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -156,11 +156,13 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getLatestTenTopics(TokenDto tokenDto, String groupId) { - + if (null == tokenDto) { + return new Result().error(ModuleConstant.USER_NOT_NULL); + } if(StringUtils.isBlank(groupId)){ return new Result>().error(); } @@ -238,6 +244,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { + if (null == tokenDto) { + return new Result().error(ModuleConstant.USER_NOT_NULL); + } + //1.查询历史话题列表 topicPageFormDTO.setUserId(tokenDto.getUserId()); @@ -263,7 +273,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topicIds) { - //1.1拿到组Id ResiTopicEntity topic = baseDao.selectById(topicIds.get(0)); @@ -384,7 +395,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(TopicConstant.TOPIC_ID,topicId); - wrapper.eq(TopicConstant.DEL_FLAG,NumConstant.ZERO_STR); + //wrapper.eq(TopicConstant.DEL_FLAG,NumConstant.ZERO_STR); wrapper.orderByDesc(TopicConstant.CREATED_DATE); List attachments = resiTopicAttachmentDao.selectList(wrapper); List attachmentUrls = new ArrayList<>(); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml index 4f64d97e42..4dc9b8cfda 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml @@ -6,11 +6,12 @@ - select replace(uuid(),'-','') AS APPROVAL_ID + select replace(uuid(),'-','') AS ID INSERT INTO resi_topic_attachment + id, topic_id, @@ -36,6 +37,7 @@ updated_time + #{id}, #{topicId}, diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml index a7bd739c48..adf7e2aeae 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml @@ -6,11 +6,12 @@ - select replace(uuid(),'-','') AS APPROVAL_ID + select replace(uuid(),'-','') AS ID INSERT INTO resi_topic_operation + id, topic_id, @@ -30,6 +31,7 @@ updated_time + #{id}, #{topicId}, diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 9ced62fb55..5269c441c9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -7,11 +7,12 @@ - select replace(uuid(),'-','') AS APPROVAL_ID + select replace(uuid(),'-','') AS ID INSERT INTO resi_topic + id, group_id, @@ -43,13 +44,14 @@ created_by, updated_by, - delFlag, + del_flag, revision, created_time, updated_time + #{id}, #{groupId}, @@ -91,13 +93,17 @@ SELECT - ID, + ID AS topicId, GROUP_ID, TOPIC_CONTENT, STATUS, CREATED_TIME AS releaseTime, CREATED_BY AS userId, - DECODE(CREATED_BY,#{userId},'me','other') as releaseUserFlag + CASE + WHEN CREATED_BY = #{userId} THEN 'me' + ELSE 'other' + END AS releaseUserFlag FROM RESI_TOPIC diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml index 6254bb021a..abf5bc56fd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml @@ -7,11 +7,12 @@ - select replace(uuid(),'-','') AS APPROVAL_ID + select replace(uuid(),'-','') AS ID INSERT INTO resi_topic_operation + id, topic_id, @@ -31,6 +32,7 @@ updated_time + #{id}, #{topicId}, diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserCustomerConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserCustomerConstant.java new file mode 100644 index 0000000000..301c78b105 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserCustomerConstant.java @@ -0,0 +1,21 @@ +package com.epmet.constant; + +/** + * @Description + * @IntefaceName UserCustomerConstant + * @Author wangc + * @date 2020.04.02 17:03 + */ +public interface UserCustomerConstant { + + /** + * wrapper映射列名 用户Id + * */ + String USER_ID = "USER_ID"; + + /** + * wrapper映射列名 客户Id + * */ + String CUSTOMER_ID = "CUSTOMER_ID"; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index f0d9b43022..aada56a6b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.UserCustomerConstant; import com.epmet.dao.*; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.RegisterRelationDTO; @@ -144,6 +145,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO) { Result result = new Result<>(); @@ -167,7 +169,14 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId()); + wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId()); + List userCustomerList = userCustomerDao.selectList(wrapper); + if(null == userCustomerList || userCustomerList.size() <= 0){ + userCustomerDao.insert(userCustomer); + } + }else{ //2.根据居民认证的网格、客户进行统计