动态

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/DynamicCommentDTO.java

@@ -60,6 +60,11 @@ public class DynamicCommentDTO implements Serializable {
      */
     private Long goodNum;
 
+    /**
+     * 用户查看动态状态：0-未点赞和未踩；1-已点赞；2-已踩
+     */
+    private Integer clickStatus;
+
     /**
      * 差评数
      */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/DynamicComment.java

@@ -22,6 +22,7 @@ import java.util.Date;
 @TableName(autoResultMap = true)
 public class DynamicComment implements Entity<Long> {
 
+    private static final long serialVersionUID = -6204734154047255006L;
     /**
      * 主键
      */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicEvaluateRecordService.java

@@ -3,7 +3,6 @@ package com.chelvc.cloud.vehicle.server.service;
 
 import com.chelvc.cloud.vehicle.api.dto.DynamicEvaluateRecordDTO;
 import com.chelvc.cloud.vehicle.api.dto.EvaluateDTO;
-import com.chelvc.cloud.vehicle.api.param.AddDynamicEvaluateRecordParam;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 
@@ -15,11 +14,6 @@ import com.chelvc.framework.common.model.Paging;
  */
 public interface DynamicEvaluateRecordService {
 
-    /**
-     * 修改内容评价(点赞/踩)列
-     */
-    Boolean updateRecord(AddDynamicEvaluateRecordParam param, Long userId);
-
     DynamicEvaluateRecordDTO queryOperaterType(Long id, Long userId, Integer recordType);
 
     /**

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.lock.annotation.Lock4j;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,7 +12,9 @@ import com.chelvc.cloud.uc.api.dto.UserDTO;
 import com.chelvc.cloud.uc.api.service.UserService;
 import com.chelvc.cloud.vehicle.api.constant.DynamicStatusType;
 import com.chelvc.cloud.vehicle.api.constant.ExamineType;
+import com.chelvc.cloud.vehicle.api.constant.RecordType;
 import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
+import com.chelvc.cloud.vehicle.api.dto.DynamicEvaluateRecordDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicCommentParam;
 import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicCommentParam;
@@ -19,6 +22,7 @@ import com.chelvc.cloud.vehicle.server.dao.DynamicCommentMapper;
 import com.chelvc.cloud.vehicle.server.entity.DynamicComment;
 import com.chelvc.cloud.vehicle.server.service.DynamicCommentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
+import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.util.BeanCopyUtil;
@@ -51,6 +55,7 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
   private final DynamicContentService dynamicContentService;
   @DubboReference
   private final UserService userService;
+  DynamicEvaluateRecordService dynamicEvaluateRecordService;
 
   //private final ContentAuditHelper contentAuditHelper;
   /**
@@ -73,6 +78,7 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
     Page<DynamicComment> page = baseMapper.selectPage(
         new Page<>(pageNum, pageSize), lqw);
     List<DynamicComment> result = page.getRecords();
+    DynamicEvaluateRecordService service = getContentEvaluateRecordService();
     if (result != null && result.size() > 0) {
       List<DynamicCommentDTO> records = BeanCopyUtil.copy(result,
           DynamicCommentDTO.class);
@@ -81,6 +87,13 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
       Map<Long, UserDTO> map = userService.queryUserByIds(userIds);
       records.forEach(e -> {
         e.setUserDTO(map == null ? new UserDTO() : map.get(e.getUserId()));
+        DynamicEvaluateRecordDTO dto = service.queryOperaterType(e.getId(),
+                userId, RecordType.COMMENT.getValue());
+        if (dto == null) {
+          e.setClickStatus(0);
+        } else {
+          e.setClickStatus(dto.getOperaterType());
+        }
       });
       return Pagination.<DynamicCommentDTO>builder().total(page.getTotal()).pages(page.getPages())
               .records(records).build();
@@ -88,6 +101,11 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
     return new Pagination<>();
   }
 
+  public DynamicEvaluateRecordService getContentEvaluateRecordService() {
+    this.dynamicEvaluateRecordService = SpringUtil.getBean(DynamicEvaluateRecordService.class);
+    return dynamicEvaluateRecordService;
+  }
+
   @Override
   public Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
                                                        Long pageSize) {
@@ -149,6 +167,9 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
     }
     //异步处理审核
     //contentAuditHelper.asyncCommentHandle(add);
+    //暂时不审核
+    addParentComment(param.getParentId());
+    dynamicContentService.addComment(param.getDynamicId());
   }
 
   private void addParentComment(Long parentId) {

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicContentServiceImpl.java

@@ -179,7 +179,7 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
 
   public QueryWrapper<DynamicContent> queryHotWrapper(String keyWord, Long userId) {
     QueryWrapper<DynamicContent> lqw = Wrappers.query();
-    lqw.ge("t1.good_num", 50);
+    lqw.ge("t1.good_num", 10);
     return format(lqw, keyWord, userId);
   }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicEvaluateRecordServiceImpl.java

@@ -23,6 +23,7 @@ import com.chelvc.framework.common.util.BeanCopyUtil;
 import com.chelvc.framework.database.util.PagingUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -41,7 +42,9 @@ import java.util.Objects;
 @Slf4j
 @Service
 @RequiredArgsConstructor(onConstructor = @__({@Autowired, @Lazy}))
-public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluateRecordMapper, DynamicEvaluateRecord> implements DynamicEvaluateRecordService {
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.DynamicEvaluateRecordService.class)
+public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluateRecordMapper, DynamicEvaluateRecord>
+        implements DynamicEvaluateRecordService, com.chelvc.cloud.vehicle.api.service.DynamicEvaluateRecordService{
 
   private final DynamicEvaluateRecordMapper baseMapper;