From 0ae76de9dc30284d99edba1ecbce68c7ee1c354d Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 15 Jul 2025 10:06:24 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=A8=8B=E5=BA=8F=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=88=97=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/domain/ProdTechnologyStepInfo.java | 33 +++++++++-- .../domain/bo/ProdTechnologyStepInfoBo.java | 49 +++++++++++---- .../domain/vo/ProdTechnologyStepInfoVo.java | 59 ++++++++++++++----- .../ProdTechnologyStepInfoServiceImpl.java | 29 +++++---- 4 files changed, 122 insertions(+), 48 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java index 681ef2a..5db0f02 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java @@ -4,6 +4,7 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.io.Serial; @@ -11,7 +12,7 @@ import java.io.Serial; * 工艺步序信息对象 prod_technology_step_info * * @author Yinq - * @date 2025-01-21 + * @date 2025-07-15 */ @Data @EqualsAndHashCode(callSuper = true) @@ -33,22 +34,22 @@ public class ProdTechnologyStepInfo extends TenantEntity { private Long technologyId; /** - * 步序编号 + * 编号/属性名 */ - private Long stepCode; + private String stepCode; /** - * 步序名称 + * 名称/描述 */ private String stepName; /** - * 步序时间（秒） + * 时间/频率（毫秒） */ private Long stepTime; /** - * 步序参数 + * 参数 */ private String stepParameter; @@ -72,6 +73,26 @@ public class ProdTechnologyStepInfo extends TenantEntity { */ private String dataType; + /** + * 地址 + */ + private String pointAddress; + + /** + * 操作类型（0读 1写） + */ + private Long operationType; + + /** + * 阈值上限 + */ + private BigDecimal upperLimit; + + /** + * 阈值下限 + */ + private BigDecimal lowerLimit; + /** * 删除标志（0代表存在 2代表删除） */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java index 539ff22..ed1355e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java @@ -8,12 +8,13 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; /** * 工艺步序信息业务对象 prod_technology_step_info * * @author Yinq - * @date 2025-01-21 + * @date 2025-07-15 */ @Data @EqualsAndHashCode(callSuper = true) @@ -32,24 +33,24 @@ public class ProdTechnologyStepInfoBo extends BaseEntity { private Long technologyId; /** - * 步序编号 + * 编号/属性名 */ - @NotNull(message = "步序编号不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long stepCode; + @NotBlank(message = "编号/属性名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String stepCode; /** - * 步序名称 + * 名称/描述 */ - @NotBlank(message = "步序名称不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "名称/描述不能为空", groups = { AddGroup.class, EditGroup.class }) private String stepName; /** - * 步序时间（秒） + * 时间/频率（毫秒） */ private Long stepTime; /** - * 步序参数 + * 参数 */ private String stepParameter; @@ -58,11 +59,6 @@ public class ProdTechnologyStepInfoBo extends BaseEntity { */ private String valueState; - /** - * 数据类型 - */ - private String dataType; - /** * 激活标识（1是 0否） */ @@ -73,5 +69,32 @@ public class ProdTechnologyStepInfoBo extends BaseEntity { */ private String remark; + /** + * 数据类型 + */ + @NotBlank(message = "数据类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String dataType; + + /** + * 地址 + */ + private String pointAddress; + + /** + * 操作类型（0读 1写） + */ + @NotNull(message = "操作类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long operationType; + + /** + * 阈值上限 + */ + private BigDecimal upperLimit; + + /** + * 阈值下限 + */ + private BigDecimal lowerLimit; + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java index 09a04b3..594d0f0 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java @@ -1,5 +1,6 @@ package org.dromara.mes.domain.vo; +import java.math.BigDecimal; import org.dromara.mes.domain.ProdTechnologyStepInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -18,7 +19,7 @@ import java.util.Date; * 工艺步序信息视图对象 prod_technology_step_info * * @author Yinq - * @date 2025-01-21 + * @date 2025-07-15 */ @Data @ExcelIgnoreUnannotated @@ -41,27 +42,27 @@ public class ProdTechnologyStepInfoVo implements Serializable { private Long technologyId; /** - * 步序编号 + * 编号/属性名 */ - @ExcelProperty(value = "步序编号") - private Long stepCode; + @ExcelProperty(value = "编号/属性名") + private String stepCode; /** - * 步序名称 + * 名称/描述 */ - @ExcelProperty(value = "步序名称") + @ExcelProperty(value = "名称/描述") private String stepName; /** - * 步序时间（秒） + * 时间/频率（毫秒） */ - @ExcelProperty(value = "步序时间", converter = ExcelDictConvert.class) + @ExcelProperty(value = "时间/频率", converter = ExcelDictConvert.class) private Long stepTime; /** - * 步序参数 + * 参数 */ - @ExcelProperty(value = "步序参数") + @ExcelProperty(value = "参数") private String stepParameter; /** @@ -70,12 +71,6 @@ public class ProdTechnologyStepInfoVo implements Serializable { @ExcelProperty(value = "阀门状态") private String valueState; - /** - * 数据类型 - */ - @ExcelProperty(value = "数据类型") - private String dataType; - /** * 激活标识（1是 0否） */ @@ -89,5 +84,37 @@ public class ProdTechnologyStepInfoVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 数据类型 + */ + @ExcelProperty(value = "数据类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "machine_data_type") + private String dataType; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String pointAddress; + + /** + * 操作类型（0读 1写） + */ + @ExcelProperty(value = "操作类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_operation_type") + private Long operationType; + + /** + * 阈值上限 + */ + @ExcelProperty(value = "阈值上限") + private BigDecimal upperLimit; + + /** + * 阈值下限 + */ + @ExcelProperty(value = "阈值下限") + private BigDecimal lowerLimit; + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java index 803c633..5de0395 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java @@ -39,7 +39,7 @@ public class ProdTechnologyStepInfoServiceImpl implements IProdTechnologyStepInf * @return 工艺步序信息 */ @Override - public ProdTechnologyStepInfoVo queryById(Long stepId){ + public ProdTechnologyStepInfoVo queryById(Long stepId) { return baseMapper.selectVoById(stepId); } @@ -72,16 +72,19 @@ public class ProdTechnologyStepInfoServiceImpl implements IProdTechnologyStepInf private MPJLambdaWrapper buildQueryWrapper(ProdTechnologyStepInfoBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdTechnologyStepInfo.class) - .selectAll(ProdTechnologyStepInfo.class) - .eq(bo.getStepId() != null, ProdTechnologyStepInfo::getStepId, bo.getStepId()) - .eq(bo.getTechnologyId() != null, ProdTechnologyStepInfo::getTechnologyId, bo.getTechnologyId()) - .eq(bo.getStepCode() != null, ProdTechnologyStepInfo::getStepCode, bo.getStepCode()) - .like(StringUtils.isNotBlank(bo.getStepName()), ProdTechnologyStepInfo::getStepName, bo.getStepName()) - .eq(bo.getStepTime() != null, ProdTechnologyStepInfo::getStepTime, bo.getStepTime()) - .eq(StringUtils.isNotBlank(bo.getStepParameter()), ProdTechnologyStepInfo::getStepParameter, bo.getStepParameter()) - .eq(StringUtils.isNotBlank(bo.getValueState()), ProdTechnologyStepInfo::getValueState, bo.getValueState()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdTechnologyStepInfo::getActiveFlag, bo.getActiveFlag()) - .orderByDesc(ProdTechnologyStepInfo::getStepCode); + .selectAll(ProdTechnologyStepInfo.class) + .eq(bo.getStepId() != null, ProdTechnologyStepInfo::getStepId, bo.getStepId()) + .eq(bo.getTechnologyId() != null, ProdTechnologyStepInfo::getTechnologyId, bo.getTechnologyId()) + .eq(bo.getStepCode() != null, ProdTechnologyStepInfo::getStepCode, bo.getStepCode()) + .like(StringUtils.isNotBlank(bo.getStepName()), ProdTechnologyStepInfo::getStepName, bo.getStepName()) + .eq(bo.getStepTime() != null, ProdTechnologyStepInfo::getStepTime, bo.getStepTime()) + .eq(StringUtils.isNotBlank(bo.getStepParameter()), ProdTechnologyStepInfo::getStepParameter, bo.getStepParameter()) + .eq(StringUtils.isNotBlank(bo.getValueState()), ProdTechnologyStepInfo::getValueState, bo.getValueState()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdTechnologyStepInfo::getActiveFlag, bo.getActiveFlag()) + .eq(StringUtils.isNotBlank(bo.getDataType()), ProdTechnologyStepInfo::getDataType, bo.getDataType()) + .eq(StringUtils.isNotBlank(bo.getPointAddress()), ProdTechnologyStepInfo::getPointAddress, bo.getPointAddress()) + .eq(bo.getOperationType() != null, ProdTechnologyStepInfo::getOperationType, bo.getOperationType()) + .orderByDesc(ProdTechnologyStepInfo::getStepCode); return lqw; } @@ -118,7 +121,7 @@ public class ProdTechnologyStepInfoServiceImpl implements IProdTechnologyStepInf /** * 保存前的数据校验 */ - private void validEntityBeforeSave(ProdTechnologyStepInfo entity){ + private void validEntityBeforeSave(ProdTechnologyStepInfo entity) { //TODO 做一些数据校验,如唯一约束 } @@ -131,7 +134,7 @@ public class ProdTechnologyStepInfoServiceImpl implements IProdTechnologyStepInf */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0;