chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

客服相关功能

Browse Source
This commit is contained in:
SjS 2025-04-04 18:22:43 +08:00
parent ed3173eea9
commit ab33dc9e84
15 changed files with 137 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml
View File

@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.adId != null and query.adId != ''"> and bad.ad_id = #{query.adId}</if>
<if test="query.type != null and query.type != ''"> and bad.type = #{query.type}</if>
<if test="query.picture != null and query.picture != ''"> and bad.picture = #{query.picture}</if>
<if test="query.url != null and query.url != ''"> and bad.url = #{query.url}</if>
<if test="query.url != null and query.url != ''"> and bad.url like concat('%',#{query.url},'%') </if>
<if test="query.deleted != null "> and bad.deleted = #{query.deleted}</if>
<if test="query.urlType != null and query.urlType != ''"> and bad.url_type = #{query.urlType}</if>
${query.params.dataScope}

8
ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/Article.java
View File

@ -32,8 +32,16 @@ public class Article extends BaseEntity
@ApiModelProperty("标题")
private String title;
@Excel(name = "简介")
@ApiModelProperty("简介")
private String brief;
@Excel(name = "内容详情")
@ApiModelProperty("内容详情")
private String content;
@Excel(name = "文章类型")
@ApiModelProperty(value = "文章类型")
private String code;
}

5
ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleQuery.java
View File

@ -1,4 +1,9 @@
package com.ruoyi.bst.article.domain;
import lombok.Data;
@Data
public class ArticleQuery extends Article{
}

6
ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java
View File

@ -1,7 +1,13 @@
package com.ruoyi.bst.article.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ArticleVO extends Article {
@ApiModelProperty(value = "分类名称")
private String articleCategoryName;
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
View File

@ -73,7 +73,7 @@ public interface ArticleMapper
*/
public int deleteArticleByIds(Long[] ids);
public ArticleVO selectChildrenById(Long id);
public List<ArticleVO> selectChildrenById(Long id);
ArticleVO selectArticleByCode(ArticleCategoryQuery articleCategoryQuery);
}

55
ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
View File

@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="ArticleVO" id="ArticleResult" autoMapping="true">
<result property="id" column="id" />
<result property="categoryId" column="category_id" />
<result property="areaId" column="area_id" />
<result property="title" column="title" />
<result property="content" column="content" />
<result property="createTime" column="create_time" />
@ -16,22 +15,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectArticleVo">
select
id,
category_id,
area_id,
title,
content,
create_time,
update_time
from bst_article
bart.id,
bart.category_id,
bart.title,
bart.content,
bart.create_time,
bart.brief,
bart.code,
bart.update_time,
bac.category_name as article_category_name
from bst_article bart
left join bst_article_category bac on bart.category_id = bac.id
</sql>
<sql id="searchCondition">
<if test="query.id != null "> and id = #{query.id}</if>
<if test="query.categoryId != null "> and category_id = #{query.categoryId}</if>
<if test="query.areaId != null "> and area_id = #{query.areaId}</if>
<if test="query.title != null and query.title != ''"> and title = #{query.title}</if>
<if test="query.content != null and query.content != ''"> and content = #{query.content}</if>
<if test="query.id != null "> and bart.id = #{query.id}</if>
<if test="query.categoryId != null "> and bart.category_id = #{query.categoryId}</if>
<if test="query.brief != null "> and bart.brief = #{query.brief}</if>
<if test="query.title != null and query.title != ''"> and bart.title like concat ('',#{query.title},'') </if>
<if test="query.content != null and query.content != ''"> and bart.content = #{query.content}</if>
${query.params.dataScope}
</sql>
@ -44,12 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectArticleById" parameterType="Long" resultMap="ArticleResult">
<include refid="selectArticleVo"/>
where id = #{id}
where bart.id = #{id}
</select>
<select id="selectChildrenById" resultType="com.ruoyi.bst.article.domain.ArticleVO">
<include refid="selectArticleVo"/>
where id = #{categoryId}
where category_id = #{categoryId}
</select>
<select id="selectArticleByCode" resultType="com.ruoyi.bst.article.domain.ArticleVO">
@ -61,17 +63,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bst_article
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="categoryId != null">category_id,</if>
<if test="areaId != null">area_id,</if>
<if test="title != null and title != ''">title,</if>
<if test="content != null">content,</if>
<if test="brief != null">brief,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="categoryId != null">#{categoryId},</if>
<if test="areaId != null">#{areaId},</if>
<if test="title != null and title != ''">#{title},</if>
<if test="content != null">#{content},</if>
<if test="brief != null">#{brief},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
@ -81,8 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bst_article
<trim prefix="(" suffix=")" suffixOverrides=",">
category_id,
area_id,
title,
brief,
content,
create_time,
update_time,
@ -119,16 +121,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</otherwise>
</choose>
</foreach>
<foreach open="area_id = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.areaId != null ">
WHEN #{item.id} THEN #{item.areaId}
</when>
<otherwise>
WHEN #{item.id} THEN `area_id`
</otherwise>
</choose>
</foreach>
<foreach open="title = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.title != null and item.title != ''">
@ -177,16 +169,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<update id="updateArticle" parameterType="Article">
update bst_article
update bst_article bart
<trim prefix="SET" suffixOverrides=",">
<include refid="updateColumns"/>
</trim>
where id = #{data.id}
where bart.id = #{data.id}
</update>
<sql id="updateColumns">
<if test="data.categoryId != null">category_id = #{data.categoryId},</if>
<if test="data.areaId != null">area_id = #{data.areaId},</if>
<if test="data.title != null and data.title != ''">title = #{data.title},</if>
<if test="data.content != null">content = #{data.content},</if>
<if test="data.createTime != null">create_time = #{data.createTime},</if>

3
ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
View File

@ -62,9 +62,8 @@ public interface ArticleService
*/
public int deleteArticleById(Long id);
ArticleVO selectChildrenByCategoryId(Long id);
ArticleVO selectArticleByCode(ArticleCategoryQuery articleCategoryQuery);
ArticleVO selectArticleByCategoryId(Long id);
List<ArticleVO> selectArticleByCategoryId(Long categoryId);
}

