Merge branch 'dev' of http://121.4.140.159:10880/378402801/ruoyi-community

ruoyi-admin/src/main/resources/application.yml

@@ -68,7 +68,7 @@ spring:
   # redis 配置
   redis:
     # 地址 47.122.10.161 121.4.140.159
-    host: 47.122.10.161
+    host: 121.4.140.159
     # 端口，默认为6379
     port: 6379
     # 数据库索引

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -730,7 +730,7 @@ public class CommunityArticleController extends BaseController {
     @ApiOperation("获取用户信息")
     @GetMapping("/userInfo")
     @Anonymous
-    public AjaxResult userInfo(@RequestParam(required = false) Long userId,boolean isToken) {
+    public AjaxResult userInfo(@RequestParam(required = false) Long userId,@RequestParam(defaultValue = "true") boolean isToken) {
         if (Objects.isNull(userId)) {
             userId = SecurityUtils.getLoginUser().getUserId();
 
@@ -744,7 +744,7 @@ public class CommunityArticleController extends BaseController {
 
         CommunityUserInfoVo communityUserInfoVo = null;
         try {
-            communityUserInfoVo = communityArticleService.selectCommunityUserInfoById(userId,isToken);
+            communityUserInfoVo = communityArticleService.selectCommunityUserInfoById(userId, isToken);
         } catch (Exception e) {
             System.out.println(e.getMessage());
             throw new ProjectException();
@@ -1148,7 +1148,7 @@ public class CommunityArticleController extends BaseController {
     @ApiOperation("查询用户合集")
     @GetMapping("/getCollection")
     @Anonymous
-    public AjaxResult getCollection(Long collectionId, Long searchType,@RequestParam(required = false) Long userId) {
+    public AjaxResult getCollection(Long collectionId, Long searchType, @RequestParam(required = false) Long userId) {
         if (Objects.isNull(collectionId)) {
             return AjaxResult.error("合集不存在!");
         }
@@ -1160,7 +1160,7 @@ public class CommunityArticleController extends BaseController {
         List<CommunityCollectionArticleVo> collectionArticleVos = null;
         JSONArray jsonArray;
         try {
-            jsonArray = communityCollectionService.selectArticleInfoInCollection(userId,collectionId, searchType);
+            jsonArray = communityCollectionService.selectArticleInfoInCollection(userId, collectionId, searchType);
         } catch (Exception e) {
             System.out.println(e.getMessage());
             throw new ProjectException();

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityChatMsgController.java

@@ -224,21 +224,24 @@ public class CommunityChatMsgController extends BaseController {
         long otherUserId = updateAnonName.getOtherUserId();
         String newAnonName = updateAnonName.getNewAnonName();
         String type = updateAnonName.getType();
+        String returnRecordId = updateAnonName.getReturnRecordId();
         try {
             if ("anonymous".equals(type)) {
-                List<CommunityChatMsg> chatMsgList = communitychatMsgMapper.getChatMsgRecord(userId, otherUserId, type,1,100000);
-                for (CommunityChatMsg chatMsg : chatMsgList) {
-                    if (chatMsg.getSenderId().equals(otherUserId)) {
-                        chatMsg.setSenderAnonName(newAnonName);
-                    }
+                CommunityReturnRecord returnRecord = communityReturnRecordService.getOne(new UpdateWrapper<CommunityReturnRecord>()
+                        .eq("id", returnRecordId));
+                if (returnRecord.getReturnCreateUserId().equals(otherUserId)) {
+                    System.out.println("修改创建者者匿名名称:" + newAnonName);
+                    communityReturnRecordService.update(new UpdateWrapper<CommunityReturnRecord>()
+                            .eq("id", returnRecordId)
+                            .set("return_create_anon_name", newAnonName));
+                }
 
-                    if (chatMsg.getReceiverId().equals(otherUserId)) {
-                        chatMsg.setReceiverAnonName(newAnonName);
-                    }
-                    chatMsg.setUpdateBy(SecurityUtils.getUserId());
-                    chatMsg.setUpdateTime(DateUtils.parseDate(DateUtils.getDate()));
+                if (returnRecord.getReturnReceiveUserId().equals(otherUserId)) {
+                    System.out.println("修改接收者者匿名名称:" + newAnonName);
+                    communityReturnRecordService.update(new UpdateWrapper<CommunityReturnRecord>()
+                            .eq("id", returnRecordId)
+                            .set("return_receive_anon_name", newAnonName));
                 }
-                communityChatMsgService.updateBatchById(chatMsgList);
             }
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -264,6 +267,18 @@ public class CommunityChatMsgController extends BaseController {
         if (returnRecords != null && !returnRecords.isEmpty()) {
             List<Long> returnIds = returnRecords.stream().map(CommunityReturnRecord::getId).collect(Collectors.toList());
             sysUserChatVos = communityChatMsgService.getChatListWithLatestMessage(userId, "anonymous", searchValue, returnIds,offset,pageSize);
+            if (!sysUserChatVos.isEmpty()) {
+                for (SysUserVo sysUserChatVo : sysUserChatVos) {
+                    CommunityReturnRecord returnRecord = communityReturnRecordService.getOne(new QueryWrapper<CommunityReturnRecord>().eq("id", sysUserChatVo.getReturnRecordId()));
+                    if (returnRecord != null) {
+                        if (sysUserChatVo.getSenderId().equals(returnRecord.getReturnCreateUserId())) {
+                            sysUserChatVo.setSenderNickName(returnRecord.getReturnCreateAnonName());
+                        } else {
+                            sysUserChatVo.setSenderNickName(returnRecord.getReturnReceiveAnonName());
+                        }
+                    }
+                }
+            }
         }
         return AjaxResult.success(sysUserChatVos);
     }

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityTagController.java

@@ -10,10 +10,11 @@ import com.ruoyi.common.exception.user.ProjectException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.generator.domain.Community.CommunityTag;
-import com.ruoyi.generator.domain.Community.CommunityTagBlock;
+import com.ruoyi.generator.domain.Community.*;
 import com.ruoyi.generator.mapper.community.CommunityTagBlockMapper;
 import com.ruoyi.generator.mapper.community.CommunityTagMapper;
+import com.ruoyi.generator.mapper.community.CommunityUserCircleMapper;
+import com.ruoyi.generator.mapper.community.CommunityUserTagMapper;
 import com.ruoyi.generator.service.ICommunityTagService;
 import com.ruoyi.generator.vo.CommunityTagVo;
 import io.swagger.annotations.Api;
@@ -51,6 +52,11 @@ public class CommunityTagController extends BaseController {
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private CommunityUserCircleMapper communityUserCircleMapper;
+
+    @Autowired
+    private CommunityUserTagMapper communityUserTagMapper;
     /**
      * 获取标签信息
      */
@@ -77,6 +83,113 @@ public class CommunityTagController extends BaseController {
         return AjaxResult.success(communityTags);
     }
 
+    /**
+     * 获取我创建的标签
+     */
+    @ApiOperation("我创建的标签")
+    @GetMapping("/createdTags")
+    @Transactional
+    //@Anonymous
+    public AjaxResult createdTags(String tagName,Long userId) {
+        if (userId == null) {
+            userId = SecurityUtils.getUserId();
+        }
+        List<CommunityTag> communityTags = null;
+        try {
+            Page<CommunityTag> page = new Page<>(1, 20);
+            communityTags = communityTagService.page(page, new QueryWrapper<CommunityTag>().and((wrapper) -> {
+                        wrapper.ne("is_delete", 1)
+                                .or()
+                                .isNull("is_delete");
+                    })
+                    .like("tag_name", tagName)
+                    .eq("create_by", userId)
+                    .orderByDesc("tag_hot")).getRecords();
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            throw new ProjectException();
+        }
+
+        return AjaxResult.success(communityTags);
+    }
+
+
+    @ApiOperation("收藏/取关标签")
+    @PostMapping("/likeTag")
+    @Transactional
+    //@Anonymous
+    public AjaxResult likeTag(@RequestBody CommunityUserTag communityUserTag) {
+        if (Objects.isNull(communityUserTag.getTagId())) {
+            return AjaxResult.error("关注圈子异常,请刷新页面重试!");
+        }
+        Long userId = SecurityUtils.getLoginUser().getUserId();
+        String msg = "";
+        try {
+            CommunityUserTag userTag = communityUserTagMapper
+                    .selectOne(new QueryWrapper<CommunityUserTag>()
+                            .eq("tag_id", communityUserTag.getTagId())
+                            .eq("user_id", userId)
+                            .eq("is_delete", 0));
+
+            if (Objects.isNull(userTag) || Objects.isNull(userTag.getId())) {
+                //如果未找到数据,则进行关注
+                userTag = new CommunityUserTag();
+                userTag.setTagId(communityUserTag.getTagId());
+                userTag.setUserId(userId);
+                userTag.setCreateBy(userId);
+                userTag.setCreateTime(DateUtils.parseDate(DateUtils.getTime()));
+                communityUserTagMapper.insert(userTag);
+                msg = "已关注";
+            } else {
+                //更新删除标识
+                userTag.setDelete(true);
+                userTag.setUpdateBy(userId);
+                userTag.setUpdateTime(DateUtils.parseDate(DateUtils.getTime()));
+                communityUserTagMapper.updateById(userTag);
+                msg = "已取关";
+            }
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            throw new ProjectException();
+        }
+
+        return AjaxResult.success(msg);
+    }
+
+    /**
+     * 获取我关注的标签
+     */
+    @ApiOperation("我关注的标签")
+    @GetMapping("/likeTags")
+    @Transactional
+    //@Anonymous
+    public AjaxResult likeTags(String tagName,Long userId) {
+        if (userId == null) {
+            userId = SecurityUtils.getUserId();
+        }
+        List<CommunityTag> communityTags = null;
+        try {
+            //获取关注的圈子ID
+            List<CommunityUserTag> userTags = communityUserTagMapper
+                    .selectList(new QueryWrapper<CommunityUserTag>()
+                            .eq("user_id", userId)
+                            .eq("is_delete", 0));
+
+            List<Long> tagList = userTags.stream().map(CommunityUserTag::getTagId).collect(Collectors.toList());
+            communityTags= communityTagMapper.selectList(new QueryWrapper<CommunityTag>()
+                    .in("id", tagList)
+                    .and((wrapper) -> {
+                        wrapper.ne("is_delete", 1).or().isNull("is_delete");
+                    }));
+
+
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            throw new ProjectException();
+        }
+
+        return AjaxResult.success(communityTags);
+    }
 
     /**
      * 获取标签信息(当前用户是否已拉黑)

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityUserTag.java

@@ -0,0 +1,71 @@
+package com.ruoyi.generator.domain.Community;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户关注圈子
+ *
+ * @TableName community_user_tag
+ */
+@Data
+@TableName("community_user_tag")
+public class CommunityUserTag implements Serializable {
+
+    /**
+     * 唯一id
+     */
+    @NotNull(message = "[唯一id]不能为空")
+    @ApiModelProperty("唯一id")
+    @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private Long userId;
+    /**
+     * 圈子id
+     */
+    @ApiModelProperty("标签id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long tagId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty("是否删除")
+    private boolean isDelete;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private Long createBy;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty("更新人")
+    private Long updateBy;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+}

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ReqEntity/UpdateAnonName.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class UpdateAnonName {
+    private String returnRecordId;
     private long otherUserId;
     private String newAnonName;
     private String type;

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/community/CommunityUserTagMapper.java

@@ -0,0 +1,10 @@
+package com.ruoyi.generator.mapper.community;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.generator.domain.Community.CommunityUserCircle;
+import com.ruoyi.generator.domain.Community.CommunityUserTag;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CommunityUserTagMapper extends BaseMapper<CommunityUserTag> {
+}