feats

bin/service.sh

@@ -30,13 +30,13 @@ stop() {
     echo ""
     echo "Stoping service ..."
 
-    PID=`ps -ef|grep marketing-v|grep -v grep|awk '{print $2}'`
+    PID=`ps -ef|grep shigongli-|grep -v grep|awk '{print $2}'`
     if [[ "$PID" != "" ]]; then
         kill -9 $PID
     fi
 
     # 这个延迟不能去掉
-    sleep 5s
+    sleep 1s
     echo "Service is stoped"
     echo ""
 }

src/main/java/com/yunzhi/shigongli/common/Constants.java

@@ -46,6 +46,7 @@ public class Constants {
     public final static String TARGET_SHOP = "shop";                    // 商铺
     public final static String TARGET_SHOP_PACKAGE = "shop_package";    // 商铺套餐
     public final static String TARGET_TOURIST = "tourist";              // 景点
+    public final static String TARGET_NOTE = "note";                    // 笔记
 
     // 商品套餐类型
     public final static String PACKAGE_NORMAL = "normal";           // 普通套餐
@@ -78,4 +79,8 @@ public class Constants {
     // 公众号设置
     public final static String MP_SETTING_MINIAPP_POSTER = "miniapp_poster";            // 客服消息小程序封面
     public final static String MP_SETTING_HOTEL_CHECK_IN_TPL = "hotel_check_in_tpl";    // 房源入住提醒模板ID
+
+    // 笔记分类
+    public final static String NOTE_TYPE_IMAGE = "image";   // 图片
+    public final static String NOTE_TYPE_VIDEO = "video";   // 视频
 }

src/main/java/com/yunzhi/shigongli/common/ExcelUtils.java

@@ -19,7 +19,8 @@ public class ExcelUtils {
     public static void flush(HttpServletResponse response, Class dataClass, List data, String fileName) throws IOException {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        response.setHeader("Content-disposition", "attachment;filename="+StringUtils.urlEncode(fileName)+".xlsx");
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment;filename="+StringUtils.urlEncode(fileName)+".xlsx");
 
         EasyExcel.write(response.getOutputStream(), dataClass).sheet("sheet1").doWrite(data);
     }

src/main/java/com/yunzhi/shigongli/controller/TaNoteController.java

@@ -0,0 +1,226 @@
+package com.yunzhi.shigongli.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.entity.TaImage;
+import com.yunzhi.shigongli.entity.TaNote;
+import com.yunzhi.shigongli.entity.TaNoteResource;
+import com.yunzhi.shigongli.service.ITaImageService;
+import com.yunzhi.shigongli.service.ITaNoteResourceService;
+import com.yunzhi.shigongli.service.ITaNoteService;
+import com.yunzhi.shigongli.vo.NoteVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 笔记 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+
+@Api(tags = "笔记")
+@RestController
+@RequestMapping("/")
+public class TaNoteController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaNoteController.class);
+
+    @Autowired
+    public ITaNoteService iTaNoteService;
+
+    @Autowired
+    public ITaImageService iTaImageService;
+
+    @Autowired
+    public ITaNoteResourceService iTaNoteResourceService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/note",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = TaNote.class)
+    public ResponseBean taPvList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                 @ApiParam("笔记类型") @RequestParam(value ="noteType", required = false) String noteType,
+                                 @ApiParam("简介") @RequestParam(value ="summary", required = false) String summary) throws Exception{
+
+		    IPage<TaNote> pg = new Page<>(pageNum, pageSize);
+
+            IPage<TaNote> result = iTaNoteService.getPageBy(pg, noteType, summary);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param noteVO 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/note",method= RequestMethod.POST)
+    @ApiOperation(value="保存笔记", notes = "保存笔记", httpMethod = "POST", response = TaNote.class)
+    public ResponseBean taPvAdd(@ApiParam("保存内容") @RequestBody NoteVO noteVO) throws Exception{
+        if (null == noteVO) {
+            return ResponseBean.error("没有找到保存内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (null == noteVO.getNoteType()) {
+            return ResponseBean.error("请设置笔记类型", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // banner 图集
+        List<TaImage> imageList = noteVO.getImageList();
+        if ((null == imageList || imageList.size() == 0) && Constants.NOTE_TYPE_IMAGE.equals(noteVO.getNoteType())) {
+            return ResponseBean.error("请上传 banner 图片", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 关联地点
+        List<TaNoteResource> resourceList = noteVO.getResourceList();
+        if (null == resourceList || resourceList.size() == 0) {
+            // 暂时不处理
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        noteVO.setCreateDate(now);
+        if (null == noteVO.getStatus()) {
+            noteVO.setStatus(Constants.STATUS_NORMAL);
+        }
+
+        TaNote taNote = new TaNote();
+        BeanUtils.copyProperties(noteVO, taNote);
+
+        if (iTaNoteService.save(taNote)) {
+            noteVO.setNoteId(taNote.getNoteId());
+
+            // banner 图集
+            if (Constants.NOTE_TYPE_IMAGE.equals(noteVO.getNoteType())) {
+                for (TaImage image : imageList) {
+                    image.setCreateDate(now);
+                    image.setImageType("banner");
+                }
+                iTaImageService.updateImages(Constants.TARGET_NOTE, taNote.getNoteId(), imageList);
+            }
+
+            // 关联地点
+            if (null != resourceList && resourceList.size() > 0) {
+                iTaNoteResourceService.updateResource(taNote.getNoteId(), resourceList);
+            }
+
+            return ResponseBean.success(noteVO);
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/note", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除笔记", notes = "删除笔记", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taPvDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaNoteService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param noteVO 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPv/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新笔记", notes = "更新笔记", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taPvUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                   @ApiParam("更新内容") @RequestBody NoteVO noteVO) throws Exception {
+
+        TaNote taNote = iTaNoteService.getById(id);
+        if (null == taNote || Constants.STATUS_DELETED == taNote.getStatus()) {
+            return ResponseBean.error("没有找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+
+        if (null == noteVO.getNoteType()) {
+            return ResponseBean.error("请设置笔记类型", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // banner 图集
+        List<TaImage> imageList = noteVO.getImageList();
+        if ((null == imageList || imageList.size() == 0) && Constants.NOTE_TYPE_IMAGE.equals(noteVO.getNoteType())) {
+            return ResponseBean.error("请上传 banner 图片", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 关联地点
+        List<TaNoteResource> resourceList = noteVO.getResourceList();
+        if (null == resourceList || resourceList.size() == 0) {
+            // 暂时不处理
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        BeanUtils.copyProperties(noteVO, taNote);
+        taNote.setNoteId(id);
+
+        if (iTaNoteService.updateById(taNote)) {
+
+            // banner 图集
+            if (Constants.NOTE_TYPE_IMAGE.equals(noteVO.getNoteType())) {
+                for (TaImage image : imageList) {
+                    image.setCreateDate(now);
+                    image.setImageType("banner");
+                }
+                iTaImageService.updateImages(Constants.TARGET_NOTE, taNote.getNoteId(), imageList);
+            }
+
+            // 关联地点
+            if (null != resourceList && resourceList.size() > 0) {
+                iTaNoteResourceService.updateResource(taNote.getNoteId(), resourceList);
+            }
+
+            return ResponseBean.success(noteVO);
+        } else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/note/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taPvGet(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaNote taNote = iTaNoteService.getById(id);
+        if (null == taNote || Constants.STATUS_DELETED == taNote.getStatus()) {
+            return ResponseBean.error("没有找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        NoteVO noteVO = new NoteVO();
+        BeanUtils.copyProperties(taNote, noteVO);
+
+
+        noteVO.setImageList(iTaImageService.getListBy(Constants.TARGET_NOTE, id));
+        noteVO.setResourceList(iTaNoteResourceService.getListBy(id));
+
+        return ResponseBean.success(noteVO);
+    }
+}

src/main/java/com/yunzhi/shigongli/controller/TaResourceController.java

@@ -1,8 +1,10 @@
 package com.yunzhi.shigongli.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.common.StringUtils;
 import com.yunzhi.shigongli.entity.TaResource;
@@ -74,4 +76,27 @@ public class TaResourceController extends BaseController {
 
         return ResponseBean.success(resourceListVO);
     }
+
+    /**
+     * 资源字典
+     * @param pageNum
+     * @param pageSize
+     * @param targetName
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/admin/resource/dict")
+    @ApiOperation(value="获取资源字典", notes = "获取资源字典", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDict(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("资源名称") @RequestParam(value = "targetName", required = false) String targetName) throws Exception {
+        IPage<TaResource> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaResource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.like(!StringUtils.isEmpty(targetName), "target_name", "%"+targetName+"%");
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
+
+        return ResponseBean.success(iTaResourceService.page(pg, queryWrapper));
+    }
 }

src/main/java/com/yunzhi/shigongli/entity/TaNote.java

@@ -0,0 +1,65 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 笔记表
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaNote对象", description="笔记表")
+public class TaNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "笔记ID")
+    @TableId(value = "note_id", type = IdType.UUID)
+    private String noteId;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ApiModelProperty(value = "笔记类型;image图片,video视频")
+    private String noteType;
+
+    @ApiModelProperty(value = "封面")
+    private String poster;
+
+    @ApiModelProperty(value = "视频地址")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "PV")
+    private Integer pvNum;
+
+    @ApiModelProperty(value = "UV")
+    private Integer uvNum;
+
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/shigongli/entity/TaNoteResource.java

@@ -0,0 +1,39 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 笔记相关资源
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaNoteResource对象", description="笔记相关资源")
+public class TaNoteResource implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "笔记ID")
+    private String noteId;
+
+    @ApiModelProperty(value = "资源序号")
+    private String resourceNo;
+}

src/main/java/com/yunzhi/shigongli/entity/TaShare.java

@@ -0,0 +1,50 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 分享表
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaShare对象", description="分享表")
+public class TaShare implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "分享ID")
+    @TableId(value = "share_id", type = IdType.AUTO)
+    private Integer shareId;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "资源类型")
+    private String targetType;
+
+    @ApiModelProperty(value = "资源ID")
+    private String targetId;
+
+    @ApiModelProperty(value = "分享地址")
+    private String shareUrl;
+
+    @ApiModelProperty(value = "访问时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/shigongli/entity/TaShareOpen.java

@@ -0,0 +1,44 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 分享打开
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaShareOpen对象", description="分享打开")
+public class TaShareOpen implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "分享ID")
+    private Integer shareId;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "访问时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/shigongli/entity/TaShopPackage.java

@@ -81,4 +81,13 @@ public class TaShopPackage implements Serializable {
     @ApiModelProperty(value = "是否收藏")
     @TableField(exist = false)
     private Integer isSaved;
+
+    @ApiModelProperty(value = "网站名称")
+    private String siteName;
+
+    @ApiModelProperty(value = "外链地址")
+    private String link;
+
+    @ApiModelProperty(value = "网站内容类型")
+    private String sitePackageType;
 }

src/main/java/com/yunzhi/shigongli/mapper/TaNoteMapper.java

@@ -0,0 +1,21 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaNote;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 笔记 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaNoteMapper extends BaseMapper<TaNote> {
+
+    IPage<TaNote> getPageBy(IPage<TaNote> pg, @Param("noteType") String noteType, @Param("summary") String summary);
+}

src/main/java/com/yunzhi/shigongli/mapper/TaNoteResourceMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaNoteResource;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 笔记资源 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaNoteResourceMapper extends BaseMapper<TaNoteResource> {
+
+}

src/main/java/com/yunzhi/shigongli/service/ITaNoteResourceService.java

@@ -0,0 +1,20 @@
+package com.yunzhi.shigongli.service;
+
+import com.yunzhi.shigongli.entity.TaNoteResource;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 笔记资源 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaNoteResourceService extends IBaseService<TaNoteResource> {
+    boolean updateResource(String noteId, List<TaNoteResource> resourceList) throws Exception;
+
+    List<TaNoteResource> getListBy(String noteId);
+}

src/main/java/com/yunzhi/shigongli/service/ITaNoteService.java

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaNote;
+import com.yunzhi.shigongli.vo.NoteVO;
+
+
+/**
+ * <p>
+ * 笔记 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaNoteService extends IBaseService<TaNote> {
+    IPage<TaNote> getPageBy(IPage<TaNote> pg, String noteType, String summary);
+
+}

src/main/java/com/yunzhi/shigongli/service/impl/TaNoteResourceServiceImpl.java

@@ -0,0 +1,46 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.shigongli.entity.TaNote;
+import com.yunzhi.shigongli.entity.TaNoteResource;
+import com.yunzhi.shigongli.mapper.TaNoteResourceMapper;
+import com.yunzhi.shigongli.service.ITaNoteResourceService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 笔记资源 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaNoteResourceServiceImpl extends BaseServiceImpl<TaNoteResourceMapper, TaNoteResource> implements ITaNoteResourceService {
+
+    @Override
+    public boolean updateResource(String noteId, List<TaNoteResource> resourceList) throws Exception {
+        // 先删除原来的
+        QueryWrapper<TaNoteResource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("note_id", noteId);
+        remove(queryWrapper);
+
+        // 再插入
+        for (TaNoteResource noteResource : resourceList) {
+            noteResource.setNoteId(noteId);
+            noteResource.setSerialNo(null);
+        }
+
+        return saveBatch(resourceList);
+    }
+
+    @Override
+    public List<TaNoteResource> getListBy(String noteId) {
+        QueryWrapper<TaNoteResource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("note_id", noteId);
+
+        return list(queryWrapper);
+    }
+}

src/main/java/com/yunzhi/shigongli/service/impl/TaNoteServiceImpl.java

@@ -0,0 +1,25 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaNote;
+import com.yunzhi.shigongli.mapper.TaNoteMapper;
+import com.yunzhi.shigongli.service.ITaNoteService;
+import com.yunzhi.shigongli.vo.NoteVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 笔记 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaNoteServiceImpl extends BaseServiceImpl<TaNoteMapper, TaNote> implements ITaNoteService {
+
+    @Override
+    public IPage<TaNote> getPageBy(IPage<TaNote> pg, String noteType, String summary) {
+        return baseMapper.getPageBy(pg, noteType, summary);
+    }
+}

src/main/java/com/yunzhi/shigongli/vo/NoteVO.java

@@ -0,0 +1,54 @@
+package com.yunzhi.shigongli.vo;
+
+import com.yunzhi.shigongli.entity.TaImage;
+import com.yunzhi.shigongli.entity.TaNoteResource;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel(description = "笔记内容")
+@Data
+public class NoteVO {
+
+    @ApiModelProperty(value = "笔记ID")
+    private String noteId;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ApiModelProperty(value = "笔记类型;image图片,video视频")
+    private String noteType;
+
+    @ApiModelProperty(value = "封面")
+    private String poster;
+
+    @ApiModelProperty(value = "视频地址")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "PV")
+    private Integer pvNum;
+
+    @ApiModelProperty(value = "UV")
+    private Integer uvNum;
+
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "图片列表")
+    private List<TaImage> imageList;
+
+    @ApiModelProperty(value = "笔记资源")
+    private List<TaNoteResource> resourceList;
+}

src/main/java/com/yunzhi/shigongli/vo/ShopOrderVO.java

@@ -17,7 +17,7 @@ public class ShopOrderVO {
     @ApiModelProperty(value = "店铺ID")
     private String shopId;
 
-    @ExcelProperty(value = "民宿名称", index = 0)
+    @ExcelProperty(value = "店铺名称", index = 0)
     @ColumnWidth(30)
     @ApiModelProperty(value = "店铺名称")
     private String shopName;

src/main/java/com/yunzhi/shigongli/vo/ShopPackageVO.java

@@ -128,4 +128,15 @@ public class ShopPackageVO {
     @ApiModelProperty(value = "类别")
     private List<TaTargetDietMark> dietMarkList;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "网站名称")
+    private String siteName;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "外链地址")
+    private String link;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "网站内容类型")
+    private String sitePackageType;
 }

src/main/resources/mapper/TaNoteMapper.xml

@@ -0,0 +1,22 @@
+<?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.yunzhi.shigongli.mapper.TaNoteMapper">
+
+    <select id="getPageBy" resultType="com.yunzhi.shigongli.entity.TaNote">
+        SELECT
+            *
+        FROM
+            ta_note t
+        WHERE
+            t.`status` > - 1
+          <if test="noteType != null and noteType != ''">
+              AND t.note_type = #{noteType}
+          </if>
+            <if test="summary != null and summary != ''">
+                AND t.summary LIKE CONCAT( '%', #{summary}, '%' )
+            </if>
+        ORDER BY
+            t.weight DESC,
+            t.create_date DESC
+    </select>
+</mapper>

src/main/resources/mapper/TaNoteResourceMapper.xml

@@ -0,0 +1,5 @@
+<?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.yunzhi.shigongli.mapper.TaNoteResourceMapper">
+
+</mapper>