+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java
index b47cf46..e580f7a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.domain;
+import java.math.BigDecimal;
import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -31,31 +32,31 @@ public class TVibrationsensorData extends BaseEntity {
* 振动传感器ID
*/
@Excel(name = "振动传感器ID")
- private Long sensorId;
+ private String sensorId;
/**
* 速度(mm/s)
*/
@Excel(name = "速度(mm/s)")
- private Long speed;
+ private BigDecimal speed;
/**
* 位移(um)
*/
@Excel(name = "位移(um)")
- private Long displacement;
+ private BigDecimal displacement;
/**
* 加速度(g)
*/
@Excel(name = "加速度(g)")
- private Long acceleration;
+ private BigDecimal acceleration;
/**
* 温度(℃)
*/
@Excel(name = "温度(℃)")
- private Long temperature;
+ private BigDecimal temperature;
/**
* 记录时间
@@ -63,82 +64,67 @@ public class TVibrationsensorData extends BaseEntity {
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recodeTime;
- public void setObjId(Long objId) {
- this.objId = objId;
- }
-
public Long getObjId() {
return objId;
}
- public void setCollectTime(Date collectTime) {
- this.collectTime = collectTime;
+ public void setObjId(Long objId) {
+ this.objId = objId;
}
public Date getCollectTime() {
return collectTime;
}
- public void setSensorId(Long sensorId) {
- this.sensorId = sensorId;
+ public void setCollectTime(Date collectTime) {
+ this.collectTime = collectTime;
}
- public Long getSensorId() {
+ public String getSensorId() {
return sensorId;
}
- public void setSpeed(Long speed) {
- this.speed = speed;
+ public void setSensorId(String sensorId) {
+ this.sensorId = sensorId;
}
- public Long getSpeed() {
+ public BigDecimal getSpeed() {
return speed;
}
- public void setDisplacement(Long displacement) {
- this.displacement = displacement;
+ public void setSpeed(BigDecimal speed) {
+ this.speed = speed;
}
- public Long getDisplacement() {
+ public BigDecimal getDisplacement() {
return displacement;
}
- public void setAcceleration(Long acceleration) {
- this.acceleration = acceleration;
+ public void setDisplacement(BigDecimal displacement) {
+ this.displacement = displacement;
}
- public Long getAcceleration() {
+ public BigDecimal getAcceleration() {
return acceleration;
}
- public void setTemperature(Long temperature) {
- this.temperature = temperature;
+ public void setAcceleration(BigDecimal acceleration) {
+ this.acceleration = acceleration;
}
- public Long getTemperature() {
+ public BigDecimal getTemperature() {
return temperature;
}
- public void setRecodeTime(Date recodeTime) {
- this.recodeTime = recodeTime;
+ public void setTemperature(BigDecimal temperature) {
+ this.temperature = temperature;
}
public Date getRecodeTime() {
return recodeTime;
}
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("objId", getObjId())
- .append("collectTime", getCollectTime())
- .append("sensorId", getSensorId())
- .append("speed", getSpeed())
- .append("displacement", getDisplacement())
- .append("acceleration", getAcceleration())
- .append("temperature", getTemperature())
- .append("recodeTime", getRecodeTime())
- .append("remark", getRemark())
- .toString();
+ public void setRecodeTime(Date recodeTime) {
+ this.recodeTime = recodeTime;
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java
index f8e6b6f..8521bb2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java
@@ -75,13 +75,15 @@ public class T_MonitorServiceImpl implements IT_MonitorService
@Override
public int insertT_Monitor(T_Monitor t_Monitor)
{
- t_Monitor.setMonitorType(16);
- t_Monitor.setSecondType(0);
try {
- TSetmonitorthresholdvalue tSetmonitorthresholdvalue = new TSetmonitorthresholdvalue();
- tSetmonitorthresholdvalue.setMonitorId(t_Monitor.getMonitorId());
- tSetmonitorthresholdvalue.setMonitorType(16);
- tSetmonitorthresholdvalueService.insertTSetmonitorthresholdvalue(tSetmonitorthresholdvalue);
+ t_Monitor.setSecondType(0);
+ if (t_Monitor.getMonitorType() == null){
+ t_Monitor.setMonitorType(16);
+ TSetmonitorthresholdvalue tSetmonitorthresholdvalue = new TSetmonitorthresholdvalue();
+ tSetmonitorthresholdvalue.setMonitorId(t_Monitor.getMonitorId());
+ tSetmonitorthresholdvalue.setMonitorType(16);
+ tSetmonitorthresholdvalueService.insertTSetmonitorthresholdvalue(tSetmonitorthresholdvalue);
+ }
} catch (Exception e) {
e.printStackTrace();
}