Merge remote-tracking branch 'origin/bly_store' into bly_store

fs-admin/src/main/java/com/fs/his/controller/FsArticleViewsController.java

@@ -0,0 +1,41 @@
+package com.fs.his.controller;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.his.service.IFsArticleViewsService;
+import com.fs.hisStore.param.FsArticleViewListParam;
+import com.fs.hisStore.vo.FsArticleViewListVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 文章阅读Controller
+ *
+ * @author fs
+ * @date 2022-03-25
+ */
+@RestController
+@RequestMapping("/his/articleViews")
+public class FsArticleViewsController extends BaseController
+{
+
+    @Autowired
+    private IFsArticleViewsService fsArticleViewsService;
+    /**
+     * 查询文章阅读列表
+     */
+    @PreAuthorize("@ss.hasPermi('store:articleViews:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FsArticleViewListParam param)
+    {
+        startPage();
+        List<FsArticleViewListVO> list = fsArticleViewsService.selectFsArticleViewsListVO(param);
+        return getDataTable(list);
+    }
+
+}

fs-service/src/main/java/com/fs/his/domain/FsArticleViews.java

@@ -0,0 +1,66 @@
+package com.fs.his.domain;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 文章阅读对象 fs_article_views
+ *
+ * @author fs
+ * @date 2022-03-25
+ */
+public class FsArticleViews extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long viewId;
+
+    /**
+     * 文章ID
+     */
+    @Excel(name = "文章ID")
+    private Long articleId;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    public void setViewId(Long viewId) {
+        this.viewId = viewId;
+    }
+
+    public Long getViewId() {
+        return viewId;
+    }
+
+    public void setArticleId(Long articleId) {
+        this.articleId = articleId;
+    }
+
+    public Long getArticleId() {
+        return articleId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("viewId", getViewId())
+                .append("articleId", getArticleId())
+                .append("userId", getUserId())
+                .toString();
+    }
+}

fs-service/src/main/java/com/fs/his/mapper/FsArticleMapper.java

@@ -90,4 +90,7 @@ public interface FsArticleMapper
             "</script>"})
 
     List<FsArticleListVO> selectFsArticleListVO(FsArticle fsArticle);
+
+    @Update("update fs_article set views=views+1  where article_id=#{articleId}")
+    Integer updateViews(Long articleId);
 }

fs-service/src/main/java/com/fs/his/mapper/FsArticleViewsMapper.java

@@ -0,0 +1,92 @@
+package com.fs.his.mapper;
+
+
+import com.fs.his.domain.FsArticleViews;
+import com.fs.hisStore.param.FsArticleViewListParam;
+import com.fs.hisStore.param.FsArticleViewListQueryParam;
+import com.fs.hisStore.vo.FsArticleViewListQueryVO;
+import com.fs.hisStore.vo.FsArticleViewListVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 文章阅读Mapper接口
+ *
+ * @author fs
+ * @date 2022-03-25
+ */
+public interface FsArticleViewsMapper
+{
+    /**
+     * 查询文章阅读
+     *
+     * @param viewId 文章阅读ID
+     * @return 文章阅读
+     */
+    public FsArticleViews selectFsArticleViewsById(Long viewId);
+
+    /**
+     * 查询文章阅读列表
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 文章阅读集合
+     */
+    public List<FsArticleViews> selectFsArticleViewsList(FsArticleViews fsArticleViews);
+
+    /**
+     * 新增文章阅读
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 结果
+     */
+    public int insertFsArticleViews(FsArticleViews fsArticleViews);
+
+    /**
+     * 修改文章阅读
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 结果
+     */
+    public int updateFsArticleViews(FsArticleViews fsArticleViews);
+
+    /**
+     * 删除文章阅读
+     *
+     * @param viewId 文章阅读ID
+     * @return 结果
+     */
+    public int deleteFsArticleViewsById(Long viewId);
+    public int deleteFsArticleViewsByIds(Long[] viewIds);
+    /**
+     * 批量删除文章阅读
+     *
+     * @param articleId 需要删除的数据ID
+     * @return 结果
+     */
+
+
+    @Select("select u.user_id,u.avatar from fs_article_views v left join  fs_user u on u.user_id=v.user_id  where v.article_id=#{articleId} order by v.view_id desc  limit 3 ")
+    List<FsArticleViewListQueryVO> selectFsArticleViewsTopByArticleId(Integer articleId);
+
+
+    @Select({"<script> " +
+            "select u.user_id,u.avatar,u.nickname from fs_article_views v left join  fs_user u on u.user_id=v.user_id   " +
+            "where 1=1 " +
+            "<if test = 'maps.articleId != null    '> " +
+            "and v.article_id =#{maps.articleId} " +
+            "</if>" +
+            " order by v.view_id desc "+
+            "</script>"})
+    List<FsArticleViewListQueryVO> selectFsArticleViewsListQueryVO(@Param("maps") FsArticleViewListQueryParam param);
+    @Select({"<script> " +
+            "select v.*, a.title as article_title,  u.user_id,u.avatar,u.nickname from fs_article_views v left join fs_user u on u.user_id=v.user_id left join fs_article a on v.article_id=a.article_id   " +
+            "where 1=1 " +
+            "<if test = 'maps.articleTitle != null and  maps.articleTitle !=\"\"    '> " +
+            "and a.title like CONCAT('%',#{maps.articleTitle},'%') " +
+            "</if>" +
+            " order by v.view_id desc "+
+            "</script>"})
+    List<FsArticleViewListVO> selectFsArticleViewsListVO(@Param("maps") FsArticleViewListParam param);
+}

