Merge remote-tracking branch 'origin/dev0.2' into dev0.2

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -118,11 +118,9 @@
     <profiles>
         <profile>
             <id>dev</id>
-
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -150,6 +148,9 @@
         </profile>
         <profile>
             <id>test</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>test</spring.profiles.active>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -53,7 +53,7 @@ public class ResiTopicController {
      * @Date 2020.04.01 23:48
      **/
     @PostMapping("gettopicdetail")
-    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestParam("topicId")String topicId ){
+    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestParam("topicId") String topicId ){
         return topicService.getTopicDetail(tokenDto,topicId);
     }
 
@@ -121,7 +121,7 @@ public class ResiTopicController {
      * @Date 2020.04.01 14:17
      **/
     @PostMapping("cancelhiddentopics")
-    Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestParam("topicIds") List<String> topicIds){
+    Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestBody List<String> topicIds){
         return topicService.cancelHiddenTopics(tokenDto,topicIds);
     }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -125,6 +125,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
      * @Date 2020.03.31 17:36
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result commentTopic(TokenDto tokenDto, ResiPublishCommentFormDTO resiCommentFormDTO) {
         //1.判断当前用户是否被禁言
         ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());
@@ -133,7 +134,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
         }
 
         ResiGroupMemberDTO resiGroupMemberDTO =
-                resiGroupMemberService.getResiGroupMember(tokenDto.getUserId() , topic.getGroupId());
+                resiGroupMemberService.getResiGroupMember( topic.getGroupId() ,tokenDto.getUserId() );
         //查看当前用户是否被禁言或者被移除
         if(null != resiGroupMemberDTO){
             if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){
@@ -155,6 +156,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
         }
         ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class);
         comment.setStatus(TopicConstant.PUBLISHMENT);
+        comment.setCreatedBy(tokenDto.getUserId());
         baseDao.insertOne(comment);
 
         return new Result();

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -311,6 +311,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 14:17
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result cancelHiddenTopics(TokenDto tokenDto, List<String> topicIds) {
 
         //1.1拿到组Id
@@ -346,10 +347,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 15:37
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result closeTopic(TokenDto tokenDto, ResiTopicOperationFormDTO closeFormDTO) {
 
         //1.1拿到组Id
-        ResiTopicEntity topic = baseDao.selectById(tokenDto.getUserId());
+        ResiTopicEntity topic = baseDao.selectById(closeFormDTO.getTopicId());
 
         //1.2校验身份，是否是该话题所属群组的组长
         Result verifyError = verifyLeader(topic,tokenDto.getUserId());

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

@@ -9,7 +9,7 @@
             select replace(uuid(),'-','') AS ID
         </selectKey>
 
-        INSERT INTO resi_topic_operation
+        INSERT INTO resi_topic_comment
         <trim prefix="(" suffix=")" suffixOverrides=",">
             id,
             <if test ='null != topicId'>
@@ -53,6 +53,7 @@
     </insert>
     <!-- 分页查询某个话题下的评论列表 -->
     <select id="getCommentList" parameterType="com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO" resultType="com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO">
+        SELECT
         ID AS commentId,
         COMMENT_CONTENT,
         STATUS AS commentStatus,

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

@@ -132,13 +132,14 @@
         RESI_TOPIC
         <where>
             DEL_FLAG = '0'
+            AND GROUP_ID = #{groupId}
             <if test='"hidden" != status'>
                 AND <![CDATA[ STATUS <> 'hidden' ]]>
             </if>
-            AND GROUP_ID = #{groupId}
             <if test='null != status and "" != status'>
                 AND STATUS = #{status}
             </if>
+
         </where>
         ORDER BY
         CREATED_TIME DESC
@@ -162,7 +163,7 @@
            TOPIC_CONTENT = #{topicContent} ,
         </if>
         UPDATED_BY = #{updatedBy} ,
-        UPDATED_DATE = NOW()
+        UPDATED_TIME = NOW()
       </set>
       WHERE
         ID = #{id}
@@ -175,17 +176,19 @@
             RESI_TOPIC
             SET
             STATUS = #{status},
-            UPDATED_DATE = NOW(),
+            UPDATED_TIME = NOW(),
             UPDATED_BY = #{updatedBy}
-            WHERE
+            <where>
             ID
-        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
-            ${item}
+            <foreach collection="list" item="item" index="index" open="in (" separator="," close=")">
+                #{item}
             </foreach>
             AND
             DEL_FLAG = '0'
-            AND
-            STATUS = 'hidden'
+            <if test='"discussing" == status'>
+                AND STATUS = 'hidden'
+            </if>
+            </where>
     </update>
 
     <!-- 批量更新 -->
@@ -215,7 +218,7 @@
                 </foreach>
             </trim>
         </trim>
-            updated_date = now()
+            updated_time = now()
         where
         <foreach collection="list" separator="or" item="i" index="index" >
             id=#{i.id}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@@ -74,6 +74,6 @@ public interface ResiPartymemberFeignClient {
      * @param partyMemberInfoDTO 参数
      * @return Result
      */
-    @PostMapping("extra")
+    @PostMapping("/resi/partymember/confirm/extra")
     Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java

@@ -47,7 +47,7 @@ public class PartymemberInfoRedis {
 
     public void setUserMobileCode(String userId, String mobile, String code){
         String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code);
-        redisUtils.set(key, code);
+        redisUtils.set(key, code, RedisUtils.MINUTE_TEN_EXPIRE);
     }
 
     public String getUserMobileCode(String userId, String mobile, String code){
@@ -55,4 +55,9 @@ public class PartymemberInfoRedis {
         return (String) redisUtils.get(key);
     }
 
+    public void delUserMobileCode(String userId, String mobile, String code){
+        String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code);
+        redisUtils.delete(key);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -55,8 +55,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	@Autowired
 	private EpmetMessageFeignClient messageFeignClient;
 
-	private final static String BENCHMARK = "110010";
-
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
@@ -143,6 +141,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue());
 			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName());
 			return result;
+		} else {
+			partyMemberInfoRedis.delUserMobileCode(partyMemberInfoDTO.getUserId(),
+					partyMemberInfoDTO.getMobile(),
+					partyMemberInfoDTO.getCode());
 		}
 
 		//获取党员基本信息