新增意见

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/opinion/XiaoyuanOpinionController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.opinion;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.opinion.bo.XiaoyuanOpinionBo;
+import org.dromara.system.domain.opinion.vo.XiaoyuanOpinionVo;
+import org.dromara.system.service.opinion.IXiaoyuanOpinionService;
+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;
+
+/**
+ * 校园建议ID
+ *
+ * @author boman
+ * @date 2023-09-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/opinion")
+public class XiaoyuanOpinionController extends BaseController {
+
+    private final IXiaoyuanOpinionService xiaoyuanOpinionService;
+
+    /**
+     * 查询校园建议ID列表
+     */
+    @SaCheckPermission("system:opinion:list")
+    @GetMapping("/list")
+    public TableDataInfo<XiaoyuanOpinionVo> list(XiaoyuanOpinionBo bo, PageQuery pageQuery) {
+        return xiaoyuanOpinionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出校园建议ID列表
+     */
+    @SaCheckPermission("system:opinion:export")
+    @Log(title = "校园建议ID", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XiaoyuanOpinionBo bo, HttpServletResponse response) {
+        List<XiaoyuanOpinionVo> list = xiaoyuanOpinionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "校园建议ID", XiaoyuanOpinionVo.class, response);
+    }
+
+    /**
+     * 获取校园建议ID详细信息
+     *
+     * @param opinionId 主键
+     */
+    @SaCheckPermission("system:opinion:query")
+    @GetMapping("/{opinionId}")
+    public R<XiaoyuanOpinionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long opinionId) {
+        return R.ok(xiaoyuanOpinionService.queryById(opinionId));
+    }
+
+    /**
+     * 新增校园建议ID
+     */
+    @SaCheckPermission("system:opinion:add")
+    @Log(title = "校园建议ID", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XiaoyuanOpinionBo bo) {
+        return toAjax(xiaoyuanOpinionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改校园建议ID
+     */
+    @SaCheckPermission("system:opinion:edit")
+    @Log(title = "校园建议ID", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XiaoyuanOpinionBo bo) {
+        return toAjax(xiaoyuanOpinionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除校园建议ID
+     *
+     * @param opinionIds 主键串
+     */
+    @SaCheckPermission("system:opinion:remove")
+    @Log(title = "校园建议ID", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{opinionIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] opinionIds) {
+        return toAjax(xiaoyuanOpinionService.deleteWithValidByIds(List.of(opinionIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/opinion/XiaoyuanOpinion.java

@@ -0,0 +1,56 @@
+package org.dromara.system.domain.opinion;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 校园建议ID对象 xiaoyuan_opinion
+ *
+ * @author boman
+ * @date 2023-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xiaoyuan_opinion")
+public class XiaoyuanOpinion extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 校园建议ID
+     */
+    @TableId(value = "opinion_id")
+    private Long opinionId;
+
+    /**
+     * 建议内容
+     */
+    private String opinionDetails;
+
+    /**
+     * 建议回复
+     */
+    private String opinionReply;
+
+    /**
+     * 建议状态 1:未查看 2:已查看
+     */
+    private String opinionType;
+
+    /**
+     * 建议图片地址
+     */
+    private String opinionPhoto;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/opinion/bo/XiaoyuanOpinionBo.java

@@ -0,0 +1,61 @@
+package org.dromara.system.domain.opinion.bo;
+
+
+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.*;
+import org.dromara.system.domain.opinion.XiaoyuanOpinion;
+
+/**
+ * 校园建议ID业务对象 xiaoyuan_opinion
+ *
+ * @author boman
+ * @date 2023-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XiaoyuanOpinion.class, reverseConvertGenerate = false)
+public class XiaoyuanOpinionBo extends BaseEntity {
+
+    /**
+     * 校园建议ID
+     */
+    //@NotNull(message = "校园建议ID不能为空", groups = { EditGroup.class })
+    private Long opinionId;
+
+    /**
+     * 建议内容
+     */
+    //@NotBlank(message = "建议内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String opinionDetails;
+
+    /**
+     * 建议回复
+     */
+    //@NotBlank(message = "建议回复不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String opinionReply;
+
+    /**
+     * 建议状态 1:未查看 2:已查看
+     */
+    //@NotBlank(message = "建议状态 1:未查看 2:已查看不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String opinionType;
+
+    /**
+     * 建议图片地址
+     */
+    //@NotBlank(message = "建议图片地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String opinionPhoto;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/opinion/vo/XiaoyuanOpinionVo.java

@@ -0,0 +1,64 @@
+package org.dromara.system.domain.opinion.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.opinion.XiaoyuanOpinion;
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 校园建议ID视图对象 xiaoyuan_opinion
+ *
+ * @author boman
+ * @date 2023-09-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XiaoyuanOpinion.class)
+public class XiaoyuanOpinionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 校园建议ID
+     */
+    @ExcelProperty(value = "校园建议ID")
+    private Long opinionId;
+
+    /**
+     * 建议内容
+     */
+    @ExcelProperty(value = "建议内容")
+    private String opinionDetails;
+
+    /**
+     * 建议回复
+     */
+    @ExcelProperty(value = "建议回复")
+    private String opinionReply;
+
+    /**
+     * 建议状态 1:未查看 2:已查看
+     */
+    @ExcelProperty(value = "建议状态 1:未查看 2:已查看")
+    private String opinionType;
+
+    /**
+     * 建议图片地址
+     */
+    @ExcelProperty(value = "建议图片地址")
+    private String opinionPhoto;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/opinion/XiaoyuanOpinionMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.system.mapper.opinion;
+
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.opinion.XiaoyuanOpinion;
+import org.dromara.system.domain.opinion.vo.XiaoyuanOpinionVo;
+
+/**
+ * 校园建议IDMapper接口
+ *
+ * @author boman
+ * @date 2023-09-15
+ */
+public interface XiaoyuanOpinionMapper extends BaseMapperPlus<XiaoyuanOpinion, XiaoyuanOpinionVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/opinion/XiaoyuanOpinionServiceImpl.java

@@ -0,0 +1,111 @@
+package org.dromara.system.service.impl.opinion;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.opinion.XiaoyuanOpinion;
+import org.dromara.system.domain.opinion.bo.XiaoyuanOpinionBo;
+import org.dromara.system.domain.opinion.vo.XiaoyuanOpinionVo;
+import org.dromara.system.mapper.opinion.XiaoyuanOpinionMapper;
+import org.dromara.system.service.opinion.IXiaoyuanOpinionService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 校园建议IDService业务层处理
+ *
+ * @author boman
+ * @date 2023-09-15
+ */
+@RequiredArgsConstructor
+@Service
+public class XiaoyuanOpinionServiceImpl implements IXiaoyuanOpinionService {
+
+    private final XiaoyuanOpinionMapper baseMapper;
+
+    /**
+     * 查询校园建议ID
+     */
+    @Override
+    public XiaoyuanOpinionVo queryById(Long opinionId){
+        return baseMapper.selectVoById(opinionId);
+    }
+
+    /**
+     * 查询校园建议ID列表
+     */
+    @Override
+    public TableDataInfo<XiaoyuanOpinionVo> queryPageList(XiaoyuanOpinionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XiaoyuanOpinion> lqw = buildQueryWrapper(bo);
+        Page<XiaoyuanOpinionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询校园建议ID列表
+     */
+    @Override
+    public List<XiaoyuanOpinionVo> queryList(XiaoyuanOpinionBo bo) {
+        LambdaQueryWrapper<XiaoyuanOpinion> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XiaoyuanOpinion> buildQueryWrapper(XiaoyuanOpinionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XiaoyuanOpinion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getOpinionDetails()), XiaoyuanOpinion::getOpinionDetails, bo.getOpinionDetails());
+        lqw.eq(StringUtils.isNotBlank(bo.getOpinionReply()), XiaoyuanOpinion::getOpinionReply, bo.getOpinionReply());
+        lqw.eq(StringUtils.isNotBlank(bo.getOpinionType()), XiaoyuanOpinion::getOpinionType, bo.getOpinionType());
+        lqw.eq(StringUtils.isNotBlank(bo.getOpinionPhoto()), XiaoyuanOpinion::getOpinionPhoto, bo.getOpinionPhoto());
+        return lqw;
+    }
+
+    /**
+     * 新增校园建议ID
+     */
+    @Override
+    public Boolean insertByBo(XiaoyuanOpinionBo bo) {
+        XiaoyuanOpinion add = MapstructUtils.convert(bo, XiaoyuanOpinion.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setOpinionId(add.getOpinionId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改校园建议ID
+     */
+    @Override
+    public Boolean updateByBo(XiaoyuanOpinionBo bo) {
+        XiaoyuanOpinion update = MapstructUtils.convert(bo, XiaoyuanOpinion.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XiaoyuanOpinion entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除校园建议ID
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/opinion/IXiaoyuanOpinionService.java

@@ -0,0 +1,47 @@
+package org.dromara.system.service.opinion;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.opinion.bo.XiaoyuanOpinionBo;
+import org.dromara.system.domain.opinion.vo.XiaoyuanOpinionVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 校园建议IDService接口
+ *
+ * @author boman
+ * @date 2023-09-15
+ */
+public interface IXiaoyuanOpinionService {
+
+    /**
+     * 查询校园建议ID
+     */
+    XiaoyuanOpinionVo queryById(Long opinionId);
+
+    /**
+     * 查询校园建议ID列表
+     */
+    TableDataInfo<XiaoyuanOpinionVo> queryPageList(XiaoyuanOpinionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询校园建议ID列表
+     */
+    List<XiaoyuanOpinionVo> queryList(XiaoyuanOpinionBo bo);
+
+    /**
+     * 新增校园建议ID
+     */
+    Boolean insertByBo(XiaoyuanOpinionBo bo);
+
+    /**
+     * 修改校园建议ID
+     */
+    Boolean updateByBo(XiaoyuanOpinionBo bo);
+
+    /**
+     * 校验并批量删除校园建议ID信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/resources/mapper/opinion/XiaoyuanOpinionMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.system.mapper.opinion.XiaoyuanOpinionMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/pay/XiaoyuanPayMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.system.mapper.XiaoyuanPayMapper">
+<mapper namespace="org.dromara.system.mapper.pay.XiaoyuanPayMapper">
 
 </mapper>