diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java new file mode 100644 index 0000000..36956b8 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java @@ -0,0 +1,117 @@ +package org.dromara.dms.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.dms.domain.vo.DmsRecordInspectVo; +import org.dromara.dms.domain.bo.DmsRecordInspectBo; +import org.dromara.dms.service.IDmsRecordInspectService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * dmsRecordInspect + * 前端访问路由地址为:/dms/recordInspect + * + * @author zch + * @date 2025-06-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/recordInspect") +public class DmsRecordInspectController extends BaseController { + + private final IDmsRecordInspectService dmsRecordInspectService; + + /** + * 查询dmsRecordInspect列表 + */ + @SaCheckPermission("dms:recordInspect:list") + @GetMapping("/list") + public TableDataInfo list(DmsRecordInspectBo bo, PageQuery pageQuery) { + return dmsRecordInspectService.queryPageList(bo, pageQuery); + } + + /** + * 导出dmsRecordInspect列表 + */ + @SaCheckPermission("dms:recordInspect:export") + @Log(title = "dmsRecordInspect", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsRecordInspectBo bo, HttpServletResponse response) { + List list = dmsRecordInspectService.queryList(bo); + ExcelUtil.exportExcel(list, "dmsRecordInspect", DmsRecordInspectVo.class, response); + } + + /** + * 获取dmsRecordInspect详细信息 + * + * @param recordInspectId 主键 + */ + @SaCheckPermission("dms:recordInspect:query") + @GetMapping("/{recordInspectId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long recordInspectId) { + return R.ok(dmsRecordInspectService.queryById(recordInspectId)); + } + + /** + * 新增dmsRecordInspect + */ + @SaCheckPermission("dms:recordInspect:add") + @Log(title = "dmsRecordInspect", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsRecordInspectBo bo) { + return toAjax(dmsRecordInspectService.insertByBo(bo)); + } + + /** + * 修改dmsRecordInspect + */ + @SaCheckPermission("dms:recordInspect:edit") + @Log(title = "dmsRecordInspect", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsRecordInspectBo bo) { + return toAjax(dmsRecordInspectService.updateByBo(bo)); + } + + /** + * 删除dmsRecordInspect + * + * @param recordInspectIds 主键串 + */ + @SaCheckPermission("dms:recordInspect:remove") + @Log(title = "dmsRecordInspect", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordInspectIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] recordInspectIds) { + return toAjax(dmsRecordInspectService.deleteWithValidByIds(List.of(recordInspectIds), true)); + } + + + /** + * 下拉框查询dmsRecordInspect列表 + */ + + @GetMapping("/getDmsRecordInspectList") + public R> getDmsRecordInspectList(DmsRecordInspectBo bo) { + List list = dmsRecordInspectService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java new file mode 100644 index 0000000..0202bec --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java @@ -0,0 +1,107 @@ +package org.dromara.dms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +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; + +/** + * dmsRecordInspect对象 dms_record_inspect + * + * @author zch + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_record_inspect") +public class DmsRecordInspect extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long recordInspectId; + + /** + * 计划ID，关联dms_plan_inspect的plan_inspect_id + */ + private Long planInspectId; + + /** + * 巡检工单ID + */ + private Long inspectInstanceId; + + /** + * 巡检单号 + */ + private String billsInspectCode; + + /** + * 检查类型(1巡检 2点检) + */ + private String inspectType; + + /** + * 巡检线路，关联dms_base_inspect_route的inspect_route_id + */ + private Long inspectRouteId; + + /** + * 设备总数 + */ + private Long deviceAmount; + + /** + * 计划开始时间 + */ + private Date planBeginTime; + + /** + * 计划完成时间 + */ + private Date planEndTime; + + /** + * 实际开始时间 + */ + private Date realBeginTime; + + /** + * 实际结束时间 + */ + private Date realEndTime; + + /** + * 执行人员 + */ + private String performer; + + /** + * 巡检状态（1待巡检 2巡检中 3完成） + */ + private String inspectStatus; + + /** + * 巡检用时 + */ + private Long inspectDuration; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java new file mode 100644 index 0000000..0c6d9ff --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java @@ -0,0 +1,106 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsRecordInspect; +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 com.fasterxml.jackson.annotation.JsonFormat; + +/** + * dmsRecordInspect业务对象 dms_record_inspect + * + * @author zch + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsRecordInspect.class, reverseConvertGenerate = false) +public class DmsRecordInspectBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long recordInspectId; + + /** + * 计划ID，关联dms_plan_inspect的plan_inspect_id + */ + private Long planInspectId; + + /** + * 巡检工单ID + */ + private Long inspectInstanceId; + + /** + * 巡检单号 + */ + private String billsInspectCode; + + /** + * 检查类型(1巡检 2点检) + */ + private String inspectType; + + /** + * 巡检线路，关联dms_base_inspect_route的inspect_route_id + */ + private Long inspectRouteId; + + /** + * 设备总数 + */ + private Long deviceAmount; + + /** + * 计划开始时间 + */ + private Date planBeginTime; + + /** + * 计划完成时间 + */ + private Date planEndTime; + + /** + * 实际开始时间 + */ + private Date realBeginTime; + + /** + * 实际结束时间 + */ + private Date realEndTime; + + /** + * 执行人员 + */ + private String performer; + + /** + * 巡检状态（1待巡检 2巡检中 3完成） + */ + private String inspectStatus; + + /** + * 巡检用时 + */ + private Long inspectDuration; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordInspectVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordInspectVo.java new file mode 100644 index 0000000..0e3f173 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordInspectVo.java @@ -0,0 +1,133 @@ +package org.dromara.dms.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.dms.domain.DmsRecordInspect; +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; + + + +/** + * dmsRecordInspect视图对象 dms_record_inspect + * + * @author zch + * @date 2025-06-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsRecordInspect.class) +public class DmsRecordInspectVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long recordInspectId; + + /** + * 计划ID，关联dms_plan_inspect的plan_inspect_id + */ + @ExcelProperty(value = "计划ID，关联dms_plan_inspect的plan_inspect_id") + private Long planInspectId; + + /** + * 巡检工单ID + */ + @ExcelProperty(value = "巡检工单ID") + private Long inspectInstanceId; + + /** + * 巡检单号 + */ + @ExcelProperty(value = "巡检单号") + private String billsInspectCode; + + /** + * 检查类型(1巡检 2点检) + */ + @ExcelProperty(value = "检查类型(1巡检 2点检)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "inspect_type") + private String inspectType; + + /** + * 巡检线路，关联dms_base_inspect_route的inspect_route_id + */ + @ExcelProperty(value = "巡检线路，关联dms_base_inspect_route的inspect_route_id") + private Long inspectRouteId; + + /** + * 设备总数 + */ + @ExcelProperty(value = "设备总数") + private Long deviceAmount; + + /** + * 计划开始时间 + */ + @ExcelProperty(value = "计划开始时间") + private Date planBeginTime; + + /** + * 计划完成时间 + */ + @ExcelProperty(value = "计划完成时间") + private Date planEndTime; + + /** + * 实际开始时间 + */ + @ExcelProperty(value = "实际开始时间") + private Date realBeginTime; + + /** + * 实际结束时间 + */ + @ExcelProperty(value = "实际结束时间") + private Date realEndTime; + + /** + * 执行人员 + */ + @ExcelProperty(value = "执行人员") + private String performer; + + /** + * 巡检状态（1待巡检 2巡检中 3完成） + */ + @ExcelProperty(value = "巡检状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "dms_inspect_status") + private String inspectStatus; + + /** + * 巡检用时 + */ + @ExcelProperty(value = "巡检用时") + private Long inspectDuration; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=是,0=否") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java new file mode 100644 index 0000000..e856470 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsRecordInspect; +import org.dromara.dms.domain.vo.DmsRecordInspectVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * dmsRecordInspectMapper接口 + * + * @author zch + * @date 2025-06-24 + */ +public interface DmsRecordInspectMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRecordInspectService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRecordInspectService.java new file mode 100644 index 0000000..55b60bd --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRecordInspectService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsRecordInspect; +import org.dromara.dms.domain.vo.DmsRecordInspectVo; +import org.dromara.dms.domain.bo.DmsRecordInspectBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * dmsRecordInspectService接口 + * + * @author zch + * @date 2025-06-24 + */ +public interface IDmsRecordInspectService { + + /** + * 查询dmsRecordInspect + * + * @param recordInspectId 主键 + * @return dmsRecordInspect + */ + DmsRecordInspectVo queryById(Long recordInspectId); + + /** + * 分页查询dmsRecordInspect列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return dmsRecordInspect分页列表 + */ + TableDataInfo queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的dmsRecordInspect列表 + * + * @param bo 查询条件 + * @return dmsRecordInspect列表 + */ + List queryList(DmsRecordInspectBo bo); + + /** + * 新增dmsRecordInspect + * + * @param bo dmsRecordInspect + * @return 是否新增成功 + */ + Boolean insertByBo(DmsRecordInspectBo bo); + + /** + * 修改dmsRecordInspect + * + * @param bo dmsRecordInspect + * @return 是否修改成功 + */ + Boolean updateByBo(DmsRecordInspectBo bo); + + /** + * 校验并批量删除dmsRecordInspect信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java new file mode 100644 index 0000000..e9c4b02 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java @@ -0,0 +1,146 @@ +package org.dromara.dms.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.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsRecordInspectBo; +import org.dromara.dms.domain.vo.DmsRecordInspectVo; +import org.dromara.dms.domain.DmsRecordInspect; +import org.dromara.dms.mapper.DmsRecordInspectMapper; +import org.dromara.dms.service.IDmsRecordInspectService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * dmsRecordInspectService业务层处理 + * + * @author zch + * @date 2025-06-24 + */ +@RequiredArgsConstructor +@Service +public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService { + + private final DmsRecordInspectMapper baseMapper; + + /** + * 查询dmsRecordInspect + * + * @param recordInspectId 主键 + * @return dmsRecordInspect + */ + @Override + public DmsRecordInspectVo queryById(Long recordInspectId){ + return baseMapper.selectVoById(recordInspectId); + } + + /** + * 分页查询dmsRecordInspect列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return dmsRecordInspect分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的dmsRecordInspect列表 + * + * @param bo 查询条件 + * @return dmsRecordInspect列表 + */ + @Override + public List queryList(DmsRecordInspectBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsRecordInspectBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsRecordInspect.class) + .selectAll(DmsRecordInspect.class) + .eq(bo.getRecordInspectId() != null, DmsRecordInspect::getRecordInspectId, bo.getRecordInspectId()) + .eq(bo.getPlanInspectId() != null, DmsRecordInspect::getPlanInspectId, bo.getPlanInspectId()) + .eq(bo.getInspectInstanceId() != null, DmsRecordInspect::getInspectInstanceId, bo.getInspectInstanceId()) + .eq(StringUtils.isNotBlank(bo.getBillsInspectCode()), DmsRecordInspect::getBillsInspectCode, bo.getBillsInspectCode()) + .eq(StringUtils.isNotBlank(bo.getInspectType()), DmsRecordInspect::getInspectType, bo.getInspectType()) + .eq(bo.getInspectRouteId() != null, DmsRecordInspect::getInspectRouteId, bo.getInspectRouteId()) + .eq(bo.getDeviceAmount() != null, DmsRecordInspect::getDeviceAmount, bo.getDeviceAmount()) + .eq(bo.getPlanBeginTime() != null, DmsRecordInspect::getPlanBeginTime, bo.getPlanBeginTime()) + .eq(bo.getPlanEndTime() != null, DmsRecordInspect::getPlanEndTime, bo.getPlanEndTime()) + .eq(bo.getRealBeginTime() != null, DmsRecordInspect::getRealBeginTime, bo.getRealBeginTime()) + .eq(bo.getRealEndTime() != null, DmsRecordInspect::getRealEndTime, bo.getRealEndTime()) + .eq(StringUtils.isNotBlank(bo.getPerformer()), DmsRecordInspect::getPerformer, bo.getPerformer()) + .eq(StringUtils.isNotBlank(bo.getInspectStatus()), DmsRecordInspect::getInspectStatus, bo.getInspectStatus()) + .eq(bo.getInspectDuration() != null, DmsRecordInspect::getInspectDuration, bo.getInspectDuration()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsRecordInspect::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsRecordInspect::getCreateTime); + return lqw; + } + + /** + * 新增dmsRecordInspect + * + * @param bo dmsRecordInspect + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsRecordInspectBo bo) { + DmsRecordInspect add = MapstructUtils.convert(bo, DmsRecordInspect.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRecordInspectId(add.getRecordInspectId()); + } + return flag; + } + + /** + * 修改dmsRecordInspect + * + * @param bo dmsRecordInspect + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsRecordInspectBo bo) { + DmsRecordInspect update = MapstructUtils.convert(bo, DmsRecordInspect.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsRecordInspect entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除dmsRecordInspect信息 + * + * @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/hwmom-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml new file mode 100644 index 0000000..9d4092e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml @@ -0,0 +1,7 @@ + + + + +