通知公告基础接口

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/NoticeInfoController.java

@@ -0,0 +1,105 @@
+package org.dromara.platform.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.platform.domain.vo.NoticeInfoVo;
+import org.dromara.platform.domain.bo.NoticeInfoBo;
+import org.dromara.platform.service.INoticeInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 公告通知信息
+ *
+ * @author gejunhao
+ * @date 2025-04-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/platform/noticeInfo")
+public class NoticeInfoController extends BaseController {
+
+    private final INoticeInfoService noticeInfoService;
+
+    /**
+     * 查询公告通知信息列表
+     */
+    @SaCheckPermission("platform:noticeInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<NoticeInfoVo> list(NoticeInfoBo bo, PageQuery pageQuery) {
+        return noticeInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出公告通知信息列表
+     */
+    @SaCheckPermission("platform:noticeInfo:export")
+    @Log(title = "公告通知信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(NoticeInfoBo bo, HttpServletResponse response) {
+        List<NoticeInfoVo> list = noticeInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "公告通知信息", NoticeInfoVo.class, response);
+    }
+
+    /**
+     * 获取公告通知信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("platform:noticeInfo:query")
+    @GetMapping("/{id}")
+    public R<NoticeInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(noticeInfoService.queryById(id));
+    }
+
+    /**
+     * 新增公告通知信息
+     */
+    @SaCheckPermission("platform:noticeInfo:add")
+    @Log(title = "公告通知信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody NoticeInfoBo bo) {
+        return toAjax(noticeInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改公告通知信息
+     */
+    @SaCheckPermission("platform:noticeInfo:edit")
+    @Log(title = "公告通知信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody NoticeInfoBo bo) {
+        return toAjax(noticeInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除公告通知信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("platform:noticeInfo:remove")
+    @Log(title = "公告通知信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(noticeInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/EvaluationInfo.java

@@ -83,7 +83,7 @@ public class EvaluationInfo extends TenantEntity {
     /**
      * 备注
      */
-    private Long remark;
+    private String remark;
 
     /**
      * 当前状态

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/NoticeInfo.java

@@ -0,0 +1,72 @@
+package org.dromara.platform.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 公告通知信息对象 notice_info
+ *
+ * @author gejunhao
+ * @date 2025-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("notice_info")
+public class NoticeInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识符
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 操作人
+     */
+    private String handler;
+
+    /**
+     * 公告通知正文
+     */
+    private String content;
+
+    /**
+     * 附件
+     */
+    private String attachment;
+
+    /**
+     * 当前状态
+     */
+    private Long status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/EvaluationInfoBo.java

@@ -95,7 +95,7 @@ public class EvaluationInfoBo extends BaseEntity {
     /**
      * 备注
      */
-    private Long remark;
+    private String remark;
 
     /**
      * 当前状态

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/NoticeInfoBo.java

@@ -0,0 +1,72 @@
+package org.dromara.platform.domain.bo;
+
+import org.dromara.platform.domain.NoticeInfo;
+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.*;
+
+/**
+ * 公告通知信息业务对象 notice_info
+ *
+ * @author gejunhao
+ * @date 2025-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = NoticeInfo.class, reverseConvertGenerate = false)
+public class NoticeInfoBo extends BaseEntity {
+
+    /**
+     * 唯一标识符
+     */
+    @NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String title;
+
+    /**
+     * 项目名称
+     */
+    @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String projectName;
+
+    /**
+     * 类型
+     */
+    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 操作人
+     */
+    //@NotBlank(message = "操作人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String handler;
+
+    /**
+     * 公告通知正文
+     */
+    @NotBlank(message = "公告通知正文不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String content;
+
+    /**
+     * 附件
+     */
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String attachment;
+
+    /**
+     * 当前状态
+     */
+    //@NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/EvaluationInfoVo.java

@@ -100,7 +100,7 @@ public class EvaluationInfoVo implements Serializable {
 //     * 备注
 //     */
 //    @ExcelProperty(value = "备注")
-//    private Long remark;
+//    private String remark;
 //
 //    /**
 //     * 当前状态

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/NoticeInfoVo.java

@@ -0,0 +1,90 @@
+package org.dromara.platform.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import org.dromara.platform.domain.NoticeInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.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;
+
+
+
+/**
+ * 公告通知信息视图对象 notice_info
+ *
+ * @author gejunhao
+ * @date 2025-04-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = NoticeInfo.class)
+public class NoticeInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识符
+     */
+    @ExcelProperty(value = "唯一标识符")
+    private String id;
+
+    /**
+     * 标题
+     */
+    @ExcelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 项目名称
+     */
+    @ExcelProperty(value = "项目名称")
+    private String projectName;
+
+    /**
+     * 类型
+     */
+    @ExcelProperty(value = "类型")
+    private String type;
+
+    /**
+     * 操作人
+     */
+    @ExcelProperty(value = "操作人")
+    private String handler;
+
+    /**
+     * 公告通知正文
+     */
+    @ExcelProperty(value = "公告通知正文")
+    private String content;
+
+    /**
+     * 附件
+     */
+    @ExcelProperty(value = "附件")
+    private String attachment;
+
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Long status;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/NoticeInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.platform.mapper;
+
+import org.dromara.platform.domain.NoticeInfo;
+import org.dromara.platform.domain.vo.NoticeInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 公告通知信息Mapper接口
+ *
+ * @author gejunhao
+ * @date 2025-04-23
+ */
+public interface NoticeInfoMapper extends BaseMapperPlus<NoticeInfo, NoticeInfoVo> {
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/INoticeInfoService.java

@@ -0,0 +1,68 @@
+package org.dromara.platform.service;
+
+import org.dromara.platform.domain.vo.NoticeInfoVo;
+import org.dromara.platform.domain.bo.NoticeInfoBo;
+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 gejunhao
+ * @date 2025-04-23
+ */
+public interface INoticeInfoService {
+
+    /**
+     * 查询公告通知信息
+     *
+     * @param id 主键
+     * @return 公告通知信息
+     */
+    NoticeInfoVo queryById(String id);
+
+    /**
+     * 分页查询公告通知信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 公告通知信息分页列表
+     */
+    TableDataInfo<NoticeInfoVo> queryPageList(NoticeInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的公告通知信息列表
+     *
+     * @param bo 查询条件
+     * @return 公告通知信息列表
+     */
+    List<NoticeInfoVo> queryList(NoticeInfoBo bo);
+
+    /**
+     * 新增公告通知信息
+     *
+     * @param bo 公告通知信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(NoticeInfoBo bo);
+
+    /**
+     * 修改公告通知信息
+     *
+     * @param bo 公告通知信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(NoticeInfoBo bo);
+
+    /**
+     * 校验并批量删除公告通知信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/NoticeInfoServiceImpl.java

@@ -0,0 +1,139 @@
+package org.dromara.platform.service.impl;
+
+import org.dromara.common.core.domain.model.LoginUser;
+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 org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.stereotype.Service;
+import org.dromara.platform.domain.bo.NoticeInfoBo;
+import org.dromara.platform.domain.vo.NoticeInfoVo;
+import org.dromara.platform.domain.NoticeInfo;
+import org.dromara.platform.mapper.NoticeInfoMapper;
+import org.dromara.platform.service.INoticeInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 公告通知信息Service业务层处理
+ *
+ * @author gejunhao
+ * @date 2025-04-23
+ */
+@RequiredArgsConstructor
+@Service
+public class NoticeInfoServiceImpl implements INoticeInfoService {
+
+    private final NoticeInfoMapper baseMapper;
+
+    /**
+     * 查询公告通知信息
+     *
+     * @param id 主键
+     * @return 公告通知信息
+     */
+    @Override
+    public NoticeInfoVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询公告通知信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 公告通知信息分页列表
+     */
+    @Override
+    public TableDataInfo<NoticeInfoVo> queryPageList(NoticeInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<NoticeInfo> lqw = buildQueryWrapper(bo);
+        Page<NoticeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的公告通知信息列表
+     *
+     * @param bo 查询条件
+     * @return 公告通知信息列表
+     */
+    @Override
+    public List<NoticeInfoVo> queryList(NoticeInfoBo bo) {
+        LambdaQueryWrapper<NoticeInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<NoticeInfo> buildQueryWrapper(NoticeInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<NoticeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), NoticeInfo::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getProjectName()), NoticeInfo::getProjectName, bo.getProjectName());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), NoticeInfo::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getHandler()), NoticeInfo::getHandler, bo.getHandler());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), NoticeInfo::getContent, bo.getContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), NoticeInfo::getAttachment, bo.getAttachment());
+        lqw.eq(bo.getStatus() != null, NoticeInfo::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增公告通知信息
+     *
+     * @param bo 公告通知信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(NoticeInfoBo bo) {
+        NoticeInfo add = MapstructUtils.convert(bo, NoticeInfo.class);
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        add.setHandler(loginUser.getNickname());
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改公告通知信息
+     *
+     * @param bo 公告通知信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(NoticeInfoBo bo) {
+        NoticeInfo update = MapstructUtils.convert(bo, NoticeInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(NoticeInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除公告通知信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}