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

@@ -979,7 +979,6 @@ public class CommunityArticleController extends BaseController {
         return AjaxResult.success(communityCollection);
     }
 
-
     /**
      * 更新合集信息
      *

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

@@ -224,24 +224,21 @@ 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)) {
-                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));
-                }
+                List<CommunityChatMsg> chatMsgList = communitychatMsgMapper.getChatMsgRecord(userId, otherUserId, type,1,100000);
+                for (CommunityChatMsg chatMsg : chatMsgList) {
+                    if (chatMsg.getSenderId().equals(otherUserId)) {
+                        chatMsg.setSenderAnonName(newAnonName);
+                    }
 
-                if (returnRecord.getReturnReceiveUserId().equals(otherUserId)) {
-                    System.out.println("修改接收者者匿名名称:" + newAnonName);
-                    communityReturnRecordService.update(new UpdateWrapper<CommunityReturnRecord>()
-                            .eq("id", returnRecordId)
-                            .set("return_receive_anon_name", newAnonName));
+                    if (chatMsg.getReceiverId().equals(otherUserId)) {
+                        chatMsg.setReceiverAnonName(newAnonName);
+                    }
+                    chatMsg.setUpdateBy(SecurityUtils.getUserId());
+                    chatMsg.setUpdateTime(DateUtils.parseDate(DateUtils.getDate()));
                 }
+                communityChatMsgService.updateBatchById(chatMsgList);
             }
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -267,18 +264,6 @@ 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,11 +10,10 @@ 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.*;
+import com.ruoyi.generator.domain.Community.CommunityTag;
+import com.ruoyi.generator.domain.Community.CommunityTagBlock;
 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;
@@ -52,11 +51,6 @@ public class CommunityTagController extends BaseController {
     @Autowired
     private RedisCache redisCache;
 
-    @Autowired
-    private CommunityUserCircleMapper communityUserCircleMapper;
-
-    @Autowired
-    private CommunityUserTagMapper communityUserTagMapper;
     /**
      * 获取标签信息
      */
@@ -83,113 +77,6 @@ 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

@@ -1,71 +0,0 @@
-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,7 +8,6 @@ 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

@@ -1,10 +0,0 @@
-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> {
-}