22
ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
View File

@ -31,9 +31,7 @@ public class ArticleServiceImpl implements ArticleService
@Autowired
private ArticleCategoryService articleCategoryService;
@Autowired
private AreaService areaService;
/**
* 查询文章
*
@ -71,11 +69,6 @@ public class ArticleServiceImpl implements ArticleService
if(articleCategoryService.selectArticleCategoryById(article.getCategoryId()) ==null){
throw new ServiceException("当前分类不存在");
}
//所属区域必须存在
if (areaService.selectAreaById(article.getAreaId()) == null){
throw new ServiceException("所属区域不存在");
}
article.setCreateTime(DateUtils.getNowDate());
return articleMapper.insertArticle(article);
@ -95,11 +88,6 @@ public class ArticleServiceImpl implements ArticleService
throw new ServiceException("当前分类不存在");
}
//所属区域必须存在
if (areaService.selectAreaById(article.getAreaId()) == null){
throw new ServiceException("所属区域不存在");
}
article.setUpdateTime(DateUtils.getNowDate());
return articleMapper.updateArticle(article);
}
@ -128,10 +116,6 @@ public class ArticleServiceImpl implements ArticleService
return articleMapper.deleteArticleById(id);
}
@Override
public ArticleVO selectChildrenByCategoryId(Long id) {
return articleMapper.selectChildrenById(id);
}
@Override
public ArticleVO selectArticleByCode(ArticleCategoryQuery articleCategoryQuery) {
@ -139,7 +123,7 @@ public class ArticleServiceImpl implements ArticleService
}
@Override
public ArticleVO selectArticleByCategoryId(Long id) {
return articleMapper.selectChildrenById(id);
public List<ArticleVO> selectArticleByCategoryId(Long categoryId) {
return articleMapper.selectChildrenById(categoryId);
}
}

9
ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.java
View File

@ -79,7 +79,7 @@ public interface ArticleCategoryMapper
* @param id
* @return
*/
List<Long> selectChildren(Long id);
List<ArticleCategoryVO> selectChildrenCategory(Long id);
/**
@ -89,5 +89,10 @@ public interface ArticleCategoryMapper
* @return 结果
*/
void deleteArticleCategoryByIds(List<Long> childrenIds);
public void deleteArticleCategoryByIds(List<Long> childrenIds);
public int updateArticleCategorySortAndStatusOnly(ArticleCategory articleCategory);
}

39
ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml
View File

