lcj/xny-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

09-23-完成工单，优化通用节点

Browse Source
This commit is contained in:
青云
2025-09-23 17:57:37 +08:00
parent 9add81d728
commit b26cdfa495
9 changed files with 617 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionNodeController.java Normal file
View File

@ -0,0 +1,108 @@
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.transaction.annotation.Transactional;
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.OpsInspectionNodeVo;
import org.dromara.inspection.domain.bo.OpsInspectionNodeBo;
import org.dromara.inspection.service.IOpsInspectionNodeService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 运维-巡检-通用节点
* 前端访问路由地址为:/inspection/node
*
* @author LionLi
* @date 2025-09-23
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/node")
public class OpsInspectionNodeController extends BaseController {
private final IOpsInspectionNodeService opsInspectionNodeService;
/**
* 查询运维-巡检-通用节点列表
*/
@SaCheckPermission("inspection:node:list")
@GetMapping("/list")
public TableDataInfo<OpsInspectionNodeVo> list(OpsInspectionNodeBo bo, PageQuery pageQuery) {
return opsInspectionNodeService.queryPageList(bo, pageQuery);
}
/**
* 导出运维-巡检-通用节点列表
*/
@SaCheckPermission("inspection:node:export")
@Log(title = "运维-巡检-通用节点", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OpsInspectionNodeBo bo, HttpServletResponse response) {
List<OpsInspectionNodeVo> list = opsInspectionNodeService.queryList(bo);
ExcelUtil.exportExcel(list, "运维-巡检-通用节点", OpsInspectionNodeVo.class, response);
}
/**
* 获取运维-巡检-通用节点详细信息
*
* @param id 主键
*/
@SaCheckPermission("inspection:node:query")
@GetMapping("/{id}")
public R<OpsInspectionNodeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(opsInspectionNodeService.queryById(id));
}
/**
* 新增运维-巡检-通用节点
*/
@SaCheckPermission("inspection:node:add")
@Log(title = "运维-巡检-通用节点", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@Transactional
public R<String> add(@Validated(AddGroup.class) @RequestBody List<OpsInspectionNodeBo> bo) {
return opsInspectionNodeService.insertByBo(bo);
}
/**
* 修改运维-巡检-通用节点
*/
@SaCheckPermission("inspection:node:edit")
@Log(title = "运维-巡检-通用节点", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OpsInspectionNodeBo bo) {
return toAjax(opsInspectionNodeService.updateByBo(bo));
}
/**
* 删除运维-巡检-通用节点
*
* @param ids 主键串
*/
@SaCheckPermission("inspection:node:remove")
@Log(title = "运维-巡检-通用节点", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(opsInspectionNodeService.deleteWithValidByIds(List.of(ids), true));
}
}

77
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionNode.java Normal file
View File

@ -0,0 +1,77 @@
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_node
*
* @author LionLi
* @date 2025-09-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ops_inspection_node")
public class OpsInspectionNode extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 节点ID
*/
@TableId(value = "id")
private Long id;
/**
* 所用模块1工单2巡检任务3试验任务
*/
private String module;
/**
* 工单ID
*/
private Long orderId;
/**
* 顺序编号
*/
private Long code;
/**
* 节点名称
*/
private String name;
/**
* 预期目的
*/
private String intendedPurpose;
/**
* 预期完成时间
*/
private Date intendedTime;
/**
* 实际完成时间
*/
private Date finishTime;
/**
* 备注
*/
private String remark;
/**
* 状态1完成2未完成
*/
private String status;
}

83
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionNodeBo.java Normal file
View File

