完成查看页面和搜索页面

This commit is contained in:
wangxulei
2025-01-15 21:49:49 +08:00
parent 2bdf00f7f7
commit b16ef37566
17 changed files with 894 additions and 13 deletions

View File

@@ -15,6 +15,7 @@ import com.dd.admin.business.noteImg.service.NoteImgService;
import com.dd.admin.business.upNotes.domain.UpNotesDto;
import com.dd.admin.business.upNotes.domain.UpNotesVo;
import com.dd.admin.business.upNotes.service.UpNotesService;
import com.dd.admin.business.view.service.ViewService;
import com.dd.admin.common.aop.operationLog.aop.OperLog;
import com.dd.admin.common.aop.operationLog.aop.OperType;
import com.dd.admin.common.exception.ApiException;
@@ -52,6 +53,8 @@ public class ApiController {
UpNotesService upNotesService;
@Autowired
private JwtTokenUtil jwtTokenUtil;
@Autowired
ViewService viewService;
@ApiOperation(value = "获取所有笔记")
@ApiOperationSupport(order = 1)
@GetMapping("/api/notes")
@@ -102,6 +105,8 @@ public class ApiController {
}
if(StringUtil.isNotEmpty(followId)){
noteDto.setFollowId(followId);
//读取笔记
viewService.viewNote(followId,noteDto.getNoteId());
}
NoteVo noteVo = noteService.selectNoteDetail(noteDto);
if(noteVo==null){

View File

@@ -52,7 +52,6 @@ public class NoteVo {
private String authorId;
@ApiModelProperty(value = "作者头像")
private String authorAvatar;

View File

@@ -130,26 +130,25 @@
<select id="selectNoteDetail" resultType="com.dd.admin.business.note.domain.NoteVo"
parameterType="java.lang.String">
SELECT
a.*,
(SELECT
COALESCE (COUNT(e.note_id), 0)
(
SELECT
IFNULL(COUNT(e.note_id), 0)
FROM
business_star_notes e
WHERE
e.note_id = a.note_id
GROUP BY
e.note_id
) AS starCount,
(
SELECT
COALESCE (COUNT(d.note_id), 0)
IFNULL(COUNT(d.note_id), 0)
FROM
business_up_notes d
WHERE
d.note_id = a.note_id
GROUP BY
d.note_id
) AS upCount
) AS upCount,
d.AVATAR_URL AS authorAvatar,
a.*,
d.AUTHOR_NAME AS authorName
-- 使用 CASE WHEN 语句判断是否存在当前用户(通过传入的 followId对笔记的收藏记录有则为 true否则为 false
<if test="noteDto.followId != null and noteDto.followId != ''">
,CASE WHEN EXISTS (
@@ -170,7 +169,10 @@
LEFT JOIN
business_star_notes b ON a.note_id = b.note_id
LEFT JOIN
business_up_notes c ON a.note_id = c.note_id where a.deleted = 0
business_up_notes c ON a.note_id = c.note_id
LEFT JOIN
business_author d ON a.author_id = d.author_id
where a.deleted = 0
<if test="noteDto.authorId != null and noteDto.authorId != ''">
and a.AUTHOR_ID = #{noteDto.authorId}
</if>

View File

@@ -53,7 +53,7 @@ public class NoticeController {
@Autowired
private TioWebSocketServerBootstrap bootstrap;
@ApiOperation(value = "通知公告表-添加")
@ApiOperation(value = "发送通知")
@ApiOperationSupport(order = 3)
@PostMapping("/admin/notice/sendNotice")
public ResultBean<Notice> sendNotice(@RequestBody @Validated SendNoticeDto sendNoticeDto) {

View File

@@ -0,0 +1,88 @@
package com.dd.admin.business.view.controller;
import cn.hutool.core.bean.BeanUtil;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.dd.admin.common.model.UpdateGroup;
import com.dd.admin.common.model.result.ResultBean;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotBlank;
import com.dd.admin.business.view.entity.View;
import com.dd.admin.business.view.domain.ViewVo;
import com.dd.admin.business.view.domain.ViewDto;
import com.dd.admin.business.view.service.ViewService;
import java.util.List;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 查看 前端控制器
* </p>
*
* @author 727869402@qq.com
* @since 2025-01-15
*/
@Api(tags = "查看")
@RestController
public class ViewController {
@Autowired
ViewService viewService;
@ApiOperation(value = "查看-分页列表")
@ApiOperationSupport(order = 1)
@GetMapping("/admin/view/page")
public ResultBean<IPage<ViewVo>> page(ViewDto viewDto) {
IPage<ViewVo> pageInfo = viewService.selectViewPage(viewDto);
return ResultBean.success(pageInfo);
}
@ApiOperation(value = "查看-列表")
@ApiOperationSupport(order = 2)
@GetMapping("/admin/view/list")
public ResultBean<List<ViewVo>> list(ViewDto viewDto) {
List<ViewVo> list = viewService.selectViewList(viewDto);
return ResultBean.success(list);
}
@ApiOperation(value = "查看-添加")
@ApiOperationSupport(order = 3)
@PostMapping("/admin/view/add")
public ResultBean<View> add(@RequestBody @Validated ViewDto viewDto) {
View view = BeanUtil.copyProperties(viewDto, View.class);
viewService.save(view);
return ResultBean.success(view);
}
@ApiOperation(value = "查看-查询")
@ApiOperationSupport(order = 4)
@GetMapping("/admin/view/{viewId}")
public ResultBean<ViewVo> get(@PathVariable @NotBlank String viewId) {
View view = viewService.getById(viewId);
ViewVo viewVo = BeanUtil.copyProperties(view,ViewVo.class);
return ResultBean.success(viewVo);
}
@ApiOperation(value = "查看-修改")
@ApiOperationSupport(order = 5)
@PostMapping("/admin/view/update")
public ResultBean<View> update(@RequestBody @Validated(UpdateGroup.class) ViewDto viewDto) {
View view = BeanUtil.copyProperties(viewDto, View.class);
viewService.updateById(view);
return ResultBean.success(view);
}
@ApiOperation(value = "查看-删除")
@ApiOperationSupport(order = 6)
@GetMapping("/admin/view/delete/{viewId}")
public ResultBean<View> delete(@PathVariable @NotBlank String viewId) {
Boolean b = viewService.removeById(viewId);
return ResultBean.success(b);
}
}

View File

@@ -0,0 +1,52 @@
package com.dd.admin.business.view.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import com.dd.admin.common.model.UpdateGroup;
/**
* <p>
* 查看返回对象
* </p>
*
* @author 727869402@qq.com
* @since 2025-01-15
*/
@Data
@ApiModel(value="查看接收对象")
public class ViewDto {
@ApiModelProperty(value = "查看id")
@NotBlank(message = "查看id不能为空",groups = UpdateGroup.class)
private String viewId;
@ApiModelProperty(value = "作者id")
private String authorId;
@ApiModelProperty(value = "作者姓名")
private String authorName;
@ApiModelProperty(value = "笔记id")
private String noteId;
@ApiModelProperty(value = "笔记名")
private String noteName;
@ApiModelProperty(value = "创建时间")
private Date createTime;
}

View File

@@ -0,0 +1,48 @@
package com.dd.admin.business.view.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 查看返回对象
* </p>
*
* @author 727869402@qq.com
* @since 2025-01-15
*/
@Data
@ApiModel(value="查看返回对象")
public class ViewVo {
@ApiModelProperty(value = "查看id")
private String viewId;
@ApiModelProperty(value = "作者id")
private String authorId;
@ApiModelProperty(value = "作者姓名")
private String authorName;
@ApiModelProperty(value = "笔记id")
private String noteId;
@ApiModelProperty(value = "笔记名")
private String noteName;
@ApiModelProperty(value = "创建时间")
private Date createTime;
}

View File

@@ -0,0 +1,57 @@
package com.dd.admin.business.view.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 查看
* </p>
*
* @author 727869402@qq.com
* @since 2025-01-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("business_view")
@ApiModel(value="View对象", description="查看")
public class View implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "查看id")
@TableId(value = "VIEW_ID", type = IdType.ASSIGN_UUID)
private String viewId;
@ApiModelProperty(value = "作者id")
@TableField("AUTHOR_ID")
private String authorId;
@ApiModelProperty(value = "作者姓名")
@TableField("AUTHOR_NAME")
private String authorName;
@ApiModelProperty(value = "笔记id")
@TableField("NOTE_ID")
private String noteId;
@ApiModelProperty(value = "笔记名")
@TableField("NOTE_NAME")
private String noteName;
@ApiModelProperty(value = "创建时间")
@TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
private Date createTime;
}

View File

@@ -0,0 +1,28 @@
package com.dd.admin.business.view.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dd.admin.business.view.entity.View;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dd.admin.business.view.domain.ViewVo;
import com.dd.admin.business.view.domain.ViewDto;
import java.util.List;
/**
* <p>
* 查看 Mapper 接口
* </p>
*
* @author 727869402@qq.com
* @since 2025-01-15
*/
@Mapper
public interface ViewMapper extends BaseMapper<View> {
IPage<ViewVo> selectViewPage(Page<ViewVo> page, @Param("viewDto") ViewDto viewDto);
List<ViewVo> selectViewList(@Param("viewDto") ViewDto viewDto);
}

View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dd.admin.business.view.mapper.ViewMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dd.admin.business.view.entity.View">
<id column="VIEW_ID" property="viewId" />
<result column="AUTHOR_ID" property="authorId" />
<result column="AUTHOR_NAME" property="authorName" />
<result column="NOTE_ID" property="noteId" />
<result column="NOTE_NAME" property="noteName" />
<result column="CREATE_TIME" property="createTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
VIEW_ID, AUTHOR_ID, AUTHOR_NAME, NOTE_ID, NOTE_NAME, CREATE_TIME
</sql>
<select id="selectViewPage" resultType="com.dd.admin.business.view.domain.ViewVo">
select
*
from business_view where 1 = 1
</select>
<select id="selectViewList" resultType="com.dd.admin.business.view.domain.ViewVo">
select
*
from business_view where 1 = 1
</select>
</mapper>

View File

@@ -0,0 +1,29 @@
package com.dd.admin.business.view.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dd.admin.business.view.entity.View;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dd.admin.business.view.domain.ViewVo;
import com.dd.admin.business.view.domain.ViewDto;
import java.util.List;
/**
* <p>
* 查看 服务类
* </p>
*
* @author 727869402@qq.com
* @since 2025-01-15
*/
public interface ViewService extends IService<View> {
//查看-分页列表
IPage<ViewVo> selectViewPage(ViewDto viewDto);
//查看-列表
List<ViewVo> selectViewList(ViewDto viewDto);
View viewNote(String authorId,String noteId);
}

View File

@@ -0,0 +1,45 @@
package com.dd.admin.business.view.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dd.admin.common.model.PageFactory;
import com.dd.admin.business.view.entity.View;
import com.dd.admin.business.view.mapper.ViewMapper;
import com.dd.admin.business.view.service.ViewService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import com.dd.admin.business.view.domain.ViewVo;
import com.dd.admin.business.view.domain.ViewDto;
import java.util.List;
/**
* <p>
* 查看 服务实现类
* </p>
*
* @author 727869402@qq.com
* @since 2025-01-15
*/
@Service
public class ViewServiceImpl extends ServiceImpl<ViewMapper, View> implements ViewService {
@Override
public IPage<ViewVo> selectViewPage(ViewDto viewDto) {
Page page = PageFactory.defaultPage();
return baseMapper.selectViewPage(page,viewDto);
}
@Override
public List<ViewVo> selectViewList(ViewDto viewDto) {
return baseMapper.selectViewList(viewDto);
}
@Override
public View viewNote(String authorId, String noteId) {
View view = new View();
view.setAuthorId(authorId);
view.setNoteId(noteId);
save(view);
return view;
}
}