Browse Source

测试modbus获取数据添加时间

王先生 2 years ago
parent
commit
3ff459995c

+ 5 - 0
eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historymodbusdata/domain/DmEnvHistoryModbusData.java

@@ -22,6 +22,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
 import javax.validation.constraints.*;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
 * @website https://el-admin.vip
@@ -71,6 +72,10 @@ public class DmEnvHistoryModbusData implements Serializable {
     @ApiModelProperty(value = "关联对象id")
     private Long dataId;
 
+    @Column(name = "create_time")
+    @ApiModelProperty(value = "时间")
+    private Date createTime;
+
     public void copy(DmEnvHistoryModbusData source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

+ 4 - 0
eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historymodbusdata/service/dto/DmEnvHistoryModbusDataDto.java

@@ -17,6 +17,8 @@ package me.zhengjie.modules.dm.envmonitor.historymodbusdata.service.dto;
 
 import lombok.Data;
 import java.io.Serializable;
+import java.util.Date;
+
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
 
@@ -50,4 +52,6 @@ public class DmEnvHistoryModbusDataDto implements Serializable {
 
     /** 关联对象id */
     private Long dataId;
+
+    private Date createTime;
 }

+ 2 - 4
eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ModbusTask.java

@@ -46,10 +46,7 @@ import org.springframework.web.bind.annotation.InitBinder;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -215,6 +212,7 @@ public class ModbusTask {
                                                       return;
                                                   }
                                               });
+                                              dmEnvHistoryModbusData.setCreateTime(new Date());
                                               dmEnvHistoryModbusDataService.create(dmEnvHistoryModbusData);
                                               log.info("添加的modbus的数据,{}" + JSONObject.toJSONString(dmEnvHistoryModbusData) );
                                           }