feat(dms): 移植mes的设备信息相关接口、实体类和方法

- 新增了机台信息相关的 BO、Controller、Mapper、Service等文件
- 修改了报警详情信息多个文件中的类名和方法名，去除了不必要的分号

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseAlarmDetailController.java

@@ -23,7 +23,7 @@ import org.dromara.dms.service.IBaseAlarmDetailService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
- * 报警详情信息;
+ * 报警详情信息
  * 前端访问路由地址为:/dms/baseAlarmDetail
  *
  * @author zch
@@ -38,7 +38,7 @@ public class BaseAlarmDetailController extends BaseController {
     private final IBaseAlarmDetailService baseAlarmDetailService;
 
     /**
-     * 查询报警详情信息;列表
+     * 查询报警详情信息列表
      */
     @SaCheckPermission("dms:baseAlarmDetail:list")
     @GetMapping("/list")
@@ -47,18 +47,18 @@ public class BaseAlarmDetailController extends BaseController {
     }
 
     /**
-     * 导出报警详情信息;列表
+     * 导出报警详情信息列表
      */
     @SaCheckPermission("dms:baseAlarmDetail:export")
-    @Log(title = "报警详情信息;", businessType = BusinessType.EXPORT)
+    @Log(title = "报警详情信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(BaseAlarmDetailBo bo, HttpServletResponse response) {
         List<BaseAlarmDetailVo> list = baseAlarmDetailService.queryList(bo);
-        ExcelUtil.exportExcel(list, "报警详情信息;", BaseAlarmDetailVo.class, response);
+        ExcelUtil.exportExcel(list, "报警详情信息", BaseAlarmDetailVo.class, response);
     }
 
     /**
-     * 获取报警详情信息;详细信息
+     * 获取报警详情信息详细信息
      *
      * @param alarmDetailId 主键
      */
@@ -70,10 +70,10 @@ public class BaseAlarmDetailController extends BaseController {
     }
 
     /**
-     * 新增报警详情信息;
+     * 新增报警详情信息
      */
     @SaCheckPermission("dms:baseAlarmDetail:add")
-    @Log(title = "报警详情信息;", businessType = BusinessType.INSERT)
+    @Log(title = "报警详情信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseAlarmDetailBo bo) {
@@ -81,10 +81,10 @@ public class BaseAlarmDetailController extends BaseController {
     }
 
     /**
-     * 修改报警详情信息;
+     * 修改报警详情信息
      */
     @SaCheckPermission("dms:baseAlarmDetail:edit")
-    @Log(title = "报警详情信息;", businessType = BusinessType.UPDATE)
+    @Log(title = "报警详情信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseAlarmDetailBo bo) {
@@ -92,12 +92,12 @@ public class BaseAlarmDetailController extends BaseController {
     }
 
     /**
-     * 删除报警详情信息;
+     * 删除报警详情信息
      *
      * @param alarmDetailIds 主键串
      */
     @SaCheckPermission("dms:baseAlarmDetail:remove")
-    @Log(title = "报警详情信息;", businessType = BusinessType.DELETE)
+    @Log(title = "报警详情信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{alarmDetailIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] alarmDetailIds) {
@@ -106,7 +106,7 @@ public class BaseAlarmDetailController extends BaseController {
 
 
     /**
-     * 下拉框查询报警详情信息;列表
+     * 下拉框查询报警详情信息列表
      */
 
     @GetMapping("/getBaseAlarmDetailList")

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMachineInfoController.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.DmsBaseMachineInfoBo;
+import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
+import org.dromara.dms.service.IDmsBaseMachineInfoService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 机台信息
+ * 前端访问路由地址为:/dms/dmsBaseMachineInfo
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/dmsBaseMachineInfo")
+public class DmsBaseMachineInfoController extends BaseController {
+
+    private final IDmsBaseMachineInfoService dmsBaseMachineInfoService;
+
+    /**
+     * 查询机台信息列表
+     */
+    @SaCheckPermission("dms:dmsBaseMachineInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<DmsBaseMachineInfoVo> list(DmsBaseMachineInfoBo bo, PageQuery pageQuery) {
+        return dmsBaseMachineInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出机台信息列表
+     */
+    @SaCheckPermission("dms:dmsBaseMachineInfo:export")
+    @Log(title = "机台信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DmsBaseMachineInfoBo bo, HttpServletResponse response) {
+        List<DmsBaseMachineInfoVo> list = dmsBaseMachineInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "机台信息", DmsBaseMachineInfoVo.class, response);
+    }
+
+    /**
+     * 获取机台信息详细信息
+     *
+     * @param machineId 主键
+     */
+    @SaCheckPermission("dms:dmsBaseMachineInfo:query")
+    @GetMapping("/{machineId}")
+    public R<DmsBaseMachineInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long machineId) {
+        return R.ok(dmsBaseMachineInfoService.queryById(machineId));
+    }
+
+    /**
+     * 新增机台信息
+     */
+/*    @SaCheckPermission("dms:dmsBaseMachineInfo:add")
+    @Log(title = "机台信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
+        return toAjax(dmsBaseMachineInfoService.insertByBo(bo));
+    }*/
+
+    /**
+     * 修改机台信息
+     */
+/*    @SaCheckPermission("dms:dmsBaseMachineInfo:edit")
+    @Log(title = "机台信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
+        return toAjax(dmsBaseMachineInfoService.updateByBo(bo));
+    }*/
+
+    /**
+     * 删除机台信息
+     *
+     * @param machineIds 主键串
+     */
+/*    @SaCheckPermission("dms:dmsBaseMachineInfo:remove")
+    @Log(title = "机台信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{machineIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] machineIds) {
+        return toAjax(dmsBaseMachineInfoService.deleteWithValidByIds(List.of(machineIds), true));
+    }*/
+
+
+    /**
+     * 下拉框查询机台信息列表
+     */
+
+    @GetMapping("getDmsBaseMachineInfoList")
+    public R<List<DmsBaseMachineInfoVo>> getDmsBaseMachineInfolist(DmsBaseMachineInfoBo bo) {
+        List<DmsBaseMachineInfoVo> list = dmsBaseMachineInfoService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmDetail.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serial;
 
 /**
- * 报警详情信息;对象 base_alarm_detail
+ * 报警详情信息对象 base_alarm_detail
  *
  * @author zch
  * @date 2025-03-19

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseAlarmDetailBo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
- * 报警详情信息;业务对象 base_alarm_detail
+ * 报警详情信息业务对象 base_alarm_detail
  *
  * @author zch
  * @date 2025-03-19

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java

@@ -0,0 +1,142 @@
+package org.dromara.dms.domain.bo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+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.DmsBaseMachineInfo;
+
+import java.util.List;
+
+/**
+ * 机台信息业务对象 prod_base_machine_info
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DmsBaseMachineInfo.class, reverseConvertGenerate = false)
+public class DmsBaseMachineInfoBo extends BaseEntity {
+
+    /**
+     * 主键标识
+     */
+    private Long machineId;
+
+    /**
+     * 机台编号
+     */
+    @NotBlank(message = "机台编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String machineCode;
+
+    /**
+     * 机台名称
+     */
+    @NotBlank(message = "机台名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String machineName;
+
+    /**
+     * 资产编号
+     */
+    private String assetNumber;
+
+    /**
+     * 机台位置
+     */
+    private String machineLocation;
+
+    /**
+     * 机台类型
+     */
+    private String machineType;
+
+    /**
+     * 机台规格
+     */
+    private String machineSpec;
+
+    /**
+     * 供应商
+     */
+    private String supplierId;
+
+    /**
+     * 机台状态(0停用 1启用 2报废)
+     */
+    private String machineStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 工序
+     */
+    private Long processId;
+
+    /**
+     * 车间ID
+     */
+    private Long workshopId;
+
+    /**
+     * 设备模型，关联设备模型dms_device_mode
+     */
+    @ExcelProperty(value = "设备模型，关联设备模型dms_device_mode")
+    private Long deviceModeId;
+
+    /**
+     * 设备IP地址
+     */
+    @ExcelProperty(value = "设备IP地址")
+    private String machineIp;
+
+    /**
+     * 设备端口
+     */
+    @ExcelProperty(value = "设备端口")
+    private Long machinePort;
+
+    /**
+     * 设备协议
+     */
+    @ExcelProperty(value = "设备协议")
+    private String accessProtocol;
+
+    /**
+     * 寄存器地址
+     */
+    @ExcelProperty(value = "寄存器地址")
+    private String registerAddress;
+
+    /**
+     * 数据类型（1、bool，2、short，3int，4long，5float，6byte，7ushort，8uint，9ulong，10double，11字符串）
+     */
+    @ExcelProperty(value = "数据类型")
+    private String dataType;
+
+    /**
+     * 数据长度
+     */
+    @ExcelProperty(value = "数据长度")
+    private Long dataLength;
+
+    /**
+     * 数据编码格式（1ASCII,2Unicode,3Unicode-big,4UTF-8,5UTF-32,6、ANSI,7、GB2312）
+     */
+    @ExcelProperty(value = "数据编码格式")
+    private String dataEncoding;
+
+    /**
+     * 请求间隔（单位：毫秒）
+     */
+    @ExcelProperty(value = "请求间隔")
+    private Long requestInterval;
+
+}

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseAlarmDetailVo.java

@@ -19,7 +19,7 @@ import java.util.Date;
 
 
 /**
- * 报警详情信息;视图对象 base_alarm_detail
+ * 报警详情信息视图对象 base_alarm_detail
  *
  * @author zch
  * @date 2025-03-19

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java

@@ -0,0 +1,200 @@
+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.DmsBaseMachineInfo;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 机台信息视图对象 prod_base_machine_info
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DmsBaseMachineInfo.class)
+public class DmsBaseMachineInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @ExcelProperty(value = "主键标识")
+    private Long machineId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 机台编号
+     */
+    @ExcelProperty(value = "机台编号")
+    private String machineCode;
+
+    /**
+     * 机台名称
+     */
+    @ExcelProperty(value = "机台名称")
+    private String machineName;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty(value = "资产编号")
+    private String assetNumber;
+
+    /**
+     * 机台位置
+     */
+    @ExcelProperty(value = "机台位置")
+    private String machineLocation;
+
+    /**
+     * 机台类型
+     */
+    @ExcelProperty(value = "机台类型")
+    private String machineType;
+
+    /**
+     * 机台规格
+     */
+    @ExcelProperty(value = "机台规格")
+    private String machineSpec;
+
+    /**
+     * 供应商
+     */
+    @ExcelProperty(value = "供应商")
+    private String supplierId;
+
+    /**
+     * 机台状态(0停用 1启用 2报废)
+     */
+    @ExcelProperty(value = "机台状态(0停用 1启用 2报废)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "machine_status")
+    private String machineStatus;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 车间ID
+     */
+    private Long workshopId;
+
+    /**
+     * 设备模型，关联设备模型dms_device_mode
+     */
+    @ExcelProperty(value = "设备模型，关联设备模型dms_device_mode")
+    private Long deviceModeId;
+
+    /**
+     * 设备IP地址
+     */
+    @ExcelProperty(value = "设备IP地址")
+    private String machineIp;
+
+    /**
+     * 设备端口
+     */
+    @ExcelProperty(value = "设备端口")
+    private Long machinePort;
+
+    /**
+     * 设备协议
+     */
+    @ExcelProperty(value = "设备协议")
+    private String accessProtocol;
+
+    /**
+     * 寄存器地址
+     */
+    @ExcelProperty(value = "寄存器地址")
+    private String registerAddress;
+
+    /**
+     * 数据类型（1、bool，2、short，3int，4long，5float，6byte，7ushort，8uint，9ulong，10double，11字符串）
+     */
+    @ExcelProperty(value = "数据类型")
+    private String dataType;
+
+    /**
+     * 数据长度
+     */
+    @ExcelProperty(value = "数据长度")
+    private Long dataLength;
+
+    /**
+     * 数据编码格式（1ASCII,2Unicode,3Unicode-big,4UTF-8,5UTF-32,6、ANSI,7、GB2312）
+     */
+    @ExcelProperty(value = "数据编码格式")
+    private String dataEncoding;
+
+    /**
+     * 请求间隔（单位：毫秒）
+     */
+    @ExcelProperty(value = "请求间隔")
+    private Long requestInterval;
+
+    /**
+     * 车间名称
+     */
+    @ExcelProperty(value = "车间名称")
+    private String workshopName;
+
+    /**
+     * 设备模型名称
+     */
+    @ExcelProperty(value = "设备模型名称")
+    private String deviceModeName;
+
+
+}

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/BaseAlarmDetailMapper.java

@@ -5,7 +5,7 @@ import org.dromara.dms.domain.vo.BaseAlarmDetailVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
- * 报警详情信息;Mapper接口
+ * 报警详情信息Mapper接口
  *
  * @author zch
  * @date 2025-03-19

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.dms.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.dms.domain.DmsBaseMachineInfo;
+import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
+
+/**
+ * 机台信息Mapper接口
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+public interface DmsBaseMachineInfoMapper extends BaseMapperPlus<DmsBaseMachineInfo, DmsBaseMachineInfoVo> {
+
+}

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseAlarmDetailService.java

@@ -10,7 +10,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * 报警详情信息;Service接口
+ * 报警详情信息Service接口
  *
  * @author zch
  * @date 2025-03-19
@@ -18,48 +18,48 @@ import java.util.List;
 public interface IBaseAlarmDetailService {
 
     /**
-     * 查询报警详情信息;
+     * 查询报警详情信息
      *
      * @param alarmDetailId 主键
-     * @return 报警详情信息;
+     * @return 报警详情信息
      */
     BaseAlarmDetailVo queryById(Long alarmDetailId);
 
     /**
-     * 分页查询报警详情信息;列表
+     * 分页查询报警详情信息列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
-     * @return 报警详情信息;分页列表
+     * @return 报警详情信息分页列表
      */
     TableDataInfo<BaseAlarmDetailVo> queryPageList(BaseAlarmDetailBo bo, PageQuery pageQuery);
 
     /**
-     * 查询符合条件的报警详情信息;列表
+     * 查询符合条件的报警详情信息列表
      *
      * @param bo 查询条件
-     * @return 报警详情信息;列表
+     * @return 报警详情信息列表
      */
     List<BaseAlarmDetailVo> queryList(BaseAlarmDetailBo bo);
 
     /**
-     * 新增报警详情信息;
+     * 新增报警详情信息
      *
-     * @param bo 报警详情信息;
+     * @param bo 报警详情信息
      * @return 是否新增成功
      */
     Boolean insertByBo(BaseAlarmDetailBo bo);
 
     /**
-     * 修改报警详情信息;
+     * 修改报警详情信息
      *
-     * @param bo 报警详情信息;
+     * @param bo 报警详情信息
      * @return 是否修改成功
      */
     Boolean updateByBo(BaseAlarmDetailBo bo);
 
     /**
-     * 校验并批量删除报警详情信息;信息
+     * 校验并批量删除报警详情信息信息
      *
      * @param ids     待删除的主键集合
      * @param isValid 是否进行有效性校验

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMachineInfoService.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.DmsBaseMachineInfoBo;
+import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 机台信息Service接口
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+public interface IDmsBaseMachineInfoService {
+
+    /**
+     * 查询机台信息
+     *
+     * @param machineId 主键
+     * @return 机台信息
+     */
+    DmsBaseMachineInfoVo queryById(Long machineId);
+
+    /**
+     * 分页查询机台信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机台信息分页列表
+     */
+    TableDataInfo<DmsBaseMachineInfoVo> queryPageList(DmsBaseMachineInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的机台信息列表
+     *
+     * @param bo 查询条件
+     * @return 机台信息列表
+     */
+    List<DmsBaseMachineInfoVo> queryList(DmsBaseMachineInfoBo bo);
+
+/*    *//**
+     * 新增机台信息
+     *
+     * @param bo 机台信息
+     * @return 是否新增成功
+     *//*
+    Boolean insertByBo(DmsBaseMachineInfoBo bo);
+
+    *//**
+     * 修改机台信息
+     *
+     * @param bo 机台信息
+     * @return 是否修改成功
+     *//*
+    Boolean updateByBo(DmsBaseMachineInfoBo bo);
+
+    *//**
+     * 校验并批量删除机台信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     *//*
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);*/
+}

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmDetailServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.Collection;
 
 /**
- * 报警详情信息;Service业务层处理
+ * 报警详情信息Service业务层处理
  *
  * @author zch
  * @date 2025-03-19
@@ -36,10 +36,10 @@ public class BaseAlarmDetailServiceImpl implements IBaseAlarmDetailService {
     private final BaseAlarmDetailMapper baseMapper;
 
     /**
-     * 查询报警详情信息;
+     * 查询报警详情信息
      *
      * @param alarmDetailId 主键
-     * @return 报警详情信息;
+     * @return 报警详情信息
      */
     @Override
     public BaseAlarmDetailVo queryById(Long alarmDetailId){
@@ -47,11 +47,11 @@ public class BaseAlarmDetailServiceImpl implements IBaseAlarmDetailService {
     }
 
     /**
-     * 分页查询报警详情信息;列表
+     * 分页查询报警详情信息列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
-     * @return 报警详情信息;分页列表
+     * @return 报警详情信息分页列表
      */
     @Override
     public TableDataInfo<BaseAlarmDetailVo> queryPageList(BaseAlarmDetailBo bo, PageQuery pageQuery) {
@@ -61,10 +61,10 @@ public class BaseAlarmDetailServiceImpl implements IBaseAlarmDetailService {
     }
 
     /**
-     * 查询符合条件的报警详情信息;列表
+     * 查询符合条件的报警详情信息列表
      *
      * @param bo 查询条件
-     * @return 报警详情信息;列表
+     * @return 报警详情信息列表
      */
     @Override
     public List<BaseAlarmDetailVo> queryList(BaseAlarmDetailBo bo) {
@@ -96,9 +96,9 @@ public class BaseAlarmDetailServiceImpl implements IBaseAlarmDetailService {
     }
 
     /**
-     * 新增报警详情信息;
+     * 新增报警详情信息
      *
-     * @param bo 报警详情信息;
+     * @param bo 报警详情信息
      * @return 是否新增成功
      */
     @Override
@@ -113,9 +113,9 @@ public class BaseAlarmDetailServiceImpl implements IBaseAlarmDetailService {
     }
 
     /**
-     * 修改报警详情信息;
+     * 修改报警详情信息
      *
-     * @param bo 报警详情信息;
+     * @param bo 报警详情信息
      * @return 是否修改成功
      */
     @Override
@@ -133,7 +133,7 @@ public class BaseAlarmDetailServiceImpl implements IBaseAlarmDetailService {
     }
 
     /**
-     * 校验并批量删除报警详情信息;信息
+     * 校验并批量删除报警详情信息信息
      *
      * @param ids     待删除的主键集合
      * @param isValid 是否进行有效性校验

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java

@@ -0,0 +1,161 @@
+package org.dromara.dms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.DmsBaseMachineInfo;
+import org.dromara.dms.domain.bo.DmsBaseMachineInfoBo;
+import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
+import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
+
+import org.dromara.dms.service.IDmsBaseMachineInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 机台信息Service业务层处理
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@RequiredArgsConstructor
+@Service
+public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService {
+
+    private final DmsBaseMachineInfoMapper baseMapper;
+
+
+    /**
+     * 查询机台信息
+     *
+     * @param machineId 主键
+     * @return 机台信息
+     */
+    @Override
+    public DmsBaseMachineInfoVo queryById(Long machineId) {
+        DmsBaseMachineInfoBo bo = new DmsBaseMachineInfoBo();
+        bo.setMachineId(machineId);
+        MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(bo);
+        DmsBaseMachineInfoVo prodBaseMachineInfoVo = baseMapper.selectVoOne(lqw);
+
+        return prodBaseMachineInfoVo;
+    }
+
+    /**
+     * 分页查询机台信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机台信息分页列表
+     */
+    @Override
+    public TableDataInfo<DmsBaseMachineInfoVo> queryPageList(DmsBaseMachineInfoBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(bo);
+        Page<DmsBaseMachineInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的机台信息列表
+     *
+     * @param bo 查询条件
+     * @return 机台信息列表
+     */
+    @Override
+    public List<DmsBaseMachineInfoVo> queryList(DmsBaseMachineInfoBo bo) {
+        MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(bo);
+
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private MPJLambdaWrapper<DmsBaseMachineInfo> buildQueryWrapper(DmsBaseMachineInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<DmsBaseMachineInfo> lqw = JoinWrappers.lambda(DmsBaseMachineInfo.class)
+            .selectAll(DmsBaseMachineInfo.class)
+            .eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())
+            .like(StringUtils.isNotBlank(bo.getMachineCode()), DmsBaseMachineInfo::getMachineCode, bo.getMachineCode())
+            .like(StringUtils.isNotBlank(bo.getMachineName()), DmsBaseMachineInfo::getMachineName, bo.getMachineName())
+            .eq(StringUtils.isNotBlank(bo.getMachineLocation()), DmsBaseMachineInfo::getMachineLocation, bo.getMachineLocation())
+            .eq(StringUtils.isNotBlank(bo.getMachineType()), DmsBaseMachineInfo::getMachineType, bo.getMachineType())
+            .eq(StringUtils.isNotBlank(bo.getMachineSpec()), DmsBaseMachineInfo::getMachineSpec, bo.getMachineSpec())
+            .eq(StringUtils.isNotBlank(bo.getSupplierId()), DmsBaseMachineInfo::getSupplierId, bo.getSupplierId())
+            .eq(StringUtils.isNotBlank(bo.getMachineStatus()), DmsBaseMachineInfo::getMachineStatus, bo.getMachineStatus())
+            .eq(StringUtils.isNotNull(bo.getWorkshopId()), DmsBaseMachineInfo::getWorkshopId, bo.getWorkshopId())
+            .orderByAsc(DmsBaseMachineInfo::getCreateTime);
+        return lqw;
+    }
+
+/*    *//**
+     * 新增机台信息
+     *
+     * @param bo 机台信息
+     * @return 是否新增成功
+     *//*
+    @Override
+    public Boolean insertByBo(DmsBaseMachineInfoBo bo) {
+        DmsBaseMachineInfo add = MapstructUtils.convert(bo, DmsBaseMachineInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setMachineId(add.getMachineId());
+        }
+        return flag;
+    }
+
+    *//**
+     * 修改机台信息
+     *
+     * @param bo 机台信息
+     * @return 是否修改成功
+     *//*
+    @Override
+    public Boolean updateByBo(DmsBaseMachineInfoBo bo) {
+        DmsBaseMachineInfo update = MapstructUtils.convert(bo, DmsBaseMachineInfo.class);
+        validEntityBeforeSave(update);
+
+        return baseMapper.updateById(update) > 0;
+    }
+
+    *//**
+     * 保存前的数据校验
+     *//*
+    private void validEntityBeforeSave(DmsBaseMachineInfo entity) {
+        //TODO 做一些数据校验,如唯一约束
+        if (StringUtils.isNotBlank(entity.getMachineCode())) {
+            DmsBaseMachineInfoBo query = new DmsBaseMachineInfoBo();
+            query.setMachineCode(entity.getMachineCode());
+            MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(query);
+            DmsBaseMachineInfo baseDmsBaseMachineInfo = baseMapper.selectOne(lqw);
+            if (baseDmsBaseMachineInfo != null
+                && !baseDmsBaseMachineInfo.getMachineId().equals(entity.getMachineId())) {
+                throw new ServiceException("编码已存在");
+            }
+        }
+    }
+
+    *//**
+     * 校验并批量删除机台信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     *//*
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }*/
+}

ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBaseMachineInfoMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.dms.mapper.DmsBaseMachineInfoMapper">
+
+</mapper>