Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2

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 逻辑删除标识列名

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")
+    @PostMapping("commenttopic")
-    public Result commentTopic(@LoginUser TokenDto tokenDto, ResiPublishCommentFormDTO publishCommentFormDTO){
+    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")
+    @PostMapping("getcommentlistoftopic")
-    public Result<List<ResiCommentResultDTO>> getCommentListOfTopic(@LoginUser TokenDto tokenDto, ResiQueryCommentFormDTO queryCommentFormDTO){
+    public Result<List<ResiCommentResultDTO>> getCommentListOfTopic(@LoginUser TokenDto tokenDto,@RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
         ValidatorUtils.validateEntity(queryCommentFormDTO);
         return commentService.getCommentList(tokenDto,queryCommentFormDTO);
     }

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 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<ResiTopicDetailResultDTO> 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<List<ResiTopicInfoResultDTO>> 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")
+    @PostMapping("getlatesttentopics")
-    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(TokenDto tokenDto,String groupId){
+    Result<List<ResiTopicInfoResultDTO>> 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")
+    @PostMapping("gethiddentopic")
-    Result<List<ResiTopicInfoResultDTO>> getHiddenTopic(TokenDto tokenDto,ResiTopicPageFormDTO topicPageFormDTO){
+    Result<List<ResiTopicInfoResultDTO>> 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")
+    @PostMapping("cancelhiddentopics")
-    Result cancelHiddenTopics(TokenDto tokenDto,List<String> topicIds){
+    Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestParam("topicIds") List<String> topicIds){
         return topicService.cancelHiddenTopics(tokenDto,topicIds);
     }
 
@@ -136,8 +133,8 @@ public class ResiTopicController {
      * @Author wangc
      * @Date 2020.04.01 15:37
      **/
-    @RequestMapping("closetopic")
+    @PostMapping("closetopic")
-    Result closeTopic(TokenDto tokenDto,ResiTopicOperationFormDTO closeFormDTO){
+    Result closeTopic(@LoginUser  TokenDto tokenDto,@RequestBody ResiTopicOperationFormDTO closeFormDTO){
         ValidatorUtils.validateEntity(closeFormDTO);
         return topicService.closeTopic(tokenDto,closeFormDTO);
     }

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<ResiTopicDao, ResiTopi
      **/
     @Override
     public Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO) {
-
+        if (null == tokenDto) {
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
+        }
         //1.身份校验,查看当前用户是否是组内成员,当前用户是否被禁言
 
         ResiGroupMemberDTO resiGroupMemberDTO =
-        resiGroupMemberService.getResiGroupMember(tokenDto.getUserId() , resiTopicPublishFormDTO.getGroupId());
+        resiGroupMemberService.getResiGroupMember(resiTopicPublishFormDTO.getGroupId(),tokenDto.getUserId() );
 
         Result result = verifySilentOrRemoved(resiGroupMemberDTO);
         if(!result.success()){
@@ -174,6 +176,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }
         ResiTopicEntity topic = ConvertUtils.sourceToTarget(resiTopicPublishFormDTO,ResiTopicEntity.class);
         topic.setCreatedBy(tokenDto.getUserId());
+        topic.setStatus(TopicConstant.PUBLISHMENT);
         baseDao.insertOne(topic);
         if(StringUtils.isBlank(topic.getId())){
             //没有返回主键
@@ -184,7 +187,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             for(String url : resiTopicPublishFormDTO.getAttachmentList()){
                 attachment.setAttachmentUrl(url);
                 attachment.setTopicId(topic.getId());
-                attachment.setCreatedBy(tokenDto.getUnionId());
+                attachment.setCreatedBy(tokenDto.getUserId());
                 resiTopicAttachmentDao.insertOne(attachment);
             }
         }
@@ -193,6 +196,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
         operation.setTopicId(topic.getId());
         operation.setOperationType(TopicConstant.PUBLISHMENT);
+        operation.setCreatedBy(tokenDto.getUserId());
         resiTopicOperationDao.insertOne(operation);
 
         return new Result();
@@ -208,7 +212,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      **/
     @Override
     public Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(TokenDto tokenDto, String groupId) {
-
+        if (null == tokenDto) {
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
+        }
         if(StringUtils.isBlank(groupId)){
             return new Result<List<ResiTopicInfoResultDTO>>().error();
         }
@@ -238,6 +244,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Override
     public Result<List<ResiTopicInfoResultDTO>> 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<ResiTopicDao, ResiTopi
      **/
     @Override
     public Result hideTopic(TokenDto tokenDto, ResiTopicOperationFormDTO hiddenFormDTO) {
-
+        if (null == tokenDto) {
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
+        }
 
         //1.1拿到组Id
         ResiTopicEntity topic = baseDao.selectById(hiddenFormDTO.getTopicId());
@@ -301,7 +313,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Override
     public Result cancelHiddenTopics(TokenDto tokenDto, List<String> topicIds) {
 
-
         //1.1拿到组Id
         ResiTopicEntity topic = baseDao.selectById(topicIds.get(0));
 
@@ -384,7 +395,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> 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<ResiTopicAttachmentEntity> attachments = resiTopicAttachmentDao.selectList(wrapper);
         List<String> attachmentUrls = new ArrayList<>();

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml

@@ -6,11 +6,12 @@
     <insert id="insertOne" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.modules.topic.entity.ResiTopicAttachmentEntity">
 
         <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
-            select replace(uuid(),'-','') AS APPROVAL_ID
+            select replace(uuid(),'-','') AS ID
         </selectKey>
 
         INSERT INTO resi_topic_attachment
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            id,
             <if test ='null != topicId'>
                 topic_id,
             </if>
@@ -36,6 +37,7 @@
             updated_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{id},
             <if test ='null != topicId'>
                 #{topicId},
             </if>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml

@@ -6,11 +6,12 @@
     <!-- 新增一条数据 :  一条评论-->
     <insert id="insertOne" parameterType="com.epmet.modules.comment.entity.ResiTopicCommentEntity">
         <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
-            select replace(uuid(),'-','') AS APPROVAL_ID
+            select replace(uuid(),'-','') AS ID
         </selectKey>
 
         INSERT INTO resi_topic_operation
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            id,
             <if test ='null != topicId'>
                 topic_id,
             </if>
@@ -30,6 +31,7 @@
             updated_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{id},
             <if test ='null != topicId'>
                 #{topicId},
             </if>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -7,11 +7,12 @@
     <insert id="insertOne" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.modules.topic.entity.ResiTopicEntity">
 
         <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
-            select replace(uuid(),'-','') AS APPROVAL_ID
+            select replace(uuid(),'-','') AS ID
         </selectKey>
 
         INSERT INTO resi_topic
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            id,
             <if test ='null != groupId'>
                 group_id,
             </if>
@@ -43,13 +44,14 @@
                 created_by,
             </if>
                 updated_by,
-                delFlag,
+                del_flag,
                 revision,
                 created_time,
                 updated_time
 
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{id},
             <if test ='null != groupId'>
                 #{groupId},
             </if>
@@ -91,13 +93,17 @@
     <!-- 查询最近十条话题 -->
     <select id="getLatestTenTopics" parameterType="string" resultType="com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO">
         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
         WHERE
@@ -112,13 +118,16 @@
     <!-- 查询历史话题，分页，参数查询 -->
     <select id="getPastTopics" parameterType="com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO" resultType="com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO">
         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
         <where>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml

@@ -7,11 +7,12 @@
     <insert id="insertOne" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.modules.topic.entity.ResiTopicOperationEntity">
 
         <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
-            select replace(uuid(),'-','') AS APPROVAL_ID
+            select replace(uuid(),'-','') AS ID
         </selectKey>
 
         INSERT INTO resi_topic_operation
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            id,
             <if test ='null != topicId'>
                 topic_id,
             </if>
@@ -31,6 +32,7 @@
             updated_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{id},
             <if test ='null != topicId'>
                 #{topicId},
             </if>

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";
+
+}

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<RegisterRelatio
      * @Date 2020.03.30 15:06
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO) {
 
         Result<UserInfoOnEnterGridResultDTO> result = new Result<>();
@@ -167,7 +169,14 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证
         if(null == registerRecords || registerRecords.size() <= 0){
             //当前用户尚未注册过居民信息
-            userCustomerDao.insert(userCustomer);
+            QueryWrapper<UserCustomerEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId());
+            wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId());
+            List<UserCustomerEntity> userCustomerList = userCustomerDao.selectList(wrapper);
+            if(null == userCustomerList || userCustomerList.size() <= 0){
+                userCustomerDao.insert(userCustomer);
+            }
+
         }else{
 
             //2.根据居民认证的网格、客户进行统计