fs-service/src/main/java/com/fs/his/service/IFsArticleViewsService.java

@@ -0,0 +1,75 @@
+package com.fs.his.service;
+
+import com.fs.his.domain.FsArticleViews;
+import com.fs.hisStore.param.FsArticleViewListParam;
+import com.fs.hisStore.param.FsArticleViewListQueryParam;
+import com.fs.hisStore.vo.FsArticleViewListQueryVO;
+import com.fs.hisStore.vo.FsArticleViewListVO;
+
+import java.util.List;
+
+/**
+ * 文章阅读Service接口
+ *
+ * @author fs
+ * @date 2022-03-25
+ */
+public interface IFsArticleViewsService {
+    /**
+     * 查询文章阅读
+     *
+     * @param viewId 文章阅读ID
+     * @return 文章阅读
+     */
+    public FsArticleViews selectFsArticleViewsById(Long viewId);
+
+
+    /**
+     * 查询文章阅读列表
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 文章阅读集合
+     */
+    public List<FsArticleViews> selectFsArticleViewsList(FsArticleViews fsArticleViews);
+
+    /**
+     * 新增文章阅读
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 结果
+     */
+    public int insertFsArticleViews(FsArticleViews fsArticleViews);
+
+    /**
+     * 修改文章阅读
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 结果
+     */
+    public int updateFsArticleViews(FsArticleViews fsArticleViews);
+
+    /**
+     * 批量删除文章阅读
+     *
+     * @param viewIds 需要删除的文章阅读ID
+     * @return 结果
+     */
+    public int deleteFsArticleViewsByIds(Long[] viewIds);
+
+    /**
+     * 删除文章阅读信息
+     *
+     * @param viewId 文章阅读ID
+     * @return 结果
+     */
+    public int deleteFsArticleViewsById(Long viewId);
+
+
+    List<FsArticleViewListQueryVO> selectFsArticleViewsTopByArticleId(Integer articleId);
+
+    int updateView(Long articleId, long userId);
+
+    List<FsArticleViewListQueryVO> selectFsArticleViewsListQueryVO(FsArticleViewListQueryParam param);
+
+    List<FsArticleViewListVO> selectFsArticleViewsListVO(FsArticleViewListParam param);
+}

fs-service/src/main/java/com/fs/his/service/impl/FsArticleViewsServiceImpl.java

