From d538b3b74c3108f02cc02cd6b9945485c710fd98 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 24 Mar 2025 09:16:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat(dms):=20=E8=AE=BE=E5=A4=87=E5=A4=A7?= =?UTF-8?q?=E7=B1=BB=E5=92=8C=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AE=9E=E4=BD=93=E5=92=8C=E6=8E=A5=E5=8F=A3=E4=BB=8E?= =?UTF-8?q?mes=E7=A7=BB=E6=A4=8D=E5=88=B0dms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增设备大类(BaseDeviceCategory)和设备类型(BaseDeviceType)的实体类 - 创建对应的业务对象(BO)和视图对象(VO)类 - 实现基础的CRUD接口和服务实现类 - 添加MyBatis Plus的Mapper接口和XML文件 --- .../BaseDeviceCategoryController.java | 118 +++++++++++++ .../controller/BaseDeviceTypeController.java | 118 +++++++++++++ .../dms/domain/BaseDeviceCategory.java | 53 ++++++ .../dromara/dms/domain/BaseDeviceType.java | 75 ++++++++ .../dms/domain/bo/BaseDeviceCategoryBo.java | 54 ++++++ .../dms/domain/bo/BaseDeviceTypeBo.java | 73 ++++++++ .../dms/domain/vo/BaseDeviceCategoryVo.java | 61 +++++++ .../dms/domain/vo/BaseDeviceTypeVo.java | 84 +++++++++ .../dms/mapper/BaseDeviceCategoryMapper.java | 15 ++ .../dms/mapper/BaseDeviceTypeMapper.java | 15 ++ .../service/IBaseDeviceCategoryService.java | 68 ++++++++ .../dms/service/IBaseDeviceTypeService.java | 68 ++++++++ .../impl/BaseDeviceCategoryServiceImpl.java | 164 ++++++++++++++++++ .../impl/BaseDeviceTypeServiceImpl.java | 155 +++++++++++++++++ .../mapper/BaseDeviceCategoryMapper.xml | 7 + .../resources/mapper/BaseDeviceTypeMapper.xml | 7 + 16 files changed, 1135 insertions(+) create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceCategoryController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceTypeController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceCategory.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceCategoryBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceCategoryVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceTypeVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceCategoryMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceTypeMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceCategoryService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceTypeService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceCategoryServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceTypeServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceCategoryMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceTypeMapper.xml diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceCategoryController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceCategoryController.java new file mode 100644 index 00000000..8d60d1d3 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceCategoryController.java @@ -0,0 +1,118 @@ +package org.dromara.dms.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +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.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.dms.domain.bo.BaseDeviceCategoryBo; +import org.dromara.dms.domain.vo.BaseDeviceCategoryVo; +import org.dromara.dms.service.IBaseDeviceCategoryService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 设备大类信息 + * 前端访问路由地址为:/dms/baseDeviceCategory + * + * @author xins + * @date 2025-02-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseDeviceCategory") +public class BaseDeviceCategoryController extends BaseController { + + private final IBaseDeviceCategoryService baseDeviceCategoryService; + + /** + * 查询设备大类信息列表 + */ + @SaCheckPermission("dms:baseDeviceCategory:list") + @GetMapping("/list") + public TableDataInfo list(BaseDeviceCategoryBo bo, PageQuery pageQuery) { + return baseDeviceCategoryService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备大类信息列表 + */ + @SaCheckPermission("dms:baseDeviceCategory:export") + @Log(title = "设备大类信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseDeviceCategoryBo bo, HttpServletResponse response) { + List list = baseDeviceCategoryService.queryList(bo); + ExcelUtil.exportExcel(list, "设备大类信息", BaseDeviceCategoryVo.class, response); + } + + /** + * 获取设备大类信息详细信息 + * + * @param deviceCategoryId 主键 + */ + @SaCheckPermission("dms:baseDeviceCategory:query") + @GetMapping("/{deviceCategoryId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long deviceCategoryId) { + return R.ok(baseDeviceCategoryService.queryById(deviceCategoryId)); + } + + /** + * 新增设备大类信息 + */ +/* @SaCheckPermission("dms:baseDeviceCategory:add") + @Log(title = "设备大类信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseDeviceCategoryBo bo) { + return toAjax(baseDeviceCategoryService.insertByBo(bo)); + }*/ + + /** + * 修改设备大类信息 + */ +/* @SaCheckPermission("dms:baseDeviceCategory:edit") + @Log(title = "设备大类信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseDeviceCategoryBo bo) { + return toAjax(baseDeviceCategoryService.updateByBo(bo)); + }*/ + + /** + * 删除设备大类信息 + * + * @param deviceCategoryIds 主键串 + */ +/* @SaCheckPermission("dms:baseDeviceCategory:remove") + @Log(title = "设备大类信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{deviceCategoryIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] deviceCategoryIds) { + return toAjax(baseDeviceCategoryService.deleteWithValidByIds(List.of(deviceCategoryIds), true)); + }*/ + + + /** + * 下拉框查询设备大类信息列表 + */ + + @GetMapping("/getBaseDeviceCategoryList") + public R> getBaseDeviceCategoryList(BaseDeviceCategoryBo bo) { + List list = baseDeviceCategoryService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceTypeController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceTypeController.java new file mode 100644 index 00000000..82b40a22 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceTypeController.java @@ -0,0 +1,118 @@ +package org.dromara.dms.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +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.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.dms.domain.bo.BaseDeviceTypeBo; +import org.dromara.dms.domain.vo.BaseDeviceTypeVo; +import org.dromara.dms.service.IBaseDeviceTypeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 设备类型信息 + * 前端访问路由地址为:/dms/baseDeviceType + * + * @author xins + * @date 2025-02-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseDeviceType") +public class BaseDeviceTypeController extends BaseController { + + private final IBaseDeviceTypeService baseDeviceTypeService; + + /** + * 查询设备类型信息列表 + */ + @SaCheckPermission("dms:baseDeviceType:list") + @GetMapping("/list") + public TableDataInfo list(BaseDeviceTypeBo bo, PageQuery pageQuery) { + return baseDeviceTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备类型信息列表 + */ + @SaCheckPermission("dms:baseDeviceType:export") + @Log(title = "设备类型信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseDeviceTypeBo bo, HttpServletResponse response) { + List list = baseDeviceTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "设备类型信息", BaseDeviceTypeVo.class, response); + } + + /** + * 获取设备类型信息详细信息 + * + * @param deviceTypeId 主键 + */ + @SaCheckPermission("dms:baseDeviceType:query") + @GetMapping("/{deviceTypeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long deviceTypeId) { + return R.ok(baseDeviceTypeService.queryById(deviceTypeId)); + } + + /** + * 新增设备类型信息 + */ +/* @SaCheckPermission("dms:baseDeviceType:add") + @Log(title = "设备类型信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseDeviceTypeBo bo) { + return toAjax(baseDeviceTypeService.insertByBo(bo)); + }*/ + + /** + * 修改设备类型信息 + */ +/* @SaCheckPermission("dms:baseDeviceType:edit") + @Log(title = "设备类型信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseDeviceTypeBo bo) { + return toAjax(baseDeviceTypeService.updateByBo(bo)); + }*/ + + /** + * 删除设备类型信息 + * + * @param deviceTypeIds 主键串 + */ +/* @SaCheckPermission("dms:baseDeviceType:remove") + @Log(title = "设备类型信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{deviceTypeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] deviceTypeIds) { + return toAjax(baseDeviceTypeService.deleteWithValidByIds(List.of(deviceTypeIds), true)); + }*/ + + + /** + * 下拉框查询设备类型信息列表 + */ + + @GetMapping("/getBaseDeviceTypeList") + public R> getBaseDeviceTypeList(BaseDeviceTypeBo bo) { + List list = baseDeviceTypeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceCategory.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceCategory.java new file mode 100644 index 00000000..30ad2101 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceCategory.java @@ -0,0 +1,53 @@ +package org.dromara.dms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 设备大类信息对象 base_device_category + * + * @author xins + * @date 2025-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_device_category") +public class BaseDeviceCategory extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 大类ID + */ + @TableId(value = "device_category_id", type = IdType.AUTO) + private Long deviceCategoryId; + + /** + * 大类编号 + */ + private String deviceCategoryCode; + + /** + * 大类名称 + */ + private String deviceCategoryName; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java new file mode 100644 index 00000000..1e5adc0b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java @@ -0,0 +1,75 @@ +package org.dromara.dms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 设备类型信息对象 base_device_type + * + * @author xins + * @date 2025-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_device_type") +public class BaseDeviceType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 物料类型ID + */ + @TableId(value = "device_type_id", type = IdType.AUTO) + private Long deviceTypeId; + + /** + * 父级标识 + */ + private Long parentId; + + /** + * 设备类型编号 + */ + private String deviceTypeCode; + + /** + * 设备类型名称 + */ + private String deviceTypeName; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 设备大类ID（大类ID（关联base_category表category_type为2的）） + */ + private Long deviceCategoryId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 设备大类名称 + */ + @TableField(exist = false) + private String deviceCategoryName;//join映射字段 + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceCategoryBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceCategoryBo.java new file mode 100644 index 00000000..74f83fcd --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceCategoryBo.java @@ -0,0 +1,54 @@ +package org.dromara.dms.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.BaseDeviceCategory; + +/** + * 设备大类信息业务对象 base_device_category + * + * @author xins + * @date 2025-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseDeviceCategory.class, reverseConvertGenerate = false) +public class BaseDeviceCategoryBo extends BaseEntity { + + /** + * 大类ID + */ +// @NotNull(message = "大类ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deviceCategoryId; + + /** + * 大类编号 + */ + @NotBlank(message = "大类编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceCategoryCode; + + /** + * 大类名称 + */ + @NotBlank(message = "大类名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceCategoryName; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ +/* @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java new file mode 100644 index 00000000..13dfe631 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java @@ -0,0 +1,73 @@ +package org.dromara.dms.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.BaseDeviceType; + +/** + * 设备类型信息业务对象 base_device_type + * + * @author xins + * @date 2025-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseDeviceType.class, reverseConvertGenerate = false) +public class BaseDeviceTypeBo extends BaseEntity { + + /** + * 物料类型ID + */ +/* @NotNull(message = "物料类型ID不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long deviceTypeId; + + /** + * 父级标识 + */ +/* @NotNull(message = "父级标识不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long parentId; + + /** + * 设备类型编号 + */ +/* @NotBlank(message = "设备类型编号不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String deviceTypeCode; + + /** + * 设备类型名称 + */ +/* @NotBlank(message = "设备类型名称不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String deviceTypeName; + + /** + * 祖级列表 + */ +/* @NotBlank(message = "祖级列表不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String ancestors; + + /** + * 设备大类ID（大类ID（关联base_category表category_type为2的）） + */ +/* @NotNull(message = "设备大类不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long deviceCategoryId; + + /** + * 激活标识（1是 0否） + */ +/* @NotBlank(message = "激活标识不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String activeFlag; + + /** + * 备注 + */ +/* @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String remark; + + /** + * 设备大类名称 + */ + private String deviceCategoryName;//join映射字段 + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceCategoryVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceCategoryVo.java new file mode 100644 index 00000000..9eb87792 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceCategoryVo.java @@ -0,0 +1,61 @@ +package org.dromara.dms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.BaseDeviceCategory; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 设备大类信息视图对象 base_device_category + * + * @author xins + * @date 2025-02-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseDeviceCategory.class) +public class BaseDeviceCategoryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 大类ID + */ + @ExcelProperty(value = "大类ID") + private Long deviceCategoryId; + + /** + * 大类编号 + */ + @ExcelProperty(value = "大类编号") + private String deviceCategoryCode; + + /** + * 大类名称 + */ + @ExcelProperty(value = "大类名称") + private String deviceCategoryName; + + /** + * 激活标识（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/domain/vo/BaseDeviceTypeVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceTypeVo.java new file mode 100644 index 00000000..0bed3a34 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceTypeVo.java @@ -0,0 +1,84 @@ +package org.dromara.dms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.BaseDeviceType; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 设备类型信息视图对象 base_device_type + * + * @author xins + * @date 2025-02-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseDeviceType.class) +public class BaseDeviceTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 物料类型ID + */ + @ExcelProperty(value = "物料类型ID") + private Long deviceTypeId; + + /** + * 父级标识 + */ + @ExcelProperty(value = "父级标识") + private Long parentId; + + /** + * 设备类型编号 + */ + @ExcelProperty(value = "设备类型编号") + private String deviceTypeCode; + + /** + * 设备类型名称 + */ + @ExcelProperty(value = "设备类型名称") + private String deviceTypeName; + + /** + * 祖级列表 + */ + @ExcelProperty(value = "祖级列表") + private String ancestors; + + /** + * 设备大类ID（大类ID（关联base_category表category_type为2的）） + */ + @ExcelProperty(value = "设备大类ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "大=类ID（关联base_category表category_type为2的") + private Long deviceCategoryId; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=是,0=否") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 设备大类名称 + */ + @ExcelProperty(value = "设备大类名称") + private String deviceCategoryName;//join映射字段 +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceCategoryMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceCategoryMapper.java new file mode 100644 index 00000000..cf6a68d4 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceCategoryMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.dms.domain.BaseDeviceCategory; +import org.dromara.dms.domain.vo.BaseDeviceCategoryVo; + +/** + * 设备大类信息Mapper接口 + * + * @author xins + * @date 2025-02-21 + */ +public interface BaseDeviceCategoryMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceTypeMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceTypeMapper.java new file mode 100644 index 00000000..ab641b4b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseDeviceTypeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.dms.domain.BaseDeviceType; +import org.dromara.dms.domain.vo.BaseDeviceTypeVo; + +/** + * 设备类型信息Mapper接口 + * + * @author xins + * @date 2025-02-21 + */ +public interface BaseDeviceTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceCategoryService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceCategoryService.java new file mode 100644 index 00000000..de22819d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceCategoryService.java @@ -0,0 +1,68 @@ +package org.dromara.dms.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.bo.BaseDeviceCategoryBo; +import org.dromara.dms.domain.vo.BaseDeviceCategoryVo; + +import java.util.Collection; +import java.util.List; + +/** + * 设备大类信息Service接口 + * + * @author xins + * @date 2025-02-21 + */ +public interface IBaseDeviceCategoryService { + + /** + * 查询设备大类信息 + * + * @param deviceCategoryId 主键 + * @return 设备大类信息 + */ + BaseDeviceCategoryVo queryById(Long deviceCategoryId); + + /** + * 分页查询设备大类信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备大类信息分页列表 + */ + TableDataInfo queryPageList(BaseDeviceCategoryBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备大类信息列表 + * + * @param bo 查询条件 + * @return 设备大类信息列表 + */ + List queryList(BaseDeviceCategoryBo bo); + + /** + * 新增设备大类信息 + * + * @param bo 设备大类信息 + * @return 是否新增成功 + */ +/* Boolean insertByBo(BaseDeviceCategoryBo bo);*/ + + /** + * 修改设备大类信息 + * + * @param bo 设备大类信息 + * @return 是否修改成功 + */ +/* Boolean updateByBo(BaseDeviceCategoryBo bo);*/ + + /** + * 校验并批量删除设备大类信息信息 + * + * @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/IBaseDeviceTypeService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceTypeService.java new file mode 100644 index 00000000..a8832486 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceTypeService.java @@ -0,0 +1,68 @@ +package org.dromara.dms.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.bo.BaseDeviceTypeBo; +import org.dromara.dms.domain.vo.BaseDeviceTypeVo; + +import java.util.Collection; +import java.util.List; + +/** + * 设备类型信息Service接口 + * + * @author xins + * @date 2025-02-21 + */ +public interface IBaseDeviceTypeService { + + /** + * 查询设备类型信息 + * + * @param deviceTypeId 主键 + * @return 设备类型信息 + */ + BaseDeviceTypeVo queryById(Long deviceTypeId); + + /** + * 分页查询设备类型信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备类型信息分页列表 + */ + TableDataInfo queryPageList(BaseDeviceTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备类型信息列表 + * + * @param bo 查询条件 + * @return 设备类型信息列表 + */ + List queryList(BaseDeviceTypeBo bo); + + /** + * 新增设备类型信息 + * + * @param bo 设备类型信息 + * @return 是否新增成功 + */ +// Boolean insertByBo(BaseDeviceTypeBo bo); + + /** + * 修改设备类型信息 + * + * @param bo 设备类型信息 + * @return 是否修改成功 + */ +// Boolean updateByBo(BaseDeviceTypeBo bo); + + /** + * 校验并批量删除设备类型信息信息 + * + * @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/BaseDeviceCategoryServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceCategoryServiceImpl.java new file mode 100644 index 00000000..785b2c49 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceCategoryServiceImpl.java @@ -0,0 +1,164 @@ +package org.dromara.dms.service.impl; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.BaseDeviceCategory; +import org.dromara.dms.domain.bo.BaseDeviceCategoryBo; +import org.dromara.dms.domain.vo.BaseDeviceCategoryVo; +import org.dromara.dms.mapper.BaseDeviceCategoryMapper; +import org.dromara.dms.service.IBaseDeviceCategoryService; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 设备大类信息Service业务层处理 + * + * @author xins + * @date 2025-02-21 + */ +@RequiredArgsConstructor +@Service +public class BaseDeviceCategoryServiceImpl implements IBaseDeviceCategoryService { + + private final BaseDeviceCategoryMapper baseMapper; + + /** + * 查询设备大类信息 + * + * @param deviceCategoryId 主键 + * @return 设备大类信息 + */ + @Override + public BaseDeviceCategoryVo queryById(Long deviceCategoryId){ + return baseMapper.selectVoById(deviceCategoryId); + } + + /** + * 分页查询设备大类信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备大类信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseDeviceCategoryBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备大类信息列表 + * + * @param bo 查询条件 + * @return 设备大类信息列表 + */ + @Override + public List queryList(BaseDeviceCategoryBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseDeviceCategoryBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseDeviceCategory.class) + .selectAll(BaseDeviceCategory.class) + .eq(bo.getDeviceCategoryId() != null, BaseDeviceCategory::getDeviceCategoryId, bo.getDeviceCategoryId()) + .eq(StringUtils.isNotBlank(bo.getDeviceCategoryCode()), BaseDeviceCategory::getDeviceCategoryCode, bo.getDeviceCategoryCode()) + .like(StringUtils.isNotBlank(bo.getDeviceCategoryName()), BaseDeviceCategory::getDeviceCategoryName, bo.getDeviceCategoryName()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseDeviceCategory::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(BaseDeviceCategory::getCreateTime); + return lqw; + } + + /** + * 新增设备大类信息 + * + * @param bo 设备大类信息 + * @return 是否新增成功 + */ + @Override +/* public Boolean insertByBo(BaseDeviceCategoryBo bo) { + BaseDeviceCategory add = MapstructUtils.convert(bo, BaseDeviceCategory.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDeviceCategoryId(add.getDeviceCategoryId()); + } + return flag; + }*/ + + /** + * 修改设备大类信息 + * + * @param bo 设备大类信息 + * @return 是否修改成功 + */ +/* @Override + public Boolean updateByBo(BaseDeviceCategoryBo bo) { + BaseDeviceCategory update = MapstructUtils.convert(bo, BaseDeviceCategory.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + }*/ + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseDeviceCategory entity){ + //TODO 做一些数据校验,如唯一约束 + + //编号校验 + if (StringUtils.isNotNull(entity.getDeviceCategoryCode())){ + BaseDeviceCategoryBo query = new BaseDeviceCategoryBo(); + query.setDeviceCategoryCode(entity.getDeviceCategoryCode()); + MPJLambdaWrapper lqw = buildQueryWrapper(query); + BaseDeviceCategory detail = baseMapper.selectOne(lqw); + if ( !ObjectUtils.isEmpty(detail) + && !detail.getDeviceCategoryId().equals(entity.getDeviceCategoryId())){ + throw new ServiceException("编号已存在"); + } + } + + //名称校验 + if (StringUtils.isNotNull(entity.getDeviceCategoryName())){ + BaseDeviceCategoryBo query = new BaseDeviceCategoryBo(); + query.setDeviceCategoryName(entity.getDeviceCategoryName()); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseDeviceCategory.class) + .selectAll(BaseDeviceCategory.class) + .eq(StringUtils.isNotBlank(query.getDeviceCategoryName()),BaseDeviceCategory::getDeviceCategoryName, query.getDeviceCategoryName()); + BaseDeviceCategory detail = baseMapper.selectOne(lqw); + if ( !ObjectUtils.isEmpty(detail) + && !detail.getDeviceCategoryId().equals(entity.getDeviceCategoryId())){ + throw new ServiceException("名称已存在"); + } + } + + } + + /** + * 校验并批量删除设备大类信息信息 + * + * @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/java/org/dromara/dms/service/impl/BaseDeviceTypeServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceTypeServiceImpl.java new file mode 100644 index 00000000..7cc201db --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceTypeServiceImpl.java @@ -0,0 +1,155 @@ +package org.dromara.dms.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.ObjectUtils; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.BaseDeviceCategory; +import org.dromara.dms.domain.BaseDeviceType; +import org.dromara.dms.domain.bo.BaseDeviceTypeBo; +import org.dromara.dms.domain.vo.BaseDeviceTypeVo; +import org.dromara.dms.mapper.BaseDeviceTypeMapper; +import org.dromara.dms.service.IBaseDeviceTypeService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 设备类型信息Service业务层处理 + * + * @author xins + * @date 2025-02-21 + */ +@RequiredArgsConstructor +@Service +public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService { + + private final BaseDeviceTypeMapper baseMapper; + + /** + * 查询设备类型信息 + * + * @param deviceTypeId 主键 + * @return 设备类型信息 + */ + @Override + public BaseDeviceTypeVo queryById(Long deviceTypeId){ + return baseMapper.selectVoById(deviceTypeId); + } + + /** + * 分页查询设备类型信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备类型信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseDeviceTypeBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备类型信息列表 + * + * @param bo 查询条件 + * @return 设备类型信息列表 + */ + @Override + public List queryList(BaseDeviceTypeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseDeviceTypeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseDeviceType.class) + .selectAll(BaseDeviceType.class) + + // 关联查询设备大类信息 + .select(BaseDeviceCategory::getDeviceCategoryName) + .leftJoin(BaseDeviceCategory.class,BaseDeviceCategory::getDeviceCategoryId,BaseDeviceType::getDeviceCategoryId) + + .eq(bo.getDeviceTypeId() != null, BaseDeviceType::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(bo.getParentId() != null, BaseDeviceType::getParentId, bo.getParentId()) + .eq(StringUtils.isNotBlank(bo.getDeviceTypeCode()), BaseDeviceType::getDeviceTypeCode, bo.getDeviceTypeCode()) + .like(StringUtils.isNotBlank(bo.getDeviceTypeName()), BaseDeviceType::getDeviceTypeName, bo.getDeviceTypeName()) + .eq(StringUtils.isNotBlank(bo.getAncestors()), BaseDeviceType::getAncestors, bo.getAncestors()) + .eq(bo.getDeviceCategoryId() != null, BaseDeviceType::getDeviceCategoryId, bo.getDeviceCategoryId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseDeviceType::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(BaseDeviceType::getCreateTime); + return lqw; + } + + /** + * 新增设备类型信息 + * + * @param bo 设备类型信息 + * @return 是否新增成功 + */ +/* + @Override + public Boolean insertByBo(BaseDeviceTypeBo bo) { + BaseDeviceType add = MapstructUtils.convert(bo, BaseDeviceType.class); + validEntityBeforeSave(add); + //获取父节点信息 + BaseDeviceTypeVo query = baseMapper.selectVoById(bo.getParentId()); + if (ObjectUtils.isNotEmpty(query)) { + //若父节点不为空，则将父节点的ancestors拼接父节点id拼接成ancestors + add.setAncestors(query.getAncestors() + "," + bo.getParentId()); + }else{ + //若父节点为空，则ancestors仅有父节点id + add.setAncestors(bo.getParentId().toString()); + } + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDeviceTypeId(add.getDeviceTypeId()); + } + return flag; + } +*/ + + /** + * 修改设备类型信息 + * + * @param bo 设备类型信息 + * @return 是否修改成功 + */ +/* @Override + public Boolean updateByBo(BaseDeviceTypeBo bo) { + BaseDeviceType update = MapstructUtils.convert(bo, BaseDeviceType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + }*/ + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseDeviceType 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/hwmom-dms/src/main/resources/mapper/BaseDeviceCategoryMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceCategoryMapper.xml new file mode 100644 index 00000000..b39cbc1a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceCategoryMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceTypeMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceTypeMapper.xml new file mode 100644 index 00000000..ca6a3289 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + From 13e40554daea7e6c2e32199d5a62af95c7eedb48 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 24 Mar 2025 09:41:01 +0800 Subject: [PATCH 2/7] =?UTF-8?q?add(dms):=20=E7=94=9F=E6=88=90=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BF=9D=E5=85=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E3=80=81=E4=BF=9D=E5=85=BB=E9=83=A8=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E4=BF=9D=E5=85=BB=E8=AE=A1=E5=88=92=E3=80=81=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=98=8E=E7=BB=86=E4=B8=8E=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E9=83=A8=E4=BD=8D=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AE=8C=E5=96=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DmsBaseMaintProjectController.java | 117 +++++++++++++ .../DmsBaseMaintStandardController.java | 117 +++++++++++++ .../DmsBaseMaintStationController.java | 117 +++++++++++++ .../DmsBaseStationProjectController.java | 117 +++++++++++++ .../controller/DmsPlanMaintController.java | 117 +++++++++++++ .../DmsPlanMaintDetailController.java | 117 +++++++++++++ .../dms/domain/DmsBaseMaintProject.java | 51 ++++++ .../dms/domain/DmsBaseMaintStandard.java | 67 ++++++++ .../dms/domain/DmsBaseMaintStation.java | 67 ++++++++ .../dms/domain/DmsBaseStationProject.java | 35 ++++ .../org/dromara/dms/domain/DmsPlanMaint.java | 93 +++++++++++ .../dms/domain/DmsPlanMaintDetail.java | 85 ++++++++++ .../dms/domain/bo/DmsBaseMaintProjectBo.java | 51 ++++++ .../dms/domain/bo/DmsBaseMaintStandardBo.java | 61 +++++++ .../dms/domain/bo/DmsBaseMaintStationBo.java | 63 +++++++ .../domain/bo/DmsBaseStationProjectBo.java | 36 ++++ .../dromara/dms/domain/bo/DmsPlanMaintBo.java | 93 +++++++++++ .../dms/domain/bo/DmsPlanMaintDetailBo.java | 62 +++++++ .../dms/domain/vo/DmsBaseMaintProjectVo.java | 63 +++++++ .../dms/domain/vo/DmsBaseMaintStandardVo.java | 79 +++++++++ .../dms/domain/vo/DmsBaseMaintStationVo.java | 79 +++++++++ .../domain/vo/DmsBaseStationProjectVo.java | 44 +++++ .../dms/domain/vo/DmsPlanMaintDetailVo.java | 94 +++++++++++ .../dromara/dms/domain/vo/DmsPlanMaintVo.java | 117 +++++++++++++ .../dms/mapper/DmsBaseMaintProjectMapper.java | 15 ++ .../mapper/DmsBaseMaintStandardMapper.java | 15 ++ .../dms/mapper/DmsBaseMaintStationMapper.java | 15 ++ .../mapper/DmsBaseStationProjectMapper.java | 15 ++ .../dms/mapper/DmsPlanMaintDetailMapper.java | 15 ++ .../dms/mapper/DmsPlanMaintMapper.java | 15 ++ .../service/IDmsBaseMaintProjectService.java | 69 ++++++++ .../service/IDmsBaseMaintStandardService.java | 69 ++++++++ .../service/IDmsBaseMaintStationService.java | 69 ++++++++ .../IDmsBaseStationProjectService.java | 69 ++++++++ .../service/IDmsPlanMaintDetailService.java | 69 ++++++++ .../dms/service/IDmsPlanMaintService.java | 69 ++++++++ .../impl/DmsBaseMaintProjectServiceImpl.java | 135 +++++++++++++++ .../impl/DmsBaseMaintStandardServiceImpl.java | 143 ++++++++++++++++ .../impl/DmsBaseMaintStationServiceImpl.java | 148 +++++++++++++++++ .../DmsBaseStationProjectServiceImpl.java | 133 +++++++++++++++ .../impl/DmsPlanMaintDetailServiceImpl.java | 155 ++++++++++++++++++ .../service/impl/DmsPlanMaintServiceImpl.java | 143 ++++++++++++++++ .../mapper/dms/DmsBaseMaintProjectMapper.xml | 7 + .../mapper/dms/DmsBaseMaintStandardMapper.xml | 7 + .../mapper/dms/DmsBaseMaintStationMapper.xml | 7 + .../dms/DmsBaseStationProjectMapper.xml | 7 + .../mapper/dms/DmsPlanMaintDetailMapper.xml | 7 + .../mapper/dms/DmsPlanMaintMapper.xml | 7 + 48 files changed, 3345 insertions(+) create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintProjectController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStandardController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStationController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseStationProjectController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintDetailController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintProject.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStandard.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStation.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseStationProject.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaint.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintProjectBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStandardBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStationBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseStationProjectBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintDetailBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintProjectVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStandardVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStationVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseStationProjectVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintProjectMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStandardMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStationMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseStationProjectMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintDetailMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintProjectService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintStandardService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintStationService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseStationProjectService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsPlanMaintDetailService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsPlanMaintService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintProjectServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStandardServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStationServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseStationProjectServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintDetailServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintProjectController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintProjectController.java new file mode 100644 index 00000000..a8a4944e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintProjectController.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.DmsBaseMaintProjectVo; +import org.dromara.dms.domain.bo.DmsBaseMaintProjectBo; +import org.dromara.dms.service.IDmsBaseMaintProjectService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养项目信息 + * 前端访问路由地址为:/dms/dmsBaseMaintProject + * + * @author zch + * @date 2025-03-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseMaintProject") +public class DmsBaseMaintProjectController extends BaseController { + + private final IDmsBaseMaintProjectService dmsBaseMaintProjectService; + + /** + * 查询保养项目信息列表 + */ + @SaCheckPermission("dms:dmsBaseMaintProject:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseMaintProjectBo bo, PageQuery pageQuery) { + return dmsBaseMaintProjectService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养项目信息列表 + */ + @SaCheckPermission("dms:dmsBaseMaintProject:export") + @Log(title = "保养项目信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseMaintProjectBo bo, HttpServletResponse response) { + List list = dmsBaseMaintProjectService.queryList(bo); + ExcelUtil.exportExcel(list, "保养项目信息", DmsBaseMaintProjectVo.class, response); + } + + /** + * 获取保养项目信息详细信息 + * + * @param maintProjectId 主键 + */ + @SaCheckPermission("dms:dmsBaseMaintProject:query") + @GetMapping("/{maintProjectId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long maintProjectId) { + return R.ok(dmsBaseMaintProjectService.queryById(maintProjectId)); + } + + /** + * 新增保养项目信息 + */ + @SaCheckPermission("dms:dmsBaseMaintProject:add") + @Log(title = "保养项目信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseMaintProjectBo bo) { + return toAjax(dmsBaseMaintProjectService.insertByBo(bo)); + } + + /** + * 修改保养项目信息 + */ + @SaCheckPermission("dms:dmsBaseMaintProject:edit") + @Log(title = "保养项目信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseMaintProjectBo bo) { + return toAjax(dmsBaseMaintProjectService.updateByBo(bo)); + } + + /** + * 删除保养项目信息 + * + * @param maintProjectIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseMaintProject:remove") + @Log(title = "保养项目信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{maintProjectIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] maintProjectIds) { + return toAjax(dmsBaseMaintProjectService.deleteWithValidByIds(List.of(maintProjectIds), true)); + } + + + /** + * 下拉框查询保养项目信息列表 + */ + + @GetMapping("/getDmsBaseMaintProjectList") + public R> getDmsBaseMaintProjectList(DmsBaseMaintProjectBo bo) { + List list = dmsBaseMaintProjectService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStandardController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStandardController.java new file mode 100644 index 00000000..b74218ca --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStandardController.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.DmsBaseMaintStandardVo; +import org.dromara.dms.domain.bo.DmsBaseMaintStandardBo; +import org.dromara.dms.service.IDmsBaseMaintStandardService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养标准信息 + * 前端访问路由地址为:/dms/dmsBaseMaintStandard + * + * @author zch + * @date 2025-03-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseMaintStandard") +public class DmsBaseMaintStandardController extends BaseController { + + private final IDmsBaseMaintStandardService dmsBaseMaintStandardService; + + /** + * 查询保养标准信息列表 + */ + @SaCheckPermission("dms:dmsBaseMaintStandard:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseMaintStandardBo bo, PageQuery pageQuery) { + return dmsBaseMaintStandardService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养标准信息列表 + */ + @SaCheckPermission("dms:dmsBaseMaintStandard:export") + @Log(title = "保养标准信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseMaintStandardBo bo, HttpServletResponse response) { + List list = dmsBaseMaintStandardService.queryList(bo); + ExcelUtil.exportExcel(list, "保养标准信息", DmsBaseMaintStandardVo.class, response); + } + + /** + * 获取保养标准信息详细信息 + * + * @param maintStandardId 主键 + */ + @SaCheckPermission("dms:dmsBaseMaintStandard:query") + @GetMapping("/{maintStandardId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long maintStandardId) { + return R.ok(dmsBaseMaintStandardService.queryById(maintStandardId)); + } + + /** + * 新增保养标准信息 + */ + @SaCheckPermission("dms:dmsBaseMaintStandard:add") + @Log(title = "保养标准信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseMaintStandardBo bo) { + return toAjax(dmsBaseMaintStandardService.insertByBo(bo)); + } + + /** + * 修改保养标准信息 + */ + @SaCheckPermission("dms:dmsBaseMaintStandard:edit") + @Log(title = "保养标准信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseMaintStandardBo bo) { + return toAjax(dmsBaseMaintStandardService.updateByBo(bo)); + } + + /** + * 删除保养标准信息 + * + * @param maintStandardIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseMaintStandard:remove") + @Log(title = "保养标准信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{maintStandardIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] maintStandardIds) { + return toAjax(dmsBaseMaintStandardService.deleteWithValidByIds(List.of(maintStandardIds), true)); + } + + + /** + * 下拉框查询保养标准信息列表 + */ + + @GetMapping("/getDmsBaseMaintStandardList") + public R> getDmsBaseMaintStandardList(DmsBaseMaintStandardBo bo) { + List list = dmsBaseMaintStandardService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStationController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStationController.java new file mode 100644 index 00000000..0f6a9d02 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMaintStationController.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.DmsBaseMaintStationVo; +import org.dromara.dms.domain.bo.DmsBaseMaintStationBo; +import org.dromara.dms.service.IDmsBaseMaintStationService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养部位信息 + * 前端访问路由地址为:/dms/dmsBaseMaintStation + * + * @author zch + * @date 2025-03-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseMaintStation") +public class DmsBaseMaintStationController extends BaseController { + + private final IDmsBaseMaintStationService dmsBaseMaintStationService; + + /** + * 查询保养部位信息列表 + */ + @SaCheckPermission("dms:dmsBaseMaintStation:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseMaintStationBo bo, PageQuery pageQuery) { + return dmsBaseMaintStationService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养部位信息列表 + */ + @SaCheckPermission("dms:dmsBaseMaintStation:export") + @Log(title = "保养部位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseMaintStationBo bo, HttpServletResponse response) { + List list = dmsBaseMaintStationService.queryList(bo); + ExcelUtil.exportExcel(list, "保养部位信息", DmsBaseMaintStationVo.class, response); + } + + /** + * 获取保养部位信息详细信息 + * + * @param maintStationId 主键 + */ + @SaCheckPermission("dms:dmsBaseMaintStation:query") + @GetMapping("/{maintStationId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long maintStationId) { + return R.ok(dmsBaseMaintStationService.queryById(maintStationId)); + } + + /** + * 新增保养部位信息 + */ + @SaCheckPermission("dms:dmsBaseMaintStation:add") + @Log(title = "保养部位信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseMaintStationBo bo) { + return toAjax(dmsBaseMaintStationService.insertByBo(bo)); + } + + /** + * 修改保养部位信息 + */ + @SaCheckPermission("dms:dmsBaseMaintStation:edit") + @Log(title = "保养部位信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseMaintStationBo bo) { + return toAjax(dmsBaseMaintStationService.updateByBo(bo)); + } + + /** + * 删除保养部位信息 + * + * @param maintStationIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseMaintStation:remove") + @Log(title = "保养部位信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{maintStationIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] maintStationIds) { + return toAjax(dmsBaseMaintStationService.deleteWithValidByIds(List.of(maintStationIds), true)); + } + + + /** + * 下拉框查询保养部位信息列表 + */ + + @GetMapping("/getDmsBaseMaintStationList") + public R> getDmsBaseMaintStationList(DmsBaseMaintStationBo bo) { + List list = dmsBaseMaintStationService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseStationProjectController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseStationProjectController.java new file mode 100644 index 00000000..7b1bdf13 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseStationProjectController.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.DmsBaseStationProjectVo; +import org.dromara.dms.domain.bo.DmsBaseStationProjectBo; +import org.dromara.dms.service.IDmsBaseStationProjectService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养部位关联项目信息 + * 前端访问路由地址为:/dms/dmsBaseStationProject + * + * @author zch + * @date 2025-03-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseStationProject") +public class DmsBaseStationProjectController extends BaseController { + + private final IDmsBaseStationProjectService dmsBaseStationProjectService; + + /** + * 查询保养部位关联项目信息列表 + */ +/* @SaCheckPermission("dms:dmsBaseStationProject:list")*/ + @GetMapping("/list") + public TableDataInfo list(DmsBaseStationProjectBo bo, PageQuery pageQuery) { + return dmsBaseStationProjectService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养部位关联项目信息列表 + */ +/* @SaCheckPermission("dms:dmsBaseStationProject:export")*/ + @Log(title = "保养部位关联项目信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseStationProjectBo bo, HttpServletResponse response) { + List list = dmsBaseStationProjectService.queryList(bo); + ExcelUtil.exportExcel(list, "保养部位关联项目信息", DmsBaseStationProjectVo.class, response); + } + + /** + * 获取保养部位关联项目信息详细信息 + * + * @param maintStationId 主键 + */ +/* @SaCheckPermission("dms:dmsBaseStationProject:query")*/ + @GetMapping("/{maintStationId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long maintStationId) { + return R.ok(dmsBaseStationProjectService.queryById(maintStationId)); + } + + /** + * 新增保养部位关联项目信息 + */ +/* @SaCheckPermission("dms:dmsBaseStationProject:add")*/ + @Log(title = "保养部位关联项目信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseStationProjectBo bo) { + return toAjax(dmsBaseStationProjectService.insertByBo(bo)); + } + + /** + * 修改保养部位关联项目信息 + */ +/* @SaCheckPermission("dms:dmsBaseStationProject:edit")*/ + @Log(title = "保养部位关联项目信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseStationProjectBo bo) { + return toAjax(dmsBaseStationProjectService.updateByBo(bo)); + } + + /** + * 删除保养部位关联项目信息 + * + * @param maintStationIds 主键串 + */ +/* @SaCheckPermission("dms:dmsBaseStationProject:remove")*/ + @Log(title = "保养部位关联项目信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{maintStationIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] maintStationIds) { + return toAjax(dmsBaseStationProjectService.deleteWithValidByIds(List.of(maintStationIds), true)); + } + + + /** + * 下拉框查询保养部位关联项目信息列表 + */ + +/* @GetMapping("/getDmsBaseStationProjectList")*/ + public R> getDmsBaseStationProjectList(DmsBaseStationProjectBo bo) { + List list = dmsBaseStationProjectService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintController.java new file mode 100644 index 00000000..da78427b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintController.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.DmsPlanMaintVo; +import org.dromara.dms.domain.bo.DmsPlanMaintBo; +import org.dromara.dms.service.IDmsPlanMaintService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养计划信息 + * 前端访问路由地址为:/dms/dmsPlanMaint + * + * @author zch + * @date 2025-03-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsPlanMaint") +public class DmsPlanMaintController extends BaseController { + + private final IDmsPlanMaintService dmsPlanMaintService; + + /** + * 查询保养计划信息列表 + */ + @SaCheckPermission("dms:dmsPlanMaint:list") + @GetMapping("/list") + public TableDataInfo list(DmsPlanMaintBo bo, PageQuery pageQuery) { + return dmsPlanMaintService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养计划信息列表 + */ + @SaCheckPermission("dms:dmsPlanMaint:export") + @Log(title = "保养计划信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsPlanMaintBo bo, HttpServletResponse response) { + List list = dmsPlanMaintService.queryList(bo); + ExcelUtil.exportExcel(list, "保养计划信息", DmsPlanMaintVo.class, response); + } + + /** + * 获取保养计划信息详细信息 + * + * @param planMaintId 主键 + */ + @SaCheckPermission("dms:dmsPlanMaint:query") + @GetMapping("/{planMaintId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long planMaintId) { + return R.ok(dmsPlanMaintService.queryById(planMaintId)); + } + + /** + * 新增保养计划信息 + */ + @SaCheckPermission("dms:dmsPlanMaint:add") + @Log(title = "保养计划信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsPlanMaintBo bo) { + return toAjax(dmsPlanMaintService.insertByBo(bo)); + } + + /** + * 修改保养计划信息 + */ + @SaCheckPermission("dms:dmsPlanMaint:edit") + @Log(title = "保养计划信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsPlanMaintBo bo) { + return toAjax(dmsPlanMaintService.updateByBo(bo)); + } + + /** + * 删除保养计划信息 + * + * @param planMaintIds 主键串 + */ + @SaCheckPermission("dms:dmsPlanMaint:remove") + @Log(title = "保养计划信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{planMaintIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] planMaintIds) { + return toAjax(dmsPlanMaintService.deleteWithValidByIds(List.of(planMaintIds), true)); + } + + + /** + * 下拉框查询保养计划信息列表 + */ + + @GetMapping("/getDmsPlanMaintList") + public R> getDmsPlanMaintList(DmsPlanMaintBo bo) { + List list = dmsPlanMaintService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintDetailController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintDetailController.java new file mode 100644 index 00000000..cccc6300 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsPlanMaintDetailController.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.DmsPlanMaintDetailVo; +import org.dromara.dms.domain.bo.DmsPlanMaintDetailBo; +import org.dromara.dms.service.IDmsPlanMaintDetailService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养计划明细 + * 前端访问路由地址为:/dms/dmsPlanMaintDetail + * + * @author zch + * @date 2025-03-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsPlanMaintDetail") +public class DmsPlanMaintDetailController extends BaseController { + + private final IDmsPlanMaintDetailService dmsPlanMaintDetailService; + + /** + * 查询保养计划明细列表 + */ + @SaCheckPermission("dms:dmsPlanMaintDetail:list") + @GetMapping("/list") + public TableDataInfo list(DmsPlanMaintDetailBo bo, PageQuery pageQuery) { + return dmsPlanMaintDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养计划明细列表 + */ + @SaCheckPermission("dms:dmsPlanMaintDetail:export") + @Log(title = "保养计划明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsPlanMaintDetailBo bo, HttpServletResponse response) { + List list = dmsPlanMaintDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "保养计划明细", DmsPlanMaintDetailVo.class, response); + } + + /** + * 获取保养计划明细详细信息 + * + * @param planMaintDetailId 主键 + */ + @SaCheckPermission("dms:dmsPlanMaintDetail:query") + @GetMapping("/{planMaintDetailId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long planMaintDetailId) { + return R.ok(dmsPlanMaintDetailService.queryById(planMaintDetailId)); + } + + /** + * 新增保养计划明细 + */ + @SaCheckPermission("dms:dmsPlanMaintDetail:add") + @Log(title = "保养计划明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsPlanMaintDetailBo bo) { + return toAjax(dmsPlanMaintDetailService.insertByBo(bo)); + } + + /** + * 修改保养计划明细 + */ + @SaCheckPermission("dms:dmsPlanMaintDetail:edit") + @Log(title = "保养计划明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsPlanMaintDetailBo bo) { + return toAjax(dmsPlanMaintDetailService.updateByBo(bo)); + } + + /** + * 删除保养计划明细 + * + * @param planMaintDetailIds 主键串 + */ + @SaCheckPermission("dms:dmsPlanMaintDetail:remove") + @Log(title = "保养计划明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{planMaintDetailIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] planMaintDetailIds) { + return toAjax(dmsPlanMaintDetailService.deleteWithValidByIds(List.of(planMaintDetailIds), true)); + } + + + /** + * 下拉框查询保养计划明细列表 + */ + + @GetMapping("/getDmsPlanMaintDetailList") + public R> getDmsPlanMaintDetailList(DmsPlanMaintDetailBo bo) { + List list = dmsPlanMaintDetailService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintProject.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintProject.java new file mode 100644 index 00000000..957c49cd --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintProject.java @@ -0,0 +1,51 @@ +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.io.Serial; + +/** + * 保养项目信息对象 dms_base_maint_project + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_maint_project") +public class DmsBaseMaintProject extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "maint_project_id", type = IdType.AUTO) + private Long maintProjectId; + + /** + * 项目名称 + */ + private String maintProjectName; + + /** + * 项目描述 + */ + private String maintProjectDesc; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStandard.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStandard.java new file mode 100644 index 00000000..0b828029 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStandard.java @@ -0,0 +1,67 @@ +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.io.Serial; + +/** + * 保养标准信息对象 dms_base_maint_standard + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_maint_standard") +public class DmsBaseMaintStandard extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "maint_standard_id", type = IdType.AUTO) + private Long maintStandardId; + + /** + * 标准编号 + */ + private String maintStandardCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 保养标准 + */ + private String maintProtocol; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStation.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStation.java new file mode 100644 index 00000000..80d3b632 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMaintStation.java @@ -0,0 +1,67 @@ +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.io.Serial; + +/** + * 保养部位信息对象 dms_base_maint_station + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_maint_station") +public class DmsBaseMaintStation extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "maint_station_id", type = IdType.AUTO) + private Long maintStationId; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 保养标准ID + */ + private Long maintStandardId; + + /** + * 部位编号 + */ + private String maintStationCode; + + /** + * 部位名称 + */ + private String maintStationName; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseStationProject.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseStationProject.java new file mode 100644 index 00000000..2d2d206a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseStationProject.java @@ -0,0 +1,35 @@ +package org.dromara.dms.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 保养部位关联项目信息对象 dms_base_station_project + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_station_project") +public class DmsBaseStationProject extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 保养部位ID + */ + private Long maintStationId; + + /** + * 保养项目ID + */ + private Long maintProjectId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaint.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaint.java new file mode 100644 index 00000000..8c86503f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaint.java @@ -0,0 +1,93 @@ +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; + +/** + * 保养计划信息对象 dms_plan_maint + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_plan_maint") +public class DmsPlanMaint extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "plan_maint_id", type = IdType.AUTO) + private Long planMaintId; + + /** + * 计划编号 + */ + private String planMaintCode; + + /** + * 保养级别（1日常保养 2月度保养 3年度保养） + */ + private String maintLevel; + + /** + * 保养组别 + */ + private String maintGroup; + + /** + * 保养负责人 + */ + private String maintSupervisor; + + /** + * 本次保养时间 + */ + private Date maintTime; + + /** + * 关联sj_job主键id + */ + private Long jobId; + + /** + * 时限（秒）;对于超期的报警 + */ + private Long timeLimit; + + /** + * 循环周期 + */ + private Long cyclePeriod; + + /** + * 保养状态（1待保养 2保养中 3已完成） + */ + private Long maintStatus; + + /** + * 创建方式（1人工创建 2自动创建） + */ + private Long createMethod; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java new file mode 100644 index 00000000..bac00f31 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java @@ -0,0 +1,85 @@ +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.io.Serial; + +/** + * 保养计划明细对象 dms_plan_maint_detail + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_plan_maint_detail") +public class DmsPlanMaintDetail extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "plan_maint_detail_id", type = IdType.AUTO) + private Long planMaintDetailId; + + /** + * 计划ID，关联dms_plan_maint的plan_maint_id + */ + private Long planMaintId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 保养部位,关联dms_base_maint_station的maint_station_id + */ + private Long maintStationId; + + /** + * 保养标准ID，关联保养标准主键 + */ + private Long maintStandardId; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 备注 + */ + private String remark; + + /** + * 计划编号 + */ + @TableField(exist = false) + private String planMaintCode;//JOIN + + /** + * 标准编号 + */ + @TableField(exist = false) + private String maintStandardCode;//JOIN + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + + /** + * 部位名称 + */ + @TableField(exist = false) + private String maintStationName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintProjectBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintProjectBo.java new file mode 100644 index 00000000..3e022e25 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintProjectBo.java @@ -0,0 +1,51 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseMaintProject; +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.*; + +/** + * 保养项目信息业务对象 dms_base_maint_project + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseMaintProject.class, reverseConvertGenerate = false) +public class DmsBaseMaintProjectBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long maintProjectId; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String maintProjectName; + + /** + * 项目描述 + */ + private String maintProjectDesc; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStandardBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStandardBo.java new file mode 100644 index 00000000..89aa9424 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStandardBo.java @@ -0,0 +1,61 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseMaintStandard; +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.*; + +/** + * 保养标准信息业务对象 dms_base_maint_standard + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseMaintStandard.class, reverseConvertGenerate = false) +public class DmsBaseMaintStandardBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long maintStandardId; + + /** + * 标准编号 + */ + @NotBlank(message = "标准编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String maintStandardCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 保养标准 + */ + private String maintProtocol; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStationBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStationBo.java new file mode 100644 index 00000000..8c0a78d1 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMaintStationBo.java @@ -0,0 +1,63 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseMaintStation; +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.*; + +/** + * 保养部位信息业务对象 dms_base_maint_station + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseMaintStation.class, reverseConvertGenerate = false) +public class DmsBaseMaintStationBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long maintStationId; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @NotNull(message = "设备类型ID，关联base_device_type的device_type_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deviceTypeId; + + /** + * 保养标准ID + */ + @NotNull(message = "保养标准ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long maintStandardId; + + /** + * 部位编号 + */ + @NotBlank(message = "部位编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String maintStationCode; + + /** + * 部位名称 + */ + private String maintStationName; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseStationProjectBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseStationProjectBo.java new file mode 100644 index 00000000..a3256765 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseStationProjectBo.java @@ -0,0 +1,36 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseStationProject; +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.*; + +/** + * 保养部位关联项目信息业务对象 dms_base_station_project + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseStationProject.class, reverseConvertGenerate = false) +public class DmsBaseStationProjectBo extends BaseEntity { + + /** + * 保养部位ID + */ + @NotNull(message = "保养部位ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long maintStationId; + + /** + * 保养项目ID + */ + @NotNull(message = "保养项目ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long maintProjectId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintBo.java new file mode 100644 index 00000000..538631c6 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintBo.java @@ -0,0 +1,93 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsPlanMaint; +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; + +/** + * 保养计划信息业务对象 dms_plan_maint + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsPlanMaint.class, reverseConvertGenerate = false) +public class DmsPlanMaintBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long planMaintId; + + /** + * 计划编号 + */ + @NotBlank(message = "计划编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String planMaintCode; + + /** + * 保养级别（1日常保养 2月度保养 3年度保养） + */ + private String maintLevel; + + /** + * 保养组别 + */ + private String maintGroup; + + /** + * 保养负责人 + */ + private String maintSupervisor; + + /** + * 本次保养时间 + */ + private Date maintTime; + + /** + * 关联sj_job主键id + */ + private Long jobId; + + /** + * 时限（秒）;对于超期的报警 + */ + private Long timeLimit; + + /** + * 循环周期 + */ + private Long cyclePeriod; + + /** + * 保养状态（1待保养 2保养中 3已完成） + */ + private Long maintStatus; + + /** + * 创建方式（1人工创建 2自动创建） + */ + private Long createMethod; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintDetailBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintDetailBo.java new file mode 100644 index 00000000..f2445149 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsPlanMaintDetailBo.java @@ -0,0 +1,62 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsPlanMaintDetail; +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.*; + +/** + * 保养计划明细业务对象 dms_plan_maint_detail + * + * @author zch + * @date 2025-03-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsPlanMaintDetail.class, reverseConvertGenerate = false) +public class DmsPlanMaintDetailBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long planMaintDetailId; + + /** + * 计划ID，关联dms_plan_maint的plan_maint_id + */ + @NotNull(message = "计划ID，关联dms_plan_maint的plan_maint_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long planMaintId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @NotNull(message = "设备ID，关联prod_base_machine_info的machine_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 保养部位,关联dms_base_maint_station的maint_station_id + */ + @NotNull(message = "保养部位,关联dms_base_maint_station的maint_station_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long maintStationId; + + /** + * 保养标准ID，关联保养标准主键 + */ + private Long maintStandardId; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintProjectVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintProjectVo.java new file mode 100644 index 00000000..cc1ad6ed --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintProjectVo.java @@ -0,0 +1,63 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseMaintProject; +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; + + + +/** + * 保养项目信息视图对象 dms_base_maint_project + * + * @author zch + * @date 2025-03-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseMaintProject.class) +public class DmsBaseMaintProjectVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long maintProjectId; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String maintProjectName; + + /** + * 项目描述 + */ + @ExcelProperty(value = "项目描述") + private String maintProjectDesc; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStandardVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStandardVo.java new file mode 100644 index 00000000..d2035c1b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStandardVo.java @@ -0,0 +1,79 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseMaintStandard; +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; + + + +/** + * 保养标准信息视图对象 dms_base_maint_standard + * + * @author zch + * @date 2025-03-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseMaintStandard.class) +public class DmsBaseMaintStandardVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long maintStandardId; + + /** + * 标准编号 + */ + @ExcelProperty(value = "标准编号") + private String maintStandardCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID，关联base_device_type的device_type_id") + private Long deviceTypeId; + + /** + * 保养标准 + */ + @ExcelProperty(value = "保养标准") + private String maintProtocol; + + /** + * 操作描述 + */ + @ExcelProperty(value = "操作描述") + private String operationDescription; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 设备类型名称 + */ + private String deviceTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStationVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStationVo.java new file mode 100644 index 00000000..b6742f31 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMaintStationVo.java @@ -0,0 +1,79 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseMaintStation; +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; + + + +/** + * 保养部位信息视图对象 dms_base_maint_station + * + * @author zch + * @date 2025-03-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseMaintStation.class) +public class DmsBaseMaintStationVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long maintStationId; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID，关联base_device_type的device_type_id") + private Long deviceTypeId; + + /** + * 保养标准ID + */ + @ExcelProperty(value = "保养标准ID") + private Long maintStandardId; + + /** + * 部位编号 + */ + @ExcelProperty(value = "部位编号") + private String maintStationCode; + + /** + * 部位名称 + */ + @ExcelProperty(value = "部位名称") + private String maintStationName; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 设备类型名称 + */ + private String deviceTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseStationProjectVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseStationProjectVo.java new file mode 100644 index 00000000..80384140 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseStationProjectVo.java @@ -0,0 +1,44 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseStationProject; +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; + + + +/** + * 保养部位关联项目信息视图对象 dms_base_station_project + * + * @author zch + * @date 2025-03-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseStationProject.class) +public class DmsBaseStationProjectVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 保养部位ID + */ + @ExcelProperty(value = "保养部位ID") + private Long maintStationId; + + /** + * 保养项目ID + */ + @ExcelProperty(value = "保养项目ID") + private Long maintProjectId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java new file mode 100644 index 00000000..43e8a5da --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java @@ -0,0 +1,94 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsPlanMaintDetail; +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; + + + +/** + * 保养计划明细视图对象 dms_plan_maint_detail + * + * @author zch + * @date 2025-03-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsPlanMaintDetail.class) +public class DmsPlanMaintDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long planMaintDetailId; + + /** + * 计划ID，关联dms_plan_maint的plan_maint_id + */ + @ExcelProperty(value = "计划ID，关联dms_plan_maint的plan_maint_id") + private Long planMaintId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID，关联prod_base_machine_info的machine_id") + private Long machineId; + + /** + * 保养部位,关联dms_base_maint_station的maint_station_id + */ + @ExcelProperty(value = "保养部位,关联dms_base_maint_station的maint_station_id") + private Long maintStationId; + + /** + * 保养标准ID，关联保养标准主键 + */ + @ExcelProperty(value = "保养标准ID，关联保养标准主键") + private Long maintStandardId; + + /** + * 操作描述 + */ + @ExcelProperty(value = "操作描述") + private String operationDescription; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 计划编号、 + */ + private String planMaintCode;//JOIN + + /** + * 标准编号 + */ + private String maintStandardCode;//JOIN + + /** + * 机台名称 + */ + private String machineName;//JOIN + + /** + * 部位名称 + */ + private String maintStationName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintVo.java new file mode 100644 index 00000000..4dd2fcac --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintVo.java @@ -0,0 +1,117 @@ +package org.dromara.dms.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.dms.domain.DmsPlanMaint; +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; + + + +/** + * 保养计划信息视图对象 dms_plan_maint + * + * @author zch + * @date 2025-03-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsPlanMaint.class) +public class DmsPlanMaintVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long planMaintId; + + /** + * 计划编号 + */ + @ExcelProperty(value = "计划编号") + private String planMaintCode; + + /** + * 保养级别（1日常保养 2月度保养 3年度保养） + */ + @ExcelProperty(value = "保养级别", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "maint_level") + private String maintLevel; + + /** + * 保养组别 + */ + @ExcelProperty(value = "保养组别") + private String maintGroup; + + /** + * 保养负责人 + */ + @ExcelProperty(value = "保养负责人") + private String maintSupervisor; + + /** + * 本次保养时间 + */ + @ExcelProperty(value = "本次保养时间") + private Date maintTime; + + /** + * 关联sj_job主键id + */ + @ExcelProperty(value = "关联sj_job主键id") + private Long jobId; + + /** + * 时限（秒）;对于超期的报警 + */ + @ExcelProperty(value = "时限", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "秒=") + private Long timeLimit; + + /** + * 循环周期 + */ + @ExcelProperty(value = "循环周期") + private Long cyclePeriod; + + /** + * 保养状态（1待保养 2保养中 3已完成） + */ + @ExcelProperty(value = "保养状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "maint_status") + private Long maintStatus; + + /** + * 创建方式（1人工创建 2自动创建） + */ + @ExcelProperty(value = "创建方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "create_method") + private Long createMethod; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintProjectMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintProjectMapper.java new file mode 100644 index 00000000..7f25db62 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintProjectMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseMaintProject; +import org.dromara.dms.domain.vo.DmsBaseMaintProjectVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养项目信息Mapper接口 + * + * @author zch + * @date 2025-03-21 + */ +public interface DmsBaseMaintProjectMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStandardMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStandardMapper.java new file mode 100644 index 00000000..0ce0f11f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStandardMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseMaintStandard; +import org.dromara.dms.domain.vo.DmsBaseMaintStandardVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养标准信息Mapper接口 + * + * @author zch + * @date 2025-03-21 + */ +public interface DmsBaseMaintStandardMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStationMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStationMapper.java new file mode 100644 index 00000000..e4f83745 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMaintStationMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseMaintStation; +import org.dromara.dms.domain.vo.DmsBaseMaintStationVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养部位信息Mapper接口 + * + * @author zch + * @date 2025-03-21 + */ +public interface DmsBaseMaintStationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseStationProjectMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseStationProjectMapper.java new file mode 100644 index 00000000..ebbe1e0d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseStationProjectMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseStationProject; +import org.dromara.dms.domain.vo.DmsBaseStationProjectVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养部位关联项目信息Mapper接口 + * + * @author zch + * @date 2025-03-21 + */ +public interface DmsBaseStationProjectMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintDetailMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintDetailMapper.java new file mode 100644 index 00000000..88591d6c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsPlanMaintDetail; +import org.dromara.dms.domain.vo.DmsPlanMaintDetailVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养计划明细Mapper接口 + * + * @author zch + * @date 2025-03-21 + */ +public interface DmsPlanMaintDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintMapper.java new file mode 100644 index 00000000..d3ca4878 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsPlanMaintMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsPlanMaint; +import org.dromara.dms.domain.vo.DmsPlanMaintVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养计划信息Mapper接口 + * + * @author zch + * @date 2025-03-21 + */ +public interface DmsPlanMaintMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintProjectService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintProjectService.java new file mode 100644 index 00000000..d70868a1 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintProjectService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseMaintProject; +import org.dromara.dms.domain.vo.DmsBaseMaintProjectVo; +import org.dromara.dms.domain.bo.DmsBaseMaintProjectBo; +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 zch + * @date 2025-03-21 + */ +public interface IDmsBaseMaintProjectService { + + /** + * 查询保养项目信息 + * + * @param maintProjectId 主键 + * @return 保养项目信息 + */ + DmsBaseMaintProjectVo queryById(Long maintProjectId); + + /** + * 分页查询保养项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养项目信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseMaintProjectBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养项目信息列表 + * + * @param bo 查询条件 + * @return 保养项目信息列表 + */ + List queryList(DmsBaseMaintProjectBo bo); + + /** + * 新增保养项目信息 + * + * @param bo 保养项目信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseMaintProjectBo bo); + + /** + * 修改保养项目信息 + * + * @param bo 保养项目信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseMaintProjectBo bo); + + /** + * 校验并批量删除保养项目信息信息 + * + * @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/IDmsBaseMaintStandardService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintStandardService.java new file mode 100644 index 00000000..26385c2d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintStandardService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseMaintStandard; +import org.dromara.dms.domain.vo.DmsBaseMaintStandardVo; +import org.dromara.dms.domain.bo.DmsBaseMaintStandardBo; +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 zch + * @date 2025-03-21 + */ +public interface IDmsBaseMaintStandardService { + + /** + * 查询保养标准信息 + * + * @param maintStandardId 主键 + * @return 保养标准信息 + */ + DmsBaseMaintStandardVo queryById(Long maintStandardId); + + /** + * 分页查询保养标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养标准信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseMaintStandardBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养标准信息列表 + * + * @param bo 查询条件 + * @return 保养标准信息列表 + */ + List queryList(DmsBaseMaintStandardBo bo); + + /** + * 新增保养标准信息 + * + * @param bo 保养标准信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseMaintStandardBo bo); + + /** + * 修改保养标准信息 + * + * @param bo 保养标准信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseMaintStandardBo bo); + + /** + * 校验并批量删除保养标准信息信息 + * + * @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/IDmsBaseMaintStationService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintStationService.java new file mode 100644 index 00000000..075c9e0e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMaintStationService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseMaintStation; +import org.dromara.dms.domain.vo.DmsBaseMaintStationVo; +import org.dromara.dms.domain.bo.DmsBaseMaintStationBo; +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 zch + * @date 2025-03-21 + */ +public interface IDmsBaseMaintStationService { + + /** + * 查询保养部位信息 + * + * @param maintStationId 主键 + * @return 保养部位信息 + */ + DmsBaseMaintStationVo queryById(Long maintStationId); + + /** + * 分页查询保养部位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养部位信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseMaintStationBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养部位信息列表 + * + * @param bo 查询条件 + * @return 保养部位信息列表 + */ + List queryList(DmsBaseMaintStationBo bo); + + /** + * 新增保养部位信息 + * + * @param bo 保养部位信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseMaintStationBo bo); + + /** + * 修改保养部位信息 + * + * @param bo 保养部位信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseMaintStationBo bo); + + /** + * 校验并批量删除保养部位信息信息 + * + * @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/IDmsBaseStationProjectService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseStationProjectService.java new file mode 100644 index 00000000..1e0aa3d5 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseStationProjectService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseStationProject; +import org.dromara.dms.domain.vo.DmsBaseStationProjectVo; +import org.dromara.dms.domain.bo.DmsBaseStationProjectBo; +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 zch + * @date 2025-03-21 + */ +public interface IDmsBaseStationProjectService { + + /** + * 查询保养部位关联项目信息 + * + * @param maintStationId 主键 + * @return 保养部位关联项目信息 + */ + DmsBaseStationProjectVo queryById(Long maintStationId); + + /** + * 分页查询保养部位关联项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养部位关联项目信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseStationProjectBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养部位关联项目信息列表 + * + * @param bo 查询条件 + * @return 保养部位关联项目信息列表 + */ + List queryList(DmsBaseStationProjectBo bo); + + /** + * 新增保养部位关联项目信息 + * + * @param bo 保养部位关联项目信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseStationProjectBo bo); + + /** + * 修改保养部位关联项目信息 + * + * @param bo 保养部位关联项目信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseStationProjectBo bo); + + /** + * 校验并批量删除保养部位关联项目信息信息 + * + * @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/IDmsPlanMaintDetailService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsPlanMaintDetailService.java new file mode 100644 index 00000000..6e69c5d2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsPlanMaintDetailService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsPlanMaintDetail; +import org.dromara.dms.domain.vo.DmsPlanMaintDetailVo; +import org.dromara.dms.domain.bo.DmsPlanMaintDetailBo; +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 zch + * @date 2025-03-21 + */ +public interface IDmsPlanMaintDetailService { + + /** + * 查询保养计划明细 + * + * @param planMaintDetailId 主键 + * @return 保养计划明细 + */ + DmsPlanMaintDetailVo queryById(Long planMaintDetailId); + + /** + * 分页查询保养计划明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养计划明细分页列表 + */ + TableDataInfo queryPageList(DmsPlanMaintDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养计划明细列表 + * + * @param bo 查询条件 + * @return 保养计划明细列表 + */ + List queryList(DmsPlanMaintDetailBo bo); + + /** + * 新增保养计划明细 + * + * @param bo 保养计划明细 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsPlanMaintDetailBo bo); + + /** + * 修改保养计划明细 + * + * @param bo 保养计划明细 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsPlanMaintDetailBo bo); + + /** + * 校验并批量删除保养计划明细信息 + * + * @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/IDmsPlanMaintService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsPlanMaintService.java new file mode 100644 index 00000000..50be8c7c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsPlanMaintService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsPlanMaint; +import org.dromara.dms.domain.vo.DmsPlanMaintVo; +import org.dromara.dms.domain.bo.DmsPlanMaintBo; +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 zch + * @date 2025-03-21 + */ +public interface IDmsPlanMaintService { + + /** + * 查询保养计划信息 + * + * @param planMaintId 主键 + * @return 保养计划信息 + */ + DmsPlanMaintVo queryById(Long planMaintId); + + /** + * 分页查询保养计划信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养计划信息分页列表 + */ + TableDataInfo queryPageList(DmsPlanMaintBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养计划信息列表 + * + * @param bo 查询条件 + * @return 保养计划信息列表 + */ + List queryList(DmsPlanMaintBo bo); + + /** + * 新增保养计划信息 + * + * @param bo 保养计划信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsPlanMaintBo bo); + + /** + * 修改保养计划信息 + * + * @param bo 保养计划信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsPlanMaintBo bo); + + /** + * 校验并批量删除保养计划信息信息 + * + * @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/DmsBaseMaintProjectServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintProjectServiceImpl.java new file mode 100644 index 00000000..6255a3d1 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintProjectServiceImpl.java @@ -0,0 +1,135 @@ +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.DmsBaseMaintProjectBo; +import org.dromara.dms.domain.vo.DmsBaseMaintProjectVo; +import org.dromara.dms.domain.DmsBaseMaintProject; +import org.dromara.dms.mapper.DmsBaseMaintProjectMapper; +import org.dromara.dms.service.IDmsBaseMaintProjectService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养项目信息Service业务层处理 + * + * @author zch + * @date 2025-03-21 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseMaintProjectServiceImpl implements IDmsBaseMaintProjectService { + + private final DmsBaseMaintProjectMapper baseMapper; + + /** + * 查询保养项目信息 + * + * @param maintProjectId 主键 + * @return 保养项目信息 + */ + @Override + public DmsBaseMaintProjectVo queryById(Long maintProjectId){ + return baseMapper.selectVoById(maintProjectId); + } + + /** + * 分页查询保养项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养项目信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseMaintProjectBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养项目信息列表 + * + * @param bo 查询条件 + * @return 保养项目信息列表 + */ + @Override + public List queryList(DmsBaseMaintProjectBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseMaintProjectBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseMaintProject.class) + .selectAll(DmsBaseMaintProject.class) + .eq(bo.getMaintProjectId() != null, DmsBaseMaintProject::getMaintProjectId, bo.getMaintProjectId()) + .like(StringUtils.isNotBlank(bo.getMaintProjectName()), DmsBaseMaintProject::getMaintProjectName, bo.getMaintProjectName()) + .eq(StringUtils.isNotBlank(bo.getMaintProjectDesc()), DmsBaseMaintProject::getMaintProjectDesc, bo.getMaintProjectDesc()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseMaintProject::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseMaintProject::getCreateTime); + return lqw; + } + + /** + * 新增保养项目信息 + * + * @param bo 保养项目信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseMaintProjectBo bo) { + DmsBaseMaintProject add = MapstructUtils.convert(bo, DmsBaseMaintProject.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMaintProjectId(add.getMaintProjectId()); + } + return flag; + } + + /** + * 修改保养项目信息 + * + * @param bo 保养项目信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseMaintProjectBo bo) { + DmsBaseMaintProject update = MapstructUtils.convert(bo, DmsBaseMaintProject.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseMaintProject 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStandardServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStandardServiceImpl.java new file mode 100644 index 00000000..590d4404 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStandardServiceImpl.java @@ -0,0 +1,143 @@ +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.dromara.dms.domain.DmsBaseDeviceType; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseMaintStandardBo; +import org.dromara.dms.domain.vo.DmsBaseMaintStandardVo; +import org.dromara.dms.domain.DmsBaseMaintStandard; +import org.dromara.dms.mapper.DmsBaseMaintStandardMapper; +import org.dromara.dms.service.IDmsBaseMaintStandardService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养标准信息Service业务层处理 + * + * @author zch + * @date 2025-03-21 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardService { + + private final DmsBaseMaintStandardMapper baseMapper; + + /** + * 查询保养标准信息 + * + * @param maintStandardId 主键 + * @return 保养标准信息 + */ + @Override + public DmsBaseMaintStandardVo queryById(Long maintStandardId){ + return baseMapper.selectVoById(maintStandardId); + } + + /** + * 分页查询保养标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养标准信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseMaintStandardBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养标准信息列表 + * + * @param bo 查询条件 + * @return 保养标准信息列表 + */ + @Override + public List queryList(DmsBaseMaintStandardBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseMaintStandardBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseMaintStandard.class) + .selectAll(DmsBaseMaintStandard.class) + + //关联查询设备类型 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId,DmsBaseMaintStandard::getDeviceTypeId) + + .eq(bo.getMaintStandardId() != null, DmsBaseMaintStandard::getMaintStandardId, bo.getMaintStandardId()) + .eq(StringUtils.isNotBlank(bo.getMaintStandardCode()), DmsBaseMaintStandard::getMaintStandardCode, bo.getMaintStandardCode()) + .eq(bo.getDeviceTypeId() != null, DmsBaseMaintStandard::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(StringUtils.isNotBlank(bo.getMaintProtocol()), DmsBaseMaintStandard::getMaintProtocol, bo.getMaintProtocol()) + .eq(StringUtils.isNotBlank(bo.getOperationDescription()), DmsBaseMaintStandard::getOperationDescription, bo.getOperationDescription()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseMaintStandard::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseMaintStandard::getCreateTime); + return lqw; + } + + /** + * 新增保养标准信息 + * + * @param bo 保养标准信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseMaintStandardBo bo) { + DmsBaseMaintStandard add = MapstructUtils.convert(bo, DmsBaseMaintStandard.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMaintStandardId(add.getMaintStandardId()); + } + return flag; + } + + /** + * 修改保养标准信息 + * + * @param bo 保养标准信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseMaintStandardBo bo) { + DmsBaseMaintStandard update = MapstructUtils.convert(bo, DmsBaseMaintStandard.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseMaintStandard 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStationServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStationServiceImpl.java new file mode 100644 index 00000000..1c3670ec --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMaintStationServiceImpl.java @@ -0,0 +1,148 @@ +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.dromara.dms.domain.DmsBaseDeviceType; +import org.dromara.dms.domain.DmsBaseMaintStandard; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseMaintStationBo; +import org.dromara.dms.domain.vo.DmsBaseMaintStationVo; +import org.dromara.dms.domain.DmsBaseMaintStation; +import org.dromara.dms.mapper.DmsBaseMaintStationMapper; +import org.dromara.dms.service.IDmsBaseMaintStationService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养部位信息Service业务层处理 + * + * @author zch + * @date 2025-03-21 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationService { + + private final DmsBaseMaintStationMapper baseMapper; + + /** + * 查询保养部位信息 + * + * @param maintStationId 主键 + * @return 保养部位信息 + */ + @Override + public DmsBaseMaintStationVo queryById(Long maintStationId){ + return baseMapper.selectVoById(maintStationId); + } + + /** + * 分页查询保养部位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养部位信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseMaintStationBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养部位信息列表 + * + * @param bo 查询条件 + * @return 保养部位信息列表 + */ + @Override + public List queryList(DmsBaseMaintStationBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseMaintStationBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseMaintStation.class) + .selectAll(DmsBaseMaintStation.class) + + //关联查询设备类型信息 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMaintStation::getDeviceTypeId) + + //关联查询保养标准信息 + .select(DmsBaseMaintStandard::getMaintStandardCode) + .leftJoin(DmsBaseMaintStandard.class, DmsBaseMaintStandard::getMaintStandardId, DmsBaseMaintStation::getMaintStandardId) + + .eq(bo.getMaintStationId() != null, DmsBaseMaintStation::getMaintStationId, bo.getMaintStationId()) + .eq(bo.getDeviceTypeId() != null, DmsBaseMaintStation::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(bo.getMaintStandardId() != null, DmsBaseMaintStation::getMaintStandardId, bo.getMaintStandardId()) + .eq(StringUtils.isNotBlank(bo.getMaintStationCode()), DmsBaseMaintStation::getMaintStationCode, bo.getMaintStationCode()) + .like(StringUtils.isNotBlank(bo.getMaintStationName()), DmsBaseMaintStation::getMaintStationName, bo.getMaintStationName()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseMaintStation::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseMaintStation::getCreateTime); + return lqw; + } + + /** + * 新增保养部位信息 + * + * @param bo 保养部位信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseMaintStationBo bo) { + DmsBaseMaintStation add = MapstructUtils.convert(bo, DmsBaseMaintStation.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMaintStationId(add.getMaintStationId()); + } + return flag; + } + + /** + * 修改保养部位信息 + * + * @param bo 保养部位信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseMaintStationBo bo) { + DmsBaseMaintStation update = MapstructUtils.convert(bo, DmsBaseMaintStation.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseMaintStation 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseStationProjectServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseStationProjectServiceImpl.java new file mode 100644 index 00000000..a9a0afec --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseStationProjectServiceImpl.java @@ -0,0 +1,133 @@ +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.DmsBaseStationProjectBo; +import org.dromara.dms.domain.vo.DmsBaseStationProjectVo; +import org.dromara.dms.domain.DmsBaseStationProject; +import org.dromara.dms.mapper.DmsBaseStationProjectMapper; +import org.dromara.dms.service.IDmsBaseStationProjectService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养部位关联项目信息Service业务层处理 + * + * @author zch + * @date 2025-03-21 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseStationProjectServiceImpl implements IDmsBaseStationProjectService { + + private final DmsBaseStationProjectMapper baseMapper; + + /** + * 查询保养部位关联项目信息 + * + * @param maintStationId 主键 + * @return 保养部位关联项目信息 + */ + @Override + public DmsBaseStationProjectVo queryById(Long maintStationId){ + return baseMapper.selectVoById(maintStationId); + } + + /** + * 分页查询保养部位关联项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养部位关联项目信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseStationProjectBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养部位关联项目信息列表 + * + * @param bo 查询条件 + * @return 保养部位关联项目信息列表 + */ + @Override + public List queryList(DmsBaseStationProjectBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseStationProjectBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseStationProject.class) + .selectAll(DmsBaseStationProject.class) + .eq(bo.getMaintStationId() != null, DmsBaseStationProject::getMaintStationId, bo.getMaintStationId()) + .eq(bo.getMaintProjectId() != null, DmsBaseStationProject::getMaintProjectId, bo.getMaintProjectId()) + .orderByDesc(DmsBaseStationProject::getCreateTime); + return lqw; + } + + /** + * 新增保养部位关联项目信息 + * + * @param bo 保养部位关联项目信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseStationProjectBo bo) { + DmsBaseStationProject add = MapstructUtils.convert(bo, DmsBaseStationProject.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMaintStationId(add.getMaintStationId()); + } + return flag; + } + + /** + * 修改保养部位关联项目信息 + * + * @param bo 保养部位关联项目信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseStationProjectBo bo) { + DmsBaseStationProject update = MapstructUtils.convert(bo, DmsBaseStationProject.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseStationProject 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintDetailServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintDetailServiceImpl.java new file mode 100644 index 00000000..d99f5296 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintDetailServiceImpl.java @@ -0,0 +1,155 @@ +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.dromara.dms.domain.*; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsPlanMaintDetailBo; +import org.dromara.dms.domain.vo.DmsPlanMaintDetailVo; +import org.dromara.dms.mapper.DmsPlanMaintDetailMapper; +import org.dromara.dms.service.IDmsPlanMaintDetailService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养计划明细Service业务层处理 + * + * @author zch + * @date 2025-03-21 + */ +@RequiredArgsConstructor +@Service +public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService { + + private final DmsPlanMaintDetailMapper baseMapper; + + /** + * 查询保养计划明细 + * + * @param planMaintDetailId 主键 + * @return 保养计划明细 + */ + @Override + public DmsPlanMaintDetailVo queryById(Long planMaintDetailId){ + return baseMapper.selectVoById(planMaintDetailId); + } + + /** + * 分页查询保养计划明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养计划明细分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsPlanMaintDetailBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养计划明细列表 + * + * @param bo 查询条件 + * @return 保养计划明细列表 + */ + @Override + public List queryList(DmsPlanMaintDetailBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsPlanMaintDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsPlanMaintDetail.class) + .selectAll(DmsPlanMaintDetail.class) + + //关联查询保养部位 + .select(DmsBaseMaintStation::getMaintStationName) + .leftJoin(DmsBaseMaintStation.class,DmsBaseMaintStation::getMaintStationId,DmsPlanMaintDetail::getMaintStationId) + + //关联查询设备 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class,DmsBaseMachineInfo::getMachineId,DmsPlanMaintDetail::getMachineId) + + //关联查询保养标准 + .select(DmsBaseMaintStandard::getMaintStandardCode) + .leftJoin(DmsBaseMaintStandard.class, DmsBaseMaintStandard::getMaintStandardId,DmsPlanMaintDetail::getMaintStandardId) + + //关联查询保养计划 + .select(DmsPlanMaint::getPlanMaintCode) + .leftJoin(DmsPlanMaint.class, DmsPlanMaint::getPlanMaintId,DmsPlanMaintDetail::getPlanMaintId) + + + .eq(bo.getPlanMaintDetailId() != null, DmsPlanMaintDetail::getPlanMaintDetailId, bo.getPlanMaintDetailId()) + .eq(bo.getPlanMaintId() != null, DmsPlanMaintDetail::getPlanMaintId, bo.getPlanMaintId()) + .eq(bo.getMachineId() != null, DmsPlanMaintDetail::getMachineId, bo.getMachineId()) + .eq(bo.getMaintStationId() != null, DmsPlanMaintDetail::getMaintStationId, bo.getMaintStationId()) + .eq(bo.getMaintStandardId() != null, DmsPlanMaintDetail::getMaintStandardId, bo.getMaintStandardId()) + .eq(StringUtils.isNotBlank(bo.getOperationDescription()), DmsPlanMaintDetail::getOperationDescription, bo.getOperationDescription()) + .orderByDesc(DmsPlanMaintDetail::getCreateTime); + return lqw; + } + + /** + * 新增保养计划明细 + * + * @param bo 保养计划明细 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsPlanMaintDetailBo bo) { + DmsPlanMaintDetail add = MapstructUtils.convert(bo, DmsPlanMaintDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPlanMaintDetailId(add.getPlanMaintDetailId()); + } + return flag; + } + + /** + * 修改保养计划明细 + * + * @param bo 保养计划明细 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsPlanMaintDetailBo bo) { + DmsPlanMaintDetail update = MapstructUtils.convert(bo, DmsPlanMaintDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsPlanMaintDetail 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintServiceImpl.java new file mode 100644 index 00000000..00073b7e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanMaintServiceImpl.java @@ -0,0 +1,143 @@ +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.DmsPlanMaintBo; +import org.dromara.dms.domain.vo.DmsPlanMaintVo; +import org.dromara.dms.domain.DmsPlanMaint; +import org.dromara.dms.mapper.DmsPlanMaintMapper; +import org.dromara.dms.service.IDmsPlanMaintService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养计划信息Service业务层处理 + * + * @author zch + * @date 2025-03-21 + */ +@RequiredArgsConstructor +@Service +public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService { + + private final DmsPlanMaintMapper baseMapper; + + /** + * 查询保养计划信息 + * + * @param planMaintId 主键 + * @return 保养计划信息 + */ + @Override + public DmsPlanMaintVo queryById(Long planMaintId){ + return baseMapper.selectVoById(planMaintId); + } + + /** + * 分页查询保养计划信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养计划信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsPlanMaintBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养计划信息列表 + * + * @param bo 查询条件 + * @return 保养计划信息列表 + */ + @Override + public List queryList(DmsPlanMaintBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsPlanMaintBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsPlanMaint.class) + .selectAll(DmsPlanMaint.class) + .eq(bo.getPlanMaintId() != null, DmsPlanMaint::getPlanMaintId, bo.getPlanMaintId()) + .eq(StringUtils.isNotBlank(bo.getPlanMaintCode()), DmsPlanMaint::getPlanMaintCode, bo.getPlanMaintCode()) + .eq(StringUtils.isNotBlank(bo.getMaintLevel()), DmsPlanMaint::getMaintLevel, bo.getMaintLevel()) + .eq(StringUtils.isNotBlank(bo.getMaintGroup()), DmsPlanMaint::getMaintGroup, bo.getMaintGroup()) + .eq(StringUtils.isNotBlank(bo.getMaintSupervisor()), DmsPlanMaint::getMaintSupervisor, bo.getMaintSupervisor()) + .eq(bo.getMaintTime() != null, DmsPlanMaint::getMaintTime, bo.getMaintTime()) + .eq(bo.getJobId() != null, DmsPlanMaint::getJobId, bo.getJobId()) + .eq(bo.getTimeLimit() != null, DmsPlanMaint::getTimeLimit, bo.getTimeLimit()) + .eq(bo.getCyclePeriod() != null, DmsPlanMaint::getCyclePeriod, bo.getCyclePeriod()) + .eq(bo.getMaintStatus() != null, DmsPlanMaint::getMaintStatus, bo.getMaintStatus()) + .eq(bo.getCreateMethod() != null, DmsPlanMaint::getCreateMethod, bo.getCreateMethod()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsPlanMaint::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsPlanMaint::getCreateTime); + return lqw; + } + + /** + * 新增保养计划信息 + * + * @param bo 保养计划信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsPlanMaintBo bo) { + DmsPlanMaint add = MapstructUtils.convert(bo, DmsPlanMaint.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPlanMaintId(add.getPlanMaintId()); + } + return flag; + } + + /** + * 修改保养计划信息 + * + * @param bo 保养计划信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsPlanMaintBo bo) { + DmsPlanMaint update = MapstructUtils.convert(bo, DmsPlanMaint.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsPlanMaint 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/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml new file mode 100644 index 00000000..c65a696f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml new file mode 100644 index 00000000..adc06876 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml new file mode 100644 index 00000000..58e93200 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml new file mode 100644 index 00000000..fd093819 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml new file mode 100644 index 00000000..2ec48e7c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml new file mode 100644 index 00000000..7a8a7188 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml @@ -0,0 +1,7 @@ + + + + + From a675a825d654b337b6051491aae4eb6951b6e3a5 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 24 Mar 2025 15:19:26 +0800 Subject: [PATCH 3/7] =?UTF-8?q?add(dms):=20=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=B0=83=E8=AF=95=E3=80=81=E9=85=8D=E5=A5=97=E3=80=81?= =?UTF-8?q?=E6=B6=A6=E6=BB=91=E6=A0=87=E5=87=86=E3=80=81=E6=B6=A6=E6=BB=91?= =?UTF-8?q?=E9=83=A8=E4=BD=8D=E3=80=81=E7=89=B9=E7=A7=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=8E=E7=9F=A5=E8=AF=86=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E3=80=81=E4=BF=9D=E5=85=BB=E3=80=81=E6=B6=A6?= =?UTF-8?q?=E6=BB=91=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E9=80=BB=E8=BE=91=E5=B7=B2=E5=AE=8C=E5=96=84=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E6=B5=8B=E8=AF=95=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=86=8D?= =?UTF-8?q?=E4=BB=94=E7=BB=86=E5=AF=B9=E6=AF=94=E4=BA=AC=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增相关功能，包括信息的增删改查与连表查询 - 添加了相应的实体类、业务对象、控制器、Mapper和XML文件 --- .../DmsBaseDeviceDebuggingController.java | 117 +++++++++++++ .../DmsBaseDeviceSuppliesController.java | 117 +++++++++++++ .../DmsBaseLubeStandardController.java | 117 +++++++++++++ .../DmsBaseLubeStationController.java | 117 +++++++++++++ .../DmsBaseSpecialdeviceParamController.java | 117 +++++++++++++ .../DmsKnowledgeLubeController.java | 117 +++++++++++++ .../DmsKnowledgeMaintController.java | 117 +++++++++++++ .../DmsKnowledgeRepairController.java | 117 +++++++++++++ .../dms/domain/DmsBaseDeviceDebugging.java | 69 ++++++++ .../dms/domain/DmsBaseDeviceSupplies.java | 62 +++++++ .../dms/domain/DmsBaseLubeStandard.java | 66 +++++++ .../dms/domain/DmsBaseLubeStation.java | 72 ++++++++ .../dms/domain/DmsBaseSpecialdeviceParam.java | 71 ++++++++ .../dromara/dms/domain/DmsKnowledgeLube.java | 77 +++++++++ .../dromara/dms/domain/DmsKnowledgeMaint.java | 77 +++++++++ .../dms/domain/DmsKnowledgeRepair.java | 72 ++++++++ .../domain/bo/DmsBaseDeviceDebuggingBo.java | 64 +++++++ .../domain/bo/DmsBaseDeviceSuppliesBo.java | 56 ++++++ .../dms/domain/bo/DmsBaseLubeStandardBo.java | 61 +++++++ .../dms/domain/bo/DmsBaseLubeStationBo.java | 62 +++++++ .../bo/DmsBaseSpecialdeviceParamBo.java | 68 ++++++++ .../dms/domain/bo/DmsKnowledgeLubeBo.java | 66 +++++++ .../dms/domain/bo/DmsKnowledgeMaintBo.java | 66 +++++++ .../dms/domain/bo/DmsKnowledgeRepairBo.java | 66 +++++++ .../domain/vo/DmsBaseDeviceDebuggingVo.java | 82 +++++++++ .../domain/vo/DmsBaseDeviceSuppliesVo.java | 73 ++++++++ .../dms/domain/vo/DmsBaseLubeStandardVo.java | 79 +++++++++ .../dms/domain/vo/DmsBaseLubeStationVo.java | 85 +++++++++ .../vo/DmsBaseSpecialdeviceParamVo.java | 86 +++++++++ .../dms/domain/vo/DmsKnowledgeLubeVo.java | 90 ++++++++++ .../dms/domain/vo/DmsKnowledgeMaintVo.java | 90 ++++++++++ .../dms/domain/vo/DmsKnowledgeRepairVo.java | 85 +++++++++ .../mapper/DmsBaseDeviceDebuggingMapper.java | 15 ++ .../mapper/DmsBaseDeviceSuppliesMapper.java | 15 ++ .../dms/mapper/DmsBaseLubeStandardMapper.java | 15 ++ .../dms/mapper/DmsBaseLubeStationMapper.java | 15 ++ .../DmsBaseSpecialdeviceParamMapper.java | 15 ++ .../dms/mapper/DmsKnowledgeLubeMapper.java | 15 ++ .../dms/mapper/DmsKnowledgeMaintMapper.java | 15 ++ .../dms/mapper/DmsKnowledgeRepairMapper.java | 15 ++ .../IDmsBaseDeviceDebuggingService.java | 69 ++++++++ .../IDmsBaseDeviceSuppliesService.java | 69 ++++++++ .../service/IDmsBaseLubeStandardService.java | 69 ++++++++ .../service/IDmsBaseLubeStationService.java | 69 ++++++++ .../IDmsBaseSpecialdeviceParamService.java | 69 ++++++++ .../dms/service/IDmsKnowledgeLubeService.java | 69 ++++++++ .../service/IDmsKnowledgeMaintService.java | 69 ++++++++ .../service/IDmsKnowledgeRepairService.java | 69 ++++++++ .../impl/BaseDeviceCategoryServiceImpl.java | 4 +- .../DmsBaseDeviceDebuggingServiceImpl.java | 143 +++++++++++++++ .../DmsBaseDeviceSuppliesServiceImpl.java | 157 +++++++++++++++++ .../impl/DmsBaseLubeStandardServiceImpl.java | 156 +++++++++++++++++ .../impl/DmsBaseLubeStationServiceImpl.java | 157 +++++++++++++++++ .../DmsBaseSpecialdeviceParamServiceImpl.java | 156 +++++++++++++++++ .../impl/DmsKnowledgeLubeServiceImpl.java | 160 +++++++++++++++++ .../impl/DmsKnowledgeMaintServiceImpl.java | 163 ++++++++++++++++++ .../impl/DmsKnowledgeRepairServiceImpl.java | 160 +++++++++++++++++ .../dms/DmsBaseDeviceDebuggingMapper.xml | 7 + .../dms/DmsBaseDeviceSuppliesMapper.xml | 7 + .../mapper/dms/DmsBaseLubeStandardMapper.xml | 7 + .../mapper/dms/DmsBaseLubeStationMapper.xml | 7 + .../dms/DmsBaseSpecialdeviceParamMapper.xml | 7 + .../mapper/dms/DmsKnowledgeLubeMapper.xml | 7 + .../mapper/dms/DmsKnowledgeMaintMapper.xml | 7 + .../mapper/dms/DmsKnowledgeRepairMapper.xml | 7 + 65 files changed, 4663 insertions(+), 2 deletions(-) create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceSuppliesController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStandardController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStationController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseSpecialdeviceParamController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeLubeController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeMaintController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeRepairController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStandard.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStation.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseSpecialdeviceParam.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeLube.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeMaint.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeRepair.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceDebuggingBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStandardBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStationBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseSpecialdeviceParamBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeLubeBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeMaintBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeRepairBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStandardVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStationVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseSpecialdeviceParamVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeLubeVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeMaintVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeRepairVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceDebuggingMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceSuppliesMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStandardMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStationMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseSpecialdeviceParamMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeLubeMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeMaintMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeRepairMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceSuppliesService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseLubeStandardService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseLubeStationService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseSpecialdeviceParamService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeLubeService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeMaintService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeRepairService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceSuppliesServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseLubeStandardServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseLubeStationServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeLubeServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeMaintServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeRepairServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseDeviceDebuggingMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuppliesMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeLubeMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeMaintMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.java new file mode 100644 index 00000000..2ef87037 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.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.DmsBaseDeviceDebuggingVo; +import org.dromara.dms.domain.bo.DmsBaseDeviceDebuggingBo; +import org.dromara.dms.service.IDmsBaseDeviceDebuggingService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备调试信息 + * 前端访问路由地址为:/dms/dmsBaseDeviceDebugging + * + * @author Yinq + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseDeviceDebugging") +public class DmsBaseDeviceDebuggingController extends BaseController { + + private final IDmsBaseDeviceDebuggingService dmsBaseDeviceDebuggingService; + + /** + * 查询设备调试信息列表 + */ + @SaCheckPermission("dms:dmsBaseDeviceDebugging:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseDeviceDebuggingBo bo, PageQuery pageQuery) { + return dmsBaseDeviceDebuggingService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备调试信息列表 + */ + @SaCheckPermission("dms:dmsBaseDeviceDebugging:export") + @Log(title = "设备调试信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseDeviceDebuggingBo bo, HttpServletResponse response) { + List list = dmsBaseDeviceDebuggingService.queryList(bo); + ExcelUtil.exportExcel(list, "设备调试信息", DmsBaseDeviceDebuggingVo.class, response); + } + + /** + * 获取设备调试信息详细信息 + * + * @param deviceDebuggingId 主键 + */ + @SaCheckPermission("dms:dmsBaseDeviceDebugging:query") + @GetMapping("/{deviceDebuggingId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long deviceDebuggingId) { + return R.ok(dmsBaseDeviceDebuggingService.queryById(deviceDebuggingId)); + } + + /** + * 新增设备调试信息 + */ + @SaCheckPermission("dms:dmsBaseDeviceDebugging:add") + @Log(title = "设备调试信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseDeviceDebuggingBo bo) { + return toAjax(dmsBaseDeviceDebuggingService.insertByBo(bo)); + } + + /** + * 修改设备调试信息 + */ + @SaCheckPermission("dms:dmsBaseDeviceDebugging:edit") + @Log(title = "设备调试信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseDeviceDebuggingBo bo) { + return toAjax(dmsBaseDeviceDebuggingService.updateByBo(bo)); + } + + /** + * 删除设备调试信息 + * + * @param deviceDebuggingIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseDeviceDebugging:remove") + @Log(title = "设备调试信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{deviceDebuggingIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] deviceDebuggingIds) { + return toAjax(dmsBaseDeviceDebuggingService.deleteWithValidByIds(List.of(deviceDebuggingIds), true)); + } + + + /** + * 下拉框查询设备调试信息列表 + */ + + @GetMapping("/getDmsBaseDeviceDebuggingList") + public R> getDmsBaseDeviceDebuggingList(DmsBaseDeviceDebuggingBo bo) { + List list = dmsBaseDeviceDebuggingService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceSuppliesController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceSuppliesController.java new file mode 100644 index 00000000..c9ce2ede --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceSuppliesController.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.DmsBaseDeviceSuppliesVo; +import org.dromara.dms.domain.bo.DmsBaseDeviceSuppliesBo; +import org.dromara.dms.service.IDmsBaseDeviceSuppliesService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备配套信息 + * 前端访问路由地址为:/dms/dmsBaseDeviceSupplies + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseDeviceSupplies") +public class DmsBaseDeviceSuppliesController extends BaseController { + + private final IDmsBaseDeviceSuppliesService dmsBaseDeviceSuppliesService; + + /** + * 查询设备配套信息列表 + */ + @SaCheckPermission("dms:dmsBaseDeviceSupplies:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseDeviceSuppliesBo bo, PageQuery pageQuery) { + return dmsBaseDeviceSuppliesService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备配套信息列表 + */ + @SaCheckPermission("dms:dmsBaseDeviceSupplies:export") + @Log(title = "设备配套信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseDeviceSuppliesBo bo, HttpServletResponse response) { + List list = dmsBaseDeviceSuppliesService.queryList(bo); + ExcelUtil.exportExcel(list, "设备配套信息", DmsBaseDeviceSuppliesVo.class, response); + } + + /** + * 获取设备配套信息详细信息 + * + * @param deviceSuppliesId 主键 + */ + @SaCheckPermission("dms:dmsBaseDeviceSupplies:query") + @GetMapping("/{deviceSuppliesId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long deviceSuppliesId) { + return R.ok(dmsBaseDeviceSuppliesService.queryById(deviceSuppliesId)); + } + + /** + * 新增设备配套信息 + */ + @SaCheckPermission("dms:dmsBaseDeviceSupplies:add") + @Log(title = "设备配套信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseDeviceSuppliesBo bo) { + return toAjax(dmsBaseDeviceSuppliesService.insertByBo(bo)); + } + + /** + * 修改设备配套信息 + */ + @SaCheckPermission("dms:dmsBaseDeviceSupplies:edit") + @Log(title = "设备配套信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseDeviceSuppliesBo bo) { + return toAjax(dmsBaseDeviceSuppliesService.updateByBo(bo)); + } + + /** + * 删除设备配套信息 + * + * @param deviceSuppliesIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseDeviceSupplies:remove") + @Log(title = "设备配套信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{deviceSuppliesIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] deviceSuppliesIds) { + return toAjax(dmsBaseDeviceSuppliesService.deleteWithValidByIds(List.of(deviceSuppliesIds), true)); + } + + + /** + * 下拉框查询设备配套信息列表 + */ + + @GetMapping("/getDmsBaseDeviceSuppliesList") + public R> getDmsBaseDeviceSuppliesList(DmsBaseDeviceSuppliesBo bo) { + List list = dmsBaseDeviceSuppliesService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStandardController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStandardController.java new file mode 100644 index 00000000..1a0d0140 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStandardController.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.DmsBaseLubeStandardVo; +import org.dromara.dms.domain.bo.DmsBaseLubeStandardBo; +import org.dromara.dms.service.IDmsBaseLubeStandardService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 润滑标准信息 + * 前端访问路由地址为:/dms/dmsBaseLubeStandard + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseLubeStandard") +public class DmsBaseLubeStandardController extends BaseController { + + private final IDmsBaseLubeStandardService dmsBaseLubeStandardService; + + /** + * 查询润滑标准信息列表 + */ + @SaCheckPermission("dms:dmsBaseLubeStandard:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseLubeStandardBo bo, PageQuery pageQuery) { + return dmsBaseLubeStandardService.queryPageList(bo, pageQuery); + } + + /** + * 导出润滑标准信息列表 + */ + @SaCheckPermission("dms:dmsBaseLubeStandard:export") + @Log(title = "润滑标准信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseLubeStandardBo bo, HttpServletResponse response) { + List list = dmsBaseLubeStandardService.queryList(bo); + ExcelUtil.exportExcel(list, "润滑标准信息", DmsBaseLubeStandardVo.class, response); + } + + /** + * 获取润滑标准信息详细信息 + * + * @param lubeStandardId 主键 + */ + @SaCheckPermission("dms:dmsBaseLubeStandard:query") + @GetMapping("/{lubeStandardId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long lubeStandardId) { + return R.ok(dmsBaseLubeStandardService.queryById(lubeStandardId)); + } + + /** + * 新增润滑标准信息 + */ + @SaCheckPermission("dms:dmsBaseLubeStandard:add") + @Log(title = "润滑标准信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseLubeStandardBo bo) { + return toAjax(dmsBaseLubeStandardService.insertByBo(bo)); + } + + /** + * 修改润滑标准信息 + */ + @SaCheckPermission("dms:dmsBaseLubeStandard:edit") + @Log(title = "润滑标准信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseLubeStandardBo bo) { + return toAjax(dmsBaseLubeStandardService.updateByBo(bo)); + } + + /** + * 删除润滑标准信息 + * + * @param lubeStandardIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseLubeStandard:remove") + @Log(title = "润滑标准信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{lubeStandardIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] lubeStandardIds) { + return toAjax(dmsBaseLubeStandardService.deleteWithValidByIds(List.of(lubeStandardIds), true)); + } + + + /** + * 下拉框查询润滑标准信息列表 + */ + + @GetMapping("/getDmsBaseLubeStandardList") + public R> getDmsBaseLubeStandardList(DmsBaseLubeStandardBo bo) { + List list = dmsBaseLubeStandardService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStationController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStationController.java new file mode 100644 index 00000000..a0ed0b8b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseLubeStationController.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.DmsBaseLubeStationVo; +import org.dromara.dms.domain.bo.DmsBaseLubeStationBo; +import org.dromara.dms.service.IDmsBaseLubeStationService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 润滑部位信息 + * 前端访问路由地址为:/dms/dmsBaseLubeStation + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseLubeStation") +public class DmsBaseLubeStationController extends BaseController { + + private final IDmsBaseLubeStationService dmsBaseLubeStationService; + + /** + * 查询润滑部位信息列表 + */ + @SaCheckPermission("dms:dmsBaseLubeStation:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseLubeStationBo bo, PageQuery pageQuery) { + return dmsBaseLubeStationService.queryPageList(bo, pageQuery); + } + + /** + * 导出润滑部位信息列表 + */ + @SaCheckPermission("dms:dmsBaseLubeStation:export") + @Log(title = "润滑部位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseLubeStationBo bo, HttpServletResponse response) { + List list = dmsBaseLubeStationService.queryList(bo); + ExcelUtil.exportExcel(list, "润滑部位信息", DmsBaseLubeStationVo.class, response); + } + + /** + * 获取润滑部位信息详细信息 + * + * @param lubeStationId 主键 + */ + @SaCheckPermission("dms:dmsBaseLubeStation:query") + @GetMapping("/{lubeStationId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long lubeStationId) { + return R.ok(dmsBaseLubeStationService.queryById(lubeStationId)); + } + + /** + * 新增润滑部位信息 + */ + @SaCheckPermission("dms:dmsBaseLubeStation:add") + @Log(title = "润滑部位信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseLubeStationBo bo) { + return toAjax(dmsBaseLubeStationService.insertByBo(bo)); + } + + /** + * 修改润滑部位信息 + */ + @SaCheckPermission("dms:dmsBaseLubeStation:edit") + @Log(title = "润滑部位信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseLubeStationBo bo) { + return toAjax(dmsBaseLubeStationService.updateByBo(bo)); + } + + /** + * 删除润滑部位信息 + * + * @param lubeStationIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseLubeStation:remove") + @Log(title = "润滑部位信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{lubeStationIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] lubeStationIds) { + return toAjax(dmsBaseLubeStationService.deleteWithValidByIds(List.of(lubeStationIds), true)); + } + + + /** + * 下拉框查询润滑部位信息列表 + */ + + @GetMapping("/getDmsBaseLubeStationList") + public R> getDmsBaseLubeStationList(DmsBaseLubeStationBo bo) { + List list = dmsBaseLubeStationService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseSpecialdeviceParamController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseSpecialdeviceParamController.java new file mode 100644 index 00000000..98316537 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseSpecialdeviceParamController.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.DmsBaseSpecialdeviceParamVo; +import org.dromara.dms.domain.bo.DmsBaseSpecialdeviceParamBo; +import org.dromara.dms.service.IDmsBaseSpecialdeviceParamService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 特种设备参数信息 + * 前端访问路由地址为:/dms/dmsBaseSpecialdeviceParam + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseSpecialdeviceParam") +public class DmsBaseSpecialdeviceParamController extends BaseController { + + private final IDmsBaseSpecialdeviceParamService dmsBaseSpecialdeviceParamService; + + /** + * 查询特种设备参数信息列表 + */ + @SaCheckPermission("dms:dmsBaseSpecialdeviceParam:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseSpecialdeviceParamBo bo, PageQuery pageQuery) { + return dmsBaseSpecialdeviceParamService.queryPageList(bo, pageQuery); + } + + /** + * 导出特种设备参数信息列表 + */ + @SaCheckPermission("dms:dmsBaseSpecialdeviceParam:export") + @Log(title = "特种设备参数信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseSpecialdeviceParamBo bo, HttpServletResponse response) { + List list = dmsBaseSpecialdeviceParamService.queryList(bo); + ExcelUtil.exportExcel(list, "特种设备参数信息", DmsBaseSpecialdeviceParamVo.class, response); + } + + /** + * 获取特种设备参数信息详细信息 + * + * @param specialdeviceParamId 主键 + */ + @SaCheckPermission("dms:dmsBaseSpecialdeviceParam:query") + @GetMapping("/{specialdeviceParamId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long specialdeviceParamId) { + return R.ok(dmsBaseSpecialdeviceParamService.queryById(specialdeviceParamId)); + } + + /** + * 新增特种设备参数信息 + */ + @SaCheckPermission("dms:dmsBaseSpecialdeviceParam:add") + @Log(title = "特种设备参数信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseSpecialdeviceParamBo bo) { + return toAjax(dmsBaseSpecialdeviceParamService.insertByBo(bo)); + } + + /** + * 修改特种设备参数信息 + */ + @SaCheckPermission("dms:dmsBaseSpecialdeviceParam:edit") + @Log(title = "特种设备参数信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseSpecialdeviceParamBo bo) { + return toAjax(dmsBaseSpecialdeviceParamService.updateByBo(bo)); + } + + /** + * 删除特种设备参数信息 + * + * @param specialdeviceParamIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseSpecialdeviceParam:remove") + @Log(title = "特种设备参数信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{specialdeviceParamIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] specialdeviceParamIds) { + return toAjax(dmsBaseSpecialdeviceParamService.deleteWithValidByIds(List.of(specialdeviceParamIds), true)); + } + + + /** + * 下拉框查询特种设备参数信息列表 + */ + + @GetMapping("/getDmsBaseSpecialdeviceParamList") + public R> getDmsBaseSpecialdeviceParamList(DmsBaseSpecialdeviceParamBo bo) { + List list = dmsBaseSpecialdeviceParamService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeLubeController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeLubeController.java new file mode 100644 index 00000000..46911298 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeLubeController.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.DmsKnowledgeLubeVo; +import org.dromara.dms.domain.bo.DmsKnowledgeLubeBo; +import org.dromara.dms.service.IDmsKnowledgeLubeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 润滑知识库 + * 前端访问路由地址为:/dms/dmsKnowledgeLube + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsKnowledgeLube") +public class DmsKnowledgeLubeController extends BaseController { + + private final IDmsKnowledgeLubeService dmsKnowledgeLubeService; + + /** + * 查询润滑知识库列表 + */ + @SaCheckPermission("dms:dmsKnowledgeLube:list") + @GetMapping("/list") + public TableDataInfo list(DmsKnowledgeLubeBo bo, PageQuery pageQuery) { + return dmsKnowledgeLubeService.queryPageList(bo, pageQuery); + } + + /** + * 导出润滑知识库列表 + */ + @SaCheckPermission("dms:dmsKnowledgeLube:export") + @Log(title = "润滑知识库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsKnowledgeLubeBo bo, HttpServletResponse response) { + List list = dmsKnowledgeLubeService.queryList(bo); + ExcelUtil.exportExcel(list, "润滑知识库", DmsKnowledgeLubeVo.class, response); + } + + /** + * 获取润滑知识库详细信息 + * + * @param knowledgeLubeId 主键 + */ + @SaCheckPermission("dms:dmsKnowledgeLube:query") + @GetMapping("/{knowledgeLubeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long knowledgeLubeId) { + return R.ok(dmsKnowledgeLubeService.queryById(knowledgeLubeId)); + } + + /** + * 新增润滑知识库 + */ + @SaCheckPermission("dms:dmsKnowledgeLube:add") + @Log(title = "润滑知识库", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsKnowledgeLubeBo bo) { + return toAjax(dmsKnowledgeLubeService.insertByBo(bo)); + } + + /** + * 修改润滑知识库 + */ + @SaCheckPermission("dms:dmsKnowledgeLube:edit") + @Log(title = "润滑知识库", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsKnowledgeLubeBo bo) { + return toAjax(dmsKnowledgeLubeService.updateByBo(bo)); + } + + /** + * 删除润滑知识库 + * + * @param knowledgeLubeIds 主键串 + */ + @SaCheckPermission("dms:dmsKnowledgeLube:remove") + @Log(title = "润滑知识库", businessType = BusinessType.DELETE) + @DeleteMapping("/{knowledgeLubeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] knowledgeLubeIds) { + return toAjax(dmsKnowledgeLubeService.deleteWithValidByIds(List.of(knowledgeLubeIds), true)); + } + + + /** + * 下拉框查询润滑知识库列表 + */ + + @GetMapping("/getDmsKnowledgeLubeList") + public R> getDmsKnowledgeLubeList(DmsKnowledgeLubeBo bo) { + List list = dmsKnowledgeLubeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeMaintController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeMaintController.java new file mode 100644 index 00000000..1b306ffa --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeMaintController.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.DmsKnowledgeMaintVo; +import org.dromara.dms.domain.bo.DmsKnowledgeMaintBo; +import org.dromara.dms.service.IDmsKnowledgeMaintService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养知识库 + * 前端访问路由地址为:/dms/dmsKnowledgeMaint + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsKnowledgeMaint") +public class DmsKnowledgeMaintController extends BaseController { + + private final IDmsKnowledgeMaintService dmsKnowledgeMaintService; + + /** + * 查询保养知识库列表 + */ + @SaCheckPermission("dms:dmsKnowledgeMaint:list") + @GetMapping("/list") + public TableDataInfo list(DmsKnowledgeMaintBo bo, PageQuery pageQuery) { + return dmsKnowledgeMaintService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养知识库列表 + */ + @SaCheckPermission("dms:dmsKnowledgeMaint:export") + @Log(title = "保养知识库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsKnowledgeMaintBo bo, HttpServletResponse response) { + List list = dmsKnowledgeMaintService.queryList(bo); + ExcelUtil.exportExcel(list, "保养知识库", DmsKnowledgeMaintVo.class, response); + } + + /** + * 获取保养知识库详细信息 + * + * @param knowledgeMaintId 主键 + */ + @SaCheckPermission("dms:dmsKnowledgeMaint:query") + @GetMapping("/{knowledgeMaintId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long knowledgeMaintId) { + return R.ok(dmsKnowledgeMaintService.queryById(knowledgeMaintId)); + } + + /** + * 新增保养知识库 + */ + @SaCheckPermission("dms:dmsKnowledgeMaint:add") + @Log(title = "保养知识库", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsKnowledgeMaintBo bo) { + return toAjax(dmsKnowledgeMaintService.insertByBo(bo)); + } + + /** + * 修改保养知识库 + */ + @SaCheckPermission("dms:dmsKnowledgeMaint:edit") + @Log(title = "保养知识库", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsKnowledgeMaintBo bo) { + return toAjax(dmsKnowledgeMaintService.updateByBo(bo)); + } + + /** + * 删除保养知识库 + * + * @param knowledgeMaintIds 主键串 + */ + @SaCheckPermission("dms:dmsKnowledgeMaint:remove") + @Log(title = "保养知识库", businessType = BusinessType.DELETE) + @DeleteMapping("/{knowledgeMaintIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] knowledgeMaintIds) { + return toAjax(dmsKnowledgeMaintService.deleteWithValidByIds(List.of(knowledgeMaintIds), true)); + } + + + /** + * 下拉框查询保养知识库列表 + */ + + @GetMapping("/getDmsKnowledgeMaintList") + public R> getDmsKnowledgeMaintList(DmsKnowledgeMaintBo bo) { + List list = dmsKnowledgeMaintService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeRepairController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeRepairController.java new file mode 100644 index 00000000..126b9b7a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsKnowledgeRepairController.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.DmsKnowledgeRepairVo; +import org.dromara.dms.domain.bo.DmsKnowledgeRepairBo; +import org.dromara.dms.service.IDmsKnowledgeRepairService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 维修知识库 + * 前端访问路由地址为:/dms/dmsKnowledgeRepair + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsKnowledgeRepair") +public class DmsKnowledgeRepairController extends BaseController { + + private final IDmsKnowledgeRepairService dmsKnowledgeRepairService; + + /** + * 查询维修知识库列表 + */ + @SaCheckPermission("dms:dmsKnowledgeRepair:list") + @GetMapping("/list") + public TableDataInfo list(DmsKnowledgeRepairBo bo, PageQuery pageQuery) { + return dmsKnowledgeRepairService.queryPageList(bo, pageQuery); + } + + /** + * 导出维修知识库列表 + */ + @SaCheckPermission("dms:dmsKnowledgeRepair:export") + @Log(title = "维修知识库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsKnowledgeRepairBo bo, HttpServletResponse response) { + List list = dmsKnowledgeRepairService.queryList(bo); + ExcelUtil.exportExcel(list, "维修知识库", DmsKnowledgeRepairVo.class, response); + } + + /** + * 获取维修知识库详细信息 + * + * @param knowledgeRepairId 主键 + */ + @SaCheckPermission("dms:dmsKnowledgeRepair:query") + @GetMapping("/{knowledgeRepairId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long knowledgeRepairId) { + return R.ok(dmsKnowledgeRepairService.queryById(knowledgeRepairId)); + } + + /** + * 新增维修知识库 + */ + @SaCheckPermission("dms:dmsKnowledgeRepair:add") + @Log(title = "维修知识库", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsKnowledgeRepairBo bo) { + return toAjax(dmsKnowledgeRepairService.insertByBo(bo)); + } + + /** + * 修改维修知识库 + */ + @SaCheckPermission("dms:dmsKnowledgeRepair:edit") + @Log(title = "维修知识库", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsKnowledgeRepairBo bo) { + return toAjax(dmsKnowledgeRepairService.updateByBo(bo)); + } + + /** + * 删除维修知识库 + * + * @param knowledgeRepairIds 主键串 + */ + @SaCheckPermission("dms:dmsKnowledgeRepair:remove") + @Log(title = "维修知识库", businessType = BusinessType.DELETE) + @DeleteMapping("/{knowledgeRepairIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] knowledgeRepairIds) { + return toAjax(dmsKnowledgeRepairService.deleteWithValidByIds(List.of(knowledgeRepairIds), true)); + } + + + /** + * 下拉框查询维修知识库列表 + */ + + @GetMapping("/getDmsKnowledgeRepairList") + public R> getDmsKnowledgeRepairList(DmsKnowledgeRepairBo bo) { + List list = dmsKnowledgeRepairService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java new file mode 100644 index 00000000..e5c7bc07 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java @@ -0,0 +1,69 @@ +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; + +/** + * 设备调试信息对象 dms_base_device_debugging + * + * @author Yinq + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_device_debugging") +public class DmsBaseDeviceDebugging extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "device_debugging_id", type = IdType.AUTO) + private Long deviceDebuggingId; + + /** + * 调试单号 + */ + private String workOrder; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 调试状态(0未调试 1调试中 2已完成) + */ + private String status; + + /** + * 调试时间 + */ + private Date debugTime; + + /** + * 调试人员 + */ + private String debugPerson; + + /** + * 备注 + */ + private String remark; + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java new file mode 100644 index 00000000..477971ad --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java @@ -0,0 +1,62 @@ +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.io.Serial; + +/** + * 设备配套信息对象 dms_base_device_supplies + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_device_supplies") +public class DmsBaseDeviceSupplies extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "device_supplies_id", type = IdType.AUTO) + private Long deviceSuppliesId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 配套信息名称 + */ + private String suppliesName; + + /** + * 类型（1耗材 2备件） + */ + private String suppliesType; + + /** + * 需要数量 + */ + private Long requireAmount; + + /** + * 备注 + */ + private String remark; + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStandard.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStandard.java new file mode 100644 index 00000000..06dc2a9e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStandard.java @@ -0,0 +1,66 @@ +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.io.Serial; + +/** + * 润滑标准信息对象 dms_base_lube_standard + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_lube_standard") +public class DmsBaseLubeStandard extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "lube_standard_id", type = IdType.AUTO) + private Long lubeStandardId; + + /** + * 标准编号 + */ + private String lubeStandardCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 润滑标准 + */ + private String lubeProtocol; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStation.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStation.java new file mode 100644 index 00000000..da1fa8cc --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseLubeStation.java @@ -0,0 +1,72 @@ +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.io.Serial; + +/** + * 润滑部位信息对象 dms_base_lube_station + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_lube_station") +public class DmsBaseLubeStation extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "lube_station_id", type = IdType.AUTO) + private Long lubeStationId; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 润滑标准ID，关联润滑标准信息主键 + */ + private String lubeStandardId; + + /** + * 部位编号 + */ + private String lubeStationCode; + + /** + * 部位名称 + */ + private String lubeStationName; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + + /** + * 标准编号 + */ + @TableField(exist = false) + private String lubeStandardCode;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseSpecialdeviceParam.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseSpecialdeviceParam.java new file mode 100644 index 00000000..49e69d17 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseSpecialdeviceParam.java @@ -0,0 +1,71 @@ +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.io.Serial; + +/** + * 特种设备参数信息对象 dms_base_specialdevice_param + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_specialdevice_param") +public class DmsBaseSpecialdeviceParam extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "specialdevice_param_id", type = IdType.AUTO) + private Long specialdeviceParamId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 参数编号 + */ + private String paramCode; + + /** + * 参数名称 + */ + private String paramName; + + /** + * 参数值 + */ + private String paramValue; + + /** + * 参数单位 + */ + private String paramUnit; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 设备名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeLube.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeLube.java new file mode 100644 index 00000000..0c507b0d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeLube.java @@ -0,0 +1,77 @@ +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.io.Serial; + +/** + * 润滑知识库对象 dms_knowledge_lube + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_knowledge_lube") +public class DmsKnowledgeLube extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "knowledge_lube_id", type = IdType.AUTO) + private Long knowledgeLubeId; + + /** + * 经验编号 + */ + private String experienceCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 润滑部位，关联dms_base_lube_station的lube_station_id + */ + private Long lubeStationId; + + /** + * 润滑标准 + */ + private String protocolCode; + + /** + * 操作描述 + */ + private String operationsDescription; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + + /** + * 部位名称 + */ + @TableField(exist = false) + private String lubeStationName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeMaint.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeMaint.java new file mode 100644 index 00000000..c02e6b53 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeMaint.java @@ -0,0 +1,77 @@ +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.io.Serial; + +/** + * 保养知识库对象 dms_knowledge_maint + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_knowledge_maint") +public class DmsKnowledgeMaint extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "knowledge_maint_id", type = IdType.AUTO) + private Long knowledgeMaintId; + + /** + * 经验编号 + */ + private String experienceCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 保养部位，关联dms_base_maint_station的maint_station_id + */ + private Long maintStationId; + + /** + * 保养标准 + */ + private String maintProtocol; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + + /** + * 部位名称 + */ + @TableField(exist = false) + private String maintStationName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeRepair.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeRepair.java new file mode 100644 index 00000000..935c1373 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsKnowledgeRepair.java @@ -0,0 +1,72 @@ +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.io.Serial; + +/** + * 维修知识库对象 dms_knowledge_repair + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_knowledge_repair") +public class DmsKnowledgeRepair extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "knowledge_repair_id", type = IdType.AUTO) + private Long knowledgeRepairId; + + /** + * 经验编号 + */ + private String experienceCode; + + /** + * 设备类型ID，关联dm_base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 故障描述 + */ + private String faultDescription; + + /** + * 涉及操作 + */ + private String designOperations; + + /** + * 操作描述 + */ + private String operationsDescription; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceDebuggingBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceDebuggingBo.java new file mode 100644 index 00000000..982e70f8 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceDebuggingBo.java @@ -0,0 +1,64 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseDeviceDebugging; +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; + +/** + * 设备调试信息业务对象 dms_base_device_debugging + * + * @author Yinq + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseDeviceDebugging.class, reverseConvertGenerate = false) +public class DmsBaseDeviceDebuggingBo extends BaseEntity { + + /** + * 主键ID + */ + private Long deviceDebuggingId; + + /** + * 调试单号 + */ + @NotBlank(message = "调试单号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String workOrder; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 调试状态(0未调试 1调试中 2已完成) + */ + private String status; + + /** + * 调试时间 + */ + private Date debugTime; + + /** + * 调试人员 + */ + private String debugPerson; + + /** + * 备注 + */ + private String remark; + + + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java new file mode 100644 index 00000000..07834027 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java @@ -0,0 +1,56 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseDeviceSupplies; +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.*; + +/** + * 设备配套信息业务对象 dms_base_device_supplies + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseDeviceSupplies.class, reverseConvertGenerate = false) +public class DmsBaseDeviceSuppliesBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long deviceSuppliesId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @NotNull(message = "设备ID，关联prod_base_machine_info的machine_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 配套信息名称 + */ + @NotBlank(message = "配套信息名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String suppliesName; + + /** + * 类型（1耗材 2备件） + */ + private String suppliesType; + + /** + * 需要数量 + */ + private Long requireAmount; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStandardBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStandardBo.java new file mode 100644 index 00000000..9674a9f6 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStandardBo.java @@ -0,0 +1,61 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseLubeStandard; +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.*; + +/** + * 润滑标准信息业务对象 dms_base_lube_standard + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseLubeStandard.class, reverseConvertGenerate = false) +public class DmsBaseLubeStandardBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long lubeStandardId; + + /** + * 标准编号 + */ + @NotBlank(message = "标准编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String lubeStandardCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 润滑标准 + */ + private String lubeProtocol; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStationBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStationBo.java new file mode 100644 index 00000000..c8ade9bf --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseLubeStationBo.java @@ -0,0 +1,62 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseLubeStation; +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.*; + +/** + * 润滑部位信息业务对象 dms_base_lube_station + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseLubeStation.class, reverseConvertGenerate = false) +public class DmsBaseLubeStationBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long lubeStationId; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @NotNull(message = "设备类型ID，关联base_device_type的device_type_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deviceTypeId; + + /** + * 润滑标准ID，关联润滑标准信息主键 + */ + private String lubeStandardId; + + /** + * 部位编号 + */ + @NotBlank(message = "部位编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String lubeStationCode; + + /** + * 部位名称 + */ + private String lubeStationName; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseSpecialdeviceParamBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseSpecialdeviceParamBo.java new file mode 100644 index 00000000..de0b9ea4 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseSpecialdeviceParamBo.java @@ -0,0 +1,68 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseSpecialdeviceParam; +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.*; + +/** + * 特种设备参数信息业务对象 dms_base_specialdevice_param + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseSpecialdeviceParam.class, reverseConvertGenerate = false) +public class DmsBaseSpecialdeviceParamBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long specialdeviceParamId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @NotNull(message = "设备ID，关联prod_base_machine_info的machine_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 参数编号 + */ + @NotBlank(message = "参数编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String paramCode; + + /** + * 参数名称 + */ + @NotBlank(message = "参数名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String paramName; + + /** + * 参数值 + */ + private String paramValue; + + /** + * 参数单位 + */ + private String paramUnit; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeLubeBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeLubeBo.java new file mode 100644 index 00000000..b6d035a2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeLubeBo.java @@ -0,0 +1,66 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsKnowledgeLube; +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.*; + +/** + * 润滑知识库业务对象 dms_knowledge_lube + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsKnowledgeLube.class, reverseConvertGenerate = false) +public class DmsKnowledgeLubeBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long knowledgeLubeId; + + /** + * 经验编号 + */ + @NotBlank(message = "经验编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String experienceCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 润滑部位，关联dms_base_lube_station的lube_station_id + */ + private Long lubeStationId; + + /** + * 润滑标准 + */ + private String protocolCode; + + /** + * 操作描述 + */ + private String operationsDescription; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeMaintBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeMaintBo.java new file mode 100644 index 00000000..4a71c65d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeMaintBo.java @@ -0,0 +1,66 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsKnowledgeMaint; +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.*; + +/** + * 保养知识库业务对象 dms_knowledge_maint + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsKnowledgeMaint.class, reverseConvertGenerate = false) +public class DmsKnowledgeMaintBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long knowledgeMaintId; + + /** + * 经验编号 + */ + @NotBlank(message = "经验编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String experienceCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 保养部位，关联dms_base_maint_station的maint_station_id + */ + private Long maintStationId; + + /** + * 保养标准 + */ + private String maintProtocol; + + /** + * 操作描述 + */ + private String operationDescription; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeRepairBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeRepairBo.java new file mode 100644 index 00000000..0e231b86 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsKnowledgeRepairBo.java @@ -0,0 +1,66 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsKnowledgeRepair; +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.*; + +/** + * 维修知识库业务对象 dms_knowledge_repair + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsKnowledgeRepair.class, reverseConvertGenerate = false) +public class DmsKnowledgeRepairBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long knowledgeRepairId; + + /** + * 经验编号 + */ + @NotBlank(message = "经验编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String experienceCode; + + /** + * 设备类型ID，关联dm_base_device_type的device_type_id + */ + private Long deviceTypeId; + + /** + * 故障描述 + */ + private String faultDescription; + + /** + * 涉及操作 + */ + private String designOperations; + + /** + * 操作描述 + */ + private String operationsDescription; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java new file mode 100644 index 00000000..e966ea7f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java @@ -0,0 +1,82 @@ +package org.dromara.dms.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.dms.domain.DmsBaseDeviceDebugging; +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; + + + +/** + * 设备调试信息视图对象 dms_base_device_debugging + * + * @author Yinq + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseDeviceDebugging.class) +public class DmsBaseDeviceDebuggingVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long deviceDebuggingId; + + /** + * 调试单号 + */ + @ExcelProperty(value = "调试单号") + private String workOrder; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID") + private Long machineId; + + /** + * 调试状态(0未调试 1调试中 2已完成) + */ + @ExcelProperty(value = "调试状态(0未调试 1调试中 2已完成)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "debug_status") + private String status; + + /** + * 调试时间 + */ + @ExcelProperty(value = "调试时间") + private Date debugTime; + + /** + * 调试人员 + */ + @ExcelProperty(value = "调试人员") + private String debugPerson; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 机台名称 + */ + private String machineName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java new file mode 100644 index 00000000..6f9e3d0a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java @@ -0,0 +1,73 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseDeviceSupplies; +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; + + + +/** + * 设备配套信息视图对象 dms_base_device_supplies + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseDeviceSupplies.class) +public class DmsBaseDeviceSuppliesVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long deviceSuppliesId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID") + private Long machineId; + + /** + * 配套信息名称 + */ + @ExcelProperty(value = "配套信息名称") + private String suppliesName; + + /** + * 类型（1耗材 2备件） + */ + @ExcelProperty(value = "类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "supplies_type") + private String suppliesType; + + /** + * 需要数量 + */ + @ExcelProperty(value = "需要数量") + private Long requireAmount; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 机台名称 + */ + private String machineName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStandardVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStandardVo.java new file mode 100644 index 00000000..8d9c6fb3 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStandardVo.java @@ -0,0 +1,79 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseLubeStandard; +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; + + + +/** + * 润滑标准信息视图对象 dms_base_lube_standard + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseLubeStandard.class) +public class DmsBaseLubeStandardVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long lubeStandardId; + + /** + * 标准编号 + */ + @ExcelProperty(value = "标准编号") + private String lubeStandardCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID，关联base_device_type的device_type_id") + private Long deviceTypeId; + + /** + * 润滑标准 + */ + @ExcelProperty(value = "润滑标准") + private String lubeProtocol; + + /** + * 操作描述 + */ + @ExcelProperty(value = "操作描述") + private String operationDescription; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 设备类型名称 + */ + private String deviceTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStationVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStationVo.java new file mode 100644 index 00000000..c447d43d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseLubeStationVo.java @@ -0,0 +1,85 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseLubeStation; +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; + + + +/** + * 润滑部位信息视图对象 dms_base_lube_station + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseLubeStation.class) +public class DmsBaseLubeStationVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long lubeStationId; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID") + private Long deviceTypeId; + + /** + * 润滑标准ID，关联润滑标准信息主键 + */ + @ExcelProperty(value = "润滑标准ID，关联润滑标准信息主键") + private String lubeStandardId; + + /** + * 部位编号 + */ + @ExcelProperty(value = "部位编号") + private String lubeStationCode; + + /** + * 部位名称 + */ + @ExcelProperty(value = "部位名称") + private String lubeStationName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 设备类型名称 + */ + private String deviceTypeName;//JOIN + + /** + * 标准编号 + */ + private String lubeStandardCode;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseSpecialdeviceParamVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseSpecialdeviceParamVo.java new file mode 100644 index 00000000..cf3927cd --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseSpecialdeviceParamVo.java @@ -0,0 +1,86 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseSpecialdeviceParam; +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; + + + +/** + * 特种设备参数信息视图对象 dms_base_specialdevice_param + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseSpecialdeviceParam.class) +public class DmsBaseSpecialdeviceParamVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long specialdeviceParamId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID") + private Long machineId; + + /** + * 参数编号 + */ + @ExcelProperty(value = "参数编号") + private String paramCode; + + /** + * 参数名称 + */ + @ExcelProperty(value = "参数名称") + private String paramName; + + /** + * 参数值 + */ + @ExcelProperty(value = "参数值") + private String paramValue; + + /** + * 参数单位 + */ + @ExcelProperty(value = "参数单位") + private String paramUnit; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 设备名称 + */ + private String machineName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeLubeVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeLubeVo.java new file mode 100644 index 00000000..53eaa9c2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeLubeVo.java @@ -0,0 +1,90 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsKnowledgeLube; +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; + + + +/** + * 润滑知识库视图对象 dms_knowledge_lube + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsKnowledgeLube.class) +public class DmsKnowledgeLubeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long knowledgeLubeId; + + /** + * 经验编号 + */ + @ExcelProperty(value = "经验编号") + private String experienceCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID") + private Long deviceTypeId; + + /** + * 润滑部位，关联dms_base_lube_station的lube_station_id + */ + @ExcelProperty(value = "润滑部位") + private Long lubeStationId; + + /** + * 润滑标准 + */ + @ExcelProperty(value = "润滑标准") + private String protocolCode; + + /** + * 操作描述 + */ + @ExcelProperty(value = "操作描述") + private String operationsDescription; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 设备类型名称 + */ + private String deviceTypeName;//JOIN + + /** + * 部位名称 + */ + private String lubeStationName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeMaintVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeMaintVo.java new file mode 100644 index 00000000..f1e2a398 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeMaintVo.java @@ -0,0 +1,90 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsKnowledgeMaint; +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; + + + +/** + * 保养知识库视图对象 dms_knowledge_maint + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsKnowledgeMaint.class) +public class DmsKnowledgeMaintVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long knowledgeMaintId; + + /** + * 经验编号 + */ + @ExcelProperty(value = "经验编号") + private String experienceCode; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID，关联base_device_type的device_type_id") + private Long deviceTypeId; + + /** + * 保养部位，关联dms_base_maint_station的maint_station_id + */ + @ExcelProperty(value = "保养部位") + private Long maintStationId; + + /** + * 保养标准 + */ + @ExcelProperty(value = "保养标准") + private String maintProtocol; + + /** + * 操作描述 + */ + @ExcelProperty(value = "操作描述") + private String operationDescription; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 设备类型名称 + */ + private String deviceTypeName;//JOIN + + /** + * 部位名称 + */ + private String maintStationName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeRepairVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeRepairVo.java new file mode 100644 index 00000000..9009f932 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsKnowledgeRepairVo.java @@ -0,0 +1,85 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsKnowledgeRepair; +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; + + + +/** + * 维修知识库视图对象 dms_knowledge_repair + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsKnowledgeRepair.class) +public class DmsKnowledgeRepairVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long knowledgeRepairId; + + /** + * 经验编号 + */ + @ExcelProperty(value = "经验编号") + private String experienceCode; + + /** + * 设备类型ID，关联dm_base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID，关联dm_base_device_type的device_type_id") + private Long deviceTypeId; + + /** + * 故障描述 + */ + @ExcelProperty(value = "故障描述") + private String faultDescription; + + /** + * 涉及操作 + */ + @ExcelProperty(value = "涉及操作") + private String designOperations; + + /** + * 操作描述 + */ + @ExcelProperty(value = "操作描述") + private String operationsDescription; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 设备类型名称 + */ + private String deviceTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceDebuggingMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceDebuggingMapper.java new file mode 100644 index 00000000..24208360 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceDebuggingMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseDeviceDebugging; +import org.dromara.dms.domain.vo.DmsBaseDeviceDebuggingVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备调试信息Mapper接口 + * + * @author Yinq + * @date 2025-03-24 + */ +public interface DmsBaseDeviceDebuggingMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceSuppliesMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceSuppliesMapper.java new file mode 100644 index 00000000..e456700a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseDeviceSuppliesMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseDeviceSupplies; +import org.dromara.dms.domain.vo.DmsBaseDeviceSuppliesVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备配套信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseDeviceSuppliesMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStandardMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStandardMapper.java new file mode 100644 index 00000000..60aaca4c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStandardMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseLubeStandard; +import org.dromara.dms.domain.vo.DmsBaseLubeStandardVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 润滑标准信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseLubeStandardMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStationMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStationMapper.java new file mode 100644 index 00000000..482eff3b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseLubeStationMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseLubeStation; +import org.dromara.dms.domain.vo.DmsBaseLubeStationVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 润滑部位信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseLubeStationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseSpecialdeviceParamMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseSpecialdeviceParamMapper.java new file mode 100644 index 00000000..62f5d1db --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseSpecialdeviceParamMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseSpecialdeviceParam; +import org.dromara.dms.domain.vo.DmsBaseSpecialdeviceParamVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 特种设备参数信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseSpecialdeviceParamMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeLubeMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeLubeMapper.java new file mode 100644 index 00000000..e449e5a9 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeLubeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsKnowledgeLube; +import org.dromara.dms.domain.vo.DmsKnowledgeLubeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 润滑知识库Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsKnowledgeLubeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeMaintMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeMaintMapper.java new file mode 100644 index 00000000..9652ba8d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeMaintMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsKnowledgeMaint; +import org.dromara.dms.domain.vo.DmsKnowledgeMaintVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养知识库Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsKnowledgeMaintMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeRepairMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeRepairMapper.java new file mode 100644 index 00000000..533fdce0 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsKnowledgeRepairMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsKnowledgeRepair; +import org.dromara.dms.domain.vo.DmsKnowledgeRepairVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 维修知识库Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsKnowledgeRepairMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java new file mode 100644 index 00000000..66ca0736 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseDeviceDebugging; +import org.dromara.dms.domain.vo.DmsBaseDeviceDebuggingVo; +import org.dromara.dms.domain.bo.DmsBaseDeviceDebuggingBo; +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 Yinq + * @date 2025-03-24 + */ +public interface IDmsBaseDeviceDebuggingService { + + /** + * 查询设备调试信息 + * + * @param deviceDebuggingId 主键 + * @return 设备调试信息 + */ + DmsBaseDeviceDebuggingVo queryById(Long deviceDebuggingId); + + /** + * 分页查询设备调试信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备调试信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseDeviceDebuggingBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备调试信息列表 + * + * @param bo 查询条件 + * @return 设备调试信息列表 + */ + List queryList(DmsBaseDeviceDebuggingBo bo); + + /** + * 新增设备调试信息 + * + * @param bo 设备调试信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseDeviceDebuggingBo bo); + + /** + * 修改设备调试信息 + * + * @param bo 设备调试信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseDeviceDebuggingBo bo); + + /** + * 校验并批量删除设备调试信息信息 + * + * @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/IDmsBaseDeviceSuppliesService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceSuppliesService.java new file mode 100644 index 00000000..fb0281ec --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceSuppliesService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseDeviceSupplies; +import org.dromara.dms.domain.vo.DmsBaseDeviceSuppliesVo; +import org.dromara.dms.domain.bo.DmsBaseDeviceSuppliesBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseDeviceSuppliesService { + + /** + * 查询设备配套信息 + * + * @param deviceSuppliesId 主键 + * @return 设备配套信息 + */ + DmsBaseDeviceSuppliesVo queryById(Long deviceSuppliesId); + + /** + * 分页查询设备配套信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备配套信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseDeviceSuppliesBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备配套信息列表 + * + * @param bo 查询条件 + * @return 设备配套信息列表 + */ + List queryList(DmsBaseDeviceSuppliesBo bo); + + /** + * 新增设备配套信息 + * + * @param bo 设备配套信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseDeviceSuppliesBo bo); + + /** + * 修改设备配套信息 + * + * @param bo 设备配套信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseDeviceSuppliesBo bo); + + /** + * 校验并批量删除设备配套信息信息 + * + * @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/IDmsBaseLubeStandardService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseLubeStandardService.java new file mode 100644 index 00000000..71124515 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseLubeStandardService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseLubeStandard; +import org.dromara.dms.domain.vo.DmsBaseLubeStandardVo; +import org.dromara.dms.domain.bo.DmsBaseLubeStandardBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseLubeStandardService { + + /** + * 查询润滑标准信息 + * + * @param lubeStandardId 主键 + * @return 润滑标准信息 + */ + DmsBaseLubeStandardVo queryById(Long lubeStandardId); + + /** + * 分页查询润滑标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 润滑标准信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseLubeStandardBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的润滑标准信息列表 + * + * @param bo 查询条件 + * @return 润滑标准信息列表 + */ + List queryList(DmsBaseLubeStandardBo bo); + + /** + * 新增润滑标准信息 + * + * @param bo 润滑标准信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseLubeStandardBo bo); + + /** + * 修改润滑标准信息 + * + * @param bo 润滑标准信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseLubeStandardBo bo); + + /** + * 校验并批量删除润滑标准信息信息 + * + * @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/IDmsBaseLubeStationService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseLubeStationService.java new file mode 100644 index 00000000..77c6113f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseLubeStationService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseLubeStation; +import org.dromara.dms.domain.vo.DmsBaseLubeStationVo; +import org.dromara.dms.domain.bo.DmsBaseLubeStationBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseLubeStationService { + + /** + * 查询润滑部位信息 + * + * @param lubeStationId 主键 + * @return 润滑部位信息 + */ + DmsBaseLubeStationVo queryById(Long lubeStationId); + + /** + * 分页查询润滑部位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 润滑部位信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseLubeStationBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的润滑部位信息列表 + * + * @param bo 查询条件 + * @return 润滑部位信息列表 + */ + List queryList(DmsBaseLubeStationBo bo); + + /** + * 新增润滑部位信息 + * + * @param bo 润滑部位信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseLubeStationBo bo); + + /** + * 修改润滑部位信息 + * + * @param bo 润滑部位信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseLubeStationBo bo); + + /** + * 校验并批量删除润滑部位信息信息 + * + * @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/IDmsBaseSpecialdeviceParamService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseSpecialdeviceParamService.java new file mode 100644 index 00000000..1ab79cfb --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseSpecialdeviceParamService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseSpecialdeviceParam; +import org.dromara.dms.domain.vo.DmsBaseSpecialdeviceParamVo; +import org.dromara.dms.domain.bo.DmsBaseSpecialdeviceParamBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseSpecialdeviceParamService { + + /** + * 查询特种设备参数信息 + * + * @param specialdeviceParamId 主键 + * @return 特种设备参数信息 + */ + DmsBaseSpecialdeviceParamVo queryById(Long specialdeviceParamId); + + /** + * 分页查询特种设备参数信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 特种设备参数信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseSpecialdeviceParamBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的特种设备参数信息列表 + * + * @param bo 查询条件 + * @return 特种设备参数信息列表 + */ + List queryList(DmsBaseSpecialdeviceParamBo bo); + + /** + * 新增特种设备参数信息 + * + * @param bo 特种设备参数信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseSpecialdeviceParamBo bo); + + /** + * 修改特种设备参数信息 + * + * @param bo 特种设备参数信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseSpecialdeviceParamBo bo); + + /** + * 校验并批量删除特种设备参数信息信息 + * + * @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/IDmsKnowledgeLubeService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeLubeService.java new file mode 100644 index 00000000..1a0c73d3 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeLubeService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsKnowledgeLube; +import org.dromara.dms.domain.vo.DmsKnowledgeLubeVo; +import org.dromara.dms.domain.bo.DmsKnowledgeLubeBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsKnowledgeLubeService { + + /** + * 查询润滑知识库 + * + * @param knowledgeLubeId 主键 + * @return 润滑知识库 + */ + DmsKnowledgeLubeVo queryById(Long knowledgeLubeId); + + /** + * 分页查询润滑知识库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 润滑知识库分页列表 + */ + TableDataInfo queryPageList(DmsKnowledgeLubeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的润滑知识库列表 + * + * @param bo 查询条件 + * @return 润滑知识库列表 + */ + List queryList(DmsKnowledgeLubeBo bo); + + /** + * 新增润滑知识库 + * + * @param bo 润滑知识库 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsKnowledgeLubeBo bo); + + /** + * 修改润滑知识库 + * + * @param bo 润滑知识库 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsKnowledgeLubeBo bo); + + /** + * 校验并批量删除润滑知识库信息 + * + * @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/IDmsKnowledgeMaintService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeMaintService.java new file mode 100644 index 00000000..4b35b77a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeMaintService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsKnowledgeMaint; +import org.dromara.dms.domain.vo.DmsKnowledgeMaintVo; +import org.dromara.dms.domain.bo.DmsKnowledgeMaintBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsKnowledgeMaintService { + + /** + * 查询保养知识库 + * + * @param knowledgeMaintId 主键 + * @return 保养知识库 + */ + DmsKnowledgeMaintVo queryById(Long knowledgeMaintId); + + /** + * 分页查询保养知识库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养知识库分页列表 + */ + TableDataInfo queryPageList(DmsKnowledgeMaintBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养知识库列表 + * + * @param bo 查询条件 + * @return 保养知识库列表 + */ + List queryList(DmsKnowledgeMaintBo bo); + + /** + * 新增保养知识库 + * + * @param bo 保养知识库 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsKnowledgeMaintBo bo); + + /** + * 修改保养知识库 + * + * @param bo 保养知识库 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsKnowledgeMaintBo bo); + + /** + * 校验并批量删除保养知识库信息 + * + * @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/IDmsKnowledgeRepairService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeRepairService.java new file mode 100644 index 00000000..184bf4ed --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsKnowledgeRepairService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsKnowledgeRepair; +import org.dromara.dms.domain.vo.DmsKnowledgeRepairVo; +import org.dromara.dms.domain.bo.DmsKnowledgeRepairBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsKnowledgeRepairService { + + /** + * 查询维修知识库 + * + * @param knowledgeRepairId 主键 + * @return 维修知识库 + */ + DmsKnowledgeRepairVo queryById(Long knowledgeRepairId); + + /** + * 分页查询维修知识库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 维修知识库分页列表 + */ + TableDataInfo queryPageList(DmsKnowledgeRepairBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的维修知识库列表 + * + * @param bo 查询条件 + * @return 维修知识库列表 + */ + List queryList(DmsKnowledgeRepairBo bo); + + /** + * 新增维修知识库 + * + * @param bo 维修知识库 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsKnowledgeRepairBo bo); + + /** + * 修改维修知识库 + * + * @param bo 维修知识库 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsKnowledgeRepairBo bo); + + /** + * 校验并批量删除维修知识库信息 + * + * @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/BaseDeviceCategoryServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceCategoryServiceImpl.java index 785b2c49..50e3e192 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceCategoryServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceCategoryServiceImpl.java @@ -89,8 +89,8 @@ public class BaseDeviceCategoryServiceImpl implements IBaseDeviceCategoryService * @param bo 设备大类信息 * @return 是否新增成功 */ - @Override -/* public Boolean insertByBo(BaseDeviceCategoryBo bo) { +/* @Override + public Boolean insertByBo(BaseDeviceCategoryBo bo) { BaseDeviceCategory add = MapstructUtils.convert(bo, BaseDeviceCategory.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java new file mode 100644 index 00000000..6eccfb0d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java @@ -0,0 +1,143 @@ +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.dromara.dms.domain.DmsBaseMachineInfo; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseDeviceDebuggingBo; +import org.dromara.dms.domain.vo.DmsBaseDeviceDebuggingVo; +import org.dromara.dms.domain.DmsBaseDeviceDebugging; +import org.dromara.dms.mapper.DmsBaseDeviceDebuggingMapper; +import org.dromara.dms.service.IDmsBaseDeviceDebuggingService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备调试信息Service业务层处理 + * + * @author Yinq + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseDeviceDebuggingServiceImpl implements IDmsBaseDeviceDebuggingService { + + private final DmsBaseDeviceDebuggingMapper baseMapper; + + /** + * 查询设备调试信息 + * + * @param deviceDebuggingId 主键 + * @return 设备调试信息 + */ + @Override + public DmsBaseDeviceDebuggingVo queryById(Long deviceDebuggingId){ + return baseMapper.selectVoById(deviceDebuggingId); + } + + /** + * 分页查询设备调试信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备调试信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseDeviceDebuggingBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备调试信息列表 + * + * @param bo 查询条件 + * @return 设备调试信息列表 + */ + @Override + public List queryList(DmsBaseDeviceDebuggingBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseDeviceDebuggingBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseDeviceDebugging.class) + .selectAll(DmsBaseDeviceDebugging.class) + + //关联查询设备信息 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId,DmsBaseDeviceDebugging::getMachineId) + + .eq(bo.getDeviceDebuggingId() != null, DmsBaseDeviceDebugging::getDeviceDebuggingId, bo.getDeviceDebuggingId()) + .eq(StringUtils.isNotBlank(bo.getWorkOrder()), DmsBaseDeviceDebugging::getWorkOrder, bo.getWorkOrder()) + .eq(bo.getMachineId() != null, DmsBaseDeviceDebugging::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getStatus()), DmsBaseDeviceDebugging::getStatus, bo.getStatus()) + .eq(bo.getDebugTime() != null, DmsBaseDeviceDebugging::getDebugTime, bo.getDebugTime()) + .eq(StringUtils.isNotBlank(bo.getDebugPerson()), DmsBaseDeviceDebugging::getDebugPerson, bo.getDebugPerson()) + .orderByDesc(DmsBaseDeviceDebugging::getCreateTime); + return lqw; + } + + /** + * 新增设备调试信息 + * + * @param bo 设备调试信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseDeviceDebuggingBo bo) { + DmsBaseDeviceDebugging add = MapstructUtils.convert(bo, DmsBaseDeviceDebugging.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDeviceDebuggingId(add.getDeviceDebuggingId()); + } + return flag; + } + + /** + * 修改设备调试信息 + * + * @param bo 设备调试信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseDeviceDebuggingBo bo) { + DmsBaseDeviceDebugging update = MapstructUtils.convert(bo, DmsBaseDeviceDebugging.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseDeviceDebugging 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceSuppliesServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceSuppliesServiceImpl.java new file mode 100644 index 00000000..a72ad1c3 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceSuppliesServiceImpl.java @@ -0,0 +1,157 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.exception.ServiceException; +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.dromara.dms.domain.DmsBaseMachineInfo; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseDeviceSuppliesBo; +import org.dromara.dms.domain.vo.DmsBaseDeviceSuppliesVo; +import org.dromara.dms.domain.DmsBaseDeviceSupplies; +import org.dromara.dms.mapper.DmsBaseDeviceSuppliesMapper; +import org.dromara.dms.service.IDmsBaseDeviceSuppliesService; +import org.springframework.util.ObjectUtils; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备配套信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseDeviceSuppliesServiceImpl implements IDmsBaseDeviceSuppliesService { + + private final DmsBaseDeviceSuppliesMapper baseMapper; + + /** + * 查询设备配套信息 + * + * @param deviceSuppliesId 主键 + * @return 设备配套信息 + */ + @Override + public DmsBaseDeviceSuppliesVo queryById(Long deviceSuppliesId){ + return baseMapper.selectVoById(deviceSuppliesId); + } + + /** + * 分页查询设备配套信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备配套信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseDeviceSuppliesBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备配套信息列表 + * + * @param bo 查询条件 + * @return 设备配套信息列表 + */ + @Override + public List queryList(DmsBaseDeviceSuppliesBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseDeviceSuppliesBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseDeviceSupplies.class) + .selectAll(DmsBaseDeviceSupplies.class) + + //关联查询设备信息 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId, DmsBaseDeviceSupplies::getMachineId) + + .eq(bo.getDeviceSuppliesId() != null, DmsBaseDeviceSupplies::getDeviceSuppliesId, bo.getDeviceSuppliesId()) + .eq(bo.getMachineId() != null, DmsBaseDeviceSupplies::getMachineId, bo.getMachineId()) + .like(StringUtils.isNotBlank(bo.getSuppliesName()), DmsBaseDeviceSupplies::getSuppliesName, bo.getSuppliesName()) + .eq(StringUtils.isNotBlank(bo.getSuppliesType()), DmsBaseDeviceSupplies::getSuppliesType, bo.getSuppliesType()) + .eq(bo.getRequireAmount() != null, DmsBaseDeviceSupplies::getRequireAmount, bo.getRequireAmount()) + .orderByDesc(DmsBaseDeviceSupplies::getCreateTime); + return lqw; + } + + /** + * 新增设备配套信息 + * + * @param bo 设备配套信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseDeviceSuppliesBo bo) { + DmsBaseDeviceSupplies add = MapstructUtils.convert(bo, DmsBaseDeviceSupplies.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDeviceSuppliesId(add.getDeviceSuppliesId()); + } + return flag; + } + + /** + * 修改设备配套信息 + * + * @param bo 设备配套信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseDeviceSuppliesBo bo) { + DmsBaseDeviceSupplies update = MapstructUtils.convert(bo, DmsBaseDeviceSupplies.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseDeviceSupplies entity){ + //TODO 做一些数据校验,如唯一约束 + + // 名称校验 + if (StringUtils.isNotNull(entity.getSuppliesName())){ + DmsBaseDeviceSuppliesBo query = new DmsBaseDeviceSuppliesBo(); + query.setSuppliesName(entity.getSuppliesName()); + MPJLambdaWrapper lqw = buildQueryWrapper(query); + DmsBaseDeviceSupplies detail = baseMapper.selectOne(lqw); + if ( !ObjectUtils.isEmpty(detail) + && !detail.getDeviceSuppliesId().equals(entity.getDeviceSuppliesId())){ + throw new ServiceException("名称已存在"); + } + } + + } + + /** + * 校验并批量删除设备配套信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsBaseLubeStandardServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseLubeStandardServiceImpl.java new file mode 100644 index 00000000..7c320fd9 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseLubeStandardServiceImpl.java @@ -0,0 +1,156 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.exception.ServiceException; +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.dromara.dms.domain.DmsBaseDeviceType; +import org.dromara.dms.domain.DmsBaseLubeStation; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseLubeStandardBo; +import org.dromara.dms.domain.vo.DmsBaseLubeStandardVo; +import org.dromara.dms.domain.DmsBaseLubeStandard; +import org.dromara.dms.mapper.DmsBaseLubeStandardMapper; +import org.dromara.dms.service.IDmsBaseLubeStandardService; +import org.springframework.util.ObjectUtils; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 润滑标准信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardService { + + private final DmsBaseLubeStandardMapper baseMapper; + + /** + * 查询润滑标准信息 + * + * @param lubeStandardId 主键 + * @return 润滑标准信息 + */ + @Override + public DmsBaseLubeStandardVo queryById(Long lubeStandardId){ + return baseMapper.selectVoById(lubeStandardId); + } + + /** + * 分页查询润滑标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 润滑标准信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseLubeStandardBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的润滑标准信息列表 + * + * @param bo 查询条件 + * @return 润滑标准信息列表 + */ + @Override + public List queryList(DmsBaseLubeStandardBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseLubeStandardBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseLubeStandard.class) + .selectAll(DmsBaseLubeStandard.class) + + //关联查询设备类型 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId,DmsBaseLubeStandard::getDeviceTypeId) + + .eq(bo.getLubeStandardId() != null, DmsBaseLubeStandard::getLubeStandardId, bo.getLubeStandardId()) + .eq(StringUtils.isNotBlank(bo.getLubeStandardCode()), DmsBaseLubeStandard::getLubeStandardCode, bo.getLubeStandardCode()) + .eq(bo.getDeviceTypeId() != null, DmsBaseLubeStandard::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(StringUtils.isNotBlank(bo.getLubeProtocol()), DmsBaseLubeStandard::getLubeProtocol, bo.getLubeProtocol()) + .eq(StringUtils.isNotBlank(bo.getOperationDescription()), DmsBaseLubeStandard::getOperationDescription, bo.getOperationDescription()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseLubeStandard::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseLubeStandard::getCreateTime); + return lqw; + } + + /** + * 新增润滑标准信息 + * + * @param bo 润滑标准信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseLubeStandardBo bo) { + DmsBaseLubeStandard add = MapstructUtils.convert(bo, DmsBaseLubeStandard.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setLubeStandardId(add.getLubeStandardId()); + } + return flag; + } + + /** + * 修改润滑标准信息 + * + * @param bo 润滑标准信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseLubeStandardBo bo) { + DmsBaseLubeStandard update = MapstructUtils.convert(bo, DmsBaseLubeStandard.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseLubeStandard entity){ + //TODO 做一些数据校验,如唯一约束 + + if (StringUtils.isNotBlank(entity.getLubeStandardCode())){ + DmsBaseLubeStandardBo lubeStandard = new DmsBaseLubeStandardBo(); + lubeStandard.setLubeStandardCode(entity.getLubeStandardCode()); + MPJLambdaWrapper lqw = buildQueryWrapper(lubeStandard); + DmsBaseLubeStandard detail = baseMapper.selectOne(lqw); + if ( !ObjectUtils.isEmpty(detail) && !detail.getLubeStandardId().equals(entity.getLubeStandardId())){ + throw new ServiceException("润滑标准编号已存在"); + } + } + } + + /** + * 校验并批量删除润滑标准信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsBaseLubeStationServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseLubeStationServiceImpl.java new file mode 100644 index 00000000..6cd0e657 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseLubeStationServiceImpl.java @@ -0,0 +1,157 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.exception.ServiceException; +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.dromara.dms.domain.DmsBaseDeviceType; +import org.dromara.dms.domain.DmsBaseLubeStandard; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseLubeStationBo; +import org.dromara.dms.domain.vo.DmsBaseLubeStationVo; +import org.dromara.dms.domain.DmsBaseLubeStation; +import org.dromara.dms.mapper.DmsBaseLubeStationMapper; +import org.dromara.dms.service.IDmsBaseLubeStationService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 润滑部位信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseLubeStationServiceImpl implements IDmsBaseLubeStationService { + + private final DmsBaseLubeStationMapper baseMapper; + + /** + * 查询润滑部位信息 + * + * @param lubeStationId 主键 + * @return 润滑部位信息 + */ + @Override + public DmsBaseLubeStationVo queryById(Long lubeStationId){ + return baseMapper.selectVoById(lubeStationId); + } + + /** + * 分页查询润滑部位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 润滑部位信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseLubeStationBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的润滑部位信息列表 + * + * @param bo 查询条件 + * @return 润滑部位信息列表 + */ + @Override + public List queryList(DmsBaseLubeStationBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseLubeStationBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseLubeStation.class) + .selectAll(DmsBaseLubeStation.class) + //关联设备类型 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseLubeStation::getDeviceTypeId) + //关联润滑标准 + .select(DmsBaseLubeStandard::getLubeStandardCode) + .leftJoin(DmsBaseLubeStandard.class, DmsBaseLubeStandard::getLubeStandardId, DmsBaseLubeStation::getLubeStandardId) + + .eq(bo.getLubeStationId() != null, DmsBaseLubeStation::getLubeStationId, bo.getLubeStationId()) + .eq(bo.getDeviceTypeId() != null, DmsBaseLubeStation::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(StringUtils.isNotBlank(bo.getLubeStandardId()), DmsBaseLubeStation::getLubeStandardId, bo.getLubeStandardId()) + .eq(StringUtils.isNotBlank(bo.getLubeStationCode()), DmsBaseLubeStation::getLubeStationCode, bo.getLubeStationCode()) + .like(StringUtils.isNotBlank(bo.getLubeStationName()), DmsBaseLubeStation::getLubeStationName, bo.getLubeStationName()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseLubeStation::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseLubeStation::getCreateTime); + return lqw; + } + + /** + * 新增润滑部位信息 + * + * @param bo 润滑部位信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseLubeStationBo bo) { + DmsBaseLubeStation add = MapstructUtils.convert(bo, DmsBaseLubeStation.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setLubeStationId(add.getLubeStationId()); + } + return flag; + } + + /** + * 修改润滑部位信息 + * + * @param bo 润滑部位信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseLubeStationBo bo) { + DmsBaseLubeStation update = MapstructUtils.convert(bo, DmsBaseLubeStation.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseLubeStation entity){ + //TODO 做一些数据校验,如唯一约束 + + if (StringUtils.isNotNull(entity.getLubeStationCode())){ + DmsBaseLubeStationBo query = new DmsBaseLubeStationBo(); + query.setLubeStationCode(entity.getLubeStationCode()); + MPJLambdaWrapper lqw = buildQueryWrapper(query); + DmsBaseLubeStation detail = baseMapper.selectOne(lqw); + if (StringUtils.isNotNull(detail) && !detail.getLubeStationId().equals(entity.getLubeStationId())){ + throw new ServiceException("编码已存在"); + } + } + } + + /** + * 校验并批量删除润滑部位信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java new file mode 100644 index 00000000..54fee974 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java @@ -0,0 +1,156 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.exception.ServiceException; +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.dromara.dms.domain.DmsBaseMachineInfo; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseSpecialdeviceParamBo; +import org.dromara.dms.domain.vo.DmsBaseSpecialdeviceParamVo; +import org.dromara.dms.domain.DmsBaseSpecialdeviceParam; +import org.dromara.dms.mapper.DmsBaseSpecialdeviceParamMapper; +import org.dromara.dms.service.IDmsBaseSpecialdeviceParamService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 特种设备参数信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseSpecialdeviceParamServiceImpl implements IDmsBaseSpecialdeviceParamService { + + private final DmsBaseSpecialdeviceParamMapper baseMapper; + + /** + * 查询特种设备参数信息 + * + * @param specialdeviceParamId 主键 + * @return 特种设备参数信息 + */ + @Override + public DmsBaseSpecialdeviceParamVo queryById(Long specialdeviceParamId){ + return baseMapper.selectVoById(specialdeviceParamId); + } + + /** + * 分页查询特种设备参数信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 特种设备参数信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseSpecialdeviceParamBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的特种设备参数信息列表 + * + * @param bo 查询条件 + * @return 特种设备参数信息列表 + */ + @Override + public List queryList(DmsBaseSpecialdeviceParamBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseSpecialdeviceParamBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseSpecialdeviceParam.class) + .selectAll(DmsBaseSpecialdeviceParam.class) + + //关联查询设备信息 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId, DmsBaseSpecialdeviceParam::getMachineId) + + .eq(bo.getSpecialdeviceParamId() != null, DmsBaseSpecialdeviceParam::getSpecialdeviceParamId, bo.getSpecialdeviceParamId()) + .eq(bo.getMachineId() != null, DmsBaseSpecialdeviceParam::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getParamCode()), DmsBaseSpecialdeviceParam::getParamCode, bo.getParamCode()) + .like(StringUtils.isNotBlank(bo.getParamName()), DmsBaseSpecialdeviceParam::getParamName, bo.getParamName()) + .eq(StringUtils.isNotBlank(bo.getParamValue()), DmsBaseSpecialdeviceParam::getParamValue, bo.getParamValue()) + .eq(StringUtils.isNotBlank(bo.getParamUnit()), DmsBaseSpecialdeviceParam::getParamUnit, bo.getParamUnit()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseSpecialdeviceParam::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseSpecialdeviceParam::getCreateTime); + return lqw; + } + + /** + * 新增特种设备参数信息 + * + * @param bo 特种设备参数信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseSpecialdeviceParamBo bo) { + DmsBaseSpecialdeviceParam add = MapstructUtils.convert(bo, DmsBaseSpecialdeviceParam.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSpecialdeviceParamId(add.getSpecialdeviceParamId()); + } + return flag; + } + + /** + * 修改特种设备参数信息 + * + * @param bo 特种设备参数信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseSpecialdeviceParamBo bo) { + DmsBaseSpecialdeviceParam update = MapstructUtils.convert(bo, DmsBaseSpecialdeviceParam.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseSpecialdeviceParam entity){ + //TODO 做一些数据校验,如唯一约束 + + if (StringUtils.isNotBlank(entity.getParamCode())) { + DmsBaseSpecialdeviceParamBo query = new DmsBaseSpecialdeviceParamBo(); + query.setParamCode(entity.getParamCode()); + MPJLambdaWrapper lqw = buildQueryWrapper(query); + DmsBaseSpecialdeviceParam baseSpecialdeviceParam = baseMapper.selectOne(lqw); + if (baseSpecialdeviceParam != null + && !baseSpecialdeviceParam.getSpecialdeviceParamId().equals(entity.getSpecialdeviceParamId())) { + throw new ServiceException("编码已存在"); + } + } + } + + /** + * 校验并批量删除特种设备参数信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsKnowledgeLubeServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeLubeServiceImpl.java new file mode 100644 index 00000000..c405e55f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeLubeServiceImpl.java @@ -0,0 +1,160 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.exception.ServiceException; +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.dromara.dms.domain.DmsBaseDeviceType; +import org.dromara.dms.domain.DmsBaseLubeStation; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsKnowledgeLubeBo; +import org.dromara.dms.domain.vo.DmsKnowledgeLubeVo; +import org.dromara.dms.domain.DmsKnowledgeLube; +import org.dromara.dms.mapper.DmsKnowledgeLubeMapper; +import org.dromara.dms.service.IDmsKnowledgeLubeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 润滑知识库Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService { + + private final DmsKnowledgeLubeMapper baseMapper; + + /** + * 查询润滑知识库 + * + * @param knowledgeLubeId 主键 + * @return 润滑知识库 + */ + @Override + public DmsKnowledgeLubeVo queryById(Long knowledgeLubeId){ + return baseMapper.selectVoById(knowledgeLubeId); + } + + /** + * 分页查询润滑知识库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 润滑知识库分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsKnowledgeLubeBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的润滑知识库列表 + * + * @param bo 查询条件 + * @return 润滑知识库列表 + */ + @Override + public List queryList(DmsKnowledgeLubeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsKnowledgeLubeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsKnowledgeLube.class) + .selectAll(DmsKnowledgeLube.class) + + //关联查询设备类型 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId,DmsKnowledgeLube::getDeviceTypeId) + //关联查询润滑部位 + .select(DmsBaseLubeStation::getLubeStationName) + .leftJoin(DmsBaseLubeStation.class, DmsBaseLubeStation::getLubeStationId,DmsKnowledgeLube::getLubeStationId) + + .eq(bo.getKnowledgeLubeId() != null, DmsKnowledgeLube::getKnowledgeLubeId, bo.getKnowledgeLubeId()) + .eq(StringUtils.isNotBlank(bo.getExperienceCode()), DmsKnowledgeLube::getExperienceCode, bo.getExperienceCode()) + .eq(bo.getDeviceTypeId() != null, DmsKnowledgeLube::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(bo.getLubeStationId() != null, DmsKnowledgeLube::getLubeStationId, bo.getLubeStationId()) + .eq(StringUtils.isNotBlank(bo.getProtocolCode()), DmsKnowledgeLube::getProtocolCode, bo.getProtocolCode()) + .eq(StringUtils.isNotBlank(bo.getOperationsDescription()), DmsKnowledgeLube::getOperationsDescription, bo.getOperationsDescription()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsKnowledgeLube::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsKnowledgeLube::getCreateTime); + return lqw; + } + + /** + * 新增润滑知识库 + * + * @param bo 润滑知识库 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsKnowledgeLubeBo bo) { + DmsKnowledgeLube add = MapstructUtils.convert(bo, DmsKnowledgeLube.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setKnowledgeLubeId(add.getKnowledgeLubeId()); + } + return flag; + } + + /** + * 修改润滑知识库 + * + * @param bo 润滑知识库 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsKnowledgeLubeBo bo) { + DmsKnowledgeLube update = MapstructUtils.convert(bo, DmsKnowledgeLube.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsKnowledgeLube entity){ + //TODO 做一些数据校验,如唯一约束 + + //编号校验 + if (StringUtils.isNotBlank(entity.getExperienceCode())){ + DmsKnowledgeLubeBo detailBo = new DmsKnowledgeLubeBo(); + detailBo.setExperienceCode(entity.getExperienceCode()); + MPJLambdaWrapper lqw = buildQueryWrapper(detailBo); + DmsKnowledgeLube detail = baseMapper.selectOne(lqw); + if (StringUtils.isNotNull(detail) && !entity.getKnowledgeLubeId().equals(detail.getKnowledgeLubeId())){ + throw new ServiceException("编号已存在"); + } + } + } + + /** + * 校验并批量删除润滑知识库信息 + * + * @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/java/org/dromara/dms/service/impl/DmsKnowledgeMaintServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeMaintServiceImpl.java new file mode 100644 index 00000000..69ad3dc8 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeMaintServiceImpl.java @@ -0,0 +1,163 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.exception.ServiceException; +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.dromara.dms.domain.DmsBaseDeviceType; +import org.dromara.dms.domain.DmsBaseMaintStation; +import org.dromara.dms.domain.DmsKnowledgeRepair; +import org.dromara.dms.domain.bo.DmsKnowledgeRepairBo; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsKnowledgeMaintBo; +import org.dromara.dms.domain.vo.DmsKnowledgeMaintVo; +import org.dromara.dms.domain.DmsKnowledgeMaint; +import org.dromara.dms.mapper.DmsKnowledgeMaintMapper; +import org.dromara.dms.service.IDmsKnowledgeMaintService; +import org.springframework.util.ObjectUtils; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养知识库Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService { + + private final DmsKnowledgeMaintMapper baseMapper; + + /** + * 查询保养知识库 + * + * @param knowledgeMaintId 主键 + * @return 保养知识库 + */ + @Override + public DmsKnowledgeMaintVo queryById(Long knowledgeMaintId){ + return baseMapper.selectVoById(knowledgeMaintId); + } + + /** + * 分页查询保养知识库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养知识库分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsKnowledgeMaintBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养知识库列表 + * + * @param bo 查询条件 + * @return 保养知识库列表 + */ + @Override + public List queryList(DmsKnowledgeMaintBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsKnowledgeMaintBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsKnowledgeMaint.class) + .selectAll(DmsKnowledgeMaint.class) + //关联查询设备类型 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId,DmsKnowledgeMaint::getDeviceTypeId) + //关联查询保养部位 + .select(DmsBaseMaintStation::getMaintStationName) + .leftJoin(DmsBaseMaintStation.class, DmsBaseMaintStation::getMaintStationId,DmsKnowledgeMaint::getMaintStationId) + + .eq(bo.getKnowledgeMaintId() != null, DmsKnowledgeMaint::getKnowledgeMaintId, bo.getKnowledgeMaintId()) + .eq(StringUtils.isNotBlank(bo.getExperienceCode()), DmsKnowledgeMaint::getExperienceCode, bo.getExperienceCode()) + .eq(bo.getDeviceTypeId() != null, DmsKnowledgeMaint::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(bo.getMaintStationId() != null, DmsKnowledgeMaint::getMaintStationId, bo.getMaintStationId()) + .eq(StringUtils.isNotBlank(bo.getMaintProtocol()), DmsKnowledgeMaint::getMaintProtocol, bo.getMaintProtocol()) + .eq(StringUtils.isNotBlank(bo.getOperationDescription()), DmsKnowledgeMaint::getOperationDescription, bo.getOperationDescription()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsKnowledgeMaint::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsKnowledgeMaint::getCreateTime); + return lqw; + } + + /** + * 新增保养知识库 + * + * @param bo 保养知识库 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsKnowledgeMaintBo bo) { + DmsKnowledgeMaint add = MapstructUtils.convert(bo, DmsKnowledgeMaint.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setKnowledgeMaintId(add.getKnowledgeMaintId()); + } + return flag; + } + + /** + * 修改保养知识库 + * + * @param bo 保养知识库 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsKnowledgeMaintBo bo) { + DmsKnowledgeMaint update = MapstructUtils.convert(bo, DmsKnowledgeMaint.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsKnowledgeMaint entity){ + //TODO 做一些数据校验,如唯一约束 + + //编号校验 + if (StringUtils.isNotNull(entity.getExperienceCode())){ + DmsKnowledgeMaintBo query = new DmsKnowledgeMaintBo(); + query.setExperienceCode(entity.getExperienceCode()); + MPJLambdaWrapper lqw = buildQueryWrapper(query); + DmsKnowledgeMaint detail = baseMapper.selectOne(lqw); + if ( !ObjectUtils.isEmpty(detail) + && !detail.getKnowledgeMaintId().equals(entity.getKnowledgeMaintId())){ + throw new ServiceException("编号已存在"); + } + } + } + + /** + * 校验并批量删除保养知识库信息 + * + * @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/java/org/dromara/dms/service/impl/DmsKnowledgeRepairServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeRepairServiceImpl.java new file mode 100644 index 00000000..c11f2341 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsKnowledgeRepairServiceImpl.java @@ -0,0 +1,160 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.exception.ServiceException; +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.dromara.dms.domain.DmsBaseDeviceFiles; +import org.dromara.dms.domain.DmsBaseDeviceType; +import org.dromara.dms.domain.bo.DmsBaseDeviceFilesBo; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsKnowledgeRepairBo; +import org.dromara.dms.domain.vo.DmsKnowledgeRepairVo; +import org.dromara.dms.domain.DmsKnowledgeRepair; +import org.dromara.dms.mapper.DmsKnowledgeRepairMapper; +import org.dromara.dms.service.IDmsKnowledgeRepairService; +import org.springframework.util.ObjectUtils; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 维修知识库Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService { + + private final DmsKnowledgeRepairMapper baseMapper; + + /** + * 查询维修知识库 + * + * @param knowledgeRepairId 主键 + * @return 维修知识库 + */ + @Override + public DmsKnowledgeRepairVo queryById(Long knowledgeRepairId){ + return baseMapper.selectVoById(knowledgeRepairId); + } + + /** + * 分页查询维修知识库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 维修知识库分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsKnowledgeRepairBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的维修知识库列表 + * + * @param bo 查询条件 + * @return 维修知识库列表 + */ + @Override + public List queryList(DmsKnowledgeRepairBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsKnowledgeRepairBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsKnowledgeRepair.class) + .selectAll(DmsKnowledgeRepair.class) + + //关联查询设备类型 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId,DmsKnowledgeRepair::getDeviceTypeId) + + .eq(bo.getKnowledgeRepairId() != null, DmsKnowledgeRepair::getKnowledgeRepairId, bo.getKnowledgeRepairId()) + .eq(StringUtils.isNotBlank(bo.getExperienceCode()), DmsKnowledgeRepair::getExperienceCode, bo.getExperienceCode()) + .eq(bo.getDeviceTypeId() != null, DmsKnowledgeRepair::getDeviceTypeId, bo.getDeviceTypeId()) + .eq(StringUtils.isNotBlank(bo.getFaultDescription()), DmsKnowledgeRepair::getFaultDescription, bo.getFaultDescription()) + .eq(StringUtils.isNotBlank(bo.getDesignOperations()), DmsKnowledgeRepair::getDesignOperations, bo.getDesignOperations()) + .eq(StringUtils.isNotBlank(bo.getOperationsDescription()), DmsKnowledgeRepair::getOperationsDescription, bo.getOperationsDescription()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsKnowledgeRepair::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsKnowledgeRepair::getCreateTime); + return lqw; + } + + /** + * 新增维修知识库 + * + * @param bo 维修知识库 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsKnowledgeRepairBo bo) { + DmsKnowledgeRepair add = MapstructUtils.convert(bo, DmsKnowledgeRepair.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setKnowledgeRepairId(add.getKnowledgeRepairId()); + } + return flag; + } + + /** + * 修改维修知识库 + * + * @param bo 维修知识库 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsKnowledgeRepairBo bo) { + DmsKnowledgeRepair update = MapstructUtils.convert(bo, DmsKnowledgeRepair.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsKnowledgeRepair entity){ + //TODO 做一些数据校验,如唯一约束 + + //编号校验 + if (StringUtils.isNotNull(entity.getExperienceCode())){ + DmsKnowledgeRepairBo query = new DmsKnowledgeRepairBo(); + query.setExperienceCode(entity.getExperienceCode()); + MPJLambdaWrapper lqw = buildQueryWrapper(query); + DmsKnowledgeRepair detail = baseMapper.selectOne(lqw); + if ( !ObjectUtils.isEmpty(detail) + && !detail.getKnowledgeRepairId().equals(entity.getKnowledgeRepairId())){ + throw new ServiceException("编号已存在"); + } + } + } + + /** + * 校验并批量删除维修知识库信息 + * + * @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/DmsBaseDeviceDebuggingMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseDeviceDebuggingMapper.xml new file mode 100644 index 00000000..887eeef0 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseDeviceDebuggingMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuppliesMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuppliesMapper.xml new file mode 100644 index 00000000..6744a034 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuppliesMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml new file mode 100644 index 00000000..7d570bf5 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml new file mode 100644 index 00000000..f5988fd0 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml new file mode 100644 index 00000000..c82d8ef9 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeLubeMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeLubeMapper.xml new file mode 100644 index 00000000..57d84684 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeLubeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeMaintMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeMaintMapper.xml new file mode 100644 index 00000000..eb1907b2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeMaintMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml new file mode 100644 index 00000000..822bb43b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml @@ -0,0 +1,7 @@ + + + + + From 4cfff40cb71ca81e6b7ece23dd487b597146b01b Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 24 Mar 2025 18:58:05 +0800 Subject: [PATCH 4/7] =?UTF-8?q?add(common/common-mybatis):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BC=96=E7=A0=81=E5=94=AF=E4=B8=80=E6=80=A7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=B7=A5=E5=85=B7=E7=B1=BB,=E6=96=B0=E5=A2=9E=20Uniqu?= =?UTF-8?q?eCodeUtils=20=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E9=80=9A=E7=94=A8=E7=9A=84=E7=BC=96=E7=A0=81=E5=94=AF?= =?UTF-8?q?=E4=B8=80=E6=80=A7=E6=A0=A1=E9=AA=8C=E6=96=B9=E6=B3=95=E3=80=82?= =?UTF-8?q?=E8=AF=A5=E6=96=B9=E6=B3=95=E5=8F=AF=E7=94=A8=E4=BA=8E=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=87=8D=E5=A4=8D=E7=9A=84=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=80=BC=EF=BC=8C=E6=94=AF=E6=8C=81=E6=96=B0=E5=A2=9E=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C=E6=97=B6=E7=9A=84=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 validateCodeUnique 方法，用于编码唯一性校验 - 方法参数包括：实体对应的 Mapper 实例、需校验的编码值、实体类中编码字段和主键字段的 Lambda 表达式、当前记录的 ID值、重复时的错误提示信息 - 方法内部实现编码校验逻辑，如果编码重复则抛出 ServiceException 异常 - 提供了新增和更新操作时的使用示例 --- .../common/mybatis/Utils/UniqueCodeUtils.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/Utils/UniqueCodeUtils.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/Utils/UniqueCodeUtils.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/Utils/UniqueCodeUtils.java new file mode 100644 index 00000000..b3704a3f --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/Utils/UniqueCodeUtils.java @@ -0,0 +1,81 @@ +package org.dromara.common.mybatis.Utils; + + +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.github.yulichang.base.MPJBaseMapper; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.StringUtils; +import org.springframework.stereotype.Component; + + +@Component +public class UniqueCodeUtils { + + /** + * 通用的编码唯一性校验方法 + * 用于校验数据库中是否存在重复的编码值 + * + * @param baseMapper 实体对应的Mapper实例，例如：baseMapper + * @param code 需要校验的编码值，例如：entity.getDeviceCode() + * @param codeField 实体类中编码字段的Lambda表达式，例如：DmsBaseDeviceBom::getDeviceCode + * @param idField 实体类中主键字段的Lambda表达式，例如：DmsBaseDeviceBom::getDeviceBomId + * @param idValue 当前记录的ID值（更新时需要传入，新增时传null），例如：entity.getDeviceBomId() + * @param errorMessage 重复时的错误提示信息，例如："设备编码已存在" + * @param 实体类型 + * @param Mapper类型 + * @throws ServiceException 当编码重复时抛出异常，异常信息为errorMessage + * + * 使用示例1 - 新增时校验： + * uniqueCodeService.validateCodeUnique( + * baseMapper, // Mapper实例 + * entity.getDeviceCode(), // 待校验的编码 + * DmsBaseDeviceBom::getDeviceCode, // 编码字段 + * DmsBaseDeviceBom::getDeviceBomId,// ID字段 + * null, // 新增时ID为null + * "设备编码已存在" // 错误提示 + * ); + * + * 使用示例2 - 更新时校验： + * uniqueCodeService.validateCodeUnique( + * baseMapper, // Mapper实例 + * entity.getDeviceCode(), // 待校验的编码 + * DmsBaseDeviceBom::getDeviceCode, // 编码字段 + * DmsBaseDeviceBom::getDeviceBomId,// ID字段 + * entity.getDeviceBomId(), // 更新时传入当前记录ID + * "设备编码已存在" // 错误提示 + * ); + */ + public static > void validateCodeUnique( + M baseMapper, + String code, + SFunction codeField, + SFunction idField, + Object idValue, + String errorMessage + ) { + // 1. 首先判断编码是否为空，为空则不需要校验 + if (StringUtils.isNotBlank(code)) { + // 2. 构建查询条件包装器 + MPJLambdaWrapper wrapper = JoinWrappers.lambda((Class) codeField.getClass()) + // 3. 添加编码相等的条件：WHERE code = 'xxx' + .eq(codeField, code); + + // 4. 如果是更新操作（idValue不为空），需要排除自身记录 + if (idValue != null) { + // 5. 添加ID不等于当前记录ID的条件：AND id != xxx + // 这样可以排除当前正在更新的记录，避免误报重复 + wrapper.ne(idField, idValue); + } + + // 6. 执行查询，获取符合条件的记录数 + Long count = baseMapper.selectCount(wrapper); + // 7. 如果存在符合条件的记录（count > 0），说明编码重复 + if (count > 0) { + // 8. 抛出业务异常，中断当前操作 + throw new ServiceException(errorMessage); + } + } + } +} From a6408e61e2573b1ab4e87db3af9b0c781dcdc74a Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 25 Mar 2025 10:42:46 +0800 Subject: [PATCH 5/7] =?UTF-8?q?refactor(dms):=20=E5=B0=86=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20Long=20=E7=B1=BB=E5=9E=8B=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=20BigDecimal,=E4=B8=BADmsBaseDeviceType=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0=E4=BA=86=20@TableId=20?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将这些实体类中的 Long 类型字段改为 BigDecimal 类型 - 相应地修改了对应的 BO 和 VO 类 - 为DmsBaseDeviceType实体类添加了 @TableId 注解 --- .../org/dromara/dms/domain/DmsBaseDeviceBom.java | 3 ++- .../dromara/dms/domain/DmsBaseDeviceSupplies.java | 3 ++- .../org/dromara/dms/domain/DmsBaseDeviceType.java | 3 +++ .../dromara/dms/domain/DmsDeviceModeFunction.java | 8 +++++--- .../dms/domain/DmsDeviceModeParameter.java | 9 +++++---- .../dromara/dms/domain/bo/DmsBaseDeviceBomBo.java | 11 +++++------ .../dms/domain/bo/DmsBaseDeviceSuppliesBo.java | 15 +++++++++------ .../dms/domain/bo/DmsDeviceModeFunctionBo.java | 13 +++++++------ .../dms/domain/bo/DmsDeviceModeParameterBo.java | 14 ++++++++------ .../dromara/dms/domain/vo/DmsBaseDeviceBomVo.java | 10 +++++----- .../dms/domain/vo/DmsBaseDeviceSuppliesVo.java | 10 +++++----- .../dms/domain/vo/DmsDeviceModeFunctionVo.java | 10 +++++----- .../dms/domain/vo/DmsDeviceModeParameterVo.java | 10 +++++----- 13 files changed, 66 insertions(+), 53 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java index 11677845..939ffeb7 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 设备BOM信息对象 dms_base_device_bom @@ -40,7 +41,7 @@ public class DmsBaseDeviceBom extends TenantEntity { /** * BOM数量 */ - private Long bomAmount; + private BigDecimal bomAmount; /** * 祖级列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java index 477971ad..eb469e2d 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 设备配套信息对象 dms_base_device_supplies @@ -45,7 +46,7 @@ public class DmsBaseDeviceSupplies extends TenantEntity { /** * 需要数量 */ - private Long requireAmount; + private BigDecimal requireAmount; /** * 备注 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java index eb0d6ea5..e4d21d91 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java @@ -1,5 +1,7 @@ package org.dromara.dms.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,6 +26,7 @@ public class DmsBaseDeviceType extends TenantEntity { /** * 设备类型ID */ + @TableId(value = "device_type_id", type = IdType.AUTO) private Long deviceTypeId; /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java index c3eb829d..0b699bc7 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java @@ -1,10 +1,12 @@ package org.dromara.dms.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serial; +import java.math.BigDecimal; /** * 设备模型功能对象 dms_device_mode_function @@ -118,7 +120,7 @@ public class DmsDeviceModeFunction { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; /** * 预留字段 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java index a472f4c4..b16f3d76 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java @@ -1,11 +1,12 @@ package org.dromara.dms.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 设备参数对象 dms_device_mode_parameter @@ -69,7 +70,7 @@ public class DmsDeviceModeParameter { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java index 62347e1d..19ccf373 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java @@ -1,13 +1,12 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsBaseDeviceBom; -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 org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsBaseDeviceBom; + +import java.math.BigDecimal; /** * 设备BOM信息业务对象 dms_base_device_bom @@ -38,7 +37,7 @@ public class DmsBaseDeviceBomBo extends BaseEntity { /** * BOM数量 */ - private Long bomAmount; + private BigDecimal bomAmount; /** * 祖级列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java index 07834027..272cf45a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java @@ -1,13 +1,16 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsBaseDeviceSupplies; -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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsBaseDeviceSupplies; + +import java.math.BigDecimal; /** * 设备配套信息业务对象 dms_base_device_supplies @@ -45,7 +48,7 @@ public class DmsBaseDeviceSuppliesBo extends BaseEntity { /** * 需要数量 */ - private Long requireAmount; + private BigDecimal requireAmount; /** * 备注 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java index 6c8032df..46482255 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java @@ -1,15 +1,16 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsDeviceModeFunction; -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 jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsDeviceModeFunction; import org.dromara.dms.domain.DmsDeviceModeParameter; +import java.math.BigDecimal; import java.util.List; /** @@ -123,7 +124,7 @@ public class DmsDeviceModeFunctionBo extends BaseEntity { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; /** * 预留字段 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java index 2583de03..df637ed6 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java @@ -1,13 +1,15 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsDeviceModeParameter; -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 jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsDeviceModeParameter; + +import java.math.BigDecimal; /** * 设备参数业务对象 dms_device_mode_parameter @@ -71,7 +73,7 @@ public class DmsDeviceModeParameterBo extends BaseEntity { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java index bb8f9e0f..a889461d 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java @@ -1,16 +1,16 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsBaseDeviceBom; 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 org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsBaseDeviceBom; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; @@ -50,7 +50,7 @@ public class DmsBaseDeviceBomVo implements Serializable { * BOM数量 */ @ExcelProperty(value = "BOM数量") - private Long bomAmount; + private BigDecimal bomAmount; /** * 祖级列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java index 6f9e3d0a..5d82beae 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java @@ -1,16 +1,16 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsBaseDeviceSupplies; 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 org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsBaseDeviceSupplies; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; @@ -57,7 +57,7 @@ public class DmsBaseDeviceSuppliesVo implements Serializable { * 需要数量 */ @ExcelProperty(value = "需要数量") - private Long requireAmount; + private BigDecimal requireAmount; /** * 备注 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java index 225ad239..f90d6ff0 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java @@ -1,17 +1,17 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsDeviceModeFunction; 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 org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsDeviceModeFunction; import org.dromara.dms.domain.DmsDeviceModeParameter; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; import java.util.List; @@ -157,7 +157,7 @@ public class DmsDeviceModeFunctionVo implements Serializable { * 预留字段，步长 */ @ExcelProperty(value = "预留字段，步长") - private Long propertyStep; + private BigDecimal propertyStep; /** * 预留字段 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java index e18a3f88..aa43fc1a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java @@ -1,16 +1,16 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsDeviceModeParameter; 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 org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsDeviceModeParameter; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; @@ -89,7 +89,7 @@ public class DmsDeviceModeParameterVo implements Serializable { * 预留字段，步长 */ @ExcelProperty(value = "预留字段，步长") - private Long propertyStep; + private BigDecimal propertyStep; } From f5403092b489f3dc315699c0764726edf51fd51c Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 25 Mar 2025 10:59:44 +0800 Subject: [PATCH 6/7] =?UTF-8?q?refactor(mes):=20=E5=B0=86=E9=87=8D?= =?UTF-8?q?=E9=87=8F=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BB=8E=20Long=20=E6=94=B9=E4=B8=BA=20BigDecimal=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E4=B8=BAdecimal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了 BaseMaterialInfo、BaseMaterialInfoBo、BaseMaterialInfoVo、BaseToolingInfo、BaseToolingInfoBo 和 BaseToolingInfoVo 中的重量相关字段类型 - 从 Long 改为 BigDecimal，以更准确地表示重量值，Long不保留小数 - 这个改动会影响以下表格中的字段： - base_material_info: net_weight, gross_weight, standard_weight, weight_upper_limit, weight_lower_limit - base_tooling_info: weight --- .../dromara/mes/domain/BaseMaterialInfo.java | 21 +++++++++-------- .../dromara/mes/domain/BaseToolingInfo.java | 9 +++++--- .../mes/domain/bo/BaseMaterialInfoBo.java | 23 ++++++++++--------- .../mes/domain/bo/BaseToolingInfoBo.java | 11 ++++----- .../mes/domain/vo/BaseMaterialInfoVo.java | 21 ++++++++--------- .../mes/domain/vo/BaseToolingInfoVo.java | 9 ++++---- 6 files changed, 49 insertions(+), 45 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java index c2aa8b6c..9da1de05 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java @@ -1,13 +1,16 @@ package org.dromara.mes.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; /** * 物料信息对象 base_material_info @@ -97,12 +100,12 @@ public class BaseMaterialInfo extends TenantEntity { /** * 净重 */ - private Long netWeight; + private BigDecimal netWeight; /** * 毛重 */ - private Long grossWeight; + private BigDecimal grossWeight; /** * 绑定标识(1是 0否) @@ -237,17 +240,17 @@ public class BaseMaterialInfo extends TenantEntity { /** * 标准重量 */ - private Long standardWeight; + private BigDecimal standardWeight; /** * 标准重量上限 */ - private Long weightUpperLimit; + private BigDecimal weightUpperLimit; /** * 标准重量下限 */ - private Long weightLowerLimit; + private BigDecimal weightLowerLimit; /** * 内胎标记(0无 1有) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java index ead00ff2..b55811d0 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java @@ -1,11 +1,14 @@ package org.dromara.mes.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; +import java.math.BigDecimal; /** * 载具工装信息对象 base_tooling_info @@ -65,7 +68,7 @@ public class BaseToolingInfo extends TenantEntity { /** * 重量 */ - private Long weight; + private BigDecimal weight; /** * 备注 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java index e28a0311..f6cd7ee1 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java @@ -1,15 +1,16 @@ package org.dromara.mes.domain.bo; -import org.dromara.mes.domain.BaseMaterialInfo; -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 jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mes.domain.BaseMaterialInfo; + +import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 物料信息业务对象 base_material_info @@ -98,12 +99,12 @@ public class BaseMaterialInfoBo extends BaseEntity { /** * 净重 */ - private Long netWeight; + private BigDecimal netWeight; /** * 毛重 */ - private Long grossWeight; + private BigDecimal grossWeight; /** * 绑定标识(1是 0否) @@ -238,17 +239,17 @@ public class BaseMaterialInfoBo extends BaseEntity { /** * 标准重量 */ - private Long standardWeight; + private BigDecimal standardWeight; /** * 标准重量上限 */ - private Long weightUpperLimit; + private BigDecimal weightUpperLimit; /** * 标准重量下限 */ - private Long weightLowerLimit; + private BigDecimal weightLowerLimit; /** * 内胎标记(0无 1有) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java index eb055fb6..79f4dee2 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java @@ -1,13 +1,12 @@ package org.dromara.mes.domain.bo; -import org.dromara.mes.domain.BaseToolingInfo; -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 org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mes.domain.BaseToolingInfo; + +import java.math.BigDecimal; /** * 载具工装信息业务对象 base_tooling_info @@ -63,7 +62,7 @@ public class BaseToolingInfoBo extends BaseEntity { /** * 重量 */ - private Long weight; + private BigDecimal weight; /** * 备注 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java index b2817308..dc1ebcf9 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java @@ -1,19 +1,16 @@ package org.dromara.mes.domain.vo; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.mes.domain.BaseMaterialInfo; 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 org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mes.domain.BaseMaterialInfo; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -126,13 +123,13 @@ public class BaseMaterialInfoVo implements Serializable { * 净重 */ @ExcelProperty(value = "净重") - private Long netWeight; + private BigDecimal netWeight; /** * 毛重 */ @ExcelProperty(value = "毛重") - private Long grossWeight; + private BigDecimal grossWeight; /** * 绑定标识(1是 0否) @@ -305,19 +302,19 @@ public class BaseMaterialInfoVo implements Serializable { * 标准重量 */ @ExcelProperty(value = "标准重量") - private Long standardWeight; + private BigDecimal standardWeight; /** * 标准重量上限 */ @ExcelProperty(value = "标准重量上限") - private Long weightUpperLimit; + private BigDecimal weightUpperLimit; /** * 标准重量下限 */ @ExcelProperty(value = "标准重量下限") - private Long weightLowerLimit; + private BigDecimal weightLowerLimit; /** * 内胎标记(0无 1有) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java index a152827d..28763dd1 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java @@ -1,15 +1,16 @@ package org.dromara.mes.domain.vo; -import org.dromara.mes.domain.BaseToolingInfo; 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 org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mes.domain.BaseToolingInfo; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -88,7 +89,7 @@ public class BaseToolingInfoVo implements Serializable { * 重量 */ @ExcelProperty(value = "重量") - private Long weight; + private BigDecimal weight; /** * 备注 From f327e4555d0a4bfb539be67ac23835ec9d358ed3 Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 25 Mar 2025 14:04:50 +0800 Subject: [PATCH 7/7] =?UTF-8?q?add(dms):=20=E7=94=9F=E6=88=90=E7=82=B9?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E9=A1=B9=E7=9B=AE=E3=80=81=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E5=92=8C=E6=A0=87=E5=87=86=EF=BC=8C=E5=81=9C=E6=9C=BA=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E5=8E=9F=E5=9B=A0=E5=92=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E5=92=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=9B=E7=82=B9=E5=B7=A1=E6=A3=80=E7=BA=BF=E8=B7=AF=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E3=80=81=E7=82=B9=E5=B7=A1=E6=A3=80=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E3=80=81?= =?UTF-8?q?=E4=BF=9D=E5=85=BB=E9=83=A8=E4=BD=8D=E5=85=B3=E8=81=94=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E3=80=81=E4=BF=9D=E5=85=BB=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=98=8E=E7=BB=86=E7=AD=89=E8=BF=99=E4=BA=9B=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=A1=A8=E7=9A=84=E9=80=BB=E8=BE=91=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=90=8E=E6=9C=9F=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DmsBaseInspectProjectController.java | 117 +++++++++++++ .../DmsBaseInspectRouteController.java | 117 +++++++++++++ .../DmsBaseInspectStandardController.java | 117 +++++++++++++ .../DmsBaseShutReasonController.java | 117 +++++++++++++ .../controller/DmsBaseShutTypeController.java | 117 +++++++++++++ .../DmsInspectProjectDeviceController.java | 117 +++++++++++++ .../DmsInspectRouteDetailController.java | 117 +++++++++++++ .../DmsRealtimeStatusController.java | 117 +++++++++++++ .../DmsRecordShutDownController.java | 117 +++++++++++++ .../dms/domain/DmsBaseInspectProject.java | 77 +++++++++ .../dms/domain/DmsBaseInspectRoute.java | 62 +++++++ .../dms/domain/DmsBaseInspectStandard.java | 71 ++++++++ .../dromara/dms/domain/DmsBaseShutReason.java | 72 ++++++++ .../dromara/dms/domain/DmsBaseShutType.java | 51 ++++++ .../dms/domain/DmsInspectProjectDevice.java | 40 +++++ .../dms/domain/DmsInspectRouteDetail.java | 67 ++++++++ .../dromara/dms/domain/DmsRealtimeStatus.java | 58 +++++++ .../dromara/dms/domain/DmsRecordShutDown.java | 96 +++++++++++ .../domain/bo/DmsBaseInspectProjectBo.java | 78 +++++++++ .../dms/domain/bo/DmsBaseInspectRouteBo.java | 57 +++++++ .../domain/bo/DmsBaseInspectStandardBo.java | 67 ++++++++ .../dms/domain/bo/DmsBaseShutReasonBo.java | 62 +++++++ .../dms/domain/bo/DmsBaseShutTypeBo.java | 53 ++++++ .../domain/bo/DmsInspectProjectDeviceBo.java | 39 +++++ .../domain/bo/DmsInspectRouteDetailBo.java | 60 +++++++ .../dms/domain/bo/DmsRealtimeStatusBo.java | 51 ++++++ .../dms/domain/bo/DmsRecordShutDownBo.java | 83 +++++++++ .../domain/vo/DmsBaseInspectProjectVo.java | 94 +++++++++++ .../dms/domain/vo/DmsBaseInspectRouteVo.java | 68 ++++++++ .../domain/vo/DmsBaseInspectStandardVo.java | 84 ++++++++++ .../dms/domain/vo/DmsBaseShutReasonVo.java | 84 ++++++++++ .../dms/domain/vo/DmsBaseShutTypeVo.java | 63 +++++++ .../domain/vo/DmsInspectProjectDeviceVo.java | 50 ++++++ .../domain/vo/DmsInspectRouteDetailVo.java | 78 +++++++++ .../dms/domain/vo/DmsRealtimeStatusVo.java | 67 ++++++++ .../dms/domain/vo/DmsRecordShutDownVo.java | 109 ++++++++++++ .../mapper/DmsBaseInspectProjectMapper.java | 15 ++ .../dms/mapper/DmsBaseInspectRouteMapper.java | 15 ++ .../mapper/DmsBaseInspectStandardMapper.java | 15 ++ .../dms/mapper/DmsBaseShutReasonMapper.java | 15 ++ .../dms/mapper/DmsBaseShutTypeMapper.java | 15 ++ .../mapper/DmsInspectProjectDeviceMapper.java | 15 ++ .../mapper/DmsInspectRouteDetailMapper.java | 15 ++ .../dms/mapper/DmsRealtimeStatusMapper.java | 15 ++ .../dms/mapper/DmsRecordShutDownMapper.java | 15 ++ .../IDmsBaseInspectProjectService.java | 69 ++++++++ .../service/IDmsBaseInspectRouteService.java | 69 ++++++++ .../IDmsBaseInspectStandardService.java | 69 ++++++++ .../service/IDmsBaseShutReasonService.java | 69 ++++++++ .../dms/service/IDmsBaseShutTypeService.java | 69 ++++++++ .../IDmsInspectProjectDeviceService.java | 69 ++++++++ .../IDmsInspectRouteDetailService.java | 69 ++++++++ .../service/IDmsRealtimeStatusService.java | 69 ++++++++ .../service/IDmsRecordShutDownService.java | 69 ++++++++ .../DmsBaseInspectProjectServiceImpl.java | 151 +++++++++++++++++ .../impl/DmsBaseInspectRouteServiceImpl.java | 152 +++++++++++++++++ .../DmsBaseInspectStandardServiceImpl.java | 154 +++++++++++++++++ .../impl/DmsBaseShutReasonServiceImpl.java | 158 ++++++++++++++++++ .../impl/DmsBaseShutTypeServiceImpl.java | 146 ++++++++++++++++ .../DmsInspectProjectDeviceServiceImpl.java | 134 +++++++++++++++ .../DmsInspectRouteDetailServiceImpl.java | 147 ++++++++++++++++ .../impl/DmsRealtimeStatusServiceImpl.java | 153 +++++++++++++++++ .../impl/DmsRecordShutDownServiceImpl.java | 155 +++++++++++++++++ .../dms/DmsBaseInspectProjectMapper.xml | 7 + .../mapper/dms/DmsBaseInspectRouteMapper.xml | 7 + .../dms/DmsBaseInspectStandardMapper.xml | 7 + .../mapper/dms/DmsBaseShutReasonMapper.xml | 7 + .../mapper/dms/DmsBaseShutTypeMapper.xml | 7 + .../dms/DmsInspectProjectDeviceMapper.xml | 7 + .../dms/DmsInspectRouteDetailMapper.xml | 7 + .../mapper/dms/DmsRealtimeStatusMapper.xml | 7 + .../mapper/dms/DmsRecordShutDownMapper.xml | 7 + .../impl/WmsInstockOrderServiceImpl.java | 2 +- 73 files changed, 5064 insertions(+), 1 deletion(-) create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectProjectController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectRouteController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectStandardController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutReasonController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutTypeController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectRouteDetailController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRealtimeStatusController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordShutDownController.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectProject.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectRoute.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectStandard.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutType.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectProjectBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectRouteBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectStandardBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutReasonBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutTypeBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectRouteDetailBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRealtimeStatusBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordShutDownBo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectProjectVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectRouteVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectStandardVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutTypeVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectProjectMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectRouteMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectStandardMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutReasonMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutTypeMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectRouteDetailMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRealtimeStatusMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordShutDownMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectProjectService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectRouteService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectStandardService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseShutReasonService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseShutTypeService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectProjectDeviceService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectRouteDetailService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRealtimeStatusService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRecordShutDownService.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectProjectServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectRouteServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectStandardServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseShutReasonServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseShutTypeServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRealtimeStatusServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectProjectDeviceMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectProjectController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectProjectController.java new file mode 100644 index 00000000..0c3ccfe8 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectProjectController.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.DmsBaseInspectProjectVo; +import org.dromara.dms.domain.bo.DmsBaseInspectProjectBo; +import org.dromara.dms.service.IDmsBaseInspectProjectService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 点巡检项目信息 + * 前端访问路由地址为:/dms/dmsBaseInspectProject + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseInspectProject") +public class DmsBaseInspectProjectController extends BaseController { + + private final IDmsBaseInspectProjectService dmsBaseInspectProjectService; + + /** + * 查询点巡检项目信息列表 + */ + @SaCheckPermission("dms:dmsBaseInspectProject:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseInspectProjectBo bo, PageQuery pageQuery) { + return dmsBaseInspectProjectService.queryPageList(bo, pageQuery); + } + + /** + * 导出点巡检项目信息列表 + */ + @SaCheckPermission("dms:dmsBaseInspectProject:export") + @Log(title = "点巡检项目信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseInspectProjectBo bo, HttpServletResponse response) { + List list = dmsBaseInspectProjectService.queryList(bo); + ExcelUtil.exportExcel(list, "点巡检项目信息", DmsBaseInspectProjectVo.class, response); + } + + /** + * 获取点巡检项目信息详细信息 + * + * @param inspectProjectId 主键 + */ + @SaCheckPermission("dms:dmsBaseInspectProject:query") + @GetMapping("/{inspectProjectId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long inspectProjectId) { + return R.ok(dmsBaseInspectProjectService.queryById(inspectProjectId)); + } + + /** + * 新增点巡检项目信息 + */ + @SaCheckPermission("dms:dmsBaseInspectProject:add") + @Log(title = "点巡检项目信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseInspectProjectBo bo) { + return toAjax(dmsBaseInspectProjectService.insertByBo(bo)); + } + + /** + * 修改点巡检项目信息 + */ + @SaCheckPermission("dms:dmsBaseInspectProject:edit") + @Log(title = "点巡检项目信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseInspectProjectBo bo) { + return toAjax(dmsBaseInspectProjectService.updateByBo(bo)); + } + + /** + * 删除点巡检项目信息 + * + * @param inspectProjectIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseInspectProject:remove") + @Log(title = "点巡检项目信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{inspectProjectIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] inspectProjectIds) { + return toAjax(dmsBaseInspectProjectService.deleteWithValidByIds(List.of(inspectProjectIds), true)); + } + + + /** + * 下拉框查询点巡检项目信息列表 + */ + + @GetMapping("/getDmsBaseInspectProjectList") + public R> getDmsBaseInspectProjectList(DmsBaseInspectProjectBo bo) { + List list = dmsBaseInspectProjectService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectRouteController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectRouteController.java new file mode 100644 index 00000000..7b2e6615 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectRouteController.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.DmsBaseInspectRouteVo; +import org.dromara.dms.domain.bo.DmsBaseInspectRouteBo; +import org.dromara.dms.service.IDmsBaseInspectRouteService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 点巡检线路信息 + * 前端访问路由地址为:/dms/dmsBaseInspectRoute + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseInspectRoute") +public class DmsBaseInspectRouteController extends BaseController { + + private final IDmsBaseInspectRouteService dmsBaseInspectRouteService; + + /** + * 查询点巡检线路信息列表 + */ + @SaCheckPermission("dms:dmsBaseInspectRoute:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseInspectRouteBo bo, PageQuery pageQuery) { + return dmsBaseInspectRouteService.queryPageList(bo, pageQuery); + } + + /** + * 导出点巡检线路信息列表 + */ + @SaCheckPermission("dms:dmsBaseInspectRoute:export") + @Log(title = "点巡检线路信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseInspectRouteBo bo, HttpServletResponse response) { + List list = dmsBaseInspectRouteService.queryList(bo); + ExcelUtil.exportExcel(list, "点巡检线路信息", DmsBaseInspectRouteVo.class, response); + } + + /** + * 获取点巡检线路信息详细信息 + * + * @param inspectRouteId 主键 + */ + @SaCheckPermission("dms:dmsBaseInspectRoute:query") + @GetMapping("/{inspectRouteId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long inspectRouteId) { + return R.ok(dmsBaseInspectRouteService.queryById(inspectRouteId)); + } + + /** + * 新增点巡检线路信息 + */ + @SaCheckPermission("dms:dmsBaseInspectRoute:add") + @Log(title = "点巡检线路信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseInspectRouteBo bo) { + return toAjax(dmsBaseInspectRouteService.insertByBo(bo)); + } + + /** + * 修改点巡检线路信息 + */ + @SaCheckPermission("dms:dmsBaseInspectRoute:edit") + @Log(title = "点巡检线路信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseInspectRouteBo bo) { + return toAjax(dmsBaseInspectRouteService.updateByBo(bo)); + } + + /** + * 删除点巡检线路信息 + * + * @param inspectRouteIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseInspectRoute:remove") + @Log(title = "点巡检线路信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{inspectRouteIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] inspectRouteIds) { + return toAjax(dmsBaseInspectRouteService.deleteWithValidByIds(List.of(inspectRouteIds), true)); + } + + + /** + * 下拉框查询点巡检线路信息列表 + */ + + @GetMapping("/getDmsBaseInspectRouteList") + public R> getDmsBaseInspectRouteList(DmsBaseInspectRouteBo bo) { + List list = dmsBaseInspectRouteService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectStandardController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectStandardController.java new file mode 100644 index 00000000..ddf224ef --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseInspectStandardController.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.DmsBaseInspectStandardVo; +import org.dromara.dms.domain.bo.DmsBaseInspectStandardBo; +import org.dromara.dms.service.IDmsBaseInspectStandardService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 点巡检标准信息 + * 前端访问路由地址为:/dms/dmsBaseInspectStandard + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseInspectStandard") +public class DmsBaseInspectStandardController extends BaseController { + + private final IDmsBaseInspectStandardService dmsBaseInspectStandardService; + + /** + * 查询点巡检标准信息列表 + */ + @SaCheckPermission("dms:dmsBaseInspectStandard:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseInspectStandardBo bo, PageQuery pageQuery) { + return dmsBaseInspectStandardService.queryPageList(bo, pageQuery); + } + + /** + * 导出点巡检标准信息列表 + */ + @SaCheckPermission("dms:dmsBaseInspectStandard:export") + @Log(title = "点巡检标准信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseInspectStandardBo bo, HttpServletResponse response) { + List list = dmsBaseInspectStandardService.queryList(bo); + ExcelUtil.exportExcel(list, "点巡检标准信息", DmsBaseInspectStandardVo.class, response); + } + + /** + * 获取点巡检标准信息详细信息 + * + * @param inspectStandardId 主键 + */ + @SaCheckPermission("dms:dmsBaseInspectStandard:query") + @GetMapping("/{inspectStandardId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long inspectStandardId) { + return R.ok(dmsBaseInspectStandardService.queryById(inspectStandardId)); + } + + /** + * 新增点巡检标准信息 + */ + @SaCheckPermission("dms:dmsBaseInspectStandard:add") + @Log(title = "点巡检标准信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseInspectStandardBo bo) { + return toAjax(dmsBaseInspectStandardService.insertByBo(bo)); + } + + /** + * 修改点巡检标准信息 + */ + @SaCheckPermission("dms:dmsBaseInspectStandard:edit") + @Log(title = "点巡检标准信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseInspectStandardBo bo) { + return toAjax(dmsBaseInspectStandardService.updateByBo(bo)); + } + + /** + * 删除点巡检标准信息 + * + * @param inspectStandardIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseInspectStandard:remove") + @Log(title = "点巡检标准信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{inspectStandardIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] inspectStandardIds) { + return toAjax(dmsBaseInspectStandardService.deleteWithValidByIds(List.of(inspectStandardIds), true)); + } + + + /** + * 下拉框查询点巡检标准信息列表 + */ + + @GetMapping("/getDmsBaseInspectStandardList") + public R> getDmsBaseInspectStandardList(DmsBaseInspectStandardBo bo) { + List list = dmsBaseInspectStandardService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutReasonController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutReasonController.java new file mode 100644 index 00000000..eec78787 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutReasonController.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.DmsBaseShutReasonVo; +import org.dromara.dms.domain.bo.DmsBaseShutReasonBo; +import org.dromara.dms.service.IDmsBaseShutReasonService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 停机原因信息 + * 前端访问路由地址为:/dms/dmsBaseShutReason + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseShutReason") +public class DmsBaseShutReasonController extends BaseController { + + private final IDmsBaseShutReasonService dmsBaseShutReasonService; + + /** + * 查询停机原因信息列表 + */ + @SaCheckPermission("dms:dmsBaseShutReason:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseShutReasonBo bo, PageQuery pageQuery) { + return dmsBaseShutReasonService.queryPageList(bo, pageQuery); + } + + /** + * 导出停机原因信息列表 + */ + @SaCheckPermission("dms:dmsBaseShutReason:export") + @Log(title = "停机原因信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseShutReasonBo bo, HttpServletResponse response) { + List list = dmsBaseShutReasonService.queryList(bo); + ExcelUtil.exportExcel(list, "停机原因信息", DmsBaseShutReasonVo.class, response); + } + + /** + * 获取停机原因信息详细信息 + * + * @param shutReasonId 主键 + */ + @SaCheckPermission("dms:dmsBaseShutReason:query") + @GetMapping("/{shutReasonId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long shutReasonId) { + return R.ok(dmsBaseShutReasonService.queryById(shutReasonId)); + } + + /** + * 新增停机原因信息 + */ + @SaCheckPermission("dms:dmsBaseShutReason:add") + @Log(title = "停机原因信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseShutReasonBo bo) { + return toAjax(dmsBaseShutReasonService.insertByBo(bo)); + } + + /** + * 修改停机原因信息 + */ + @SaCheckPermission("dms:dmsBaseShutReason:edit") + @Log(title = "停机原因信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseShutReasonBo bo) { + return toAjax(dmsBaseShutReasonService.updateByBo(bo)); + } + + /** + * 删除停机原因信息 + * + * @param shutReasonIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseShutReason:remove") + @Log(title = "停机原因信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{shutReasonIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] shutReasonIds) { + return toAjax(dmsBaseShutReasonService.deleteWithValidByIds(List.of(shutReasonIds), true)); + } + + + /** + * 下拉框查询停机原因信息列表 + */ + + @GetMapping("/getDmsBaseShutReasonList") + public R> getDmsBaseShutReasonList(DmsBaseShutReasonBo bo) { + List list = dmsBaseShutReasonService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutTypeController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutTypeController.java new file mode 100644 index 00000000..f37ec82a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseShutTypeController.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.DmsBaseShutTypeVo; +import org.dromara.dms.domain.bo.DmsBaseShutTypeBo; +import org.dromara.dms.service.IDmsBaseShutTypeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 停机类型信息 + * 前端访问路由地址为:/dms/dmsBaseShutType + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBaseShutType") +public class DmsBaseShutTypeController extends BaseController { + + private final IDmsBaseShutTypeService dmsBaseShutTypeService; + + /** + * 查询停机类型信息列表 + */ + @SaCheckPermission("dms:dmsBaseShutType:list") + @GetMapping("/list") + public TableDataInfo list(DmsBaseShutTypeBo bo, PageQuery pageQuery) { + return dmsBaseShutTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出停机类型信息列表 + */ + @SaCheckPermission("dms:dmsBaseShutType:export") + @Log(title = "停机类型信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBaseShutTypeBo bo, HttpServletResponse response) { + List list = dmsBaseShutTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "停机类型信息", DmsBaseShutTypeVo.class, response); + } + + /** + * 获取停机类型信息详细信息 + * + * @param shutTypeId 主键 + */ + @SaCheckPermission("dms:dmsBaseShutType:query") + @GetMapping("/{shutTypeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long shutTypeId) { + return R.ok(dmsBaseShutTypeService.queryById(shutTypeId)); + } + + /** + * 新增停机类型信息 + */ + @SaCheckPermission("dms:dmsBaseShutType:add") + @Log(title = "停机类型信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBaseShutTypeBo bo) { + return toAjax(dmsBaseShutTypeService.insertByBo(bo)); + } + + /** + * 修改停机类型信息 + */ + @SaCheckPermission("dms:dmsBaseShutType:edit") + @Log(title = "停机类型信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBaseShutTypeBo bo) { + return toAjax(dmsBaseShutTypeService.updateByBo(bo)); + } + + /** + * 删除停机类型信息 + * + * @param shutTypeIds 主键串 + */ + @SaCheckPermission("dms:dmsBaseShutType:remove") + @Log(title = "停机类型信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{shutTypeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] shutTypeIds) { + return toAjax(dmsBaseShutTypeService.deleteWithValidByIds(List.of(shutTypeIds), true)); + } + + + /** + * 下拉框查询停机类型信息列表 + */ + + @GetMapping("/getDmsBaseShutTypeList") + public R> getDmsBaseShutTypeList(DmsBaseShutTypeBo bo) { + List list = dmsBaseShutTypeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.java new file mode 100644 index 00000000..31dc4249 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.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.DmsInspectProjectDeviceVo; +import org.dromara.dms.domain.bo.DmsInspectProjectDeviceBo; +import org.dromara.dms.service.IDmsInspectProjectDeviceService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 点巡检项目关联物料信息 + * 前端访问路由地址为:/dms/dmsInspectProjectDevice + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsInspectProjectDevice") +public class DmsInspectProjectDeviceController extends BaseController { + + private final IDmsInspectProjectDeviceService dmsInspectProjectDeviceService; + + /** + * 查询点巡检项目关联物料信息列表 + */ + @SaCheckPermission("dms:dmsInspectProjectDevice:list") + @GetMapping("/list") + public TableDataInfo list(DmsInspectProjectDeviceBo bo, PageQuery pageQuery) { + return dmsInspectProjectDeviceService.queryPageList(bo, pageQuery); + } + + /** + * 导出点巡检项目关联物料信息列表 + */ + @SaCheckPermission("dms:dmsInspectProjectDevice:export") + @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsInspectProjectDeviceBo bo, HttpServletResponse response) { + List list = dmsInspectProjectDeviceService.queryList(bo); + ExcelUtil.exportExcel(list, "点巡检项目关联物料信息", DmsInspectProjectDeviceVo.class, response); + } + + /** + * 获取点巡检项目关联物料信息详细信息 + * + * @param inspectProjectId 主键 + */ + @SaCheckPermission("dms:dmsInspectProjectDevice:query") + @GetMapping("/{inspectProjectId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long inspectProjectId) { + return R.ok(dmsInspectProjectDeviceService.queryById(inspectProjectId)); + } + + /** + * 新增点巡检项目关联物料信息 + */ + @SaCheckPermission("dms:dmsInspectProjectDevice:add") + @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsInspectProjectDeviceBo bo) { + return toAjax(dmsInspectProjectDeviceService.insertByBo(bo)); + } + + /** + * 修改点巡检项目关联物料信息 + */ + @SaCheckPermission("dms:dmsInspectProjectDevice:edit") + @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsInspectProjectDeviceBo bo) { + return toAjax(dmsInspectProjectDeviceService.updateByBo(bo)); + } + + /** + * 删除点巡检项目关联物料信息 + * + * @param inspectProjectIds 主键串 + */ + @SaCheckPermission("dms:dmsInspectProjectDevice:remove") + @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{inspectProjectIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] inspectProjectIds) { + return toAjax(dmsInspectProjectDeviceService.deleteWithValidByIds(List.of(inspectProjectIds), true)); + } + + + /** + * 下拉框查询点巡检项目关联物料信息列表 + */ + + @GetMapping("/getDmsInspectProjectDeviceList") + public R> getDmsInspectProjectDeviceList(DmsInspectProjectDeviceBo bo) { + List list = dmsInspectProjectDeviceService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectRouteDetailController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectRouteDetailController.java new file mode 100644 index 00000000..ded3656e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectRouteDetailController.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.DmsInspectRouteDetailVo; +import org.dromara.dms.domain.bo.DmsInspectRouteDetailBo; +import org.dromara.dms.service.IDmsInspectRouteDetailService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 点巡检线路明细 + * 前端访问路由地址为:/dms/dmsInspectRouteDetail + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsInspectRouteDetail") +public class DmsInspectRouteDetailController extends BaseController { + + private final IDmsInspectRouteDetailService dmsInspectRouteDetailService; + + /** + * 查询点巡检线路明细列表 + */ + @SaCheckPermission("dms:dmsInspectRouteDetail:list") + @GetMapping("/list") + public TableDataInfo list(DmsInspectRouteDetailBo bo, PageQuery pageQuery) { + return dmsInspectRouteDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出点巡检线路明细列表 + */ + @SaCheckPermission("dms:dmsInspectRouteDetail:export") + @Log(title = "点巡检线路明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsInspectRouteDetailBo bo, HttpServletResponse response) { + List list = dmsInspectRouteDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "点巡检线路明细", DmsInspectRouteDetailVo.class, response); + } + + /** + * 获取点巡检线路明细详细信息 + * + * @param routeDetailId 主键 + */ + @SaCheckPermission("dms:dmsInspectRouteDetail:query") + @GetMapping("/{routeDetailId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long routeDetailId) { + return R.ok(dmsInspectRouteDetailService.queryById(routeDetailId)); + } + + /** + * 新增点巡检线路明细 + */ + @SaCheckPermission("dms:dmsInspectRouteDetail:add") + @Log(title = "点巡检线路明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsInspectRouteDetailBo bo) { + return toAjax(dmsInspectRouteDetailService.insertByBo(bo)); + } + + /** + * 修改点巡检线路明细 + */ + @SaCheckPermission("dms:dmsInspectRouteDetail:edit") + @Log(title = "点巡检线路明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsInspectRouteDetailBo bo) { + return toAjax(dmsInspectRouteDetailService.updateByBo(bo)); + } + + /** + * 删除点巡检线路明细 + * + * @param routeDetailIds 主键串 + */ + @SaCheckPermission("dms:dmsInspectRouteDetail:remove") + @Log(title = "点巡检线路明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{routeDetailIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] routeDetailIds) { + return toAjax(dmsInspectRouteDetailService.deleteWithValidByIds(List.of(routeDetailIds), true)); + } + + + /** + * 下拉框查询点巡检线路明细列表 + */ + + @GetMapping("/getDmsInspectRouteDetailList") + public R> getDmsInspectRouteDetailList(DmsInspectRouteDetailBo bo) { + List list = dmsInspectRouteDetailService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRealtimeStatusController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRealtimeStatusController.java new file mode 100644 index 00000000..36e1652d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRealtimeStatusController.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.DmsRealtimeStatusVo; +import org.dromara.dms.domain.bo.DmsRealtimeStatusBo; +import org.dromara.dms.service.IDmsRealtimeStatusService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备实时状态记录 + * 前端访问路由地址为:/dms/DmsRealtimeStatus + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/DmsRealtimeStatus") +public class DmsRealtimeStatusController extends BaseController { + + private final IDmsRealtimeStatusService dmsRealtimeStatusService; + + /** + * 查询设备实时状态记录列表 + */ + @SaCheckPermission("dms:DmsRealtimeStatus:list") + @GetMapping("/list") + public TableDataInfo list(DmsRealtimeStatusBo bo, PageQuery pageQuery) { + return dmsRealtimeStatusService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备实时状态记录列表 + */ + @SaCheckPermission("dms:DmsRealtimeStatus:export") + @Log(title = "设备实时状态记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsRealtimeStatusBo bo, HttpServletResponse response) { + List list = dmsRealtimeStatusService.queryList(bo); + ExcelUtil.exportExcel(list, "设备实时状态记录", DmsRealtimeStatusVo.class, response); + } + + /** + * 获取设备实时状态记录详细信息 + * + * @param statusId 主键 + */ + @SaCheckPermission("dms:DmsRealtimeStatus:query") + @GetMapping("/{statusId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long statusId) { + return R.ok(dmsRealtimeStatusService.queryById(statusId)); + } + + /** + * 新增设备实时状态记录 + */ + @SaCheckPermission("dms:DmsRealtimeStatus:add") + @Log(title = "设备实时状态记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsRealtimeStatusBo bo) { + return toAjax(dmsRealtimeStatusService.insertByBo(bo)); + } + + /** + * 修改设备实时状态记录 + */ + @SaCheckPermission("dms:DmsRealtimeStatus:edit") + @Log(title = "设备实时状态记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsRealtimeStatusBo bo) { + return toAjax(dmsRealtimeStatusService.updateByBo(bo)); + } + + /** + * 删除设备实时状态记录 + * + * @param statusIds 主键串 + */ + @SaCheckPermission("dms:DmsRealtimeStatus:remove") + @Log(title = "设备实时状态记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{statusIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] statusIds) { + return toAjax(dmsRealtimeStatusService.deleteWithValidByIds(List.of(statusIds), true)); + } + + + /** + * 下拉框查询设备实时状态记录列表 + */ + + @GetMapping("/getDmsRealtimeStatusList") + public R> getDmsRealtimeStatusList(DmsRealtimeStatusBo bo) { + List list = dmsRealtimeStatusService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordShutDownController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordShutDownController.java new file mode 100644 index 00000000..5f5f5324 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordShutDownController.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.DmsRecordShutDownVo; +import org.dromara.dms.domain.bo.DmsRecordShutDownBo; +import org.dromara.dms.service.IDmsRecordShutDownService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 停机记录 + * 前端访问路由地址为:/dms/dmsRecordShutDown + * + * @author zch + * @date 2025-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsRecordShutDown") +public class DmsRecordShutDownController extends BaseController { + + private final IDmsRecordShutDownService dmsRecordShutDownService; + + /** + * 查询停机记录列表 + */ + @SaCheckPermission("dms:dmsRecordShutDown:list") + @GetMapping("/list") + public TableDataInfo list(DmsRecordShutDownBo bo, PageQuery pageQuery) { + return dmsRecordShutDownService.queryPageList(bo, pageQuery); + } + + /** + * 导出停机记录列表 + */ + @SaCheckPermission("dms:dmsRecordShutDown:export") + @Log(title = "停机记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsRecordShutDownBo bo, HttpServletResponse response) { + List list = dmsRecordShutDownService.queryList(bo); + ExcelUtil.exportExcel(list, "停机记录", DmsRecordShutDownVo.class, response); + } + + /** + * 获取停机记录详细信息 + * + * @param recordShutDownId 主键 + */ + @SaCheckPermission("dms:dmsRecordShutDown:query") + @GetMapping("/{recordShutDownId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long recordShutDownId) { + return R.ok(dmsRecordShutDownService.queryById(recordShutDownId)); + } + + /** + * 新增停机记录 + */ + @SaCheckPermission("dms:dmsRecordShutDown:add") + @Log(title = "停机记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsRecordShutDownBo bo) { + return toAjax(dmsRecordShutDownService.insertByBo(bo)); + } + + /** + * 修改停机记录 + */ + @SaCheckPermission("dms:dmsRecordShutDown:edit") + @Log(title = "停机记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsRecordShutDownBo bo) { + return toAjax(dmsRecordShutDownService.updateByBo(bo)); + } + + /** + * 删除停机记录 + * + * @param recordShutDownIds 主键串 + */ + @SaCheckPermission("dms:dmsRecordShutDown:remove") + @Log(title = "停机记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordShutDownIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] recordShutDownIds) { + return toAjax(dmsRecordShutDownService.deleteWithValidByIds(List.of(recordShutDownIds), true)); + } + + + /** + * 下拉框查询停机记录列表 + */ + + @GetMapping("/getDmsRecordShutDownList") + public R> getDmsRecordShutDownList(DmsRecordShutDownBo bo) { + List list = dmsRecordShutDownService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectProject.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectProject.java new file mode 100644 index 00000000..b3e942ba --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectProject.java @@ -0,0 +1,77 @@ +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.io.Serial; +import java.math.BigDecimal; + +/** + * 点巡检项目信息对象 dms_base_inspect_project + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_inspect_project") +public class DmsBaseInspectProject extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "inspect_project_id", type = IdType.AUTO) + private Long inspectProjectId; + + /** + * 项目编号 + */ + private String inspectProjectCode; + + /** + * 巡检项目 + */ + private String inspectProject; + + /** + * 检查类型(1巡检 2点检) + */ + private String inspectType; + + /** + * 巡检项目属性(1定性 2定量) + */ + private String inspectProjectProperty; + + /** + * 记录方式 + */ + private String recordMethod; + + /** + * 上限 + */ + private BigDecimal upLimit; + + /** + * 下限 + */ + private BigDecimal lowLimit; + + /** + * 默认值 + */ + private BigDecimal defValue; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectRoute.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectRoute.java new file mode 100644 index 00000000..f21e2a4e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectRoute.java @@ -0,0 +1,62 @@ +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.io.Serial; + +/** + * 点巡检线路信息对象 dms_base_inspect_route + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_inspect_route") +public class DmsBaseInspectRoute extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "inspect_route_id", type = IdType.AUTO) + private Long inspectRouteId; + + /** + * 线路编号 + */ + private String routeCode; + + /** + * 线路名称 + */ + private String routeName; + + /** + * 线路类型(1巡检 2点检) + */ + private String inspectType; + + /** + * 循环周期 + */ + private String cyclePeriod; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + private Long deviceTypeId; + + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectStandard.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectStandard.java new file mode 100644 index 00000000..eb07626a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseInspectStandard.java @@ -0,0 +1,71 @@ +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.io.Serial; + +/** + * 点巡检标准信息对象 dms_base_inspect_standard + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_inspect_standard") +public class DmsBaseInspectStandard extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "inspect_standard_id", type = IdType.AUTO) + private Long inspectStandardId; + + /** + * 标准编号 + */ + private String standardCode; + + /** + * 标准名称 + */ + private String standardName; + + /** + * 巡检目的 + */ + private String inspectObjective; + + /** + * 巡检项目ID，关联dms_base_inspect_project的inspect_project_id + */ + private Long inspectProjectId; + + /** + * 检查项总数 + */ + private Long inspectItemCount; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 项目编号 + */ + @TableField(exist = false) + private String inspectProjectCode;//join + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java new file mode 100644 index 00000000..d05c2599 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java @@ -0,0 +1,72 @@ +package org.dromara.dms.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 停机原因信息对象 dms_base_shut_reason + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_shut_reason") +public class DmsBaseShutReason extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "shut_reason_id", type = IdType.AUTO) + private Long shutReasonId; + + /** + * 原因编号 + */ + private String reasonCode; + + /** + * 停机原因 + */ + private String shutReason; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 停机类型,关联dms_base_shut_type的shut_type_id + */ + private Long shutTypeId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + + /** + * 停机类型名称 + */ + @TableField(exist = false) + private String shutTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutType.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutType.java new file mode 100644 index 00000000..63ad8e49 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutType.java @@ -0,0 +1,51 @@ +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.io.Serial; + +/** + * 停机类型信息对象 dms_base_shut_type + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_base_shut_type") +public class DmsBaseShutType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "shut_type_id", type = IdType.AUTO) + private Long shutTypeId; + + /** + * 停机类型编号 + */ + private String shutTypeCode; + + /** + * 停机类型名称 + */ + private String shutTypeName; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java new file mode 100644 index 00000000..63d97103 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java @@ -0,0 +1,40 @@ +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.io.Serial; + +/** + * 点巡检项目关联物料信息对象 dms_inspect_project_device + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_inspect_project_device") +public class DmsInspectProjectDevice extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 点巡检项目ID + */ + private Long inspectProjectId; + + /** + * 关联类型(1设备类型) + */ + private String targetType; + + /** + * 关联类型的主键 + */ + private Long targetId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java new file mode 100644 index 00000000..c24ffc03 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java @@ -0,0 +1,67 @@ +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.io.Serial; + +/** + * 点巡检线路明细对象 dms_inspect_route_detail + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_inspect_route_detail") +public class DmsInspectRouteDetail extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "route_detail_id", type = IdType.AUTO) + private Long routeDetailId; + + /** + * 线路ID，关联dms_base_inspect_route的inspect_route_id + */ + private Long inspectRouteId; + + /** + * 巡检步骤 + */ + private Long lineStep; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 巡检标准;预留，不需要关联巡检标准，一条巡检线路的巡检标准都相同 + */ + private String inspectStandard; + + /** + * 备注 + */ + private String remark; + + /** + * 线路名称 + */ + @TableField(exist = false) + private String routeName;//JOIN + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java new file mode 100644 index 00000000..1df684f8 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java @@ -0,0 +1,58 @@ +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.io.Serial; + +/** + * 设备实时状态记录对象 dms_realtime_status + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_realtime_status") +public class DmsRealtimeStatus extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "status_id", type = IdType.AUTO) + private Long statusId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 设备状态编号 + */ + private String statusCode; + + /** + * 设备状态名称 + */ + private String statusName; + + /** + * 设备状态值 + */ + private String statusValue; + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java new file mode 100644 index 00000000..2a792c0f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java @@ -0,0 +1,96 @@ +package org.dromara.dms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 停机记录对象 dms_record_shut_down + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_record_shut_down") +public class DmsRecordShutDown extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识;scada上报的记录 + */ + @TableId(value = "record_shut_down_id", type = IdType.AUTO) + private Long recordShutDownId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + private Long machineId; + + /** + * 停机类型ID，关联dm_base_shut_type的shut_type_id + */ + private Long shutTypeId; + + /** + * 停机原因ID，关联dms_base_shut_reason的shut_reason_id + */ + private Long shutReasonId; + + /** + * 停机开始时间 + */ + private Date shutBeginTime; + + /** + * 停机结束时间 + */ + private Date shutEndTime; + + /** + * 停机时长(毫秒) + */ + private Long shutTime; + + /** + * 停机标识（0未结束 1已结束） + */ + private String downtimeFlag; + + /** + * 停机原因 + */ + private String shutReason; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + + /** + * 停机类型名称 + */ + @TableField(exist = false) + private String shutTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectProjectBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectProjectBo.java new file mode 100644 index 00000000..39eea6d2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectProjectBo.java @@ -0,0 +1,78 @@ +package org.dromara.dms.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsBaseInspectProject; + +import java.math.BigDecimal; + +/** + * 点巡检项目信息业务对象 dms_base_inspect_project + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseInspectProject.class, reverseConvertGenerate = false) +public class DmsBaseInspectProjectBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long inspectProjectId; + + /** + * 项目编号 + */ + @NotBlank(message = "项目编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectProjectCode; + + /** + * 巡检项目 + */ + @NotBlank(message = "巡检项目不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectProject; + + /** + * 检查类型(1巡检 2点检) + */ + private String inspectType; + + /** + * 巡检项目属性(1定性 2定量) + */ + private String inspectProjectProperty; + + /** + * 记录方式 + */ + private String recordMethod; + + /** + * 上限 + */ + private BigDecimal upLimit; + + /** + * 下限 + */ + private BigDecimal lowLimit; + + /** + * 默认值 + */ + private BigDecimal defValue; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectRouteBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectRouteBo.java new file mode 100644 index 00000000..d6f1bd65 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectRouteBo.java @@ -0,0 +1,57 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseInspectRoute; +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.*; + +/** + * 点巡检线路信息业务对象 dms_base_inspect_route + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseInspectRoute.class, reverseConvertGenerate = false) +public class DmsBaseInspectRouteBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long inspectRouteId; + + /** + * 线路编号 + */ + @NotBlank(message = "线路编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String routeCode; + + /** + * 线路名称 + */ + @NotBlank(message = "线路名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String routeName; + + /** + * 线路类型(1巡检 2点检) + */ + private String inspectType; + + /** + * 循环周期 + */ + private String cyclePeriod; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @NotNull(message = "设备类型ID，关联base_device_type的device_type_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deviceTypeId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectStandardBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectStandardBo.java new file mode 100644 index 00000000..06b91413 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseInspectStandardBo.java @@ -0,0 +1,67 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseInspectStandard; +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.*; + +/** + * 点巡检标准信息业务对象 dms_base_inspect_standard + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseInspectStandard.class, reverseConvertGenerate = false) +public class DmsBaseInspectStandardBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long inspectStandardId; + + /** + * 标准编号 + */ + @NotBlank(message = "标准编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String standardCode; + + /** + * 标准名称 + */ + @NotBlank(message = "标准名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String standardName; + + /** + * 巡检目的 + */ + private String inspectObjective; + + /** + * 巡检项目ID，关联dms_base_inspect_project的inspect_project_id + */ + private Long inspectProjectId; + + /** + * 检查项总数 + */ + private Long inspectItemCount; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutReasonBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutReasonBo.java new file mode 100644 index 00000000..81dcc5c7 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutReasonBo.java @@ -0,0 +1,62 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseShutReason; +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.*; + +/** + * 停机原因信息业务对象 dms_base_shut_reason + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseShutReason.class, reverseConvertGenerate = false) +public class DmsBaseShutReasonBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long shutReasonId; + + /** + * 原因编号 + */ + @NotBlank(message = "原因编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String reasonCode; + + /** + * 停机原因 + */ + private String shutReason; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @NotNull(message = "设备ID，关联prod_base_machine_info的machine_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 停机类型,关联dms_base_shut_type的shut_type_id + */ + private Long shutTypeId; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutTypeBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutTypeBo.java new file mode 100644 index 00000000..12edf14c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseShutTypeBo.java @@ -0,0 +1,53 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBaseShutType; +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.*; + +/** + * 停机类型信息业务对象 dms_base_shut_type + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBaseShutType.class, reverseConvertGenerate = false) +public class DmsBaseShutTypeBo extends BaseEntity { + + /** + * 主键标识 + */ +/* @NotNull(message = "主键标识不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long shutTypeId; + + /** + * 停机类型编号 + */ + @NotBlank(message = "停机类型编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shutTypeCode; + + /** + * 停机类型名称 + */ + @NotBlank(message = "停机类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shutTypeName; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java new file mode 100644 index 00000000..e46a62cb --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java @@ -0,0 +1,39 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsInspectProjectDevice; +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.*; + +/** + * 点巡检项目关联物料信息业务对象 dms_inspect_project_device + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsInspectProjectDevice.class, reverseConvertGenerate = false) +public class DmsInspectProjectDeviceBo extends BaseEntity { + + /** + * 点巡检项目ID + */ + private Long inspectProjectId; + + /** + * 关联类型(1设备类型) + */ + private String targetType; + + /** + * 关联类型的主键 + */ + private Long targetId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectRouteDetailBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectRouteDetailBo.java new file mode 100644 index 00000000..9c4d8098 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectRouteDetailBo.java @@ -0,0 +1,60 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsInspectRouteDetail; +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.*; + +/** + * 点巡检线路明细业务对象 dms_inspect_route_detail + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsInspectRouteDetail.class, reverseConvertGenerate = false) +public class DmsInspectRouteDetailBo extends BaseEntity { + + /** + * 主键标识 + */ + // @NotNull(message = "主键标识不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long routeDetailId; + + /** + * 线路ID，关联dms_base_inspect_route的inspect_route_id + */ + @NotNull(message = "线路ID，关联dms_base_inspect_route的inspect_route_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long inspectRouteId; + + /** + * 巡检步骤 + */ + // @NotNull(message = "巡检步骤不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long lineStep; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @NotNull(message = "设备ID，关联prod_base_machine_info的machine_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 巡检标准;预留，不需要关联巡检标准，一条巡检线路的巡检标准都相同 + */ +// @NotBlank(message = "巡检标准;预留，不需要关联巡检标准，一条巡检线路的巡检标准都相同不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectStandard; + + /** + * 备注 + */ +// @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRealtimeStatusBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRealtimeStatusBo.java new file mode 100644 index 00000000..9346352f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRealtimeStatusBo.java @@ -0,0 +1,51 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsRealtimeStatus; +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.*; + +/** + * 设备实时状态记录业务对象 dms_realtime_status + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsRealtimeStatus.class, reverseConvertGenerate = false) +public class DmsRealtimeStatusBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long statusId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @NotNull(message = "设备ID，关联prod_base_machine_info的machine_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 设备状态编号 + */ + @NotBlank(message = "设备状态编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String statusCode; + + /** + * 设备状态名称 + */ + private String statusName; + + /** + * 设备状态值 + */ + private String statusValue; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordShutDownBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordShutDownBo.java new file mode 100644 index 00000000..fe9b98dc --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordShutDownBo.java @@ -0,0 +1,83 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsRecordShutDown; +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; + +/** + * 停机记录业务对象 dms_record_shut_down + * + * @author zch + * @date 2025-03-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsRecordShutDown.class, reverseConvertGenerate = false) +public class DmsRecordShutDownBo extends BaseEntity { + + /** + * 主键标识;scada上报的记录 + */ + private Long recordShutDownId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @NotNull(message = "设备ID，关联prod_base_machine_info的machine_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 停机类型ID，关联dm_base_shut_type的shut_type_id + */ + private Long shutTypeId; + + /** + * 停机原因ID，关联dms_base_shut_reason的shut_reason_id + */ + private Long shutReasonId; + + /** + * 停机开始时间 + */ + private Date shutBeginTime; + + /** + * 停机结束时间 + */ + private Date shutEndTime; + + /** + * 停机时长(毫秒) + */ + private Long shutTime; + + /** + * 停机标识（0未结束 1已结束） + */ + private String downtimeFlag; + + /** + * 停机原因 + */ + private String shutReason; + + /** + * 激活标识（1是 0否） + */ + @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectProjectVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectProjectVo.java new file mode 100644 index 00000000..beb9ba36 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectProjectVo.java @@ -0,0 +1,94 @@ +package org.dromara.dms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsBaseInspectProject; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + + +/** + * 点巡检项目信息视图对象 dms_base_inspect_project + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseInspectProject.class) +public class DmsBaseInspectProjectVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long inspectProjectId; + + /** + * 项目编号 + */ + @ExcelProperty(value = "项目编号") + private String inspectProjectCode; + + /** + * 巡检项目 + */ + @ExcelProperty(value = "巡检项目") + private String inspectProject; + + /** + * 检查类型(1巡检 2点检) + */ + @ExcelProperty(value = "检查类型(1巡检 2点检)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "inspect_type") + private String inspectType; + + /** + * 巡检项目属性(1定性 2定量) + */ + @ExcelProperty(value = "巡检项目属性(1定性 2定量)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "inspect_project_property") + private String inspectProjectProperty; + + /** + * 记录方式 + */ + @ExcelProperty(value = "记录方式") + private String recordMethod; + + /** + * 上限 + */ + @ExcelProperty(value = "上限") + private BigDecimal upLimit; + + /** + * 下限 + */ + @ExcelProperty(value = "下限") + private BigDecimal lowLimit; + + /** + * 默认值 + */ + @ExcelProperty(value = "默认值") + private BigDecimal defValue; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectRouteVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectRouteVo.java new file mode 100644 index 00000000..adaef463 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectRouteVo.java @@ -0,0 +1,68 @@ +package org.dromara.dms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsBaseInspectRoute; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 点巡检线路信息视图对象 dms_base_inspect_route + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseInspectRoute.class) +public class DmsBaseInspectRouteVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long inspectRouteId; + + /** + * 线路编号 + */ + @ExcelProperty(value = "线路编号") + private String routeCode; + + /** + * 线路名称 + */ + @ExcelProperty(value = "线路名称") + private String routeName; + + /** + * 线路类型(1巡检 2点检) + */ + @ExcelProperty(value = "线路类型(1巡检 2点检)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "inspect_type") + private String inspectType; + + /** + * 循环周期 + */ + @ExcelProperty(value = "循环周期") + private String cyclePeriod; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + @ExcelProperty(value = "设备类型ID，关联base_device_type的device_type_id") + private Long deviceTypeId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectStandardVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectStandardVo.java new file mode 100644 index 00000000..60da2501 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseInspectStandardVo.java @@ -0,0 +1,84 @@ +package org.dromara.dms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsBaseInspectStandard; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 点巡检标准信息视图对象 dms_base_inspect_standard + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseInspectStandard.class) +public class DmsBaseInspectStandardVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long inspectStandardId; + + /** + * 标准编号 + */ + @ExcelProperty(value = "标准编号") + private String standardCode; + + /** + * 标准名称 + */ + @ExcelProperty(value = "标准名称") + private String standardName; + + /** + * 巡检目的 + */ + @ExcelProperty(value = "巡检目的") + private String inspectObjective; + + /** + * 巡检项目ID，关联dms_base_inspect_project的inspect_project_id + */ + @ExcelProperty(value = "巡检项目ID，关联dms_base_inspect_project的inspect_project_id") + private Long inspectProjectId; + + /** + * 检查项总数 + */ + @ExcelProperty(value = "检查项总数") + private Long inspectItemCount; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 项目编号 + */ + private String inspectProjectCode; + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java new file mode 100644 index 00000000..c2871a95 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java @@ -0,0 +1,84 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseShutReason; +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; + + + +/** + * 停机原因信息视图对象 dms_base_shut_reason + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseShutReason.class) +public class DmsBaseShutReasonVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long shutReasonId; + + /** + * 原因编号 + */ + @ExcelProperty(value = "原因编号") + private String reasonCode; + + /** + * 停机原因 + */ + @ExcelProperty(value = "停机原因") + private String shutReason; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID") + private Long machineId; + + /** + * 停机类型,关联dms_base_shut_type的shut_type_id + */ + @ExcelProperty(value = "停机类型") + private Long shutTypeId; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 机台名称 + */ + private String machineName;//JOIN + + /** + * 停机类型名称 + */ + private String shutTypeName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutTypeVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutTypeVo.java new file mode 100644 index 00000000..d3cf9795 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutTypeVo.java @@ -0,0 +1,63 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsBaseShutType; +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; + + + +/** + * 停机类型信息视图对象 dms_base_shut_type + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBaseShutType.class) +public class DmsBaseShutTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long shutTypeId; + + /** + * 停机类型编号 + */ + @ExcelProperty(value = "停机类型编号") + private String shutTypeCode; + + /** + * 停机类型名称 + */ + @ExcelProperty(value = "停机类型名称") + private String shutTypeName; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java new file mode 100644 index 00000000..56c4ac68 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java @@ -0,0 +1,50 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsInspectProjectDevice; +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; + + + +/** + * 点巡检项目关联物料信息视图对象 dms_inspect_project_device + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsInspectProjectDevice.class) +public class DmsInspectProjectDeviceVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 点巡检项目ID + */ + @ExcelProperty(value = "点巡检项目ID") + private Long inspectProjectId; + + /** + * 关联类型(1设备类型) + */ + @ExcelProperty(value = "关联类型(1设备类型)") + private String targetType; + + /** + * 关联类型的主键 + */ + @ExcelProperty(value = "关联类型的主键") + private Long targetId; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java new file mode 100644 index 00000000..6c675ad5 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java @@ -0,0 +1,78 @@ +package org.dromara.dms.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.dms.domain.DmsInspectRouteDetail; +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; + + + +/** + * 点巡检线路明细视图对象 dms_inspect_route_detail + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsInspectRouteDetail.class) +public class DmsInspectRouteDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long routeDetailId; + + /** + * 线路ID，关联dms_base_inspect_route的inspect_route_id + */ + @ExcelProperty(value = "线路ID，关联dms_base_inspect_route的inspect_route_id") + private Long inspectRouteId; + + /** + * 巡检步骤 + */ + @ExcelProperty(value = "巡检步骤") + private Long lineStep; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID，关联prod_base_machine_info的machine_id") + private Long machineId; + + /** + * 巡检标准;预留，不需要关联巡检标准，一条巡检线路的巡检标准都相同 + */ + @ExcelProperty(value = "巡检标准;预留，不需要关联巡检标准，一条巡检线路的巡检标准都相同") + private String inspectStandard; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 线路名称 + */ + private String routeName;//JOIN + + /** + * 机台名称 + */ + private String machineName;//JOIN + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java new file mode 100644 index 00000000..5b36c55e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java @@ -0,0 +1,67 @@ +package org.dromara.dms.domain.vo; + +import org.dromara.dms.domain.DmsRealtimeStatus; +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; + + + +/** + * 设备实时状态记录视图对象 dms_realtime_status + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsRealtimeStatus.class) +public class DmsRealtimeStatusVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long statusId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID") + private Long machineId; + + /** + * 设备状态编号 + */ + @ExcelProperty(value = "设备状态编号") + private String statusCode; + + /** + * 设备状态名称 + */ + @ExcelProperty(value = "设备状态名称") + private String statusName; + + /** + * 设备状态值 + */ + @ExcelProperty(value = "设备状态值") + private String statusValue; + + /** + * 机台名称 + */ + private String machineName;//JOIN + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java new file mode 100644 index 00000000..b808d7f2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java @@ -0,0 +1,109 @@ +package org.dromara.dms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsRecordShutDown; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 停机记录视图对象 dms_record_shut_down + * + * @author zch + * @date 2025-03-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsRecordShutDown.class) +public class DmsRecordShutDownVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识;scada上报的记录 + */ + @ExcelProperty(value = "主键标识;scada上报的记录") + private Long recordShutDownId; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + @ExcelProperty(value = "设备ID") + private Long machineId; + + /** + * 停机类型ID，关联dm_base_shut_type的shut_type_id + */ + @ExcelProperty(value = "停机类型ID") + private Long shutTypeId; + + /** + * 停机原因ID，关联dms_base_shut_reason的shut_reason_id + */ + @ExcelProperty(value = "停机原因ID") + private Long shutReasonId; + + /** + * 停机开始时间 + */ + @ExcelProperty(value = "停机开始时间") + private Date shutBeginTime; + + /** + * 停机结束时间 + */ + @ExcelProperty(value = "停机结束时间") + private Date shutEndTime; + + /** + * 停机时长(毫秒) + */ + @ExcelProperty(value = "停机时长(毫秒)") + private Long shutTime; + + /** + * 停机标识（0未结束 1已结束） + */ + @ExcelProperty(value = "停机标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=未结束,1=已结束") + private String downtimeFlag; + + /** + * 停机原因 + */ + @ExcelProperty(value = "停机原因") + private String shutReason; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 机台名称 + */ + private String machineName;//JOIN + + /** + * 停机类型名称 + */ + private String shutTypeName;//join + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectProjectMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectProjectMapper.java new file mode 100644 index 00000000..da298188 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectProjectMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseInspectProject; +import org.dromara.dms.domain.vo.DmsBaseInspectProjectVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 点巡检项目信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseInspectProjectMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectRouteMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectRouteMapper.java new file mode 100644 index 00000000..ee6589a9 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectRouteMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseInspectRoute; +import org.dromara.dms.domain.vo.DmsBaseInspectRouteVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 点巡检线路信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseInspectRouteMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectStandardMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectStandardMapper.java new file mode 100644 index 00000000..8e9b71b2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseInspectStandardMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseInspectStandard; +import org.dromara.dms.domain.vo.DmsBaseInspectStandardVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 点巡检标准信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseInspectStandardMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutReasonMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutReasonMapper.java new file mode 100644 index 00000000..1995e994 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutReasonMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseShutReason; +import org.dromara.dms.domain.vo.DmsBaseShutReasonVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 停机原因信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseShutReasonMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutTypeMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutTypeMapper.java new file mode 100644 index 00000000..af48dadf --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseShutTypeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBaseShutType; +import org.dromara.dms.domain.vo.DmsBaseShutTypeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 停机类型信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsBaseShutTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java new file mode 100644 index 00000000..01480bc9 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsInspectProjectDevice; +import org.dromara.dms.domain.vo.DmsInspectProjectDeviceVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 点巡检项目关联物料信息Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsInspectProjectDeviceMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectRouteDetailMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectRouteDetailMapper.java new file mode 100644 index 00000000..850b1a4c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectRouteDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsInspectRouteDetail; +import org.dromara.dms.domain.vo.DmsInspectRouteDetailVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 点巡检线路明细Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsInspectRouteDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRealtimeStatusMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRealtimeStatusMapper.java new file mode 100644 index 00000000..55c2cc44 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRealtimeStatusMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsRealtimeStatus; +import org.dromara.dms.domain.vo.DmsRealtimeStatusVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备实时状态记录Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsRealtimeStatusMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordShutDownMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordShutDownMapper.java new file mode 100644 index 00000000..513bd039 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordShutDownMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsRecordShutDown; +import org.dromara.dms.domain.vo.DmsRecordShutDownVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 停机记录Mapper接口 + * + * @author zch + * @date 2025-03-24 + */ +public interface DmsRecordShutDownMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectProjectService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectProjectService.java new file mode 100644 index 00000000..b35be3b6 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectProjectService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseInspectProject; +import org.dromara.dms.domain.vo.DmsBaseInspectProjectVo; +import org.dromara.dms.domain.bo.DmsBaseInspectProjectBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseInspectProjectService { + + /** + * 查询点巡检项目信息 + * + * @param inspectProjectId 主键 + * @return 点巡检项目信息 + */ + DmsBaseInspectProjectVo queryById(Long inspectProjectId); + + /** + * 分页查询点巡检项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检项目信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseInspectProjectBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的点巡检项目信息列表 + * + * @param bo 查询条件 + * @return 点巡检项目信息列表 + */ + List queryList(DmsBaseInspectProjectBo bo); + + /** + * 新增点巡检项目信息 + * + * @param bo 点巡检项目信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseInspectProjectBo bo); + + /** + * 修改点巡检项目信息 + * + * @param bo 点巡检项目信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseInspectProjectBo bo); + + /** + * 校验并批量删除点巡检项目信息信息 + * + * @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/IDmsBaseInspectRouteService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectRouteService.java new file mode 100644 index 00000000..07b76f96 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectRouteService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseInspectRoute; +import org.dromara.dms.domain.vo.DmsBaseInspectRouteVo; +import org.dromara.dms.domain.bo.DmsBaseInspectRouteBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseInspectRouteService { + + /** + * 查询点巡检线路信息 + * + * @param inspectRouteId 主键 + * @return 点巡检线路信息 + */ + DmsBaseInspectRouteVo queryById(Long inspectRouteId); + + /** + * 分页查询点巡检线路信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检线路信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseInspectRouteBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的点巡检线路信息列表 + * + * @param bo 查询条件 + * @return 点巡检线路信息列表 + */ + List queryList(DmsBaseInspectRouteBo bo); + + /** + * 新增点巡检线路信息 + * + * @param bo 点巡检线路信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseInspectRouteBo bo); + + /** + * 修改点巡检线路信息 + * + * @param bo 点巡检线路信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseInspectRouteBo bo); + + /** + * 校验并批量删除点巡检线路信息信息 + * + * @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/IDmsBaseInspectStandardService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectStandardService.java new file mode 100644 index 00000000..9f989213 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseInspectStandardService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseInspectStandard; +import org.dromara.dms.domain.vo.DmsBaseInspectStandardVo; +import org.dromara.dms.domain.bo.DmsBaseInspectStandardBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseInspectStandardService { + + /** + * 查询点巡检标准信息 + * + * @param inspectStandardId 主键 + * @return 点巡检标准信息 + */ + DmsBaseInspectStandardVo queryById(Long inspectStandardId); + + /** + * 分页查询点巡检标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检标准信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseInspectStandardBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的点巡检标准信息列表 + * + * @param bo 查询条件 + * @return 点巡检标准信息列表 + */ + List queryList(DmsBaseInspectStandardBo bo); + + /** + * 新增点巡检标准信息 + * + * @param bo 点巡检标准信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseInspectStandardBo bo); + + /** + * 修改点巡检标准信息 + * + * @param bo 点巡检标准信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseInspectStandardBo bo); + + /** + * 校验并批量删除点巡检标准信息信息 + * + * @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/IDmsBaseShutReasonService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseShutReasonService.java new file mode 100644 index 00000000..6553452f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseShutReasonService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseShutReason; +import org.dromara.dms.domain.vo.DmsBaseShutReasonVo; +import org.dromara.dms.domain.bo.DmsBaseShutReasonBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseShutReasonService { + + /** + * 查询停机原因信息 + * + * @param shutReasonId 主键 + * @return 停机原因信息 + */ + DmsBaseShutReasonVo queryById(Long shutReasonId); + + /** + * 分页查询停机原因信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 停机原因信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseShutReasonBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的停机原因信息列表 + * + * @param bo 查询条件 + * @return 停机原因信息列表 + */ + List queryList(DmsBaseShutReasonBo bo); + + /** + * 新增停机原因信息 + * + * @param bo 停机原因信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseShutReasonBo bo); + + /** + * 修改停机原因信息 + * + * @param bo 停机原因信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseShutReasonBo bo); + + /** + * 校验并批量删除停机原因信息信息 + * + * @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/IDmsBaseShutTypeService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseShutTypeService.java new file mode 100644 index 00000000..1aab32c5 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseShutTypeService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBaseShutType; +import org.dromara.dms.domain.vo.DmsBaseShutTypeVo; +import org.dromara.dms.domain.bo.DmsBaseShutTypeBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsBaseShutTypeService { + + /** + * 查询停机类型信息 + * + * @param shutTypeId 主键 + * @return 停机类型信息 + */ + DmsBaseShutTypeVo queryById(Long shutTypeId); + + /** + * 分页查询停机类型信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 停机类型信息分页列表 + */ + TableDataInfo queryPageList(DmsBaseShutTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的停机类型信息列表 + * + * @param bo 查询条件 + * @return 停机类型信息列表 + */ + List queryList(DmsBaseShutTypeBo bo); + + /** + * 新增停机类型信息 + * + * @param bo 停机类型信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsBaseShutTypeBo bo); + + /** + * 修改停机类型信息 + * + * @param bo 停机类型信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsBaseShutTypeBo bo); + + /** + * 校验并批量删除停机类型信息信息 + * + * @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/IDmsInspectProjectDeviceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectProjectDeviceService.java new file mode 100644 index 00000000..bf0809a7 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectProjectDeviceService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsInspectProjectDevice; +import org.dromara.dms.domain.vo.DmsInspectProjectDeviceVo; +import org.dromara.dms.domain.bo.DmsInspectProjectDeviceBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsInspectProjectDeviceService { + + /** + * 查询点巡检项目关联物料信息 + * + * @param inspectProjectId 主键 + * @return 点巡检项目关联物料信息 + */ + DmsInspectProjectDeviceVo queryById(Long inspectProjectId); + + /** + * 分页查询点巡检项目关联物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检项目关联物料信息分页列表 + */ + TableDataInfo queryPageList(DmsInspectProjectDeviceBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的点巡检项目关联物料信息列表 + * + * @param bo 查询条件 + * @return 点巡检项目关联物料信息列表 + */ + List queryList(DmsInspectProjectDeviceBo bo); + + /** + * 新增点巡检项目关联物料信息 + * + * @param bo 点巡检项目关联物料信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsInspectProjectDeviceBo bo); + + /** + * 修改点巡检项目关联物料信息 + * + * @param bo 点巡检项目关联物料信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsInspectProjectDeviceBo bo); + + /** + * 校验并批量删除点巡检项目关联物料信息信息 + * + * @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/IDmsInspectRouteDetailService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectRouteDetailService.java new file mode 100644 index 00000000..27bd237d --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectRouteDetailService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsInspectRouteDetail; +import org.dromara.dms.domain.vo.DmsInspectRouteDetailVo; +import org.dromara.dms.domain.bo.DmsInspectRouteDetailBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsInspectRouteDetailService { + + /** + * 查询点巡检线路明细 + * + * @param routeDetailId 主键 + * @return 点巡检线路明细 + */ + DmsInspectRouteDetailVo queryById(Long routeDetailId); + + /** + * 分页查询点巡检线路明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检线路明细分页列表 + */ + TableDataInfo queryPageList(DmsInspectRouteDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的点巡检线路明细列表 + * + * @param bo 查询条件 + * @return 点巡检线路明细列表 + */ + List queryList(DmsInspectRouteDetailBo bo); + + /** + * 新增点巡检线路明细 + * + * @param bo 点巡检线路明细 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsInspectRouteDetailBo bo); + + /** + * 修改点巡检线路明细 + * + * @param bo 点巡检线路明细 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsInspectRouteDetailBo bo); + + /** + * 校验并批量删除点巡检线路明细信息 + * + * @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/IDmsRealtimeStatusService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRealtimeStatusService.java new file mode 100644 index 00000000..2ccdd074 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRealtimeStatusService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsRealtimeStatus; +import org.dromara.dms.domain.vo.DmsRealtimeStatusVo; +import org.dromara.dms.domain.bo.DmsRealtimeStatusBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsRealtimeStatusService { + + /** + * 查询设备实时状态记录 + * + * @param statusId 主键 + * @return 设备实时状态记录 + */ + DmsRealtimeStatusVo queryById(Long statusId); + + /** + * 分页查询设备实时状态记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备实时状态记录分页列表 + */ + TableDataInfo queryPageList(DmsRealtimeStatusBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备实时状态记录列表 + * + * @param bo 查询条件 + * @return 设备实时状态记录列表 + */ + List queryList(DmsRealtimeStatusBo bo); + + /** + * 新增设备实时状态记录 + * + * @param bo 设备实时状态记录 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsRealtimeStatusBo bo); + + /** + * 修改设备实时状态记录 + * + * @param bo 设备实时状态记录 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsRealtimeStatusBo bo); + + /** + * 校验并批量删除设备实时状态记录信息 + * + * @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/IDmsRecordShutDownService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRecordShutDownService.java new file mode 100644 index 00000000..2a185cb3 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRecordShutDownService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsRecordShutDown; +import org.dromara.dms.domain.vo.DmsRecordShutDownVo; +import org.dromara.dms.domain.bo.DmsRecordShutDownBo; +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 zch + * @date 2025-03-24 + */ +public interface IDmsRecordShutDownService { + + /** + * 查询停机记录 + * + * @param recordShutDownId 主键 + * @return 停机记录 + */ + DmsRecordShutDownVo queryById(Long recordShutDownId); + + /** + * 分页查询停机记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 停机记录分页列表 + */ + TableDataInfo queryPageList(DmsRecordShutDownBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的停机记录列表 + * + * @param bo 查询条件 + * @return 停机记录列表 + */ + List queryList(DmsRecordShutDownBo bo); + + /** + * 新增停机记录 + * + * @param bo 停机记录 + * @return 是否新增成功 + */ + Boolean insertByBo(DmsRecordShutDownBo bo); + + /** + * 修改停机记录 + * + * @param bo 停机记录 + * @return 是否修改成功 + */ + Boolean updateByBo(DmsRecordShutDownBo bo); + + /** + * 校验并批量删除停机记录信息 + * + * @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/DmsBaseInspectProjectServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectProjectServiceImpl.java new file mode 100644 index 00000000..3735386b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectProjectServiceImpl.java @@ -0,0 +1,151 @@ +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.Utils.UniqueCodeUtils; +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.DmsBaseInspectProjectBo; +import org.dromara.dms.domain.vo.DmsBaseInspectProjectVo; +import org.dromara.dms.domain.DmsBaseInspectProject; +import org.dromara.dms.mapper.DmsBaseInspectProjectMapper; +import org.dromara.dms.service.IDmsBaseInspectProjectService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 点巡检项目信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectService { + + private final DmsBaseInspectProjectMapper baseMapper; + + /** + * 查询点巡检项目信息 + * + * @param inspectProjectId 主键 + * @return 点巡检项目信息 + */ + @Override + public DmsBaseInspectProjectVo queryById(Long inspectProjectId){ + return baseMapper.selectVoById(inspectProjectId); + } + + /** + * 分页查询点巡检项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检项目信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseInspectProjectBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的点巡检项目信息列表 + * + * @param bo 查询条件 + * @return 点巡检项目信息列表 + */ + @Override + public List queryList(DmsBaseInspectProjectBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseInspectProjectBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseInspectProject.class) + .selectAll(DmsBaseInspectProject.class) + .eq(bo.getInspectProjectId() != null, DmsBaseInspectProject::getInspectProjectId, bo.getInspectProjectId()) + .eq(StringUtils.isNotBlank(bo.getInspectProjectCode()), DmsBaseInspectProject::getInspectProjectCode, bo.getInspectProjectCode()) + .eq(StringUtils.isNotBlank(bo.getInspectProject()), DmsBaseInspectProject::getInspectProject, bo.getInspectProject()) + .eq(StringUtils.isNotBlank(bo.getInspectType()), DmsBaseInspectProject::getInspectType, bo.getInspectType()) + .eq(StringUtils.isNotBlank(bo.getInspectProjectProperty()), DmsBaseInspectProject::getInspectProjectProperty, bo.getInspectProjectProperty()) + .eq(StringUtils.isNotBlank(bo.getRecordMethod()), DmsBaseInspectProject::getRecordMethod, bo.getRecordMethod()) + .eq(bo.getUpLimit() != null, DmsBaseInspectProject::getUpLimit, bo.getUpLimit()) + .eq(bo.getLowLimit() != null, DmsBaseInspectProject::getLowLimit, bo.getLowLimit()) + .eq(bo.getDefValue() != null, DmsBaseInspectProject::getDefValue, bo.getDefValue()) + .orderByDesc(DmsBaseInspectProject::getCreateTime); + return lqw; + } + + /** + * 新增点巡检项目信息 + * + * @param bo 点巡检项目信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseInspectProjectBo bo) { + DmsBaseInspectProject add = MapstructUtils.convert(bo, DmsBaseInspectProject.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInspectProjectId(add.getInspectProjectId()); + } + return flag; + } + + /** + * 修改点巡检项目信息 + * + * @param bo 点巡检项目信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseInspectProjectBo bo) { + DmsBaseInspectProject update = MapstructUtils.convert(bo, DmsBaseInspectProject.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseInspectProject entity){ + //TODO 做一些数据校验,如唯一约束 + + // 编号校验 + UniqueCodeUtils.validateCodeUnique( + baseMapper, + entity.getInspectProjectCode(), + DmsBaseInspectProject::getInspectProjectCode, + DmsBaseInspectProject::getInspectProjectId, + entity.getInspectProjectId(), + "编号已存在" + ); + } + + /** + * 校验并批量删除点巡检项目信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsBaseInspectRouteServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectRouteServiceImpl.java new file mode 100644 index 00000000..b7128eea --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectRouteServiceImpl.java @@ -0,0 +1,152 @@ +package org.dromara.dms.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.Utils.UniqueCodeUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.DmsBaseDeviceType; +import org.dromara.dms.domain.DmsBaseInspectRoute; +import org.dromara.dms.domain.bo.DmsBaseInspectRouteBo; +import org.dromara.dms.domain.vo.DmsBaseInspectRouteVo; +import org.dromara.dms.mapper.DmsBaseInspectRouteMapper; +import org.dromara.dms.service.IDmsBaseInspectRouteService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 点巡检线路信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteService { + + private final DmsBaseInspectRouteMapper baseMapper; + + /** + * 查询点巡检线路信息 + * + * @param inspectRouteId 主键 + * @return 点巡检线路信息 + */ + @Override + public DmsBaseInspectRouteVo queryById(Long inspectRouteId){ + return baseMapper.selectVoById(inspectRouteId); + } + + /** + * 分页查询点巡检线路信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检线路信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseInspectRouteBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的点巡检线路信息列表 + * + * @param bo 查询条件 + * @return 点巡检线路信息列表 + */ + @Override + public List queryList(DmsBaseInspectRouteBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseInspectRouteBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseInspectRoute.class) + .selectAll(DmsBaseInspectRoute.class) + + //关联查询设备类型信息 + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId,DmsBaseInspectRoute::getDeviceTypeId) + + .eq(bo.getInspectRouteId() != null, DmsBaseInspectRoute::getInspectRouteId, bo.getInspectRouteId()) + .eq(StringUtils.isNotBlank(bo.getRouteCode()), DmsBaseInspectRoute::getRouteCode, bo.getRouteCode()) + .like(StringUtils.isNotBlank(bo.getRouteName()), DmsBaseInspectRoute::getRouteName, bo.getRouteName()) + .eq(StringUtils.isNotBlank(bo.getInspectType()), DmsBaseInspectRoute::getInspectType, bo.getInspectType()) + .eq(StringUtils.isNotBlank(bo.getCyclePeriod()), DmsBaseInspectRoute::getCyclePeriod, bo.getCyclePeriod()) + .eq(bo.getDeviceTypeId() != null, DmsBaseInspectRoute::getDeviceTypeId, bo.getDeviceTypeId()) + .orderByDesc(DmsBaseInspectRoute::getCreateTime); + return lqw; + } + + /** + * 新增点巡检线路信息 + * + * @param bo 点巡检线路信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseInspectRouteBo bo) { + DmsBaseInspectRoute add = MapstructUtils.convert(bo, DmsBaseInspectRoute.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInspectRouteId(add.getInspectRouteId()); + } + return flag; + } + + /** + * 修改点巡检线路信息 + * + * @param bo 点巡检线路信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseInspectRouteBo bo) { + DmsBaseInspectRoute update = MapstructUtils.convert(bo, DmsBaseInspectRoute.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseInspectRoute entity){ + //TODO 做一些数据校验,如唯一约束 + + UniqueCodeUtils.validateCodeUnique( + baseMapper, + entity.getRouteCode(), + DmsBaseInspectRoute::getRouteCode, + DmsBaseInspectRoute::getInspectRouteId, + entity.getInspectRouteId(), + "编码已存在" + ); + } + + /** + * 校验并批量删除点巡检线路信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsBaseInspectStandardServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectStandardServiceImpl.java new file mode 100644 index 00000000..fba8918e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseInspectStandardServiceImpl.java @@ -0,0 +1,154 @@ +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.Utils.UniqueCodeUtils; +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.dromara.dms.domain.DmsBaseInspectProject; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseInspectStandardBo; +import org.dromara.dms.domain.vo.DmsBaseInspectStandardVo; +import org.dromara.dms.domain.DmsBaseInspectStandard; +import org.dromara.dms.mapper.DmsBaseInspectStandardMapper; +import org.dromara.dms.service.IDmsBaseInspectStandardService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 点巡检标准信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandardService { + + private final DmsBaseInspectStandardMapper baseMapper; + + /** + * 查询点巡检标准信息 + * + * @param inspectStandardId 主键 + * @return 点巡检标准信息 + */ + @Override + public DmsBaseInspectStandardVo queryById(Long inspectStandardId){ + return baseMapper.selectVoById(inspectStandardId); + } + + /** + * 分页查询点巡检标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检标准信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseInspectStandardBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的点巡检标准信息列表 + * + * @param bo 查询条件 + * @return 点巡检标准信息列表 + */ + @Override + public List queryList(DmsBaseInspectStandardBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseInspectStandardBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseInspectStandard.class) + .selectAll(DmsBaseInspectStandard.class) + + //关联查询点巡检项目信息 + .select(DmsBaseInspectProject::getInspectProjectCode) + .leftJoin(DmsBaseInspectProject.class, DmsBaseInspectProject::getInspectProjectId, DmsBaseInspectStandard::getInspectProjectId) + + .eq(bo.getInspectStandardId() != null, DmsBaseInspectStandard::getInspectStandardId, bo.getInspectStandardId()) + .eq(StringUtils.isNotBlank(bo.getStandardCode()), DmsBaseInspectStandard::getStandardCode, bo.getStandardCode()) + .like(StringUtils.isNotBlank(bo.getStandardName()), DmsBaseInspectStandard::getStandardName, bo.getStandardName()) + .eq(StringUtils.isNotBlank(bo.getInspectObjective()), DmsBaseInspectStandard::getInspectObjective, bo.getInspectObjective()) + .eq(bo.getInspectProjectId() != null, DmsBaseInspectStandard::getInspectProjectId, bo.getInspectProjectId()) + .eq(bo.getInspectItemCount() != null, DmsBaseInspectStandard::getInspectItemCount, bo.getInspectItemCount()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseInspectStandard::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseInspectStandard::getCreateTime); + return lqw; + } + + /** + * 新增点巡检标准信息 + * + * @param bo 点巡检标准信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseInspectStandardBo bo) { + DmsBaseInspectStandard add = MapstructUtils.convert(bo, DmsBaseInspectStandard.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInspectStandardId(add.getInspectStandardId()); + } + return flag; + } + + /** + * 修改点巡检标准信息 + * + * @param bo 点巡检标准信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseInspectStandardBo bo) { + DmsBaseInspectStandard update = MapstructUtils.convert(bo, DmsBaseInspectStandard.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseInspectStandard entity){ + //TODO 做一些数据校验,如唯一约束 + + UniqueCodeUtils.validateCodeUnique( + baseMapper, + entity.getStandardCode(), + DmsBaseInspectStandard::getStandardCode, + DmsBaseInspectStandard::getInspectStandardId, + entity.getInspectStandardId(), + "编码已存在" + ); + } + + /** + * 校验并批量删除点巡检标准信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsBaseShutReasonServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseShutReasonServiceImpl.java new file mode 100644 index 00000000..cb41b9e9 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseShutReasonServiceImpl.java @@ -0,0 +1,158 @@ +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.Utils.UniqueCodeUtils; +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.dromara.dms.domain.DmsBaseMachineInfo; +import org.dromara.dms.domain.DmsBaseShutType; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBaseShutReasonBo; +import org.dromara.dms.domain.vo.DmsBaseShutReasonVo; +import org.dromara.dms.domain.DmsBaseShutReason; +import org.dromara.dms.mapper.DmsBaseShutReasonMapper; +import org.dromara.dms.service.IDmsBaseShutReasonService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 停机原因信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService { + + private final DmsBaseShutReasonMapper baseMapper; + + /** + * 查询停机原因信息 + * + * @param shutReasonId 主键 + * @return 停机原因信息 + */ + @Override + public DmsBaseShutReasonVo queryById(Long shutReasonId){ + return baseMapper.selectVoById(shutReasonId); + } + + /** + * 分页查询停机原因信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 停机原因信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseShutReasonBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的停机原因信息列表 + * + * @param bo 查询条件 + * @return 停机原因信息列表 + */ + @Override + public List queryList(DmsBaseShutReasonBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseShutReasonBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseShutReason.class) + .selectAll(DmsBaseShutReason.class) + + //关联查询设备信息 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId,DmsBaseShutReason::getMachineId) + //关联查询停机类型 + .select(DmsBaseShutType::getShutTypeName) + .leftJoin(DmsBaseShutType.class, DmsBaseShutType::getShutTypeId,DmsBaseShutReason::getShutTypeId) + + .eq(bo.getShutReasonId() != null, DmsBaseShutReason::getShutReasonId, bo.getShutReasonId()) + .eq(StringUtils.isNotBlank(bo.getReasonCode()), DmsBaseShutReason::getReasonCode, bo.getReasonCode()) + .eq(StringUtils.isNotBlank(bo.getShutReason()), DmsBaseShutReason::getShutReason, bo.getShutReason()) + .eq(bo.getMachineId() != null, DmsBaseShutReason::getMachineId, bo.getMachineId()) + .eq(bo.getShutTypeId() != null, DmsBaseShutReason::getShutTypeId, bo.getShutTypeId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseShutReason::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseShutReason::getCreateTime); + return lqw; + } + + /** + * 新增停机原因信息 + * + * @param bo 停机原因信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseShutReasonBo bo) { + DmsBaseShutReason add = MapstructUtils.convert(bo, DmsBaseShutReason.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setShutReasonId(add.getShutReasonId()); + } + return flag; + } + + /** + * 修改停机原因信息 + * + * @param bo 停机原因信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseShutReasonBo bo) { + DmsBaseShutReason update = MapstructUtils.convert(bo, DmsBaseShutReason.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseShutReason entity){ + //TODO 做一些数据校验,如唯一约束 + + //编号校验 + UniqueCodeUtils.validateCodeUnique( + baseMapper, + entity.getReasonCode(), + DmsBaseShutReason::getReasonCode, + DmsBaseShutReason::getShutReasonId, + entity.getShutReasonId(), + "编号已存在" + ); + } + + /** + * 校验并批量删除停机原因信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsBaseShutTypeServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseShutTypeServiceImpl.java new file mode 100644 index 00000000..37f5b00a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseShutTypeServiceImpl.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.Utils.UniqueCodeUtils; +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.DmsBaseShutTypeBo; +import org.dromara.dms.domain.vo.DmsBaseShutTypeVo; +import org.dromara.dms.domain.DmsBaseShutType; +import org.dromara.dms.mapper.DmsBaseShutTypeMapper; +import org.dromara.dms.service.IDmsBaseShutTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 停机类型信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsBaseShutTypeServiceImpl implements IDmsBaseShutTypeService { + + private final DmsBaseShutTypeMapper baseMapper; + + /** + * 查询停机类型信息 + * + * @param shutTypeId 主键 + * @return 停机类型信息 + */ + @Override + public DmsBaseShutTypeVo queryById(Long shutTypeId){ + return baseMapper.selectVoById(shutTypeId); + } + + /** + * 分页查询停机类型信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 停机类型信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBaseShutTypeBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的停机类型信息列表 + * + * @param bo 查询条件 + * @return 停机类型信息列表 + */ + @Override + public List queryList(DmsBaseShutTypeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBaseShutTypeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseShutType.class) + .selectAll(DmsBaseShutType.class) + .eq(bo.getShutTypeId() != null, DmsBaseShutType::getShutTypeId, bo.getShutTypeId()) + .eq(StringUtils.isNotBlank(bo.getShutTypeCode()), DmsBaseShutType::getShutTypeCode, bo.getShutTypeCode()) + .like(StringUtils.isNotBlank(bo.getShutTypeName()), DmsBaseShutType::getShutTypeName, bo.getShutTypeName()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseShutType::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsBaseShutType::getCreateTime); + return lqw; + } + + /** + * 新增停机类型信息 + * + * @param bo 停机类型信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsBaseShutTypeBo bo) { + DmsBaseShutType add = MapstructUtils.convert(bo, DmsBaseShutType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setShutTypeId(add.getShutTypeId()); + } + return flag; + } + + /** + * 修改停机类型信息 + * + * @param bo 停机类型信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsBaseShutTypeBo bo) { + DmsBaseShutType update = MapstructUtils.convert(bo, DmsBaseShutType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBaseShutType entity){ + //TODO 做一些数据校验,如唯一约束 + + //编号校验 + UniqueCodeUtils.validateCodeUnique( + baseMapper, + entity.getShutTypeCode(), + DmsBaseShutType::getShutTypeCode, + DmsBaseShutType::getShutTypeId, + entity.getShutTypeId(), + "编号已存在" + ); + } + + /** + * 校验并批量删除停机类型信息信息 + * + * @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/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java new file mode 100644 index 00000000..b839fb4f --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java @@ -0,0 +1,134 @@ +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.DmsInspectProjectDeviceBo; +import org.dromara.dms.domain.vo.DmsInspectProjectDeviceVo; +import org.dromara.dms.domain.DmsInspectProjectDevice; +import org.dromara.dms.mapper.DmsInspectProjectDeviceMapper; +import org.dromara.dms.service.IDmsInspectProjectDeviceService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 点巡检项目关联物料信息Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDeviceService { + + private final DmsInspectProjectDeviceMapper baseMapper; + + /** + * 查询点巡检项目关联物料信息 + * + * @param inspectProjectId 主键 + * @return 点巡检项目关联物料信息 + */ + @Override + public DmsInspectProjectDeviceVo queryById(Long inspectProjectId){ + return baseMapper.selectVoById(inspectProjectId); + } + + /** + * 分页查询点巡检项目关联物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检项目关联物料信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsInspectProjectDeviceBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的点巡检项目关联物料信息列表 + * + * @param bo 查询条件 + * @return 点巡检项目关联物料信息列表 + */ + @Override + public List queryList(DmsInspectProjectDeviceBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsInspectProjectDeviceBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsInspectProjectDevice.class) + .selectAll(DmsInspectProjectDevice.class) + .eq(bo.getInspectProjectId() != null, DmsInspectProjectDevice::getInspectProjectId, bo.getInspectProjectId()) + .eq(StringUtils.isNotBlank(bo.getTargetType()), DmsInspectProjectDevice::getTargetType, bo.getTargetType()) + .eq(bo.getTargetId() != null, DmsInspectProjectDevice::getTargetId, bo.getTargetId()) + .orderByDesc(DmsInspectProjectDevice::getCreateTime); + return lqw; + } + + /** + * 新增点巡检项目关联物料信息 + * + * @param bo 点巡检项目关联物料信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsInspectProjectDeviceBo bo) { + DmsInspectProjectDevice add = MapstructUtils.convert(bo, DmsInspectProjectDevice.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInspectProjectId(add.getInspectProjectId()); + } + return flag; + } + + /** + * 修改点巡检项目关联物料信息 + * + * @param bo 点巡检项目关联物料信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsInspectProjectDeviceBo bo) { + DmsInspectProjectDevice update = MapstructUtils.convert(bo, DmsInspectProjectDevice.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsInspectProjectDevice 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java new file mode 100644 index 00000000..4a0ab4d0 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java @@ -0,0 +1,147 @@ +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.Utils.UniqueCodeUtils; +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.dromara.dms.domain.DmsBaseInspectRoute; +import org.dromara.dms.domain.DmsBaseMachineInfo; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsInspectRouteDetailBo; +import org.dromara.dms.domain.vo.DmsInspectRouteDetailVo; +import org.dromara.dms.domain.DmsInspectRouteDetail; +import org.dromara.dms.mapper.DmsInspectRouteDetailMapper; +import org.dromara.dms.service.IDmsInspectRouteDetailService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 点巡检线路明细Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailService { + + private final DmsInspectRouteDetailMapper baseMapper; + + /** + * 查询点巡检线路明细 + * + * @param routeDetailId 主键 + * @return 点巡检线路明细 + */ + @Override + public DmsInspectRouteDetailVo queryById(Long routeDetailId){ + return baseMapper.selectVoById(routeDetailId); + } + + /** + * 分页查询点巡检线路明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检线路明细分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsInspectRouteDetailBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的点巡检线路明细列表 + * + * @param bo 查询条件 + * @return 点巡检线路明细列表 + */ + @Override + public List queryList(DmsInspectRouteDetailBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsInspectRouteDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsInspectRouteDetail.class) + .selectAll(DmsInspectRouteDetail.class) + //关联查询路线 + .select(DmsBaseInspectRoute::getRouteName) + .leftJoin(DmsBaseInspectRoute.class, DmsBaseInspectRoute::getInspectRouteId,DmsInspectRouteDetail::getInspectRouteId) + //关联查询设备 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId,DmsInspectRouteDetail::getMachineId) + + .eq(bo.getRouteDetailId() != null, DmsInspectRouteDetail::getRouteDetailId, bo.getRouteDetailId()) + .eq(bo.getInspectRouteId() != null, DmsInspectRouteDetail::getInspectRouteId, bo.getInspectRouteId()) + .eq(bo.getLineStep() != null, DmsInspectRouteDetail::getLineStep, bo.getLineStep()) + .eq(bo.getMachineId() != null, DmsInspectRouteDetail::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getInspectStandard()), DmsInspectRouteDetail::getInspectStandard, bo.getInspectStandard()) + .orderByDesc(DmsInspectRouteDetail::getCreateTime); + return lqw; + } + + /** + * 新增点巡检线路明细 + * + * @param bo 点巡检线路明细 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsInspectRouteDetailBo bo) { + DmsInspectRouteDetail add = MapstructUtils.convert(bo, DmsInspectRouteDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRouteDetailId(add.getRouteDetailId()); + } + return flag; + } + + /** + * 修改点巡检线路明细 + * + * @param bo 点巡检线路明细 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsInspectRouteDetailBo bo) { + DmsInspectRouteDetail update = MapstructUtils.convert(bo, DmsInspectRouteDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsInspectRouteDetail 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/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRealtimeStatusServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRealtimeStatusServiceImpl.java new file mode 100644 index 00000000..96385a7b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRealtimeStatusServiceImpl.java @@ -0,0 +1,153 @@ +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.Utils.UniqueCodeUtils; +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.dromara.dms.domain.DmsBaseMachineInfo; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsRealtimeStatusBo; +import org.dromara.dms.domain.vo.DmsRealtimeStatusVo; +import org.dromara.dms.domain.DmsRealtimeStatus; +import org.dromara.dms.mapper.DmsRealtimeStatusMapper; +import org.dromara.dms.service.IDmsRealtimeStatusService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备实时状态记录Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsRealtimeStatusServiceImpl implements IDmsRealtimeStatusService { + + private final DmsRealtimeStatusMapper baseMapper; + + /** + * 查询设备实时状态记录 + * + * @param statusId 主键 + * @return 设备实时状态记录 + */ + @Override + public DmsRealtimeStatusVo queryById(Long statusId){ + return baseMapper.selectVoById(statusId); + } + + /** + * 分页查询设备实时状态记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备实时状态记录分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsRealtimeStatusBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备实时状态记录列表 + * + * @param bo 查询条件 + * @return 设备实时状态记录列表 + */ + @Override + public List queryList(DmsRealtimeStatusBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsRealtimeStatusBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsRealtimeStatus.class) + .selectAll(DmsRealtimeStatus.class) + + //关联查询设备信息 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId, DmsRealtimeStatus::getMachineId) + + .eq(bo.getStatusId() != null, DmsRealtimeStatus::getStatusId, bo.getStatusId()) + .eq(bo.getMachineId() != null, DmsRealtimeStatus::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getStatusCode()), DmsRealtimeStatus::getStatusCode, bo.getStatusCode()) + .like(StringUtils.isNotBlank(bo.getStatusName()), DmsRealtimeStatus::getStatusName, bo.getStatusName()) + .eq(StringUtils.isNotBlank(bo.getStatusValue()), DmsRealtimeStatus::getStatusValue, bo.getStatusValue()) + .orderByDesc(DmsRealtimeStatus::getCreateTime); + return lqw; + } + + /** + * 新增设备实时状态记录 + * + * @param bo 设备实时状态记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsRealtimeStatusBo bo) { + DmsRealtimeStatus add = MapstructUtils.convert(bo, DmsRealtimeStatus.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setStatusId(add.getStatusId()); + } + return flag; + } + + /** + * 修改设备实时状态记录 + * + * @param bo 设备实时状态记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsRealtimeStatusBo bo) { + DmsRealtimeStatus update = MapstructUtils.convert(bo, DmsRealtimeStatus.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsRealtimeStatus entity){ + //TODO 做一些数据校验,如唯一约束 + + //编号校验 + UniqueCodeUtils.validateCodeUnique( + baseMapper, + entity.getStatusCode(), + DmsRealtimeStatus::getStatusCode, + DmsRealtimeStatus::getStatusId, + entity.getStatusId(), + "编号已存在" + ); + } + + /** + * 校验并批量删除设备实时状态记录信息 + * + * @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/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java new file mode 100644 index 00000000..89a0224a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java @@ -0,0 +1,155 @@ +package org.dromara.dms.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.DmsBaseMachineInfo; +import org.dromara.dms.domain.DmsBaseShutType; +import org.dromara.dms.domain.DmsRecordShutDown; +import org.dromara.dms.domain.bo.DmsRecordShutDownBo; +import org.dromara.dms.domain.vo.DmsRecordShutDownVo; +import org.dromara.dms.mapper.DmsRecordShutDownMapper; +import org.dromara.dms.service.IDmsRecordShutDownService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 停机记录Service业务层处理 + * + * @author zch + * @date 2025-03-24 + */ +@RequiredArgsConstructor +@Service +public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService { + + private final DmsRecordShutDownMapper baseMapper; + + /** + * 查询停机记录 + * + * @param recordShutDownId 主键 + * @return 停机记录 + */ + @Override + public DmsRecordShutDownVo queryById(Long recordShutDownId){ + return baseMapper.selectVoById(recordShutDownId); + } + + /** + * 分页查询停机记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 停机记录分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsRecordShutDownBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的停机记录列表 + * + * @param bo 查询条件 + * @return 停机记录列表 + */ + @Override + public List queryList(DmsRecordShutDownBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsRecordShutDownBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsRecordShutDown.class) + .selectAll(DmsRecordShutDown.class) + + //关联查询设备信息 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId,DmsRecordShutDown::getMachineId) + //关联查询停机类型信息 + .select(DmsBaseShutType::getShutTypeName) + .leftJoin(DmsBaseShutType.class,DmsBaseShutType::getShutTypeId,DmsRecordShutDown::getShutTypeId) + //关联查询停机原因信息 +/* .select(DmsBaseShutReason::getReasonCode,DmsBaseShutReason::getShutReason) + .select(DmsBaseShutReason::getReasonCode) + .leftJoin(DmsBaseShutReason.class,DmsBaseShutReason::getShutReasonId,DmsRecordShutDown::getShutReasonId)*/ + + .eq(bo.getRecordShutDownId() != null, DmsRecordShutDown::getRecordShutDownId, bo.getRecordShutDownId()) + .eq(bo.getMachineId() != null, DmsRecordShutDown::getMachineId, bo.getMachineId()) + .eq(bo.getShutTypeId() != null, DmsRecordShutDown::getShutTypeId, bo.getShutTypeId()) + .eq(bo.getShutReasonId() != null, DmsRecordShutDown::getShutReasonId, bo.getShutReasonId()) + .eq(bo.getShutBeginTime() != null, DmsRecordShutDown::getShutBeginTime, bo.getShutBeginTime()) + .eq(bo.getShutEndTime() != null, DmsRecordShutDown::getShutEndTime, bo.getShutEndTime()) + .eq(bo.getShutTime() != null, DmsRecordShutDown::getShutTime, bo.getShutTime()) + .eq(StringUtils.isNotBlank(bo.getDowntimeFlag()), DmsRecordShutDown::getDowntimeFlag, bo.getDowntimeFlag()) + .eq(StringUtils.isNotBlank(bo.getShutReason()), DmsRecordShutDown::getShutReason, bo.getShutReason()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsRecordShutDown::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(DmsRecordShutDown::getCreateTime); + return lqw; + } + + /** + * 新增停机记录 + * + * @param bo 停机记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DmsRecordShutDownBo bo) { + DmsRecordShutDown add = MapstructUtils.convert(bo, DmsRecordShutDown.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRecordShutDownId(add.getRecordShutDownId()); + } + return flag; + } + + /** + * 修改停机记录 + * + * @param bo 停机记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DmsRecordShutDownBo bo) { + DmsRecordShutDown update = MapstructUtils.convert(bo, DmsRecordShutDown.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsRecordShutDown 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/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml new file mode 100644 index 00000000..c1b653e2 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml new file mode 100644 index 00000000..d69b7052 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml new file mode 100644 index 00000000..a589d5ed --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml new file mode 100644 index 00000000..1deb2a1c --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml new file mode 100644 index 00000000..fd351047 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectProjectDeviceMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectProjectDeviceMapper.xml new file mode 100644 index 00000000..f26055bd --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectProjectDeviceMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml new file mode 100644 index 00000000..e9da4bb4 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml new file mode 100644 index 00000000..77b632c4 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml new file mode 100644 index 00000000..d582a60a --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java index 925ee63e..ddb87651 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java @@ -138,7 +138,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService { .leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsInstockOrder::getWarehouseId); lqw.eq(bo.getInstockId() != null, WmsInstockOrder::getInstockId, bo.getInstockId()); lqw.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockOrder::getInstockCode, bo.getInstockCode()); - lqw.eq(bo.getMaterialCategoryId() != null, WmsInstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId()); lqw.eq(StringUtils.isNotBlank(bo.getInstockType()), WmsInstockOrder::getInstockType, bo.getInstockType()); lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), WmsInstockOrder::getOrderNo, bo.getOrderNo()); lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsInstockOrder::getAuditBy, bo.getAuditBy());