From 978ef43c75a585f271d5c83a8aa6bb76b551fe27 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Fri, 18 Oct 2024 11:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/lims/job/EnterprisePowerTaskJob.java     | 4 ++++
 .../org/springblade/lims/mapper/EnterprisePowerMapper.java   | 2 ++
 .../org/springblade/lims/mapper/EnterprisePowerMapper.xml    | 5 +++++
 .../springblade/lims/service/IEnterprisePowerService.java    | 2 ++
 .../lims/service/impl/EnterprisePowerServiceImpl.java        | 5 +++++
 5 files changed, 18 insertions(+)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/job/EnterprisePowerTaskJob.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/job/EnterprisePowerTaskJob.java
index ed6a66d..0ce40dc 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/job/EnterprisePowerTaskJob.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/job/EnterprisePowerTaskJob.java
@@ -24,7 +24,11 @@ public class EnterprisePowerTaskJob {
         //统计前一天的数据
         Date now = new Date();
         String currentDay = DateFormatUtils.format(DateUtils.addDays(now,-1),"yyyy-MM-dd");
+        String currentMonth = DateFormatUtils.format(DateUtils.addDays(now,-1),"yyyyMM");
         enterprisePowerService.insertData(currentDay);
+        //保存昨天数据
+        String tableName = "t_instrument_data_"+currentMonth;
+        enterprisePowerService.insertCurrentDayData(currentDay,tableName);
         //删除7天前的数据，数据表里只保留7天数据
         String days = DateFormatUtils.format(DateUtils.addDays(now,-6),"yyyy-MM-dd") + " 00:00:00";
         enterprisePowerService.deleteData(days);
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.java
index ebd39d2..aae5c6e 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.java
@@ -13,6 +13,8 @@ import org.springblade.lims.entry.EnterprisePower;
 public interface EnterprisePowerMapper extends BaseMapper<EnterprisePower> {
     void insertData(String currentDay);
 
+    void insertCurrentDayData(String currentDay,String tableName);
+
     void createTable(String tableName);
 
     void deleteData(String daytime);
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.xml b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.xml
index 8071fa1..7ce49ad 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.xml
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EnterprisePowerMapper.xml
@@ -18,6 +18,11 @@
             a.manufacturer_brand,b.current_day,b.current_month,b.current_year
     </insert>
 
+    <insert id="insertCurrentDayData">
+        insert into `${tableName}`
+        select * from t_instrument_data where DATE_FORMAT(send_time,'%Y-%m-%d') = #{currentDay}
+    </insert>
+
     <update id="createTable" parameterType="java.lang.String">
         CREATE TABLE `${tableName}` LIKE t_instrument_data;
     </update>
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IEnterprisePowerService.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IEnterprisePowerService.java
index f9a097e..fee31ea 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IEnterprisePowerService.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IEnterprisePowerService.java
@@ -12,6 +12,8 @@ import org.springblade.lims.entry.EnterprisePower;
 public interface IEnterprisePowerService extends BaseService<EnterprisePower> {
     void insertData(String currentDay);
 
+    void insertCurrentDayData(String currentDay,String tableName);
+
     void createTable(String tableName);
 
     void deleteData(String daytime);
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EnterprisePowerServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EnterprisePowerServiceImpl.java
index 1e3d05e..19c75ba 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EnterprisePowerServiceImpl.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EnterprisePowerServiceImpl.java
@@ -23,6 +23,11 @@ public class EnterprisePowerServiceImpl extends BaseServiceImpl<EnterprisePowerM
         baseMapper.insertData(currentDay);
     }
 
+    @Override
+    public void insertCurrentDayData(String currentDay,String tableName) {
+        baseMapper.insertCurrentDayData(currentDay,tableName);
+    }
+
     @Override
     public void createTable(String tableName) {
         baseMapper.createTable(tableName);