创建任务

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/qiandao/QdUserSignInNoteRequestDto.java

@@ -9,6 +9,8 @@ import java.util.Date;
 @Data
 public class QdUserSignInNoteRequestDto extends BaseRequestDto implements Entity {
 
+    private Long id;
+
     /**
      * 用户id
      */

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdGiveLikeRecordServiceImpl.java

@@ -46,7 +46,7 @@ public class QdGiveLikeRecordServiceImpl implements QdGiveLikeRecordService {
             qdUserSignInNoteUpdateDto.setId(qdUserSignInNote.getId());
             qdUserSignInNoteUpdateDto.setLikeNum(qdUserSignInNote.getLikeNum() + 1);
             qdUserSignInNoteUpdateDto.setUpdateTime(now);
-            qdUserSignInNoteDao.updateByPrimaryKey(qdUserSignInNote);
+            qdUserSignInNoteDao.updateByPrimaryKey(qdUserSignInNoteUpdateDto);
             return Result.success();
         } catch (Exception e) {
             logger.error("点赞签到笔记失败 error:{}", e);
@@ -65,7 +65,7 @@ public class QdGiveLikeRecordServiceImpl implements QdGiveLikeRecordService {
             qdUserSignInNoteUpdateDto.setId(qdUserSignInNote.getId());
             qdUserSignInNoteUpdateDto.setLikeNum(qdUserSignInNote.getLikeNum() - 1);
             qdUserSignInNoteUpdateDto.setUpdateTime(new Date());
-            qdUserSignInNoteDao.updateByPrimaryKey(qdUserSignInNote);
+            qdUserSignInNoteDao.updateByPrimaryKey(qdUserSignInNoteUpdateDto);
             return Result.success();
         } catch (Exception e) {
             logger.error("取消点赞失败 error:{}", e);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdSignInTaskServiceImpl.java

@@ -43,9 +43,11 @@ public class QdSignInTaskServiceImpl implements QdSignInTaskService {
         try {
             Date now = new Date();
             SignInTask signInTask = new SignInTask();
+            EntityMapper.copyAttribute(dto, signInTask);
             signInTask.setState(SignInTaskEnum.StateEnum.PROCESSING.getCode());
             signInTask.setName(dto.getName());
             signInTask.setDesc(dto.getDesc());
+            signInTask.setImage(dto.getImage());
             signInTask.setCreateTime(now);
             signInTask.setUpdateTime(now);
             signInTaskDao.insert(signInTask);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdUserSignInNoteServiceImpl.java

@@ -88,4 +88,41 @@ public class QdUserSignInNoteServiceImpl implements QdUserSignInNoteService {
         }
         return Result.failed();
     }
+
+
+    @Override
+    public Result findDetail(QdUserSignInNoteRequestDto dto) {
+        try {
+            QdUserSignInNote qdUserSignInNote = qdUserSignInNoteDao.findByNoteId(dto.getId());
+            QdSignInNoteVo qdSignInNoteVo = new QdSignInNoteVo();
+            EntityMapper.copyAttribute(qdUserSignInNote, qdSignInNoteVo);
+            qdSignInNoteVo.setImageList(Arrays.asList(qdUserSignInNote.getImage().split(";")));
+            QdUser qdUser = qdUserDao.queryById(qdUserSignInNote.getUserId());
+            qdSignInNoteVo.setUserAvatar(qdSignInNoteVo.getUserAvatar());
+            qdSignInNoteVo.setUserName(qdUser.getNickName());
+            long diffInMillies = Math.abs(new Date().getTime() - qdUserSignInNote.getCreateTime().getTime());
+            long diffInHours = diffInMillies / (60 * 1000 * 60);
+            String uploadTime = "";
+            if (diffInHours >= 1 && diffInHours < 24) {
+                uploadTime =  diffInHours + "小时前发布";
+            } else if (diffInHours > 24) {
+                long diffInDays = diffInMillies / (60 * 1000 * 60 * 24);
+                uploadTime = diffInDays + "天前发布";
+            } else {
+                uploadTime = "1小时内发布";
+            }
+            qdSignInNoteVo.setUploadTime(uploadTime);
+            SignInTask signInTask = signInTaskDao.findById(qdUserSignInNote.getTaskId());
+            qdSignInNoteVo.setTaskName(signInTask.getName());
+            //查询当前用户是否点赞
+            if (dto.getUserId() != null) {
+                qdGiveLikeRecordDao.isExisted(dto.getUserId(), qdUserSignInNote.getId());
+                qdSignInNoteVo.setIsLike(true);
+            }
+            return Result.success(qdSignInNoteVo);
+        } catch (Exception e) {
+            logger.error("查询签到笔记详情失败 error:{}", e);
+        }
+        return Result.failed();
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/qiandao/QdUserSignInNoteService.java

@@ -14,4 +14,11 @@ public interface QdUserSignInNoteService {
      * @return
      */
     Result findSignInNoteList(QdUserSignInNoteRequestDto dto);
+
+    /**
+     * 查询签到笔记详情
+     * @param dto
+     * @return
+     */
+    Result findDetail(QdUserSignInNoteRequestDto dto);
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/qiandao/QdUserSignInNoteController.java

@@ -2,6 +2,7 @@ package com.wwdz.ch.wx.web.qiandao;
 
 
 import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dto.request.qiandao.QdUserSignInNoteRequestDto;
 import com.wwdz.ch.wx.entity.request.QdHomePageRequestDto;
@@ -32,4 +33,15 @@ public class QdUserSignInNoteController {
         return qdUserSignInNoteService.findSignInNoteList(dto);
     }
 
+
+    @ApiOperation(value = "查询用户签到笔记详情")
+    @PostMapping("/findDetail")
+    public Result findDetail(@RequestBody QdUserSignInNoteRequestDto dto) {
+        logger.info("【请求开始】查询用户签到笔记详情,请求参数:{}", JSON.toJSONString(dto));
+        if (dto.getId() == null) {
+            return Result.failed(ResultCode.PARAM_ERROR);
+        }
+        return qdUserSignInNoteService.findDetail(dto);
+    }
+
 }