diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionItemController.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionItemController.java new file mode 100644 index 0000000..4d71da3 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionItemController.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.OpsInspectionItemVo; +import org.dromara.inspection.domain.bo.OpsInspectionItemBo; +import org.dromara.inspection.service.IOpsInspectionItemService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 运维-巡检-自定义巡检项 + * 前端访问路由地址为:/inspection/item + * + * @author LionLi + * @date 2025-09-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/item") +public class OpsInspectionItemController extends BaseController { + + private final IOpsInspectionItemService opsInspectionItemService; + + /** + * 查询运维-巡检-自定义巡检项列表 + */ + @SaCheckPermission("inspection:item:list") + @GetMapping("/list") + public TableDataInfo list(OpsInspectionItemBo bo, PageQuery pageQuery) { + return opsInspectionItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出运维-巡检-自定义巡检项列表 + */ + @SaCheckPermission("inspection:item:export") + @Log(title = "运维-巡检-自定义巡检项", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OpsInspectionItemBo bo, HttpServletResponse response) { + List list = opsInspectionItemService.queryList(bo); + ExcelUtil.exportExcel(list, "运维-巡检-自定义巡检项", OpsInspectionItemVo.class, response); + } + + /** + * 获取运维-巡检-自定义巡检项详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("inspection:item:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(opsInspectionItemService.queryById(id)); + } + + /** + * 新增运维-巡检-自定义巡检项 + */ + @SaCheckPermission("inspection:item:add") + @Log(title = "运维-巡检-自定义巡检项", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OpsInspectionItemBo bo) { + return toAjax(opsInspectionItemService.insertByBo(bo)); + } + + /** + * 修改运维-巡检-自定义巡检项 + */ + @SaCheckPermission("inspection:item:edit") + @Log(title = "运维-巡检-自定义巡检项", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OpsInspectionItemBo bo) { + return toAjax(opsInspectionItemService.updateByBo(bo)); + } + + /** + * 删除运维-巡检-自定义巡检项 + * + * @param ids 主键串 + */ + @SaCheckPermission("inspection:item:remove") + @Log(title = "运维-巡检-自定义巡检项", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(opsInspectionItemService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionPlanController.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionPlanController.java new file mode 100644 index 0000000..051486e --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionPlanController.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.OpsInspectionPlanVo; +import org.dromara.inspection.domain.bo.OpsInspectionPlanBo; +import org.dromara.inspection.service.IOpsInspectionPlanService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 运维-巡检-计划 + * 前端访问路由地址为:/inspection/plan + * + * @author LionLi + * @date 2025-09-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/plan") +public class OpsInspectionPlanController extends BaseController { + + private final IOpsInspectionPlanService opsInspectionPlanService; + + /** + * 查询运维-巡检-计划列表 + */ + @SaCheckPermission("inspection:plan:list") + @GetMapping("/list") + public TableDataInfo list(OpsInspectionPlanBo bo, PageQuery pageQuery) { + return opsInspectionPlanService.queryPageList(bo, pageQuery); + } + + /** + * 导出运维-巡检-计划列表 + */ + @SaCheckPermission("inspection:plan:export") + @Log(title = "运维-巡检-计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OpsInspectionPlanBo bo, HttpServletResponse response) { + List list = opsInspectionPlanService.queryList(bo); + ExcelUtil.exportExcel(list, "运维-巡检-计划", OpsInspectionPlanVo.class, response); + } + + /** + * 获取运维-巡检-计划详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("inspection:plan:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(opsInspectionPlanService.queryById(id)); + } + + /** + * 新增运维-巡检-计划 + */ + @SaCheckPermission("inspection:plan:add") + @Log(title = "运维-巡检-计划", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OpsInspectionPlanBo bo) { + return toAjax(opsInspectionPlanService.insertByBo(bo)); + } + + /** + * 修改运维-巡检-计划 + */ + @SaCheckPermission("inspection:plan:edit") + @Log(title = "运维-巡检-计划", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OpsInspectionPlanBo bo) { + return toAjax(opsInspectionPlanService.updateByBo(bo)); + } + + /** + * 删除运维-巡检-计划 + * + * @param ids 主键串 + */ + @SaCheckPermission("inspection:plan:remove") + @Log(title = "运维-巡检-计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(opsInspectionPlanService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionItem.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionItem.java new file mode 100644 index 0000000..eadcc80 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionItem.java @@ -0,0 +1,46 @@ +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.io.Serial; + +/** + * 运维-巡检-自定义巡检项对象 ops_inspection_item + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ops_inspection_item") +public class OpsInspectionItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 电站id + */ + private Long projectId; + + /** + * 自定义巡检项名称 + */ + private String name; + + /** + * 业务id，巡检计划1 + */ + private String type; + + +} 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 index fbf0586..a0179c7 100644 --- 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 @@ -41,7 +41,7 @@ public class OpsInspectionMatter extends BaseEntity { /** * 任务描述 */ - private String describe; + private String describeValue; /** * 任务开始时间 @@ -68,5 +68,10 @@ public class OpsInspectionMatter extends BaseEntity { */ private String taskType; + /** + * 状态 + */ + private String status; + } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionPlan.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionPlan.java new file mode 100644 index 0000000..5cb4397 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionPlan.java @@ -0,0 +1,100 @@ +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 com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; +import java.util.List; + +/** + * 运维-巡检-计划对象 ops_inspection_plan + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ops_inspection_plan") +public class OpsInspectionPlan extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 电站id + */ + private Long projectId; + + /** + * 计划名称 + */ + private Long planName; + + /** + * 计划类型，1每日巡检2每周巡检3每月巡检4每季度巡检 + */ + private String planType; + + /** + * 巡检对象，1服务器2网络设备3应用系统4基础设施 + */ + private String objectType; + + /** + * 开始日期 + */ + private Date beginTime; + + /** + * 结束日期 + */ + private Date endTime; + + /** + * 巡检频率 + */ + private String inspectionFrequency; + + /** + * 计划开始时间 + */ + private String planBeginTime; + + /** + * 持续时间(分钟) + */ + private Long duration; + + /** + * 负责人ID + */ + private Long person; + + + /** + * 巡检项IDS + */ + private String inspectionItemId; + + /** + * 1启用2停用 + */ + private String status; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionItemBo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionItemBo.java new file mode 100644 index 0000000..749ee2c --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionItemBo.java @@ -0,0 +1,43 @@ +package org.dromara.inspection.domain.bo; + +import org.dromara.inspection.domain.OpsInspectionItem; +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.*; + +/** + * 运维-巡检-自定义巡检项业务对象 ops_inspection_item + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = OpsInspectionItem.class, reverseConvertGenerate = false) +public class OpsInspectionItemBo extends BaseEntity { + + private Long id; + + /** + * 电站id + */ + private Long projectId; + + /** + * 自定义巡检项名称 + */ + @NotBlank(message = "自定义巡检项名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 业务id，巡检计划1 + */ + @NotBlank(message = "业务id，巡检计划1不能为空", groups = { AddGroup.class, EditGroup.class }) + private String type; + + +} 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 index 382d621..36f228d 100644 --- 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 @@ -39,7 +39,7 @@ public class OpsInspectionMatterBo extends BaseEntity { * 任务描述 */ @NotBlank(message = "任务描述不能为空", groups = { AddGroup.class, EditGroup.class }) - private String describe; + private String describeValue; /** * 任务开始时间 @@ -63,7 +63,7 @@ public class OpsInspectionMatterBo extends BaseEntity { * 等级，1常规，2重要，3紧急 */ @NotBlank(message = "等级，1常规，2重要，3紧急不能为空", groups = { AddGroup.class, EditGroup.class }) - private String taskLeval; + private String taskLevel; /** * 任务类型 @@ -71,5 +71,11 @@ public class OpsInspectionMatterBo extends BaseEntity { @NotBlank(message = "任务类型不能为空", groups = { AddGroup.class, EditGroup.class }) private String taskType; + /** + * 状态 + */ +// @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionPlanBo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionPlanBo.java new file mode 100644 index 0000000..5f2bdd3 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionPlanBo.java @@ -0,0 +1,108 @@ +package org.dromara.inspection.domain.bo; + +import org.dromara.inspection.domain.OpsInspectionPlan; +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; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 运维-巡检-计划业务对象 ops_inspection_plan + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = OpsInspectionPlan.class, reverseConvertGenerate = false) +public class OpsInspectionPlanBo extends BaseEntity { + + /** + * id + */ + private Long id; + + /** + * 电站id + */ + private Long projectId; + + /** + * 计划名称 + */ + @NotNull(message = "计划名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long planName; + + /** + * 计划类型，1每日巡检2每周巡检3每月巡检4每季度巡检 + */ + @NotBlank(message = "计划类型，1每日巡检2每周巡检3每月巡检4每季度巡检不能为空", groups = { AddGroup.class, EditGroup.class }) + private String planType; + + /** + * 巡检对象，1服务器2网络设备3应用系统4基础设施 + */ + @NotBlank(message = "巡检对象，1服务器2网络设备3应用系统4基础设施不能为空", groups = { AddGroup.class, EditGroup.class }) + private String objectType; + + /** + * 开始日期 + */ + @NotNull(message = "开始日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date beginTime; + + /** + * 结束日期 + */ + @NotNull(message = "结束日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date endTime; + + /** + * 巡检频率 + */ + @NotBlank(message = "巡检频率不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectionFrequency; + + /** + * 计划开始时间 + */ + @NotBlank(message = "计划开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private String planBeginTime; + + /** + * 持续时间(分钟) + */ + @NotNull(message = "持续时间(分钟)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long duration; + + /** + * 负责人ID + */ + @NotNull(message = "负责人ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long person; + + /** + * 巡检项IDS + */ + private String inspectionItemId; + + /** + * 1启用2停用 + */ + @NotBlank(message = "1启用2停用不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionItemVo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionItemVo.java new file mode 100644 index 0000000..da091d0 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionItemVo.java @@ -0,0 +1,55 @@ +package org.dromara.inspection.domain.vo; + +import org.dromara.inspection.domain.OpsInspectionItem; +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; + + + +/** + * 运维-巡检-自定义巡检项视图对象 ops_inspection_item + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = OpsInspectionItem.class) +public class OpsInspectionItemVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 电站id + */ + private Long projectId; + + /** + * 自定义巡检项名称 + */ + @ExcelProperty(value = "自定义巡检项名称") + private String name; + + /** + * 业务id，巡检计划1 + */ + @ExcelProperty(value = "业务id，巡检计划1") + private String type; + + +} 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 index 014b4d8..dd4f201 100644 --- 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 @@ -48,7 +48,7 @@ public class OpsInspectionMatterVo implements Serializable { * 任务描述 */ @ExcelProperty(value = "任务描述") - private String describe; + private String describeValue; /** * 任务开始时间 @@ -72,7 +72,7 @@ public class OpsInspectionMatterVo implements Serializable { * 等级，1常规，2重要，3紧急 */ @ExcelProperty(value = "等级，1常规，2重要，3紧急") - private String taskLeval; + private String taskLevel; /** * 任务类型 @@ -80,5 +80,7 @@ public class OpsInspectionMatterVo implements Serializable { @ExcelProperty(value = "任务类型") private String taskType; + @ExcelProperty(value = "状态") + private String status; } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionPlanVo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionPlanVo.java new file mode 100644 index 0000000..77778ff --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionPlanVo.java @@ -0,0 +1,121 @@ +package org.dromara.inspection.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.inspection.domain.OpsInspectionPlan; +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; +import java.util.List; + + +/** + * 运维-巡检-计划视图对象 ops_inspection_plan + * + * @author LionLi + * @date 2025-09-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = OpsInspectionPlan.class) +public class OpsInspectionPlanVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 电站id + */ + private Long projectId; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 计划名称 + */ + @ExcelProperty(value = "计划名称") + private Long planName; + + /** + * 计划类型，1每日巡检2每周巡检3每月巡检4每季度巡检 + */ + @ExcelProperty(value = "计划类型，1每日巡检2每周巡检3每月巡检4每季度巡检") + private String planType; + + /** + * 巡检对象，1服务器2网络设备3应用系统4基础设施 + */ + @ExcelProperty(value = "巡检对象，1服务器2网络设备3应用系统4基础设施") + private String objectType; + + /** + * 开始日期 + */ + @ExcelProperty(value = "开始日期") + private Date beginTime; + + /** + * 结束日期 + */ + @ExcelProperty(value = "结束日期") + private Date endTime; + + /** + * 巡检频率 + */ + @ExcelProperty(value = "巡检频率") + private String inspectionFrequency; + + /** + * 计划开始时间 + */ + @ExcelProperty(value = "计划开始时间") + private String planBeginTime; + + /** + * 持续时间(分钟) + */ + @ExcelProperty(value = "持续时间(分钟)") + private Long duration; + + /** + * 负责人ID + */ + @ExcelProperty(value = "负责人ID") + private Long person; + + /** + * 负责人姓名 + */ + private String nickName; + + /** + * 负责人头像 + */ + private String avatar; + + /** + * 巡检项IDS + */ + @ExcelProperty(value = "巡检项ID") + private String inspectionItemId; + + /** + * 1启用2停用 + */ + @ExcelProperty(value = "1启用2停用") + private String status; + + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionItemMapper.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionItemMapper.java new file mode 100644 index 0000000..3f8c402 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionItemMapper.java @@ -0,0 +1,15 @@ +package org.dromara.inspection.mapper; + +import org.dromara.inspection.domain.OpsInspectionItem; +import org.dromara.inspection.domain.vo.OpsInspectionItemVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 运维-巡检-自定义巡检项Mapper接口 + * + * @author LionLi + * @date 2025-09-19 + */ +public interface OpsInspectionItemMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionPlanMapper.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionPlanMapper.java new file mode 100644 index 0000000..893efd2 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionPlanMapper.java @@ -0,0 +1,15 @@ +package org.dromara.inspection.mapper; + +import org.dromara.inspection.domain.OpsInspectionPlan; +import org.dromara.inspection.domain.vo.OpsInspectionPlanVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 运维-巡检-计划Mapper接口 + * + * @author LionLi + * @date 2025-09-19 + */ +public interface OpsInspectionPlanMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionItemService.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionItemService.java new file mode 100644 index 0000000..d677fb9 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionItemService.java @@ -0,0 +1,69 @@ +package org.dromara.inspection.service; + +import org.dromara.inspection.domain.OpsInspectionItem; +import org.dromara.inspection.domain.vo.OpsInspectionItemVo; +import org.dromara.inspection.domain.bo.OpsInspectionItemBo; +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 IOpsInspectionItemService { + + /** + * 查询运维-巡检-自定义巡检项 + * + * @param id 主键 + * @return 运维-巡检-自定义巡检项 + */ + OpsInspectionItemVo queryById(Long id); + + /** + * 分页查询运维-巡检-自定义巡检项列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 运维-巡检-自定义巡检项分页列表 + */ + TableDataInfo queryPageList(OpsInspectionItemBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的运维-巡检-自定义巡检项列表 + * + * @param bo 查询条件 + * @return 运维-巡检-自定义巡检项列表 + */ + List queryList(OpsInspectionItemBo bo); + + /** + * 新增运维-巡检-自定义巡检项 + * + * @param bo 运维-巡检-自定义巡检项 + * @return 是否新增成功 + */ + Boolean insertByBo(OpsInspectionItemBo bo); + + /** + * 修改运维-巡检-自定义巡检项 + * + * @param bo 运维-巡检-自定义巡检项 + * @return 是否修改成功 + */ + Boolean updateByBo(OpsInspectionItemBo 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/IOpsInspectionPlanService.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionPlanService.java new file mode 100644 index 0000000..af3cf37 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionPlanService.java @@ -0,0 +1,69 @@ +package org.dromara.inspection.service; + +import org.dromara.inspection.domain.OpsInspectionPlan; +import org.dromara.inspection.domain.vo.OpsInspectionPlanVo; +import org.dromara.inspection.domain.bo.OpsInspectionPlanBo; +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 IOpsInspectionPlanService { + + /** + * 查询运维-巡检-计划 + * + * @param id 主键 + * @return 运维-巡检-计划 + */ + OpsInspectionPlanVo queryById(Long id); + + /** + * 分页查询运维-巡检-计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 运维-巡检-计划分页列表 + */ + TableDataInfo queryPageList(OpsInspectionPlanBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的运维-巡检-计划列表 + * + * @param bo 查询条件 + * @return 运维-巡检-计划列表 + */ + List queryList(OpsInspectionPlanBo bo); + + /** + * 新增运维-巡检-计划 + * + * @param bo 运维-巡检-计划 + * @return 是否新增成功 + */ + Boolean insertByBo(OpsInspectionPlanBo bo); + + /** + * 修改运维-巡检-计划 + * + * @param bo 运维-巡检-计划 + * @return 是否修改成功 + */ + Boolean updateByBo(OpsInspectionPlanBo 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/OpsInspectionItemServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionItemServiceImpl.java new file mode 100644 index 0000000..8c7197a --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionItemServiceImpl.java @@ -0,0 +1,134 @@ +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.OpsInspectionItemBo; +import org.dromara.inspection.domain.vo.OpsInspectionItemVo; +import org.dromara.inspection.domain.OpsInspectionItem; +import org.dromara.inspection.mapper.OpsInspectionItemMapper; +import org.dromara.inspection.service.IOpsInspectionItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 运维-巡检-自定义巡检项Service业务层处理 + * + * @author LionLi + * @date 2025-09-19 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class OpsInspectionItemServiceImpl implements IOpsInspectionItemService { + + private final OpsInspectionItemMapper baseMapper; + + /** + * 查询运维-巡检-自定义巡检项 + * + * @param id 主键 + * @return 运维-巡检-自定义巡检项 + */ + @Override + public OpsInspectionItemVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询运维-巡检-自定义巡检项列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 运维-巡检-自定义巡检项分页列表 + */ + @Override + public TableDataInfo queryPageList(OpsInspectionItemBo 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(OpsInspectionItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OpsInspectionItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(OpsInspectionItem::getId); + lqw.eq(bo.getProjectId() != null, OpsInspectionItem::getProjectId, bo.getProjectId()); + lqw.like(StringUtils.isNotBlank(bo.getName()), OpsInspectionItem::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getType()), OpsInspectionItem::getType, bo.getType()); + return lqw; + } + + /** + * 新增运维-巡检-自定义巡检项 + * + * @param bo 运维-巡检-自定义巡检项 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(OpsInspectionItemBo bo) { + OpsInspectionItem add = MapstructUtils.convert(bo, OpsInspectionItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改运维-巡检-自定义巡检项 + * + * @param bo 运维-巡检-自定义巡检项 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(OpsInspectionItemBo bo) { + OpsInspectionItem update = MapstructUtils.convert(bo, OpsInspectionItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OpsInspectionItem 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/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 index 79e344c..b7a6cd8 100644 --- 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 @@ -76,11 +76,11 @@ public class OpsInspectionMatterServiceImpl implements IOpsInspectionMatterServi 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(StringUtils.isNotBlank(bo.getDescribeValue()), OpsInspectionMatter::getDescribeValue, bo.getDescribeValue()); 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.getTaskLevel()), OpsInspectionMatter::getTaskLevel, bo.getTaskLevel()); lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), OpsInspectionMatter::getTaskType, bo.getTaskType()); return lqw; } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionPlanServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionPlanServiceImpl.java new file mode 100644 index 0000000..7519622 --- /dev/null +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionPlanServiceImpl.java @@ -0,0 +1,143 @@ +package org.dromara.inspection.service.impl; + +import org.apache.dubbo.config.annotation.DubboReference; +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.dromara.system.api.RemoteUserService; +import org.springframework.stereotype.Service; +import org.dromara.inspection.domain.bo.OpsInspectionPlanBo; +import org.dromara.inspection.domain.vo.OpsInspectionPlanVo; +import org.dromara.inspection.domain.OpsInspectionPlan; +import org.dromara.inspection.mapper.OpsInspectionPlanMapper; +import org.dromara.inspection.service.IOpsInspectionPlanService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 运维-巡检-计划Service业务层处理 + * + * @author LionLi + * @date 2025-09-19 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class OpsInspectionPlanServiceImpl implements IOpsInspectionPlanService { + + @DubboReference + private RemoteUserService remoteUserService; + + private final OpsInspectionPlanMapper baseMapper; + + /** + * 查询运维-巡检-计划 + * + * @param id 主键 + * @return 运维-巡检-计划 + */ + @Override + public OpsInspectionPlanVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询运维-巡检-计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 运维-巡检-计划分页列表 + */ + @Override + public TableDataInfo queryPageList(OpsInspectionPlanBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + for (OpsInspectionPlanVo record : result.getRecords()) { +// remoteUserService.select(); + } + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的运维-巡检-计划列表 + * + * @param bo 查询条件 + * @return 运维-巡检-计划列表 + */ + @Override + public List queryList(OpsInspectionPlanBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OpsInspectionPlanBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(OpsInspectionPlan::getId); + lqw.eq(bo.getProjectId() != null, OpsInspectionPlan::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getPlanType()), OpsInspectionPlan::getPlanType, bo.getPlanType()); + lqw.eq(StringUtils.isNotBlank(bo.getObjectType()), OpsInspectionPlan::getObjectType, bo.getObjectType()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), OpsInspectionPlan::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增运维-巡检-计划 + * + * @param bo 运维-巡检-计划 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(OpsInspectionPlanBo bo) { + OpsInspectionPlan add = MapstructUtils.convert(bo, OpsInspectionPlan.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改运维-巡检-计划 + * + * @param bo 运维-巡检-计划 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(OpsInspectionPlanBo bo) { + OpsInspectionPlan update = MapstructUtils.convert(bo, OpsInspectionPlan.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OpsInspectionPlan entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除运维-巡检-计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}