xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 程序工艺信息加列参数

Browse Source
master
yinq 5 days ago
parent 8faba2dd74
commit 0ae76de9dc
4 changed files with 122 additions and 48 deletions
Show Stats Download Patch File Download Diff File

33
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java
Unescape Escape View File

@ -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代表删除）
*/

49
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java
Unescape Escape View File

@ -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;
}

59
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java
Unescape Escape View File

@ -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;
}

29
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java
Unescape Escape View File

@ -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<ProdTechnologyStepInfo> buildQueryWrapper(ProdTechnologyStepInfoBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<ProdTechnologyStepInfo> 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<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;

Write Preview
Loading…
Cancel
Save