@@ -0,0 +1,137 @@
+package com.fs.his.service.impl;
+
+import com.fs.his.domain.FsArticleViews;
+import com.fs.his.mapper.FsArticleMapper;
+import com.fs.his.mapper.FsArticleViewsMapper;
+import com.fs.his.service.IFsArticleViewsService;
+import com.fs.hisStore.param.FsArticleViewListParam;
+import com.fs.hisStore.param.FsArticleViewListQueryParam;
+import com.fs.hisStore.vo.FsArticleViewListQueryVO;
+import com.fs.hisStore.vo.FsArticleViewListVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 文章阅读Service业务层处理
+ *
+ * @author fs
+ * @date 2022-03-25
+ */
+@Service
+public class FsArticleViewsServiceImpl implements IFsArticleViewsService
+{
+    @Autowired
+    private FsArticleViewsMapper fsArticleViewsMapper;
+    @Autowired
+    private FsArticleMapper articleMapper;
+
+    /**
+     * 查询文章阅读
+     *
+     * @param viewId 文章阅读ID
+     * @return 文章阅读
+     */
+    @Override
+    public FsArticleViews selectFsArticleViewsById(Long viewId)
+    {
+        return fsArticleViewsMapper.selectFsArticleViewsById(viewId);
+    }
+
+    /**
+     * 查询文章阅读列表
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 文章阅读
+     */
+    @Override
+    public List<FsArticleViews> selectFsArticleViewsList(FsArticleViews fsArticleViews)
+    {
+        return fsArticleViewsMapper.selectFsArticleViewsList(fsArticleViews);
+    }
+
+    /**
+     * 新增文章阅读
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 结果
+     */
+    @Override
+    public int insertFsArticleViews(FsArticleViews fsArticleViews)
+    {
+        return fsArticleViewsMapper.insertFsArticleViews(fsArticleViews);
+    }
+
+    /**
+     * 修改文章阅读
+     *
+     * @param fsArticleViews 文章阅读
+     * @return 结果
+     */
+    @Override
+    public int updateFsArticleViews(FsArticleViews fsArticleViews)
+    {
+        return fsArticleViewsMapper.updateFsArticleViews(fsArticleViews);
+    }
+
+    /**
+     * 批量删除文章阅读
+     *
+     * @param viewIds 需要删除的文章阅读ID
+     * @return 结果
+     */
+    @Override
+    public int deleteFsArticleViewsByIds(Long[] viewIds)
+    {
+        return fsArticleViewsMapper.deleteFsArticleViewsByIds(viewIds);
+    }
+
+    /**
+     * 删除文章阅读信息
+     *
+     * @param viewId 文章阅读ID
+     * @return 结果
+     */
+    @Override
+    public int deleteFsArticleViewsById(Long viewId)
+    {
+        return fsArticleViewsMapper.deleteFsArticleViewsById(viewId);
+    }
+
+    @Override
+    public List<FsArticleViewListQueryVO> selectFsArticleViewsTopByArticleId(Integer articleId) {
+        return fsArticleViewsMapper.selectFsArticleViewsTopByArticleId(articleId);
+    }
+
+    @Override
+    @Transactional
+    public int updateView(Long articleId, long userId) {
+        FsArticleViews map=new FsArticleViews();
+        map.setArticleId(articleId);
+        map.setUserId(userId);
+//        List<FsArticleViews> check=fsArticleViewsMapper.selectFsArticleViewsList(map);
+//        if(check!=null&&check.size()>0){
+//            return 0;
+//        }
+        map.setCreateTime(new Date());
+        fsArticleViewsMapper.insertFsArticleViews(map);
+        //更新文章阅读数
+        articleMapper.updateViews(articleId);
+        return 1;
+    }
+
+    @Override
+    public List<FsArticleViewListQueryVO> selectFsArticleViewsListQueryVO(FsArticleViewListQueryParam param) {
+        return fsArticleViewsMapper.selectFsArticleViewsListQueryVO(param);
+    }
+
+    @Override
+    public List<FsArticleViewListVO> selectFsArticleViewsListVO(FsArticleViewListParam param) {
+        return fsArticleViewsMapper.selectFsArticleViewsListVO(param);
+    }
+
+
+}

fs-service/src/main/java/com/fs/hisStore/mapper/FsPrescribeScrmMapper.java

@@ -81,7 +81,7 @@ public interface FsPrescribeScrmMapper
     @Select("select * from fs_prescribe where order_id=#{orderId} order by prescribe_id desc  limit 1 ")
     FsPrescribeScrm selectFsPrescribeByOrderId(Long orderId);
     @Select({"<script> " +
-            "select p.*,u.nickname as user_nickname,u.phone as user_phone,o.order_code from fs_prescribe p left join fs_store_order_scrm o on o.id=p.order_id left join fs_user u on u.user_id=p.user_id  " +
+            "select p.*,u.nickname as user_nickname,u.phone as user_phone,o.order_code from fs_prescribe p left join fs_store_order_scrm o on o.id=p.inquiry_order_id left join fs_user u on u.user_id=p.user_id  " +
             "where 1=1 " +
             "<if test = 'maps.rpId != null and maps.rpId!=\"\"    '> " +
             "and p.rp_id =#{maps.rpId} " +

fs-service/src/main/resources/mapper/his/FsArticleViewsMapper.xml

@@ -0,0 +1,66 @@
+<?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.fs.his.mapper.FsArticleViewsMapper">
+
+    <resultMap type="FsArticleViews" id="FsArticleViewsResult">
+        <result property="viewId"    column="view_id"    />
+        <result property="articleId"    column="article_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectFsArticleViewsVo">
+        select view_id, article_id, user_id from fs_article_views
+    </sql>
+
+    <select id="selectFsArticleViewsList" parameterType="FsArticleViews" resultMap="FsArticleViewsResult">
+        <include refid="selectFsArticleViewsVo"/>
+        <where>
+            <if test="articleId != null "> and article_id = #{articleId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+
+    <select id="selectFsArticleViewsById" parameterType="Long" resultMap="FsArticleViewsResult">
+        <include refid="selectFsArticleViewsVo"/>
+        where view_id = #{viewId}
+    </select>
+
+    <insert id="insertFsArticleViews" parameterType="FsArticleViews" useGeneratedKeys="true" keyProperty="viewId">
+        insert into fs_article_views
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="articleId != null">article_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="articleId != null">#{articleId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFsArticleViews" parameterType="FsArticleViews">
+        update fs_article_views
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="articleId != null">article_id = #{articleId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where view_id = #{viewId}
+    </update>
+
+    <delete id="deleteFsArticleViewsById" parameterType="Long">
+        delete from fs_article_views where view_id = #{viewId}
+    </delete>
+
+    <delete id="deleteFsArticleViewsByIds" parameterType="String">
+        delete from fs_article_views where view_id in
+        <foreach item="viewId" collection="array" open="(" separator="," close=")">
+            #{viewId}
+        </foreach>
+    </delete>
+
+</mapper>