@ -25,11 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<sql id="searchCondition">
<if test="query.id != null "> and id = #{query.id}</if>
<if test="query.categoryName != null and query.categoryName != ''"> and category_name like concat('%', #{query.categoryName}, '%')</if>
<if test="query.parentId != null "> and parent_id = #{query.parentId}</if>
<if test="query.categoryStatus != null "> and category_status = #{query.categoryStatus}</if>
<if test="query.sort != null "> and sort = #{query.sort}</if>
<if test="query.id != null "> and bac.id = #{query.id}</if>
<if test="query.categoryName != null and query.categoryName != ''"> and bac.category_name like concat('%', #{query.categoryName}, '%')</if>
<if test="query.parentId != null "> and bac.parent_id = #{query.parentId}</if>
<if test="query.categoryStatus != null "> and bac.category_status = #{query.categoryStatus}</if>
<if test="query.sort != null "> and bac.sort = #{query.sort}</if>
${query.params.dataScope}
</sql>
@ -53,13 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectChildren" resultType="java.lang.Long">
select bac.id from bst_article_category bac
<select id="selectChildrenCategory" resultType="ArticleCategoryVO">
<include refid="selectArticleCategoryVo"/>
<where>
bac.parent_id IN
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
bac.parent_id = #{id}
</where>
</select>
@ -174,15 +171,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<include refid="updateColumns"/>
</trim>
where id = #{data.id}
where id = #{id}
</update>
<!--updateArticleCategorySortOnly-->
<update id="updateArticleCategorySortAndStatusOnly" parameterType="ArticleCategory">
update bst_article_category set
<if test="categoryStatus != null">category_status = #{categoryStatus},</if>
<if test="sort != null">sort = #{sort}</if>
where id = #{id}
</update>
<sql id="updateColumns">
<if test="data.categoryName != null and data.categoryName != ''">category_name = #{data.categoryName},</if>
<if test="data.parentId != null">parent_id = #{data.parentId},</if>
<if test="data.categoryStatus != null">category_status = #{data.categoryStatus},</if>
<if test="data.sort != null">sort = #{data.sort},</if>
<if test="data.createTime != null">create_time = #{data.createTime},</if>
<if test="categoryName != null and categoryName != ''">category_name = #{data.categoryName},</if>
<if test="parentId != null">parent_id = #{data.parentId},</if>
<if test="categoryStatus != null">category_status = #{data.categoryStatus},</if>
<if test="sort != null">sort = #{data.sort},</if>
<if test="createTime != null">create_time = #{data.createTime},</if>
</sql>
<delete id="deleteArticleCategoryById" parameterType="Long">

7
ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/ArticleCategoryService.java
View File

@ -47,13 +47,6 @@ public interface ArticleCategoryService
*/
public int updateArticleCategory(ArticleCategory articleCategory);
/**
* 批量删除文章分类
*
* @param ids 需要删除的文章分类主键集合
* @return 结果
*/
public int deleteArticleCategoryByIds(Long[] ids);
/**
* 删除文章分类信息

69
ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
View File

@ -6,7 +6,9 @@ import com.github.pagehelper.PageHelper;
import com.ruoyi.bst.area.domain.AreaQuery;
import com.ruoyi.bst.area.domain.AreaVO;
import com.ruoyi.bst.article.domain.ArticleVO;
import com.ruoyi.bst.article.mapper.ArticleMapper;
import com.ruoyi.bst.article.service.ArticleService;
import com.ruoyi.bst.articleCategory.domain.enums.ArticleCategoryStatus;
import com.ruoyi.bst.device.utils.DeviceUtil;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
@ -36,6 +38,8 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
@Autowired
private ArticleService articleService;
@Autowired
private ArticleMapper articleMapper;
/**
* 查询文章分类
@ -85,10 +89,15 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
if (flag){
ServiceUtil.assertion(true,"不允许插入重复分类");
}
//只允许两次分类
if(articleCategory.getParentId()!= null) {
Boolean hasParent = hasParent(articleCategory.getParentId());
ServiceUtil.assertion(hasParent,"该分类下不允许再次分类");
ArticleCategoryVO vo = articleCategoryMapper.selectArticleCategoryById(articleCategory.getParentId());
ServiceUtil.assertion(vo==null,"当前分类不存在");
// 只允许两次分类
if (vo.getParentId()!=0) {
Boolean hasParent = hasParent(articleCategory.getParentId());
ServiceUtil.assertion(hasParent,"该分类下不允许再次分类");
}
}
articleCategory.setCreateTime(DateUtils.getNowDate());
return articleCategoryMapper.insertArticleCategory(articleCategory);
@ -103,6 +112,25 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
@Override
public int updateArticleCategory(ArticleCategory articleCategory)
{
ArticleCategoryVO vo = articleCategoryMapper.selectArticleCategoryById(articleCategory.getId());
//检查是否仅修改排序或状态字段
if (vo != null && vo.getParentId().equals(articleCategory.getParentId())&&vo.getCategoryName().equals(articleCategory.getCategoryName())) {
if (vo.getCategoryStatus()!=null) {
if (vo.getParentId() != null) {
ArticleCategoryVO parentVO = articleCategoryMapper.selectArticleCategoryById(vo.getParentId());
ServiceUtil.assertion(parentVO.getCategoryStatus().equals(ArticleCategoryStatus.DISABLED.getCode()),"该分类所属分类已禁用，无法启用该分类");
}
// 判断当前分类下是否有启用的分类
List<ArticleCategoryVO> childrenCategoryList = articleCategoryMapper.selectChildrenCategory(articleCategory.getId());
childrenCategoryList.forEach(child -> {
if (Objects.equals(child.getCategoryStatus(), ArticleCategoryStatus.ENABLED.getCode())) {
ServiceUtil.assertion(!childrenCategoryList.isEmpty(),"当前分类下有启用的分类，不可禁用");
}
});
}
return articleCategoryMapper.updateArticleCategorySortAndStatusOnly(articleCategory);
}
//目标分类不允许子分类重名
Boolean flag = articleCategoryMapper.checkByNameAndParetId(articleCategory);
if (flag){
@ -116,31 +144,18 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
return articleCategoryMapper.updateArticleCategory(articleCategory);
}
@Override
public int deleteArticleCategoryByIds(Long[] ids) {
return 0;
}
private Boolean hasParent(Long id){
if (id == 0){
return false;
}
Long parentId = selectArticleCategoryById(id).getParentId();
if (parentId != null){
return true;
}
return false;
}
/**
* 批量删除文章分类
*
* @param ids 需要删除的文章分类主键
* @return 结果
*/
// @Override
// @Transactional
// public int deleteArticleCategoryByIds(List<Long> ids)
// {
//
// return articleCategoryMapper.deleteArticleCategoryByIds(ids);
// }
/**
* 删除文章分类信息
@ -151,14 +166,12 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
@Override
public int deleteArticleCategoryById(Long categoryId)
{
List<Long> childrenIds = articleCategoryMapper.selectChildren(categoryId);
if (childrenIds != null){
articleCategoryMapper.deleteArticleCategoryByIds(childrenIds);
}
ArticleVO articleVO = articleService.selectArticleByCategoryId(categoryId);
if (articleVO != null){
return 0;
}
// 如果当前分类有子分类，先删除子分类
List<ArticleCategoryVO> childrenCategoryList = articleCategoryMapper.selectChildrenCategory(categoryId);
ServiceUtil.assertion(!childrenCategoryList.isEmpty(),"请先删除当前分类下的子分类");
// 如果当前分类下有文章，先删除文章
List<ArticleVO> articleList = articleService.selectArticleByCategoryId(categoryId);
ServiceUtil.assertion(!articleList.isEmpty(),"当前分类下存在文章，请先删除分类下的文章");
return articleCategoryMapper.deleteArticleCategoryById(categoryId);
}
}

31
ruoyi-service/src/main/java/com/ruoyi/bst/complaint/mapper/ComplaintMapper.xml
View File

@ -16,23 +16,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectComplaintVo">
select
id,
user_id,
create_time,
content,
type,
picture,
contact
from bst_complaint
bc.id,
bc.user_id,
bc.create_time,
bc.content,
bc.type,
bc.picture,
bc.contact,
su.user_name
from bst_complaint bc
left join sys_user su
on bc.user_id = su.user_id
</sql>
<sql id="searchCondition">
<if test="query.id != null "> and id = #{query.id}</if>
<if test="query.userId != null "> and user_id = #{query.userId}</if>
<if test="query.content != null and query.content != ''"> and content = #{query.content}</if>
<if test="query.type != null and query.type != ''"> and type = #{query.type}</if>
<if test="query.picture != null and query.picture != ''"> and picture = #{query.picture}</if>
<if test="query.contact != null and query.contact != ''"> and contact = #{query.contact}</if>
<if test="query.id != null "> and bc.id = #{query.id}</if>
<if test="query.userId != null "> and bc.user_id = #{query.userId}</if>
<if test="query.content != null and query.content != ''"> and bc.content = #{query.content}</if>
<if test="query.type != null and query.type != ''"> and bc.type = #{query.type}</if>
<if test="query.picture != null and query.picture != ''"> and bc.picture = #{query.picture}</if>
<if test="query.contact != null and query.contact != ''"> and bc.contact like concat('%',#{query.contact},'%') </if>
${query.params.dataScope}
</sql>

1
ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java
View File

@ -36,6 +36,7 @@ public class ArticleCategoryController extends BaseController
@GetMapping("/list")
public AjaxResult list(ArticleCategoryQuery articleCategoryQuery)
{
articleCategoryQuery.setScope(true);
List<ArticleCategoryVO> list = articleCategoryService.selectArticleCategoryList(articleCategoryQuery);
return success(list);
}

1
ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleController.java
View File

@ -40,6 +40,7 @@ public class ArticleController extends BaseController
{
startPage();
startOrderBy();
query.setScope(true);
List<ArticleVO> list = articleService.selectArticleList(query);
return getDataTable(list);
}