From bfcac500a0cd253b4458ea1de27b14634c872866 Mon Sep 17 00:00:00 2001
From: ccongli <1441652193@qq.com>
Date: Tue, 18 Apr 2023 16:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C485?=
=?UTF-8?q?=E4=B8=B2=E5=8F=A3=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.gitignore | 8 --------
.idea/.name | 1 -
.idea/vcs.xml | 6 ------
.../java/org/jeecg/custom/task/TtDataCollectTask.java | 7 +++++--
4 files changed, 5 insertions(+), 17 deletions(-)
delete mode 100644 .idea/.gitignore
delete mode 100644 .idea/.name
delete mode 100644 .idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 73f69e0..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 9559630..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-linkage-boot-parent
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java b/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java
index e1b7a5b..59a1af2 100644
--- a/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java
+++ b/linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java
@@ -84,6 +84,7 @@ public class TtDataCollectTask implements SchedulingConfigurer {
TtPouringEquip ttPouringEquip = new TtPouringEquip();
ttPouringEquip.setTemperature(new BigDecimal(temp));
ttPouringEquip.setCreateTime(new Date());
+ ttPouringEquip.setCreateBy("system");
ttPouringEquip.setType(type);
ttPouringEquip.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0"));
ttPouringEquip.setEqtIp(eqtIp);
@@ -107,6 +108,7 @@ public class TtDataCollectTask implements SchedulingConfigurer {
TtFeedingEquip ttFeedingEquip = new TtFeedingEquip();
ttFeedingEquip.setTemperature(new BigDecimal(temp));
ttFeedingEquip.setCreateTime(new Date());
+ ttFeedingEquip.setCreateBy("system");
ttFeedingEquip.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0"));
ttFeedingEquip.setEqtIp(eqtIp);
feedingEquipService.save(ttFeedingEquip);
@@ -116,8 +118,8 @@ public class TtDataCollectTask implements SchedulingConfigurer {
}
-// String cron2 = "0 0 8 * * ?";
- String cron2 = "0/5 * * * * ?";
+ String cron2 = "0 0 8 * * ?";
+// String cron2 = "0 0/5 * * * ?";
// 创建数字电表定时任务
for(Map.Entry entry : meterHandlerMap.entrySet()) {
RS485Handler handler = entry.getValue();
@@ -134,6 +136,7 @@ public class TtDataCollectTask implements SchedulingConfigurer {
TtElectricMeter ttElectricMeter = new TtElectricMeter();
ttElectricMeter.setTotalPower(totalPower);
ttElectricMeter.setCreateTime(new Date());
+ ttElectricMeter.setCreateBy("system");
ttElectricMeter.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0"));
ttElectricMeter.setEqtIp(eqtIp);
// 获取昨日用电量