diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionMatterController.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionMatterController.java new file mode 100644 index 0000000..53ca4a6 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionMatterController.java @@ -0,0 +1,106 @@ +package org.dromara.inspection.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.inspection.domain.vo.OpsInspectionMatterVo; +import org.dromara.inspection.domain.bo.OpsInspectionMatterBo; +import org.dromara.inspection.service.IOpsInspectionMatterService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 运维-巡检-待办 + * 前端访问路由地址为:/inspection/matter + * + * @author LionLi + * @date 2025-09-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/matter") +public class OpsInspectionMatterController extends BaseController { + + private final IOpsInspectionMatterService opsInspectionMatterService; + + /** + * 查询运维-巡检-待办列表 + */ + @SaCheckPermission("inspection:matter:list") + @GetMapping("/list") + public TableDataInfo list(OpsInspectionMatterBo bo, PageQuery pageQuery) { + return opsInspectionMatterService.queryPageList(bo, pageQuery); + } + + /** + * 导出运维-巡检-待办列表 + */ + @SaCheckPermission("inspection:matter:export") + @Log(title = "运维-巡检-待办", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OpsInspectionMatterBo bo, HttpServletResponse response) { + List list = opsInspectionMatterService.queryList(bo); + ExcelUtil.exportExcel(list, "运维-巡检-待办", OpsInspectionMatterVo.class, response); + } + + /** + * 获取运维-巡检-待办详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("inspection:matter:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(opsInspectionMatterService.queryById(id)); + } + + /** + * 新增运维-巡检-待办 + */ + @SaCheckPermission("inspection:matter:add") + @Log(title = "运维-巡检-待办", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OpsInspectionMatterBo bo) { + return toAjax(opsInspectionMatterService.insertByBo(bo)); + } + + /** + * 修改运维-巡检-待办 + */ + @SaCheckPermission("inspection:matter:edit") + @Log(title = "运维-巡检-待办", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OpsInspectionMatterBo bo) { + return toAjax(opsInspectionMatterService.updateByBo(bo)); + } + + /** + * 删除运维-巡检-待办 + * + * @param ids 主键串 + */ + @SaCheckPermission("inspection:matter:remove") + @Log(title = "运维-巡检-待办", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(opsInspectionMatterService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionMatter.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionMatter.java new file mode 100644 index 0000000..fbf0586 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionMatter.java @@ -0,0 +1,72 @@ +package org.dromara.inspection.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + +import java.io.Serial; + +/** + * 运维-巡检-待办对象 ops_inspection_matter + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ops_inspection_matter") +public class OpsInspectionMatter extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * (任务)电站id + */ + private Long projectId; + + /** + * 任务名称 + */ + private String taskName; + + /** + * 任务描述 + */ + private String describe; + + /** + * 任务开始时间 + */ + private Date taskBeginTime; + + /** + * 任务结束时间 + */ + private Date taskEndTime; + + /** + * 时间段 + */ + private String taskTimeInfo; + + /** + * 等级,常规,重要,紧急 + */ + private String taskLevel; + + /** + * 任务类型 + */ + private String taskType; + + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionMatterBo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionMatterBo.java new file mode 100644 index 0000000..382d621 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionMatterBo.java @@ -0,0 +1,75 @@ +package org.dromara.inspection.domain.bo; + +import org.dromara.inspection.domain.OpsInspectionMatter; +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 java.util.Date; + +/** + * 运维-巡检-待办业务对象 ops_inspection_matter + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = OpsInspectionMatter.class, reverseConvertGenerate = false) +public class OpsInspectionMatterBo extends BaseEntity { + + private Long id; + + /** + * (任务)电站id + */ + @NotNull(message = "(任务)电站id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long projectId; + + /** + * 任务名称 + */ + @NotBlank(message = "任务名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String taskName; + + /** + * 任务描述 + */ + @NotBlank(message = "任务描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String describe; + + /** + * 任务开始时间 + */ + @NotNull(message = "任务开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date taskBeginTime; + + /** + * 任务结束时间 + */ + @NotNull(message = "任务结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date taskEndTime; + + /** + * 时间段 + */ + @NotBlank(message = "时间段不能为空", groups = { AddGroup.class, EditGroup.class }) + private String taskTimeInfo; + + /** + * 等级,1常规,2重要,3紧急 + */ + @NotBlank(message = "等级,1常规,2重要,3紧急不能为空", groups = { AddGroup.class, EditGroup.class }) + private String taskLeval; + + /** + * 任务类型 + */ + @NotBlank(message = "任务类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String taskType; + + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionMatterVo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionMatterVo.java new file mode 100644 index 0000000..014b4d8 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionMatterVo.java @@ -0,0 +1,84 @@ +package org.dromara.inspection.domain.vo; + +import java.util.Date; + +import org.dromara.inspection.domain.OpsInspectionMatter; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 运维-巡检-待办视图对象 ops_inspection_matter + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = OpsInspectionMatter.class) +public class OpsInspectionMatterVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * (任务)电站id + */ + @ExcelProperty(value = "(任务)电站id") + private Long projectId; + + /** + * 任务名称 + */ + @ExcelProperty(value = "任务名称") + private String taskName; + + /** + * 任务描述 + */ + @ExcelProperty(value = "任务描述") + private String describe; + + /** + * 任务开始时间 + */ + @ExcelProperty(value = "任务开始时间") + private Date taskBeginTime; + + /** + * 任务结束时间 + */ + @ExcelProperty(value = "任务结束时间") + private Date taskEndTime; + + /** + * 时间段 + */ + @ExcelProperty(value = "时间段") + private String taskTimeInfo; + + /** + * 等级,1常规,2重要,3紧急 + */ + @ExcelProperty(value = "等级,1常规,2重要,3紧急") + private String taskLeval; + + /** + * 任务类型 + */ + @ExcelProperty(value = "任务类型") + private String taskType; + + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionMatterMapper.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionMatterMapper.java new file mode 100644 index 0000000..8118d03 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionMatterMapper.java @@ -0,0 +1,15 @@ +package org.dromara.inspection.mapper; + +import org.dromara.inspection.domain.OpsInspectionMatter; +import org.dromara.inspection.domain.vo.OpsInspectionMatterVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 运维-巡检-待办Mapper接口 + * + * @author LionLi + * @date 2025-09-19 + */ +public interface OpsInspectionMatterMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionMatterService.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionMatterService.java new file mode 100644 index 0000000..96f9d48 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionMatterService.java @@ -0,0 +1,68 @@ +package org.dromara.inspection.service; + +import org.dromara.inspection.domain.vo.OpsInspectionMatterVo; +import org.dromara.inspection.domain.bo.OpsInspectionMatterBo; +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-09-19 + */ +public interface IOpsInspectionMatterService { + + /** + * 查询运维-巡检-待办 + * + * @param id 主键 + * @return 运维-巡检-待办 + */ + OpsInspectionMatterVo queryById(Long id); + + /** + * 分页查询运维-巡检-待办列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 运维-巡检-待办分页列表 + */ + TableDataInfo queryPageList(OpsInspectionMatterBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的运维-巡检-待办列表 + * + * @param bo 查询条件 + * @return 运维-巡检-待办列表 + */ + List queryList(OpsInspectionMatterBo bo); + + /** + * 新增运维-巡检-待办 + * + * @param bo 运维-巡检-待办 + * @return 是否新增成功 + */ + Boolean insertByBo(OpsInspectionMatterBo bo); + + /** + * 修改运维-巡检-待办 + * + * @param bo 运维-巡检-待办 + * @return 是否修改成功 + */ + Boolean updateByBo(OpsInspectionMatterBo bo); + + /** + * 校验并批量删除运维-巡检-待办信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionMatterServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionMatterServiceImpl.java new file mode 100644 index 0000000..79e344c --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionMatterServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.inspection.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.inspection.domain.bo.OpsInspectionMatterBo; +import org.dromara.inspection.domain.vo.OpsInspectionMatterVo; +import org.dromara.inspection.domain.OpsInspectionMatter; +import org.dromara.inspection.mapper.OpsInspectionMatterMapper; +import org.dromara.inspection.service.IOpsInspectionMatterService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 运维-巡检-待办Service业务层处理 + * + * @author LionLi + * @date 2025-09-19 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class OpsInspectionMatterServiceImpl implements IOpsInspectionMatterService { + + private final OpsInspectionMatterMapper baseMapper; + + /** + * 查询运维-巡检-待办 + * + * @param id 主键 + * @return 运维-巡检-待办 + */ + @Override + public OpsInspectionMatterVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询运维-巡检-待办列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 运维-巡检-待办分页列表 + */ + @Override + public TableDataInfo queryPageList(OpsInspectionMatterBo 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(OpsInspectionMatterBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OpsInspectionMatterBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(OpsInspectionMatter::getId); + lqw.eq(bo.getProjectId() != null, OpsInspectionMatter::getProjectId, bo.getProjectId()); + lqw.like(StringUtils.isNotBlank(bo.getTaskName()), OpsInspectionMatter::getTaskName, bo.getTaskName()); + lqw.eq(StringUtils.isNotBlank(bo.getDescribe()), OpsInspectionMatter::getDescribe, bo.getDescribe()); + lqw.eq(bo.getTaskBeginTime() != null, OpsInspectionMatter::getTaskBeginTime, bo.getTaskBeginTime()); + lqw.eq(bo.getTaskEndTime() != null, OpsInspectionMatter::getTaskEndTime, bo.getTaskEndTime()); + lqw.eq(StringUtils.isNotBlank(bo.getTaskTimeInfo()), OpsInspectionMatter::getTaskTimeInfo, bo.getTaskTimeInfo()); + lqw.eq(StringUtils.isNotBlank(bo.getTaskLeval()), OpsInspectionMatter::getTaskLevel, bo.getTaskLeval()); + lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), OpsInspectionMatter::getTaskType, bo.getTaskType()); + return lqw; + } + + /** + * 新增运维-巡检-待办 + * + * @param bo 运维-巡检-待办 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(OpsInspectionMatterBo bo) { + OpsInspectionMatter add = MapstructUtils.convert(bo, OpsInspectionMatter.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改运维-巡检-待办 + * + * @param bo 运维-巡检-待办 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(OpsInspectionMatterBo bo) { + OpsInspectionMatter update = MapstructUtils.convert(bo, OpsInspectionMatter.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OpsInspectionMatter entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除运维-巡检-待办信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}