@ -0,0 +1,83 @@
package org.dromara.inspection.domain.bo;
import org.dromara.inspection.domain.OpsInspectionNode;
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_node
*
* @author LionLi
* @date 2025-09-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = OpsInspectionNode.class, reverseConvertGenerate = false)
public class OpsInspectionNodeBo extends BaseEntity {
/**
* 节点ID
*/
private Long id;
/**
* 所用模块1工单2巡检任务3试验任务
*/
@NotBlank(message = "所用模块1工单2巡检任务3试验任务不能为空", groups = { AddGroup.class, EditGroup.class })
private String module;
/**
* 工单ID
*/
@NotNull(message = "工单ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long orderId;
/**
* 顺序编号
*/
@NotNull(message = "顺序编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long code;
/**
* 节点名称
*/
@NotBlank(message = "节点名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String name;
/**
* 预期目的
*/
// @NotBlank(message = "预期目的不能为空", groups = { AddGroup.class, EditGroup.class })
private String intendedPurpose;
/**
* 预期完成时间
*/
// @NotNull(message = "预期完成时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date intendedTime;
/**
* 实际完成时间
*/
// @NotNull(message = "实际完成时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date finishTime;
/**
* 备注
*/
private String remark;
/**
* 状态1完成2未完成
*/
@NotBlank(message = "状态1完成2未完成不能为空", groups = { AddGroup.class, EditGroup.class })
private String status;
}

90
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionNodeVo.java Normal file
View File

@ -0,0 +1,90 @@
package org.dromara.inspection.domain.vo;
import java.util.Date;
import org.dromara.inspection.domain.OpsInspectionNode;
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_node
*
* @author LionLi
* @date 2025-09-23
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = OpsInspectionNode.class)
public class OpsInspectionNodeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 节点ID
*/
@ExcelProperty(value = "节点ID")
private Long id;
/**
* 所用模块1工单2巡检任务3试验任务
*/
@ExcelProperty(value = "所用模块1工单2巡检任务3试验任务")
private String module;
/**
* 工单ID
*/
@ExcelProperty(value = "工单ID")
private Long orderId;
/**
* 顺序编号
*/
@ExcelProperty(value = "顺序编号")
private Long code;
/**
* 节点名称
*/
@ExcelProperty(value = "节点名称")
private String name;
/**
* 预期目的
*/
@ExcelProperty(value = "预期目的")
private String intendedPurpose;
/**
* 预期完成时间
*/
@ExcelProperty(value = "预期完成时间")
private Date intendedTime;
/**
* 实际完成时间
*/
@ExcelProperty(value = "实际完成时间")
private Date finishTime;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 状态1完成2未完成
*/
@ExcelProperty(value = "状态1完成2未完成")
private String status;
}

9
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionOrderVo.java
View File

@ -12,6 +12,7 @@ import org.dromara.personnel.domain.vo.OpsUserVo;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
@ -100,8 +101,16 @@ public class OpsInspectionOrderVo implements Serializable {
@ExcelProperty(value = "节点ids")
private String nodeIds;
/**
* 工单进度
*/
private BigDecimal progress;
/**
* 工单节点
*/
private List<OpsInspectionNodeVo> nodes;
/**
* 预期成果
*/

15
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/mapper/OpsInspectionNodeMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.inspection.mapper;
import org.dromara.inspection.domain.OpsInspectionNode;
import org.dromara.inspection.domain.vo.OpsInspectionNodeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 运维-巡检-通用节点Mapper接口
*
* @author LionLi
* @date 2025-09-23
*/
public interface OpsInspectionNodeMapper extends BaseMapperPlus<OpsInspectionNode, OpsInspectionNodeVo> {
}

69
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/IOpsInspectionNodeService.java Normal file
View File

@ -0,0 +1,69 @@
package org.dromara.inspection.service;
import org.dromara.common.core.domain.R;
import org.dromara.inspection.domain.vo.OpsInspectionNodeVo;
import org.dromara.inspection.domain.bo.OpsInspectionNodeBo;
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-23
*/
public interface IOpsInspectionNodeService {
/**
* 查询运维-巡检-通用节点
*
* @param id 主键
* @return 运维-巡检-通用节点
*/
OpsInspectionNodeVo queryById(Long id);
/**
* 分页查询运维-巡检-通用节点列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 运维-巡检-通用节点分页列表
*/
TableDataInfo<OpsInspectionNodeVo> queryPageList(OpsInspectionNodeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的运维-巡检-通用节点列表
*
* @param bo 查询条件
* @return 运维-巡检-通用节点列表
*/
List<OpsInspectionNodeVo> queryList(OpsInspectionNodeBo bo);
/**
* 新增运维-巡检-通用节点
*
* @param bo 运维-巡检-通用节点
* @return 是否新增成功
*/
R<String> insertByBo(List<OpsInspectionNodeBo> bo);
/**
* 修改运维-巡检-通用节点
*
* @param bo 运维-巡检-通用节点
* @return 是否修改成功
*/
Boolean updateByBo(OpsInspectionNodeBo bo);
/**
* 校验并批量删除运维-巡检-通用节点信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

149
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionNodeServiceImpl.java Normal file
View File

@ -0,0 +1,149 @@
package org.dromara.inspection.service.impl;
import org.dromara.common.core.domain.R;
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.OpsInspectionNodeBo;
import org.dromara.inspection.domain.vo.OpsInspectionNodeVo;
import org.dromara.inspection.domain.OpsInspectionNode;
import org.dromara.inspection.mapper.OpsInspectionNodeMapper;
import org.dromara.inspection.service.IOpsInspectionNodeService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 运维-巡检-通用节点Service业务层处理
*
* @author LionLi
* @date 2025-09-23
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class OpsInspectionNodeServiceImpl implements IOpsInspectionNodeService {
private final OpsInspectionNodeMapper baseMapper;
/**
* 查询运维-巡检-通用节点
*
* @param id 主键
* @return 运维-巡检-通用节点
*/
@Override
public OpsInspectionNodeVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询运维-巡检-通用节点列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 运维-巡检-通用节点分页列表
*/
@Override
public TableDataInfo<OpsInspectionNodeVo> queryPageList(OpsInspectionNodeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OpsInspectionNode> lqw = buildQueryWrapper(bo);
Page<OpsInspectionNodeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的运维-巡检-通用节点列表
*
* @param bo 查询条件
* @return 运维-巡检-通用节点列表
*/
@Override
public List<OpsInspectionNodeVo> queryList(OpsInspectionNodeBo bo) {
LambdaQueryWrapper<OpsInspectionNode> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OpsInspectionNode> buildQueryWrapper(OpsInspectionNodeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OpsInspectionNode> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(OpsInspectionNode::getId);
lqw.eq(StringUtils.isNotBlank(bo.getModule()), OpsInspectionNode::getModule, bo.getModule());
lqw.eq(bo.getOrderId() != null, OpsInspectionNode::getOrderId, bo.getOrderId());
lqw.eq(bo.getCode() != null, OpsInspectionNode::getCode, bo.getCode());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), OpsInspectionNode::getStatus, bo.getStatus());
return lqw;
}
/**
* 新增运维-巡检-通用节点
*
* @param bo 运维-巡检-通用节点
* @return 是否新增成功
*/
@Override
public R<String> insertByBo(List<OpsInspectionNodeBo> bo) {
List<String> ids = new ArrayList<>();
if (bo != null) {
for (OpsInspectionNodeBo nodeBo : bo) {
OpsInspectionNode add = MapstructUtils.convert(nodeBo, OpsInspectionNode.class);
validEntityBeforeSave(add);
int insert = baseMapper.insert(add);
if (insert > 0){
if (add != null) {
ids.add(add.getId().toString());
}
}
}
return R.ok(StringUtils.join(ids, ","));
}else{
return R.fail();
}
}
/**
* 修改运维-巡检-通用节点
*
* @param bo 运维-巡检-通用节点
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(OpsInspectionNodeBo bo) {
OpsInspectionNode update = MapstructUtils.convert(bo, OpsInspectionNode.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OpsInspectionNode entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除运维-巡检-通用节点信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

17
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionOrderServiceImpl.java
View File

@ -9,6 +9,7 @@ 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.common.satoken.utils.LoginHelper;
import org.dromara.inspection.domain.OpsInspectionNode;
import org.dromara.inspection.domain.vo.OpsInspectionNodeVo;
import org.dromara.inspection.mapper.OpsInspectionNodeMapper;
@ -24,6 +25,7 @@ import org.dromara.inspection.service.IOpsInspectionOrderService;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@ -157,7 +159,9 @@ public class OpsInspectionOrderServiceImpl implements IOpsInspectionOrderService
private void setValue(List<OpsInspectionOrderVo> list){
LambdaQueryWrapper<OpsInspectionNode> nodeWrapper = new LambdaQueryWrapper<>();
for (OpsInspectionOrderVo vo : list) {
nodeWrapper.clear();
nodeWrapper.eq(OpsInspectionNode::getOrderId, vo.getId());
List<OpsInspectionNodeVo> nodeVoList = nodeMapper.selectVoList(nodeWrapper);
@ -186,6 +190,19 @@ public class OpsInspectionOrderServiceImpl implements IOpsInspectionOrderService
}
}
//处理节点列表
if (vo.getNodeIds() != null && !vo.getNodeIds().isEmpty()){
String[] ids = vo.getNodeIds().split(",");
List<OpsInspectionNodeVo> nodeVos = new ArrayList<>();
for (String id : ids) {
OpsInspectionNodeVo nodeVo = nodeMapper.selectVoById(id);
if (nodeVo != null) {
nodeVos.add(nodeVo);
}
}
vo.setNodes(nodeVos);
}
}
}