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

update Dms报警规则关系信息、机台添加字段

Browse Source
master
yinq 1 week ago
parent 5a012a38ff
commit aeb72a2501
10 changed files with 315 additions and 26 deletions
Show Stats Download Patch File Download Diff File

22
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRule.java
Unescape Escape View File

@ -112,5 +112,27 @@ public class BaseAlarmRule extends TenantEntity {
*/
private String remark;
/**
* 报警级别名称
*/
@TableField(exist = false)
private String alarmLevelName;
/**
* 报警类型名称
*/
@TableField(exist = false)
private String alarmTypeName;
/**
* 设备名称
*/
@TableField(exist = false)
private String ruleDeviceName;
/**
* 设备模型名称
*/
@TableField(exist = false)
private String ruleDeviceModeName;
}

7
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseAlarmRuleBo.java
Unescape Escape View File

@ -28,19 +28,19 @@ public class BaseAlarmRuleBo extends BaseEntity {
/**
* 规则名称
*/
@NotBlank(message = "规则名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "规则名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String alarmRuleName;
/**
* 报警级别，关联表hw_alarm_level字段alarm_level_id
*/
@NotNull(message = "报警级别，关联表hw_alarm_level字段alarm_level_id不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "报警级别", groups = {AddGroup.class, EditGroup.class})
private Long alarmLevelId;
/**
* 报警类型，关联表hw_alarm_type字段alarm_type_id
*/
@NotNull(message = "报警类型，关联表hw_alarm_type字段alarm_type_id不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "报警类型", groups = {AddGroup.class, EditGroup.class})
private Long alarmTypeId;
/**
@ -66,6 +66,7 @@ public class BaseAlarmRuleBo extends BaseEntity {
/**
* 表达式，例如:{}>60 or {}<-88
*/
@NotBlank(message = "表达式不能为空", groups = {AddGroup.class, EditGroup.class})
private String triggerExpression;
/**

23
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseAlarmRuleVo.java
Unescape Escape View File

@ -141,5 +141,28 @@ public class BaseAlarmRuleVo implements Serializable {
@ExcelProperty(value = "描述")
private String remark;
/**
* 报警级别名称
*/
@ExcelProperty(value = "报警级别名称")
private String alarmLevelName;
/**
* 报警类型名称
*/
@ExcelProperty(value = "报警类型名称")
private String alarmTypeName;
/**
* 设备名称
*/
@ExcelProperty(value = "设备名称")
private String ruleDeviceName;
/**
* 设备模型名称
*/
@ExcelProperty(value = "设备模型名称")
private String ruleDeviceModeName;
}

54
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmRuleServiceImpl.java
Unescape Escape View File

@ -7,8 +7,10 @@ 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.BaseAlarmLevel;
import org.dromara.dms.domain.BaseAlarmType;
import org.dromara.dms.domain.DmsDeviceMode;
import org.springframework.stereotype.Service;
import org.dromara.dms.domain.bo.BaseAlarmRuleBo;
import org.dromara.dms.domain.vo.BaseAlarmRuleVo;
@ -39,7 +41,7 @@ public class BaseAlarmRuleServiceImpl implements IBaseAlarmRuleService {
* @return 报警规则
*/
@Override
public BaseAlarmRuleVo queryById(Long alarmRuleId){
public BaseAlarmRuleVo queryById(Long alarmRuleId) {
return baseMapper.selectVoById(alarmRuleId);
}
@ -72,25 +74,31 @@ public class BaseAlarmRuleServiceImpl implements IBaseAlarmRuleService {
private MPJLambdaWrapper<BaseAlarmRule> buildQueryWrapper(BaseAlarmRuleBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseAlarmRule> lqw = JoinWrappers.lambda(BaseAlarmRule.class)
.selectAll(BaseAlarmRule.class)
.eq(bo.getAlarmRuleId() != null, BaseAlarmRule::getAlarmRuleId, bo.getAlarmRuleId())
.like(StringUtils.isNotBlank(bo.getAlarmRuleName()), BaseAlarmRule::getAlarmRuleName, bo.getAlarmRuleName())
.eq(bo.getAlarmLevelId() != null, BaseAlarmRule::getAlarmLevelId, bo.getAlarmLevelId())
.eq(bo.getAlarmTypeId() != null, BaseAlarmRule::getAlarmTypeId, bo.getAlarmTypeId())
.eq(StringUtils.isNotBlank(bo.getRuleType()), BaseAlarmRule::getRuleType, bo.getRuleType())
.eq(bo.getRuleDeviceId() != null, BaseAlarmRule::getRuleDeviceId, bo.getRuleDeviceId())
.eq(bo.getRuleDeviceModeId() != null, BaseAlarmRule::getRuleDeviceModeId, bo.getRuleDeviceModeId())
.eq(bo.getRuleFunctionTotal() != null, BaseAlarmRule::getRuleFunctionTotal, bo.getRuleFunctionTotal())
.eq(StringUtils.isNotBlank(bo.getTriggerExpression()), BaseAlarmRule::getTriggerExpression, bo.getTriggerExpression())
.eq(StringUtils.isNotBlank(bo.getLinkFlag()), BaseAlarmRule::getLinkFlag, bo.getLinkFlag())
.eq(StringUtils.isNotBlank(bo.getAlarmRuleStatus()), BaseAlarmRule::getAlarmRuleStatus, bo.getAlarmRuleStatus())
.eq(StringUtils.isNotBlank(bo.getAlarmPushFlag()), BaseAlarmRule::getAlarmPushFlag, bo.getAlarmPushFlag())
.eq(StringUtils.isNotBlank(bo.getAlarmPushContent()), BaseAlarmRule::getAlarmPushContent, bo.getAlarmPushContent())
.eq(StringUtils.isNotBlank(bo.getAlarmRecoverContent()), BaseAlarmRule::getAlarmRecoverContent, bo.getAlarmRecoverContent())
.eq(bo.getTriggerTimeFrame() != null, BaseAlarmRule::getTriggerTimeFrame, bo.getTriggerTimeFrame())
.eq(bo.getTriggerNumber() != null, BaseAlarmRule::getTriggerNumber, bo.getTriggerNumber())
.eq(bo.getTriggerDeadzone() != null, BaseAlarmRule::getTriggerDeadzone, bo.getTriggerDeadzone())
.orderByAsc(BaseAlarmRule::getCreateTime);
.selectAll(BaseAlarmRule.class)
.select(BaseAlarmLevel::getAlarmLevelName)
.select(BaseAlarmType::getAlarmTypeName)
.select(DmsDeviceMode::getDeviceModeName)
.leftJoin(BaseAlarmLevel.class, BaseAlarmLevel::getAlarmLevelId, BaseAlarmRule::getAlarmLevelId)
.leftJoin(BaseAlarmType.class, BaseAlarmType::getAlarmTypeId, BaseAlarmRule::getAlarmTypeId)
.leftJoin(DmsDeviceMode.class, DmsDeviceMode::getDeviceModeId, BaseAlarmRule::getRuleDeviceModeId)
.eq(bo.getAlarmRuleId() != null, BaseAlarmRule::getAlarmRuleId, bo.getAlarmRuleId())
.like(StringUtils.isNotBlank(bo.getAlarmRuleName()), BaseAlarmRule::getAlarmRuleName, bo.getAlarmRuleName())
.eq(bo.getAlarmLevelId() != null, BaseAlarmRule::getAlarmLevelId, bo.getAlarmLevelId())
.eq(bo.getAlarmTypeId() != null, BaseAlarmRule::getAlarmTypeId, bo.getAlarmTypeId())
.eq(StringUtils.isNotBlank(bo.getRuleType()), BaseAlarmRule::getRuleType, bo.getRuleType())
.eq(bo.getRuleDeviceId() != null, BaseAlarmRule::getRuleDeviceId, bo.getRuleDeviceId())
.eq(bo.getRuleDeviceModeId() != null, BaseAlarmRule::getRuleDeviceModeId, bo.getRuleDeviceModeId())
.eq(bo.getRuleFunctionTotal() != null, BaseAlarmRule::getRuleFunctionTotal, bo.getRuleFunctionTotal())
.eq(StringUtils.isNotBlank(bo.getTriggerExpression()), BaseAlarmRule::getTriggerExpression, bo.getTriggerExpression())
.eq(StringUtils.isNotBlank(bo.getLinkFlag()), BaseAlarmRule::getLinkFlag, bo.getLinkFlag())
.eq(StringUtils.isNotBlank(bo.getAlarmRuleStatus()), BaseAlarmRule::getAlarmRuleStatus, bo.getAlarmRuleStatus())
.eq(StringUtils.isNotBlank(bo.getAlarmPushFlag()), BaseAlarmRule::getAlarmPushFlag, bo.getAlarmPushFlag())
.eq(StringUtils.isNotBlank(bo.getAlarmPushContent()), BaseAlarmRule::getAlarmPushContent, bo.getAlarmPushContent())
.eq(StringUtils.isNotBlank(bo.getAlarmRecoverContent()), BaseAlarmRule::getAlarmRecoverContent, bo.getAlarmRecoverContent())
.eq(bo.getTriggerTimeFrame() != null, BaseAlarmRule::getTriggerTimeFrame, bo.getTriggerTimeFrame())
.eq(bo.getTriggerNumber() != null, BaseAlarmRule::getTriggerNumber, bo.getTriggerNumber())
.eq(bo.getTriggerDeadzone() != null, BaseAlarmRule::getTriggerDeadzone, bo.getTriggerDeadzone())
.orderByAsc(BaseAlarmRule::getCreateTime);
return lqw;
}
@ -127,7 +135,7 @@ public class BaseAlarmRuleServiceImpl implements IBaseAlarmRuleService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BaseAlarmRule entity){
private void validEntityBeforeSave(BaseAlarmRule entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -140,7 +148,7 @@ public class BaseAlarmRuleServiceImpl implements IBaseAlarmRuleService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;

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

@ -0,0 +1,53 @@
package org.dromara.mes.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;
/**
* 设备模型对象 dms_device_mode
*
* @author Yinq
* @date 2025-03-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("dms_device_mode")
public class ProdBaseDeviceMode extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 设备模型ID
*/
@TableId(value = "device_mode_id", type = IdType.AUTO)
private Long deviceModeId;
/**
* 设备模型名称
*/
private String deviceModeName;
/**
* 设备模型状态（1：启用，9：删除）
*/
private String deviceModeStatus;
/**
* 设备模型图片地址
*/
private String deviceModePic;
/**
* 场景描述
*/
private String remark;
}

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

@ -77,9 +77,60 @@ public class ProdBaseMachineInfo extends TenantEntity {
*/
private Long workshopId;
/**
* 设备模型，关联设备模型dms_device_mode
*/
private Long deviceModeId;
/**
* 设备IP地址
*/
private String machineIp;
/**
* 设备端口
*/
private Long machinePort;
/**
* 设备协议
*/
private String accessProtocol;
/**
* 寄存器地址
*/
private String registerAddress;
/**
* 数据类型（1、bool，2、short，3int，4long，5float，6byte，7ushort，8uint，9ulong，10double，11字符串）
*/
private String dataType;
/**
* 数据长度
*/
private Long dataLength;
/**
* 数据编码格式（1ASCII,2Unicode,3Unicode-big,4UTF-8,5UTF-32,6、ANSI,7、GB2312）
*/
private String dataEncoding;
/**
* 请求间隔（单位：毫秒）
*/
private Long requestInterval;
/**
* 车间名称
*/
@TableField(exist = false)
private String workshopName;
/**
* 设备模型名称
*/
@TableField(exist = false)
private String deviceModeName;
}

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

@ -1,5 +1,6 @@
package org.dromara.mes.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.mes.domain.ProdBaseMachineInfo;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@ -85,5 +86,59 @@ public class ProdBaseMachineInfoBo extends BaseEntity {
*/
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;
private List<ProdBaseMachineProcess> baseMachineProcessList;
}

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

@ -131,12 +131,72 @@ public class ProdBaseMachineInfoVo implements Serializable {
*/
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;
private List<ProdBaseMachineProcess> baseMachineProcessList;
}

14
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/prodBaseDeviceModeMapper.java
Unescape Escape View File

@ -0,0 +1,14 @@
package org.dromara.mes.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.mes.domain.ProdBaseDeviceMode;
/**
* 设备模型Mapper接口
*
* @author Yinq
* @date 2025-03-11
*/
public interface prodBaseDeviceModeMapper extends BaseMapperPlus<ProdBaseDeviceMode, ProdBaseDeviceMode> {
}

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

@ -96,7 +96,9 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi
MPJLambdaWrapper<ProdBaseMachineInfo> lqw = JoinWrappers.lambda(ProdBaseMachineInfo.class)
.selectAll(ProdBaseMachineInfo.class)
.select(ProdBaseWorkshopInfo::getWorkshopName)
.select(ProdBaseDeviceMode::getDeviceModeName)
.leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId)
.leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)
.eq(bo.getMachineId() != null, ProdBaseMachineInfo::getMachineId, bo.getMachineId())
.like(StringUtils.isNotBlank(bo.getMachineCode()), ProdBaseMachineInfo::getMachineCode, bo.getMachineCode())
.like(StringUtils.isNotBlank(bo.getMachineName()), ProdBaseMachineInfo::getMachineName, bo.getMachineName())

Write Preview
Loading…
Cancel
Save