From 50ddc1e9549ce462e024f0a25c94b1f6bd0175cf Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Mon, 18 Aug 2025 17:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B8=B8=E8=A7=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- .../controller/FaqManagementController.java | 106 ++++++++++++++ .../property/domain/FaqManagement.java | 61 ++++++++ .../property/domain/bo/FaqManagementBo.java | 64 ++++++++ .../property/domain/vo/FaqManagementVo.java | 86 +++++++++++ .../property/mapper/FaqManagementMapper.java | 17 +++ .../service/IFaqManagementService.java | 69 +++++++++ .../impl/FaqManagementServiceImpl.java | 137 ++++++++++++++++++ .../mapper/Property/FaqManagementMapper.xml | 7 + .../service/impl/SysDictTypeServiceImpl.java | 2 +- .../src/main/resources/application.properties | 4 +- 11 files changed, 552 insertions(+), 5 deletions(-) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/FaqManagementController.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/FaqManagement.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/FaqManagementBo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/FaqManagementVo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/FaqManagementMapper.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/IFaqManagementService.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/FaqManagementMapper.xml diff --git a/pom.xml b/pom.xml index 08b4c075..b1e680ad 100644 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,8 @@ dev - 10.20.1.60:8848 - 10.20.1.60:4560 + 127.0.0.1:8848 + 127.0.0.1:4560 DEFAULT_GROUP DEFAULT_GROUP nacos diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/FaqManagementController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/FaqManagementController.java new file mode 100644 index 00000000..8420db8b --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/FaqManagementController.java @@ -0,0 +1,106 @@ +package org.dromara.property.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.property.domain.vo.FaqManagementVo; +import org.dromara.property.domain.bo.FaqManagementBo; +import org.dromara.property.service.IFaqManagementService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 常见问题管理 + * 前端访问路由地址为:/property/faqManagement + * + * @author LionLi + * @date 2025-08-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/faqManagement") +public class FaqManagementController extends BaseController { + + private final IFaqManagementService faqManagementService; + + /** + * 查询常见问题管理列表 + */ + @SaCheckPermission("property:faqManagement:list") + @GetMapping("/list") + public TableDataInfo list(FaqManagementBo bo, PageQuery pageQuery) { + return faqManagementService.queryPageList(bo, pageQuery); + } + + /** + * 导出常见问题管理列表 + */ + @SaCheckPermission("property:faqManagement:export") + @Log(title = "常见问题管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(FaqManagementBo bo, HttpServletResponse response) { + List list = faqManagementService.queryList(bo); + ExcelUtil.exportExcel(list, "常见问题管理", FaqManagementVo.class, response); + } + + /** + * 获取常见问题管理详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("property:faqManagement:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(faqManagementService.queryById(id)); + } + + /** + * 新增常见问题管理 + */ + @SaCheckPermission("property:faqManagement:add") + @Log(title = "常见问题管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody FaqManagementBo bo) { + return toAjax(faqManagementService.insertByBo(bo)); + } + + /** + * 修改常见问题管理 + */ + @SaCheckPermission("property:faqManagement:edit") + @Log(title = "常见问题管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody FaqManagementBo bo) { + return toAjax(faqManagementService.updateByBo(bo)); + } + + /** + * 删除常见问题管理 + * + * @param ids 主键串 + */ + @SaCheckPermission("property:faqManagement:remove") + @Log(title = "常见问题管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(faqManagementService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/FaqManagement.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/FaqManagement.java new file mode 100644 index 00000000..8c304da2 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/FaqManagement.java @@ -0,0 +1,61 @@ +package org.dromara.property.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 常见问题管理对象 faq_management + * + * @author LionLi + * @date 2025-08-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("faq_management") +public class FaqManagement extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 标题 + */ + private String head; + + /** + * 分类 + */ + private String type; + + /** + * 浏览量 + */ + private Long pageView; + + /** + * 内容 + */ + private String contents; + + /** + * 状态(1草稿 2已发布) + */ + private String status; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/FaqManagementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/FaqManagementBo.java new file mode 100644 index 00000000..5d3cab2c --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/FaqManagementBo.java @@ -0,0 +1,64 @@ +package org.dromara.property.domain.bo; + +import org.dromara.property.domain.FaqManagement; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 常见问题管理业务对象 faq_management + * + * @author LionLi + * @date 2025-08-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = FaqManagement.class, reverseConvertGenerate = false) +public class FaqManagementBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 标题 + */ + @NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class }) + private String head; + + /** + * 分类 + */ + @NotBlank(message = "分类不能为空", groups = { AddGroup.class, EditGroup.class }) + private String type; + + /** + * 浏览量 + */ + private Long pageView; + + /** + * 内容 + */ + @NotBlank(message = "内容不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contents; + + /** + * 状态(1草稿 2已发布) + */ + @NotBlank(message = "状态(1草稿 2已发布)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/FaqManagementVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/FaqManagementVo.java new file mode 100644 index 00000000..8d805d1b --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/FaqManagementVo.java @@ -0,0 +1,86 @@ +package org.dromara.property.domain.vo; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.property.domain.FaqManagement; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 常见问题管理视图对象 faq_management + * + * @author LionLi + * @date 2025-08-18 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = FaqManagement.class) +public class FaqManagementVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 标题 + */ + @ExcelProperty(value = "标题") + private String head; + + /** + * 分类 + */ + @ExcelProperty(value = "分类") + private String type; + + /** + * 浏览量 + */ + @ExcelProperty(value = "浏览量") + private Long pageView; + + /** + * 内容 + */ + @ExcelProperty(value = "内容") + private String contents; + + /** + * 状态(1草稿 2已发布) + */ + @ExcelProperty(value = "状态(1草稿 2已发布)") + private String status; + + /** + * 搜索值 + */ + @ExcelProperty(value = "搜索值") + private String searchValue; + + /** + * 创建时间 + */ + + private Date createTime; + + + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/FaqManagementMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/FaqManagementMapper.java new file mode 100644 index 00000000..39acebd8 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/FaqManagementMapper.java @@ -0,0 +1,17 @@ +package org.dromara.property.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.property.domain.FaqManagement; +import org.dromara.property.domain.vo.FaqManagementVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 常见问题管理Mapper接口 + * + * @author LionLi + * @date 2025-08-18 + */ +@Mapper +public interface FaqManagementMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IFaqManagementService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IFaqManagementService.java new file mode 100644 index 00000000..0658d696 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IFaqManagementService.java @@ -0,0 +1,69 @@ +package org.dromara.property.service; + +import org.dromara.property.domain.FaqManagement; +import org.dromara.property.domain.vo.FaqManagementVo; +import org.dromara.property.domain.bo.FaqManagementBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 常见问题管理Service接口 + * + * @author LionLi + * @date 2025-08-18 + */ +public interface IFaqManagementService { + + /** + * 查询常见问题管理 + * + * @param id 主键 + * @return 常见问题管理 + */ + FaqManagementVo queryById(Long id); + + /** + * 分页查询常见问题管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 常见问题管理分页列表 + */ + TableDataInfo queryPageList(FaqManagementBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的常见问题管理列表 + * + * @param bo 查询条件 + * @return 常见问题管理列表 + */ + List queryList(FaqManagementBo bo); + + /** + * 新增常见问题管理 + * + * @param bo 常见问题管理 + * @return 是否新增成功 + */ + Boolean insertByBo(FaqManagementBo bo); + + /** + * 修改常见问题管理 + * + * @param bo 常见问题管理 + * @return 是否修改成功 + */ + Boolean updateByBo(FaqManagementBo bo); + + /** + * 校验并批量删除常见问题管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java new file mode 100644 index 00000000..b0ae90fc --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java @@ -0,0 +1,137 @@ +package org.dromara.property.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.property.domain.bo.FaqManagementBo; +import org.dromara.property.domain.vo.FaqManagementVo; +import org.dromara.property.domain.FaqManagement; +import org.dromara.property.mapper.FaqManagementMapper; +import org.dromara.property.service.IFaqManagementService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 常见问题管理Service业务层处理 + * + * @author LionLi + * @date 2025-08-18 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class FaqManagementServiceImpl implements IFaqManagementService { + + private final FaqManagementMapper baseMapper; + + /** + * 查询常见问题管理 + * + * @param id 主键 + * @return 常见问题管理 + */ + @Override + public FaqManagementVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询常见问题管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 常见问题管理分页列表 + */ + @Override + public TableDataInfo queryPageList(FaqManagementBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的常见问题管理列表 + * + * @param bo 查询条件 + * @return 常见问题管理列表 + */ + @Override + public List queryList(FaqManagementBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(FaqManagementBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(FaqManagement::getId); + lqw.like(StringUtils.isNotBlank(bo.getHead()), FaqManagement::getHead, bo.getHead()); + lqw.eq(StringUtils.isNotBlank(bo.getType()), FaqManagement::getType, bo.getType()); + lqw.eq(bo.getPageView() != null, FaqManagement::getPageView, bo.getPageView()); + lqw.eq(StringUtils.isNotBlank(bo.getContents()), FaqManagement::getContents, bo.getContents()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), FaqManagement::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), FaqManagement::getSearchValue, bo.getSearchValue()); + return lqw; + } + + /** + * 新增常见问题管理 + * + * @param bo 常见问题管理 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(FaqManagementBo bo) { + FaqManagement add = MapstructUtils.convert(bo, FaqManagement.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改常见问题管理 + * + * @param bo 常见问题管理 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(FaqManagementBo bo) { + FaqManagement update = MapstructUtils.convert(bo, FaqManagement.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(FaqManagement entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除常见问题管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/FaqManagementMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/FaqManagementMapper.xml new file mode 100644 index 00000000..1452bd05 --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/FaqManagementMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index fa505951..20571ce3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -90,7 +90,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { * @param dictType 字典类型 * @return 字典数据集合信息 */ - @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType") + // @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType") @Override public List selectDictDataByType(String dictType) { List dictDatas = dictDataMapper.selectDictDataByType(dictType); diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties index ef3ece6a..5aa89231 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties @@ -40,9 +40,9 @@ spring.sql.init.platform=mysql db.num=1 ### Connect URL of DB: -db.url.0=jdbc:mysql://10.20.1.65:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.user.0=root -db.password.0=By@2025! +db.password.0=123456 ### the maximum retry times for push nacos.config.push.maxRetryTime=50