Ver código fonte

每5秒抓取实时数据,存入数据库

Wang Zi Wen 3 anos atrás
pai
commit
19eb254b02

+ 40 - 0
src/main/java/io/renren/modules/aspen/controller/TElecdashboardRealtimeController.java

@@ -0,0 +1,40 @@
+package io.renren.modules.aspen.controller;
+
+import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
+import io.renren.modules.aspen.entity.base.TElecdashboard;
+import io.renren.modules.aspen.service.TElecdashboardRealtimeService;
+import io.renren.modules.aspen.utils.DashboardDataPullUtils;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 电厂大屏实时数据
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 10:58:53
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class TElecdashboardRealtimeController {
+
+    @Resource
+    private TElecdashboardRealtimeService tElecdashboardRealtimeService;
+
+    /**
+     * 每5秒抓取实时数据,存入数据库
+     */
+    @Scheduled(cron = "*/5 * * * * ?" )
+    public void getExcelDataEvery5Seconds(){
+        DashboardDataPullUtils dashboardDataPullUtils = new DashboardDataPullUtils();
+        TElecdashboard tElecdashboard = dashboardDataPullUtils.getExcelData(new TElecdashboardRealtimeEntity());
+        TElecdashboardRealtimeEntity tElecdashboardRealtimeEntity = (TElecdashboardRealtimeEntity) tElecdashboard;
+        tElecdashboardRealtimeService.insertTElecdashboardRealtime(tElecdashboardRealtimeEntity);
+    }
+
+}

+ 19 - 0
src/main/java/io/renren/modules/aspen/dao/TElecdashboardRealtimeDao.java

@@ -0,0 +1,19 @@
+package io.renren.modules.aspen.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 电厂大屏实时数据
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 10:47:03
+ */
+@Mapper
+public interface TElecdashboardRealtimeDao extends BaseMapper<TElecdashboardRealtimeEntity> {
+
+    public void insertTElecdashboardRealtime(TElecdashboardRealtimeEntity elecDashboardDataRealTime);
+
+}

+ 13 - 0
src/main/java/io/renren/modules/aspen/entity/TElecdashboardRealtimeEntity.java

@@ -0,0 +1,13 @@
+package io.renren.modules.aspen.entity;
+
+import io.renren.modules.aspen.entity.base.TElecdashboard;
+
+/**
+ * 电厂大屏实时数据
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 10:03:04
+ */
+public class TElecdashboardRealtimeEntity extends TElecdashboard {
+}

+ 13 - 0
src/main/java/io/renren/modules/aspen/entity/TElecdashboradDayEntity.java

@@ -0,0 +1,13 @@
+package io.renren.modules.aspen.entity;
+
+import io.renren.modules.aspen.entity.base.TElecdashboard;
+
+/**
+ * 电厂大屏每日数据
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 10:01:20
+ */
+public class TElecdashboradDayEntity extends TElecdashboard {
+}

+ 216 - 203
src/main/java/io/renren/modules/test/entity/ElecDashboardData.java → src/main/java/io/renren/modules/aspen/entity/base/TElecdashboard.java

@@ -1,21 +1,18 @@
-package io.renren.modules.test.entity;
+package io.renren.modules.aspen.entity.base;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 电厂大屏数据
  *
- * @author: Wang Zi Wen
- * @email: wangggziwen@163.com
- * @datetime: 2022/8/30 10:33
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 09:58:48
  */
-public class ElecDashboardData {
+public abstract class TElecdashboard {
+
+    private long id;        // 唯一标识id
+    private Date pullDate;  // 抓取时间
 
     private String gtg1PowerGenLevel;   // 1#GTG 发电水平
     private String gtg1Efficiency;      // 1#GTG 效率(百分比)
@@ -257,196 +254,212 @@ public class ElecDashboardData {
     public String toString() {
         return
                 "gtg1PowerGenLevel: " + this.gtg1PowerGenLevel + "\n" +
-                "gtg1Efficiency: " + this.gtg1Efficiency + "\n" +
-                "gtg2PowerGenLevel: " + this.gtg2PowerGenLevel + "\n" +
-                "gtg2Efficiency: " + this.gtg2Efficiency + "\n" +
-                "gtg3PowerGenLevel: " + this.gtg3PowerGenLevel + "\n" +
-                "gtg3Efficiency: " + this.gtg3Efficiency + "\n" +
-                "stgPowerGenLevel: " + this.stgPowerGenLevel + "\n" +
-                "stgEfficiency: " + this.stgEfficiency + "\n" +
-                "totalPowerGen: " + this.totalPowerGen + "\n" +
-                "steamHhp: " + this.steamHhp + "\n" +
-                "steamHp: " + this.steamHp + "\n" +
-                "steamMp: " + this.steamMp + "\n" +
-                "steamLp: " + this.steamLp + "\n" +
-                "gasRealTime: " + this.gasRealTime + "\n" +
-                "gasLeft: " + this.gasLeft + "\n" +
-                "gasUsed: " + this.gasUsed + "\n" +
-                "gasPlan: " + this.gasPlan + "\n" +
-                "gasElec: " + this.gasElec + "\n" +
-                "gasSynGas: " + this.gasSynGas + "\n" +
-                "gasU2: " + this.gasU2 + "\n" +
-                "gasStyrene: " + this.gasStyrene + "\n" +
-                "elecPowerGen: " + this.elecPowerGen + "\n" +
-                "elecPowerSwitch: " + this.elecPowerSwitch + "\n" +
-                "elecUsed: " + this.elecUsed + "\n" +
-                "elecDiff: " + this.elecDiff + "\n" +
-                "elecBycUsed: " + this.elecBycUsed + "\n" +
-                "elecBocUsed: " + this.elecBocUsed + "\n" +
-                "carbonUsed: " + this.carbonUsed + "\n" +
-                "carbonRealTime: " + this.carbonRealTime + "\n" +
-                "sub: " + this.sub + "\n" +
-                "subFurnaceLoad: " + this.subFurnaceLoad + "\n" +
-                "hhpPphhp: " + this.hhpPphhp + "\n" +
-                "hhpAaae: " + this.hhpAaae + "\n" +
-                "hhpGaa: " + this.hhpGaa + "\n" +
-                "hhpSyn: " + this.hhpSyn + "\n" +
-                "hhpP3802: " + this.hhpP3802 + "\n" +
-                "hpLpg: " + this.hpLpg + "\n" +
-                "hpSub: " + this.hpSub + "\n" +
-                "hpNg: " + this.hpNg + "\n" +
-                "hpJ1501: " + this.hpJ1501 + "\n" +
-                "hpJ1504In: " + this.hpJ1504In + "\n" +
-                "hpJ1504Out: " + this.hpJ1504Out + "\n" +
-                "hpUser: " + this.hpUser + "\n" +
-                "mpNcipmp: " + this.mpNcipMp + "\n" +
-                "mp150511: " + this.mp150511 + "\n" +
-                "mp150512: " + this.mp150512 + "\n" +
-                "mpPpmp: " + this.mpPpMp + "\n" +
-                "mpP9801In: " + this.mpP9801In + "\n" +
-                "mpP9801Out: " + this.mpP9801Out + "\n" +
-                "mpJ1502: " + this.mpJ1502 + "\n" +
-                "mpUser: " + this.mpUser + "\n" +
-                "lpPpLp: " + this.lpPpLp + "\n" +
-                "lpEmpty: " + this.lpEmpty + "\n" +
-                "lpMpLetdown: " + this.lpMpLetdown + "\n" +
-                "lpJ1509: " + this.lpJ1509 + "\n" +
-                "lpJ1503: " + this.lpJ1503 + "\n" +
-                "lpLdpeTs: " + this.lpLdpeTs + "\n" +
-                "lpLdpeDm: " + this.lpLdpeDm + "\n" +
-                "lpUser: " + this.lpUser + "\n" +
-                "bccSyn: " + this.bccSyn + "\n" +
-                "bccYpc: " + this.bccYpc + "\n"  +
-                "hrsg1SmokeConvert: " + this.hrsg1SmokeConvert + "\n"  +
-                "hrsg1So2Convert: " + this.hrsg1So2Convert + "\n"  +
-                "hrsg1NoxConvert: " + this.hrsg1NoxConvert + "\n"  +
-                "hrsg2SmokeConvert: " + this.hrsg2SmokeConvert + "\n"  +
-                "hrsg2So2Convert: " + this.hrsg2So2Convert + "\n"  +
-                "hrsg2NoxConvert: " + this.hrsg2NoxConvert + "\n"  +
-                "hrsg3SmokeConvert: " + this.hrsg3SmokeConvert + "\n"  +
-                "hrsg3So2Convert: " + this.hrsg3So2Convert + "\n"  +
-                "hrsg3NoxConvert: " + this.hrsg3NoxConvert + "\n"  +
-                "rainPh: " + this.rainPh + "\n"  +
-                "rainCod: " + this.rainCod + "\n"  +
-                "wastePh: " + this.wastePh + "\n"  +
-                "wasteCod: " + this.wasteCod + "\n"  +
-                "gtg45ha1: " + this.gtg45ha1 + "\n" +
-                "gtg45ha2: " + this.gtg45ha2 + "\n" +
-                "gtg45ha3: " + this.gtg45ha3 + "\n" +
-                "gtg45ha4: " + this.gtg45ha4 + "\n" +
-                "gtg45ha5: " + this.gtg45ha5 + "\n" +
-                "gtg45ha6: " + this.gtg45ha6 + "\n" +
-                "gtg45ha7: " + this.gtg45ha7 + "\n" +
-                "gtg45ha8: " + this.gtg45ha8 + "\n" +
-                "gtg45ha9: " + this.gtg45ha9 + "\n" +
-                "gtg45ht1: " + this.gtg45ht1 + "\n" +
-                "gtg45ht2: " + this.gtg45ht2 + "\n" +
-                "gtg45ht3: " + this.gtg45ht3 + "\n" +
-                "gtg45ht4: " + this.gtg45ht4 + "\n" +
-                "gtg45ht5: " + this.gtg45ht5 + "\n" +
-                "gtg45ht6: " + this.gtg45ht6 + "\n" +
-                "qt61001: " + this.qt61001 + "\n" +
-                "qt61002: " + this.qt61002 + "\n" +
-                "qt61003: " + this.qt61003 + "\n" +
-                "qt61004: " + this.qt61004 + "\n" +
-                "qt61005: " + this.qt61005 + "\n" +
-                "qt61101: " + this.qt61101 + "\n" +
-                "qt61102: " + this.qt61102 + "\n" +
-                "qt61103: " + this.qt61103 + "\n" +
-                "qt61104: " + this.qt61104 + "\n" +
-                "qt61105: " + this.qt61105 + "\n" +
-                "qt76001: " + this.qt76001 + "\n" +
-                "qt76002: " + this.qt76002 + "\n" +
-                "qt76041: " + this.qt76041 + "\n" +
-                "qt80001: " + this.qt80001 + "\n" +
-                "qt80002: " + this.qt80002 + "\n" +
-                "qt80003: " + this.qt80003 + "\n" +
-                "qt91001: " + this.qt91001 + "\n" +
-                "qt91002: " + this.qt91002 + "\n" +
-                "qt91003: " + this.qt91003 + "\n" +
-                "qt91004: " + this.qt91004 + "\n" +
-                "qt91005: " + this.qt91005 + "\n" +
-                "qt91006: " + this.qt91006 + "\n" +
-                "qt91011: " + this.qt91011 + "\n" +
-                "qt91012: " + this.qt91012 + "\n" +
-                "qt91013: " + this.qt91013 + "\n" +
-                "at83001: " + this.at83001 + "\n" +
-                "at83002: " + this.at83002 + "\n" +
-                "at83003: " + this.at83003 + "\n" +
-                "at83004: " + this.at83004 + "\n" +
-                "qt12001: " + this.qt12001 + "\n" +
-                "qt12501: " + this.qt12501 + "\n" +
-                "qt12502: " + this.qt12502 + "\n" +
-                "qt22001: " + this.qt22001 + "\n" +
-                "qt22501: " + this.qt22501 + "\n" +
-                "qt22502: " + this.qt22502 + "\n" +
-                "qt32001: " + this.qt32001 + "\n" +
-                "hrsg1Ai82201: " + this.hrsg1Ai82201 + "\n" +
-                "hrsg1Ai82202: " + this.hrsg1Ai82202 + "\n" +
-                "hrsg1Ai82203: " + this.hrsg1Ai82203 + "\n" +
-                "hrsg1Ai82204: " + this.hrsg1Ai82204 + "\n" +
-                "hrsg1Ai82205: " + this.hrsg1Ai82205 + "\n" +
-                "hrsg1Ai82206: " + this.hrsg1Ai82206 + "\n" +
-                "hrsg1Ai82207: " + this.hrsg1Ai82207 + "\n" +
-                "hrsg1Ai82208: " + this.hrsg1Ai82208 + "\n" +
-                "hrsg1Ai82209: " + this.hrsg1Ai82209 + "\n" +
-                "hrsg1Ai82210: " + this.hrsg1Ai82210 + "\n" +
-                "hrsg1Ai82211: " + this.hrsg1Ai82211 + "\n" +
-                "hrsg1Ai82212: " + this.hrsg1Ai82212 + "\n" +
-                "hrsg1Air12551: " + this.hrsg1Air12551 + "\n" +
-                "hrsg1Air12552: " + this.hrsg1Air12552 + "\n" +
-                "hrsg1Air12553: " + this.hrsg1Air12553 + "\n" +
-                "hrsg1Air12554: " + this.hrsg1Air12554 + "\n" +
-                "hrsg1Air12555: " + this.hrsg1Air12555 + "\n" +
-                "hrsg1Air12556: " + this.hrsg1Air12556 + "\n" +
-                "hrsg1Air12557: " + this.hrsg1Air12557 + "\n" +
-                "hrsg1Air12558: " + this.hrsg1Air12558 + "\n" +
-                "hrsg2Ai82301: " + this.hrsg2Ai82301 + "\n" +
-                "hrsg2Ai82302: " + this.hrsg2Ai82302 + "\n" +
-                "hrsg2Ai82303: " + this.hrsg2Ai82303 + "\n" +
-                "hrsg2Ai82304: " + this.hrsg2Ai82304 + "\n" +
-                "hrsg2Ai82305: " + this.hrsg2Ai82305 + "\n" +
-                "hrsg2Ai82306: " + this.hrsg2Ai82306 + "\n" +
-                "hrsg2Ai82307: " + this.hrsg2Ai82307 + "\n" +
-                "hrsg2Ai82308: " + this.hrsg2Ai82308 + "\n" +
-                "hrsg2Ai82309: " + this.hrsg2Ai82309 + "\n" +
-                "hrsg2Ai82310: " + this.hrsg2Ai82310 + "\n" +
-                "hrsg2Ai82311: " + this.hrsg2Ai82311 + "\n" +
-                "hrsg2Ai82312: " + this.hrsg2Ai82312 + "\n" +
-                "hrsg2Air22551: " + this.hrsg2Air22551 + "\n" +
-                "hrsg2Air22552: " + this.hrsg2Air22552 + "\n" +
-                "hrsg2Air22553: " + this.hrsg2Air22553 + "\n" +
-                "hrsg2Air22554: " + this.hrsg2Air22554 + "\n" +
-                "hrsg2Air22555: " + this.hrsg2Air22555 + "\n" +
-                "hrsg2Air22556: " + this.hrsg2Air22556 + "\n" +
-                "hrsg2Air22557: " + this.hrsg2Air22557 + "\n" +
-                "hrsg2AiR22558: " + this.hrsg2AiR22558 + "\n" +
-                "hrsg2Qi22240: " + this.hrsg2Qi22240 + "\n" +
-                "hrsg2Qi22241: " + this.hrsg2Qi22241 + "\n" +
-                "hrsg2Qi22242: " + this.hrsg2Qi22242 + "\n" +
-                "hrsg3Ai82401: " + this.hrsg3Ai82401  + "\n" +
-                "hrsg3Ai82402: " + this.hrsg3Ai82402  + "\n" +
-                "hrsg3Ai82403: " + this.hrsg3Ai82403  + "\n" +
-                "hrsg3Ai82404: " + this.hrsg3Ai82404  + "\n" +
-                "hrsg3Ai82405: " + this.hrsg3Ai82405  + "\n" +
-                "hrsg3Ai82406: " + this.hrsg3Ai82406  + "\n" +
-                "hrsg3Ai82407: " + this.hrsg3Ai82407  + "\n" +
-                "hrsg3Ai82408: " + this.hrsg3Ai82408  + "\n" +
-                "hrsg3Ai82409: " + this.hrsg3Ai82409  + "\n" +
-                "hrsg3Ai82410: " + this.hrsg3Ai82410  + "\n" +
-                "hrsg3Ai82411: " + this.hrsg3Ai82411  + "\n" +
-                "hrsg3Ai82412: " + this.hrsg3Ai82412 + "\n" +
-                "hrsg3Air32551: " + this.hrsg3Air32551 + "\n" +
-                "hrsg3Air32552: " + this.hrsg3Air32552 + "\n" +
-                "hrsg3Air32553: " + this.hrsg3Air32553 + "\n" +
-                "hrsg3Air32554: " + this.hrsg3Air32554 + "\n" +
-                "hrsg3Air32555: " + this.hrsg3Air32555 + "\n" +
-                "hrsg3Air32556: " + this.hrsg3Air32556 + "\n" +
-                "hrsg3Air32557: " + this.hrsg3Air32557 + "\n" +
-                "hrsg3Air32558: " + this.hrsg3Air32558 + "\n" +
-                "hrsg3Qi32240: " + this.hrsg3Qi32240  + "\n" +
-                "hrsg3Qi32241: " + this.hrsg3Qi32241  + "\n" +
-                "hrsg3Qi32242: " + this.hrsg3Qi32242 + "\n";
+                        "gtg1Efficiency: " + this.gtg1Efficiency + "\n" +
+                        "gtg2PowerGenLevel: " + this.gtg2PowerGenLevel + "\n" +
+                        "gtg2Efficiency: " + this.gtg2Efficiency + "\n" +
+                        "gtg3PowerGenLevel: " + this.gtg3PowerGenLevel + "\n" +
+                        "gtg3Efficiency: " + this.gtg3Efficiency + "\n" +
+                        "stgPowerGenLevel: " + this.stgPowerGenLevel + "\n" +
+                        "stgEfficiency: " + this.stgEfficiency + "\n" +
+                        "totalPowerGen: " + this.totalPowerGen + "\n" +
+                        "steamHhp: " + this.steamHhp + "\n" +
+                        "steamHp: " + this.steamHp + "\n" +
+                        "steamMp: " + this.steamMp + "\n" +
+                        "steamLp: " + this.steamLp + "\n" +
+                        "gasRealTime: " + this.gasRealTime + "\n" +
+                        "gasLeft: " + this.gasLeft + "\n" +
+                        "gasUsed: " + this.gasUsed + "\n" +
+                        "gasPlan: " + this.gasPlan + "\n" +
+                        "gasElec: " + this.gasElec + "\n" +
+                        "gasSynGas: " + this.gasSynGas + "\n" +
+                        "gasU2: " + this.gasU2 + "\n" +
+                        "gasStyrene: " + this.gasStyrene + "\n" +
+                        "elecPowerGen: " + this.elecPowerGen + "\n" +
+                        "elecPowerSwitch: " + this.elecPowerSwitch + "\n" +
+                        "elecUsed: " + this.elecUsed + "\n" +
+                        "elecDiff: " + this.elecDiff + "\n" +
+                        "elecBycUsed: " + this.elecBycUsed + "\n" +
+                        "elecBocUsed: " + this.elecBocUsed + "\n" +
+                        "carbonUsed: " + this.carbonUsed + "\n" +
+                        "carbonRealTime: " + this.carbonRealTime + "\n" +
+                        "sub: " + this.sub + "\n" +
+                        "subFurnaceLoad: " + this.subFurnaceLoad + "\n" +
+                        "hhpPphhp: " + this.hhpPphhp + "\n" +
+                        "hhpAaae: " + this.hhpAaae + "\n" +
+                        "hhpGaa: " + this.hhpGaa + "\n" +
+                        "hhpSyn: " + this.hhpSyn + "\n" +
+                        "hhpP3802: " + this.hhpP3802 + "\n" +
+                        "hpLpg: " + this.hpLpg + "\n" +
+                        "hpSub: " + this.hpSub + "\n" +
+                        "hpNg: " + this.hpNg + "\n" +
+                        "hpJ1501: " + this.hpJ1501 + "\n" +
+                        "hpJ1504In: " + this.hpJ1504In + "\n" +
+                        "hpJ1504Out: " + this.hpJ1504Out + "\n" +
+                        "hpUser: " + this.hpUser + "\n" +
+                        "mpNcipmp: " + this.mpNcipMp + "\n" +
+                        "mp150511: " + this.mp150511 + "\n" +
+                        "mp150512: " + this.mp150512 + "\n" +
+                        "mpPpmp: " + this.mpPpMp + "\n" +
+                        "mpP9801In: " + this.mpP9801In + "\n" +
+                        "mpP9801Out: " + this.mpP9801Out + "\n" +
+                        "mpJ1502: " + this.mpJ1502 + "\n" +
+                        "mpUser: " + this.mpUser + "\n" +
+                        "lpPpLp: " + this.lpPpLp + "\n" +
+                        "lpEmpty: " + this.lpEmpty + "\n" +
+                        "lpMpLetdown: " + this.lpMpLetdown + "\n" +
+                        "lpJ1509: " + this.lpJ1509 + "\n" +
+                        "lpJ1503: " + this.lpJ1503 + "\n" +
+                        "lpLdpeTs: " + this.lpLdpeTs + "\n" +
+                        "lpLdpeDm: " + this.lpLdpeDm + "\n" +
+                        "lpUser: " + this.lpUser + "\n" +
+                        "bccSyn: " + this.bccSyn + "\n" +
+                        "bccYpc: " + this.bccYpc + "\n"  +
+                        "hrsg1SmokeConvert: " + this.hrsg1SmokeConvert + "\n"  +
+                        "hrsg1So2Convert: " + this.hrsg1So2Convert + "\n"  +
+                        "hrsg1NoxConvert: " + this.hrsg1NoxConvert + "\n"  +
+                        "hrsg2SmokeConvert: " + this.hrsg2SmokeConvert + "\n"  +
+                        "hrsg2So2Convert: " + this.hrsg2So2Convert + "\n"  +
+                        "hrsg2NoxConvert: " + this.hrsg2NoxConvert + "\n"  +
+                        "hrsg3SmokeConvert: " + this.hrsg3SmokeConvert + "\n"  +
+                        "hrsg3So2Convert: " + this.hrsg3So2Convert + "\n"  +
+                        "hrsg3NoxConvert: " + this.hrsg3NoxConvert + "\n"  +
+                        "rainPh: " + this.rainPh + "\n"  +
+                        "rainCod: " + this.rainCod + "\n"  +
+                        "wastePh: " + this.wastePh + "\n"  +
+                        "wasteCod: " + this.wasteCod + "\n"  +
+                        "gtg45ha1: " + this.gtg45ha1 + "\n" +
+                        "gtg45ha2: " + this.gtg45ha2 + "\n" +
+                        "gtg45ha3: " + this.gtg45ha3 + "\n" +
+                        "gtg45ha4: " + this.gtg45ha4 + "\n" +
+                        "gtg45ha5: " + this.gtg45ha5 + "\n" +
+                        "gtg45ha6: " + this.gtg45ha6 + "\n" +
+                        "gtg45ha7: " + this.gtg45ha7 + "\n" +
+                        "gtg45ha8: " + this.gtg45ha8 + "\n" +
+                        "gtg45ha9: " + this.gtg45ha9 + "\n" +
+                        "gtg45ht1: " + this.gtg45ht1 + "\n" +
+                        "gtg45ht2: " + this.gtg45ht2 + "\n" +
+                        "gtg45ht3: " + this.gtg45ht3 + "\n" +
+                        "gtg45ht4: " + this.gtg45ht4 + "\n" +
+                        "gtg45ht5: " + this.gtg45ht5 + "\n" +
+                        "gtg45ht6: " + this.gtg45ht6 + "\n" +
+                        "qt61001: " + this.qt61001 + "\n" +
+                        "qt61002: " + this.qt61002 + "\n" +
+                        "qt61003: " + this.qt61003 + "\n" +
+                        "qt61004: " + this.qt61004 + "\n" +
+                        "qt61005: " + this.qt61005 + "\n" +
+                        "qt61101: " + this.qt61101 + "\n" +
+                        "qt61102: " + this.qt61102 + "\n" +
+                        "qt61103: " + this.qt61103 + "\n" +
+                        "qt61104: " + this.qt61104 + "\n" +
+                        "qt61105: " + this.qt61105 + "\n" +
+                        "qt76001: " + this.qt76001 + "\n" +
+                        "qt76002: " + this.qt76002 + "\n" +
+                        "qt76041: " + this.qt76041 + "\n" +
+                        "qt80001: " + this.qt80001 + "\n" +
+                        "qt80002: " + this.qt80002 + "\n" +
+                        "qt80003: " + this.qt80003 + "\n" +
+                        "qt91001: " + this.qt91001 + "\n" +
+                        "qt91002: " + this.qt91002 + "\n" +
+                        "qt91003: " + this.qt91003 + "\n" +
+                        "qt91004: " + this.qt91004 + "\n" +
+                        "qt91005: " + this.qt91005 + "\n" +
+                        "qt91006: " + this.qt91006 + "\n" +
+                        "qt91011: " + this.qt91011 + "\n" +
+                        "qt91012: " + this.qt91012 + "\n" +
+                        "qt91013: " + this.qt91013 + "\n" +
+                        "at83001: " + this.at83001 + "\n" +
+                        "at83002: " + this.at83002 + "\n" +
+                        "at83003: " + this.at83003 + "\n" +
+                        "at83004: " + this.at83004 + "\n" +
+                        "qt12001: " + this.qt12001 + "\n" +
+                        "qt12501: " + this.qt12501 + "\n" +
+                        "qt12502: " + this.qt12502 + "\n" +
+                        "qt22001: " + this.qt22001 + "\n" +
+                        "qt22501: " + this.qt22501 + "\n" +
+                        "qt22502: " + this.qt22502 + "\n" +
+                        "qt32001: " + this.qt32001 + "\n" +
+                        "hrsg1Ai82201: " + this.hrsg1Ai82201 + "\n" +
+                        "hrsg1Ai82202: " + this.hrsg1Ai82202 + "\n" +
+                        "hrsg1Ai82203: " + this.hrsg1Ai82203 + "\n" +
+                        "hrsg1Ai82204: " + this.hrsg1Ai82204 + "\n" +
+                        "hrsg1Ai82205: " + this.hrsg1Ai82205 + "\n" +
+                        "hrsg1Ai82206: " + this.hrsg1Ai82206 + "\n" +
+                        "hrsg1Ai82207: " + this.hrsg1Ai82207 + "\n" +
+                        "hrsg1Ai82208: " + this.hrsg1Ai82208 + "\n" +
+                        "hrsg1Ai82209: " + this.hrsg1Ai82209 + "\n" +
+                        "hrsg1Ai82210: " + this.hrsg1Ai82210 + "\n" +
+                        "hrsg1Ai82211: " + this.hrsg1Ai82211 + "\n" +
+                        "hrsg1Ai82212: " + this.hrsg1Ai82212 + "\n" +
+                        "hrsg1Air12551: " + this.hrsg1Air12551 + "\n" +
+                        "hrsg1Air12552: " + this.hrsg1Air12552 + "\n" +
+                        "hrsg1Air12553: " + this.hrsg1Air12553 + "\n" +
+                        "hrsg1Air12554: " + this.hrsg1Air12554 + "\n" +
+                        "hrsg1Air12555: " + this.hrsg1Air12555 + "\n" +
+                        "hrsg1Air12556: " + this.hrsg1Air12556 + "\n" +
+                        "hrsg1Air12557: " + this.hrsg1Air12557 + "\n" +
+                        "hrsg1Air12558: " + this.hrsg1Air12558 + "\n" +
+                        "hrsg2Ai82301: " + this.hrsg2Ai82301 + "\n" +
+                        "hrsg2Ai82302: " + this.hrsg2Ai82302 + "\n" +
+                        "hrsg2Ai82303: " + this.hrsg2Ai82303 + "\n" +
+                        "hrsg2Ai82304: " + this.hrsg2Ai82304 + "\n" +
+                        "hrsg2Ai82305: " + this.hrsg2Ai82305 + "\n" +
+                        "hrsg2Ai82306: " + this.hrsg2Ai82306 + "\n" +
+                        "hrsg2Ai82307: " + this.hrsg2Ai82307 + "\n" +
+                        "hrsg2Ai82308: " + this.hrsg2Ai82308 + "\n" +
+                        "hrsg2Ai82309: " + this.hrsg2Ai82309 + "\n" +
+                        "hrsg2Ai82310: " + this.hrsg2Ai82310 + "\n" +
+                        "hrsg2Ai82311: " + this.hrsg2Ai82311 + "\n" +
+                        "hrsg2Ai82312: " + this.hrsg2Ai82312 + "\n" +
+                        "hrsg2Air22551: " + this.hrsg2Air22551 + "\n" +
+                        "hrsg2Air22552: " + this.hrsg2Air22552 + "\n" +
+                        "hrsg2Air22553: " + this.hrsg2Air22553 + "\n" +
+                        "hrsg2Air22554: " + this.hrsg2Air22554 + "\n" +
+                        "hrsg2Air22555: " + this.hrsg2Air22555 + "\n" +
+                        "hrsg2Air22556: " + this.hrsg2Air22556 + "\n" +
+                        "hrsg2Air22557: " + this.hrsg2Air22557 + "\n" +
+                        "hrsg2AiR22558: " + this.hrsg2AiR22558 + "\n" +
+                        "hrsg2Qi22240: " + this.hrsg2Qi22240 + "\n" +
+                        "hrsg2Qi22241: " + this.hrsg2Qi22241 + "\n" +
+                        "hrsg2Qi22242: " + this.hrsg2Qi22242 + "\n" +
+                        "hrsg3Ai82401: " + this.hrsg3Ai82401  + "\n" +
+                        "hrsg3Ai82402: " + this.hrsg3Ai82402  + "\n" +
+                        "hrsg3Ai82403: " + this.hrsg3Ai82403  + "\n" +
+                        "hrsg3Ai82404: " + this.hrsg3Ai82404  + "\n" +
+                        "hrsg3Ai82405: " + this.hrsg3Ai82405  + "\n" +
+                        "hrsg3Ai82406: " + this.hrsg3Ai82406  + "\n" +
+                        "hrsg3Ai82407: " + this.hrsg3Ai82407  + "\n" +
+                        "hrsg3Ai82408: " + this.hrsg3Ai82408  + "\n" +
+                        "hrsg3Ai82409: " + this.hrsg3Ai82409  + "\n" +
+                        "hrsg3Ai82410: " + this.hrsg3Ai82410  + "\n" +
+                        "hrsg3Ai82411: " + this.hrsg3Ai82411  + "\n" +
+                        "hrsg3Ai82412: " + this.hrsg3Ai82412 + "\n" +
+                        "hrsg3Air32551: " + this.hrsg3Air32551 + "\n" +
+                        "hrsg3Air32552: " + this.hrsg3Air32552 + "\n" +
+                        "hrsg3Air32553: " + this.hrsg3Air32553 + "\n" +
+                        "hrsg3Air32554: " + this.hrsg3Air32554 + "\n" +
+                        "hrsg3Air32555: " + this.hrsg3Air32555 + "\n" +
+                        "hrsg3Air32556: " + this.hrsg3Air32556 + "\n" +
+                        "hrsg3Air32557: " + this.hrsg3Air32557 + "\n" +
+                        "hrsg3Air32558: " + this.hrsg3Air32558 + "\n" +
+                        "hrsg3Qi32240: " + this.hrsg3Qi32240  + "\n" +
+                        "hrsg3Qi32241: " + this.hrsg3Qi32241  + "\n" +
+                        "hrsg3Qi32242: " + this.hrsg3Qi32242 + "\n";
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Date getPullDate() {
+        return pullDate;
+    }
+
+    public void setPullDate(Date pullDate) {
+        this.pullDate = pullDate;
     }
 
     public String getGtg1PowerGenLevel() {
@@ -2192,4 +2205,4 @@ public class ElecDashboardData {
     public void setHrsg3Qi32242(String hrsg3Qi32242) {
         this.hrsg3Qi32242 = hrsg3Qi32242;
     }
-}
+}

+ 17 - 0
src/main/java/io/renren/modules/aspen/service/TElecdashboardRealtimeService.java

@@ -0,0 +1,17 @@
+package io.renren.modules.aspen.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
+
+/**
+ * 电厂大屏实时数据
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 10:51:47
+ */
+public interface TElecdashboardRealtimeService extends IService<TElecdashboardRealtimeEntity> {
+
+    public void insertTElecdashboardRealtime(TElecdashboardRealtimeEntity elecDashboardDataRealTime);
+
+}

+ 29 - 0
src/main/java/io/renren/modules/aspen/service/impl/TElecdashboardRealtimeServiceImpl.java

@@ -0,0 +1,29 @@
+package io.renren.modules.aspen.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.renren.modules.aspen.dao.TElecdashboardRealtimeDao;
+import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
+import io.renren.modules.aspen.service.TElecdashboardRealtimeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 电厂大屏实时数据
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 10:51:47
+ */
+@Service("elecDashboardDataRealTimeService")
+public class TElecdashboardRealtimeServiceImpl extends ServiceImpl<TElecdashboardRealtimeDao, TElecdashboardRealtimeEntity> implements TElecdashboardRealtimeService {
+
+    @Resource
+    private TElecdashboardRealtimeDao tElecdashboardRealtimeDao;
+
+    @Override
+    public void insertTElecdashboardRealtime(TElecdashboardRealtimeEntity elecDashboardDataRealTime) {
+        tElecdashboardRealtimeDao.insertTElecdashboardRealtime(elecDashboardDataRealTime);
+    }
+
+}

+ 242 - 231
src/main/java/io/renren/modules/test/TestPullDataExcel.java → src/main/java/io/renren/modules/aspen/utils/DashboardDataPullUtils.java

@@ -1,6 +1,8 @@
-package io.renren.modules.test;
+package io.renren.modules.aspen.utils;
 
-import io.renren.modules.test.entity.ElecDashboardData;
+import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
+import io.renren.modules.aspen.entity.TElecdashboradDayEntity;
+import io.renren.modules.aspen.entity.base.TElecdashboard;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -8,25 +10,34 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Date;
 
 /**
- * 电厂大屏抓取数据测试类(.xls/.xlsx文件)
+ * 电厂大屏数据抓取工具
  *
- * @author: Wang Zi Wen
- * @email: wangggziwen@163.com
- * @datetime: 2022/8/30 9:22
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2022/09/01 09:54:38
  */
-public class TestPullDataExcel {
+public class DashboardDataPullUtils {
 
     /**
      * 抓取excel数据
+     *
+     * @param TElecDashboard 电厂大屏数据
      * @return 电厂大屏数据
      */
-    private ElecDashboardData getExcelData() {
+    public TElecdashboard getExcelData(TElecdashboard TElecDashboard) {
+        // 设置对象创建时间
+        TElecDashboard.setPullDate(new Date());
+        // 判断电厂大屏数据类型
+        if (TElecDashboard instanceof TElecdashboardRealtimeEntity) {   // 抓取实时数据
+
+        } else if (TElecDashboard instanceof TElecdashboradDayEntity) { // 抓取每日数据
+
+        }
         // excel对象
         Workbook workbook = null;
-        // 电厂大屏数据对象
-        ElecDashboardData elecDashboardData = new ElecDashboardData();
         try {
             // 文件读取路径
             String filePath = "C://elecdashboard/elecDashboardData.xlsx";
@@ -53,24 +64,24 @@ public class TestPullDataExcel {
             String stgPowerGenLevel = this.getCellData(sheet1, 2, 5);   // STG发电水平
             String stgEfficiency = this.getCellData(sheet1, 3, 5);      // STG效率(百分比)
             String totalPowerGen = this.getCellData(sheet1, 2, 6);      // 总发电量
-            elecDashboardData.setGtg1PowerGenLevel(gtg1PowerGenLevel);
-            elecDashboardData.setGtg1Efficiency(gtg1Efficiency);
-            elecDashboardData.setGtg2PowerGenLevel(gtg2PowerGenLevel);
-            elecDashboardData.setGtg2Efficiency(gtg2Efficiency);
-            elecDashboardData.setGtg3PowerGenLevel(gtg3PowerGenLevel);
-            elecDashboardData.setGtg3Efficiency(gtg3Efficiency);
-            elecDashboardData.setStgPowerGenLevel(stgPowerGenLevel);
-            elecDashboardData.setStgEfficiency(stgEfficiency);
-            elecDashboardData.setTotalPowerGen(totalPowerGen);
+            TElecDashboard.setGtg1PowerGenLevel(gtg1PowerGenLevel);
+            TElecDashboard.setGtg1Efficiency(gtg1Efficiency);
+            TElecDashboard.setGtg2PowerGenLevel(gtg2PowerGenLevel);
+            TElecDashboard.setGtg2Efficiency(gtg2Efficiency);
+            TElecDashboard.setGtg3PowerGenLevel(gtg3PowerGenLevel);
+            TElecDashboard.setGtg3Efficiency(gtg3Efficiency);
+            TElecDashboard.setStgPowerGenLevel(stgPowerGenLevel);
+            TElecDashboard.setStgEfficiency(stgEfficiency);
+            TElecDashboard.setTotalPowerGen(totalPowerGen);
             // 蒸汽
             String steamHhp = this.getCellData(sheet1, 6, 2);    // 蒸汽HHP
             String steamHp = this.getCellData(sheet1, 6, 3);     // 蒸汽HP
             String steamMp = this.getCellData(sheet1, 6, 4);     // 蒸汽MP
             String steamLp = this.getCellData(sheet1, 6, 5);     // 蒸汽LP
-            elecDashboardData.setSteamHhp(steamHhp);
-            elecDashboardData.setSteamHp(steamHp);
-            elecDashboardData.setSteamMp(steamMp);
-            elecDashboardData.setSteamLp(steamLp);
+            TElecDashboard.setSteamHhp(steamHhp);
+            TElecDashboard.setSteamHp(steamHp);
+            TElecDashboard.setSteamMp(steamMp);
+            TElecDashboard.setSteamLp(steamLp);
             // 天然气
             String gasRealTime = this.getCellData(sheet1, 9, 2);    // 瞬时量
             String gasLeft = this.getCellData(sheet1, 9, 3);        // 日剩余量
@@ -80,14 +91,14 @@ public class TestPullDataExcel {
             String gasSynGas = this.getCellData(sheet1, 11, 3);     // 合成气
             String gasU2 = this.getCellData(sheet1, 11, 4);         // U2
             String gasStyrene = this.getCellData(sheet1, 11, 5);    // 苯乙烯
-            elecDashboardData.setGasRealTime(gasRealTime);
-            elecDashboardData.setGasLeft(gasLeft);
-            elecDashboardData.setGasUsed(gasUsed);
-            elecDashboardData.setGasPlan(gasPlan);
-            elecDashboardData.setGasElec(gasElec);
-            elecDashboardData.setGasSynGas(gasSynGas);
-            elecDashboardData.setGasU2(gasU2);
-            elecDashboardData.setGasStyrene(gasStyrene);
+            TElecDashboard.setGasRealTime(gasRealTime);
+            TElecDashboard.setGasLeft(gasLeft);
+            TElecDashboard.setGasUsed(gasUsed);
+            TElecDashboard.setGasPlan(gasPlan);
+            TElecDashboard.setGasElec(gasElec);
+            TElecDashboard.setGasSynGas(gasSynGas);
+            TElecDashboard.setGasU2(gasU2);
+            TElecDashboard.setGasStyrene(gasStyrene);
             // 电量
             String elecPowerGen = this.getCellData(sheet1, 14, 2);    // 昨日发电量
             String elecPowerSwitch = this.getCellData(sheet1, 14, 3); // 倒电量
@@ -95,22 +106,22 @@ public class TestPullDataExcel {
             String elecDiff = this.getCellData(sheet1, 14, 5);        // 每日峰谷差
             String elecBycUsed = this.getCellData(sheet1, 16, 2);     // BYC用电量
             String elecBocUsed = this.getCellData(sheet1, 16, 3);     // BOC用电量
-            elecDashboardData.setElecPowerGen(elecPowerGen);
-            elecDashboardData.setElecPowerSwitch(elecPowerSwitch);
-            elecDashboardData.setElecUsed(elecUsed);
-            elecDashboardData.setElecDiff(elecDiff);
-            elecDashboardData.setElecBycUsed(elecBycUsed);
-            elecDashboardData.setElecBocUsed(elecBocUsed);
+            TElecDashboard.setElecPowerGen(elecPowerGen);
+            TElecDashboard.setElecPowerSwitch(elecPowerSwitch);
+            TElecDashboard.setElecUsed(elecUsed);
+            TElecDashboard.setElecDiff(elecDiff);
+            TElecDashboard.setElecBycUsed(elecBycUsed);
+            TElecDashboard.setElecBocUsed(elecBocUsed);
             // 煤耗
             String carbonUsed = this.getCellData(sheet1, 19, 2);        // 每日煤耗量
             String carbonRealTime = this.getCellData(sheet1, 19, 3);    // 瞬时煤耗量
-            elecDashboardData.setCarbonUsed(carbonUsed);
-            elecDashboardData.setCarbonRealTime(carbonRealTime);
+            TElecDashboard.setCarbonUsed(carbonUsed);
+            TElecDashboard.setCarbonRealTime(carbonRealTime);
             // SUB
             String sub = this.getCellData(sheet1, 22, 2);               // SUB
             String subFurnaceLoad = this.getCellData(sheet1, 22, 3);    // SUB开工锅炉负荷(百分比)
-            elecDashboardData.setSub(sub);
-            elecDashboardData.setSubFurnaceLoad(subFurnaceLoad);
+            TElecDashboard.setSub(sub);
+            TElecDashboard.setSubFurnaceLoad(subFurnaceLoad);
             //========================================电厂大屏数据第二页:蒸汽平衡=======================================
             // HHP
             String hhpPphhp = this.getCellData(sheet2, 2, 1);   // HHP PPHHP
@@ -118,11 +129,11 @@ public class TestPullDataExcel {
             String hhpGaa = this.getCellData(sheet2, 2, 3);     // HHP GAA
             String hhpSyn = this.getCellData(sheet2, 2, 4);     // HHP SYN
             String hhpP3802 = this.getCellData(sheet2, 2, 5);   // HHP P3802
-            elecDashboardData.setHhpPphhp(hhpPphhp);
-            elecDashboardData.setHhpAaae(hhpAaae);
-            elecDashboardData.setHhpGaa(hhpGaa);
-            elecDashboardData.setHhpSyn(hhpSyn);
-            elecDashboardData.setHhpP3802(hhpP3802);
+            TElecDashboard.setHhpPphhp(hhpPphhp);
+            TElecDashboard.setHhpAaae(hhpAaae);
+            TElecDashboard.setHhpGaa(hhpGaa);
+            TElecDashboard.setHhpSyn(hhpSyn);
+            TElecDashboard.setHhpP3802(hhpP3802);
             // HP
             String hpLpg = this.getCellData(sheet2, 5, 1);          // HP LPG(百分比)
             String hpSub = this.getCellData(sheet2, 5, 2);          // HP SUB(百分比)
@@ -131,13 +142,13 @@ public class TestPullDataExcel {
             String hpJ1504In = this.getCellData(sheet2, 5, 5);      // HP J1504入
             String hpJ1504Out = this.getCellData(sheet2, 5, 6);     // HP J1504出
             String hpUser = this.getCellData(sheet2, 5, 7);         // HP HP用户
-            elecDashboardData.setHpLpg(hpLpg);
-            elecDashboardData.setHpSub(hpSub);
-            elecDashboardData.setHpNg(hpNg);
-            elecDashboardData.setHpJ1501(hpJ1501);
-            elecDashboardData.setHpJ1504In(hpJ1504In);
-            elecDashboardData.setHpJ1504Out(hpJ1504Out);
-            elecDashboardData.setHpUser(hpUser);
+            TElecDashboard.setHpLpg(hpLpg);
+            TElecDashboard.setHpSub(hpSub);
+            TElecDashboard.setHpNg(hpNg);
+            TElecDashboard.setHpJ1501(hpJ1501);
+            TElecDashboard.setHpJ1504In(hpJ1504In);
+            TElecDashboard.setHpJ1504Out(hpJ1504Out);
+            TElecDashboard.setHpUser(hpUser);
             // MP
             String mpNcipmp = this.getCellData(sheet2, 8, 1);   // MP NCI MP
             String mp150511 = this.getCellData(sheet2, 8, 2);   // MP 15051_2(百分比)
@@ -147,14 +158,14 @@ public class TestPullDataExcel {
             String mpP9801Out = this.getCellData(sheet2, 8, 6); // MP P9801出
             String mpJ1502 = this.getCellData(sheet2, 8, 7);    // MP J1502(百分比)
             String mpUser = this.getCellData(sheet2, 8, 8);     // MP MP用户
-            elecDashboardData.setMpNcipMp(mpNcipmp);
-            elecDashboardData.setMp150511(mp150511);
-            elecDashboardData.setMp150512(mp150512);
-            elecDashboardData.setMpPpMp(mpPpmp);
-            elecDashboardData.setMpP9801In(mpP9801In);
-            elecDashboardData.setMpP9801Out(mpP9801Out);
-            elecDashboardData.setMpJ1502(mpJ1502);
-            elecDashboardData.setMpUser(mpUser);
+            TElecDashboard.setMpNcipMp(mpNcipmp);
+            TElecDashboard.setMp150511(mp150511);
+            TElecDashboard.setMp150512(mp150512);
+            TElecDashboard.setMpPpMp(mpPpmp);
+            TElecDashboard.setMpP9801In(mpP9801In);
+            TElecDashboard.setMpP9801Out(mpP9801Out);
+            TElecDashboard.setMpJ1502(mpJ1502);
+            TElecDashboard.setMpUser(mpUser);
             // LP
             String lpPpLp = this.getCellData(sheet2, 11, 1);        // LP PP LP
             String lpEmpty = this.getCellData(sheet2, 11, 2);       // LP防空
@@ -164,19 +175,19 @@ public class TestPullDataExcel {
             String lpLdpeTs = this.getCellData(sheet2, 11, 6);      // LP LDPE TS
             String lpLdpeDm = this.getCellData(sheet2, 11, 7);      // LP LDPE DM
             String lpUser = this.getCellData(sheet2, 11, 8);        // LP用户
-            elecDashboardData.setLpPpLp(lpPpLp);
-            elecDashboardData.setLpEmpty(lpEmpty);
-            elecDashboardData.setLpMpLetdown(lpMpLetdown);
-            elecDashboardData.setLpJ1509(lpJ1509);
-            elecDashboardData.setLpJ1503(lpJ1503);
-            elecDashboardData.setLpLdpeTs(lpLdpeTs);
-            elecDashboardData.setLpLdpeDm(lpLdpeDm);
-            elecDashboardData.setLpUser(lpUser);
+            TElecDashboard.setLpPpLp(lpPpLp);
+            TElecDashboard.setLpEmpty(lpEmpty);
+            TElecDashboard.setLpMpLetdown(lpMpLetdown);
+            TElecDashboard.setLpJ1509(lpJ1509);
+            TElecDashboard.setLpJ1503(lpJ1503);
+            TElecDashboard.setLpLdpeTs(lpLdpeTs);
+            TElecDashboard.setLpLdpeDm(lpLdpeDm);
+            TElecDashboard.setLpUser(lpUser);
             // BCC
             String bccSyn = this.getCellData(sheet2, 14, 1);    // BCC SYN
             String bccYpc = this.getCellData(sheet2, 14, 2);    // BCC YPC
-            elecDashboardData.setBccSyn(bccSyn);
-            elecDashboardData.setBccYpc(bccYpc);
+            TElecDashboard.setBccSyn(bccSyn);
+            TElecDashboard.setBccYpc(bccYpc);
             //========================================电厂大屏数据第三页:环保监控=======================================
             // HRSG
             String hrsg1SmokeConvert = this.getCellData(sheet3, 2, 2);  // HRSG 1# 烟尘折算
@@ -188,25 +199,25 @@ public class TestPullDataExcel {
             String hrsg3SmokeConvert = this.getCellData(sheet3, 4, 2);  // HRSG 3# 烟尘折算
             String hrsg3So2Convert = this.getCellData(sheet3, 4, 3);    // HRSG 3# SO2 折算
             String hrsg3NoxConvert = this.getCellData(sheet3, 4, 4);    // HRSG 3# NOx 折算
-            elecDashboardData.setHrsg1SmokeConvert(hrsg1SmokeConvert);
-            elecDashboardData.setHrsg1So2Convert(hrsg1So2Convert);
-            elecDashboardData.setHrsg1NoxConvert(hrsg1NoxConvert);
-            elecDashboardData.setHrsg2SmokeConvert(hrsg2SmokeConvert);
-            elecDashboardData.setHrsg2So2Convert(hrsg2So2Convert);
-            elecDashboardData.setHrsg2NoxConvert(hrsg2NoxConvert);
-            elecDashboardData.setHrsg3SmokeConvert(hrsg3SmokeConvert);
-            elecDashboardData.setHrsg3So2Convert(hrsg3So2Convert);
-            elecDashboardData.setHrsg3NoxConvert(hrsg3NoxConvert);
+            TElecDashboard.setHrsg1SmokeConvert(hrsg1SmokeConvert);
+            TElecDashboard.setHrsg1So2Convert(hrsg1So2Convert);
+            TElecDashboard.setHrsg1NoxConvert(hrsg1NoxConvert);
+            TElecDashboard.setHrsg2SmokeConvert(hrsg2SmokeConvert);
+            TElecDashboard.setHrsg2So2Convert(hrsg2So2Convert);
+            TElecDashboard.setHrsg2NoxConvert(hrsg2NoxConvert);
+            TElecDashboard.setHrsg3SmokeConvert(hrsg3SmokeConvert);
+            TElecDashboard.setHrsg3So2Convert(hrsg3So2Convert);
+            TElecDashboard.setHrsg3NoxConvert(hrsg3NoxConvert);
             // Rain Water
             String rainPh = this.getCellData(sheet3, 7, 2);         // 雨水 PH
             String rainCod = this.getCellData(sheet3, 7, 3);;       // 雨水 COD
-            elecDashboardData.setRainPh(rainPh);
-            elecDashboardData.setRainCod(rainCod);
+            TElecDashboard.setRainPh(rainPh);
+            TElecDashboard.setRainCod(rainCod);
             // Waste Water
             String wastePh = this.getCellData(sheet3, 10, 2);;      // 废水 PH
             String wasteCod = this.getCellData(sheet3, 10, 3);;     // 废水 COD
-            elecDashboardData.setWastePh(wastePh);
-            elecDashboardData.setWasteCod(wasteCod);
+            TElecDashboard.setWastePh(wastePh);
+            TElecDashboard.setWasteCod(wasteCod);
             // 1# GTG
             String gtg45ha1 = this.getCellData(sheet3, 12, 3);   // 1#GTG 45HA1
             String gtg45ha2 = this.getCellData(sheet3, 13, 3);   // 1#GTG 45HA2
@@ -223,21 +234,21 @@ public class TestPullDataExcel {
             String gtg45ht4 = this.getCellData(sheet3, 24, 3);   // 1#GTG 45HT4
             String gtg45ht5 = this.getCellData(sheet3, 25, 3);   // 1#GTG 45HT5
             String gtg45ht6 = this.getCellData(sheet3, 26, 3);   // 1#GTG 45HT6
-            elecDashboardData.setGtg45ha1(gtg45ha1);
-            elecDashboardData.setGtg45ha2(gtg45ha2);
-            elecDashboardData.setGtg45ha3(gtg45ha3);
-            elecDashboardData.setGtg45ha4(gtg45ha4);
-            elecDashboardData.setGtg45ha5(gtg45ha5);
-            elecDashboardData.setGtg45ha6(gtg45ha6);
-            elecDashboardData.setGtg45ha7(gtg45ha7);
-            elecDashboardData.setGtg45ha8(gtg45ha8);
-            elecDashboardData.setGtg45ha9(gtg45ha9);
-            elecDashboardData.setGtg45ht1(gtg45ht1);
-            elecDashboardData.setGtg45ht2(gtg45ht2);
-            elecDashboardData.setGtg45ht3(gtg45ht3);
-            elecDashboardData.setGtg45ht4(gtg45ht4);
-            elecDashboardData.setGtg45ht5(gtg45ht5);
-            elecDashboardData.setGtg45ht6(gtg45ht6);
+            TElecDashboard.setGtg45ha1(gtg45ha1);
+            TElecDashboard.setGtg45ha2(gtg45ha2);
+            TElecDashboard.setGtg45ha3(gtg45ha3);
+            TElecDashboard.setGtg45ha4(gtg45ha4);
+            TElecDashboard.setGtg45ha5(gtg45ha5);
+            TElecDashboard.setGtg45ha6(gtg45ha6);
+            TElecDashboard.setGtg45ha7(gtg45ha7);
+            TElecDashboard.setGtg45ha8(gtg45ha8);
+            TElecDashboard.setGtg45ha9(gtg45ha9);
+            TElecDashboard.setGtg45ht1(gtg45ht1);
+            TElecDashboard.setGtg45ht2(gtg45ht2);
+            TElecDashboard.setGtg45ht3(gtg45ht3);
+            TElecDashboard.setGtg45ht4(gtg45ht4);
+            TElecDashboard.setGtg45ht5(gtg45ht5);
+            TElecDashboard.setGtg45ht6(gtg45ht6);
             // BP
             String qt61001 = this.getCellData(sheet3, 28, 3); // BP QT61001
             String qt61002 = this.getCellData(sheet3, 29, 3); // BP QT61002
@@ -302,69 +313,69 @@ public class TestPullDataExcel {
             String ai82111 = this.getCellData(sheet3, 88, 3); // BP AI82111
             String ai82112 = this.getCellData(sheet3, 89, 3); // BP AI82112
             String ai82113 = this.getCellData(sheet3, 90, 3); // BP AI82113
-            elecDashboardData.setQt61001(qt61001);
-            elecDashboardData.setQt61002(qt61002);
-            elecDashboardData.setQt61003(qt61003);
-            elecDashboardData.setQt61004(qt61004);
-            elecDashboardData.setQt61005(qt61005);
-            elecDashboardData.setQt61101(qt61101);
-            elecDashboardData.setQt61102(qt61102);
-            elecDashboardData.setQt61103(qt61103);
-            elecDashboardData.setQt61104(qt61104);
-            elecDashboardData.setQt61105(qt61105);
-            elecDashboardData.setQt76001(qt76001);
-            elecDashboardData.setQt76002(qt76002);
-            elecDashboardData.setQt76041(qt76041);
-            elecDashboardData.setQt80001(qt80001);
-            elecDashboardData.setQt80002(qt80002);
-            elecDashboardData.setQt80003(qt80003);
-            elecDashboardData.setQt91001(qt91001);
-            elecDashboardData.setQt91002(qt91002);
-            elecDashboardData.setQt91003(qt91003);
-            elecDashboardData.setQt91004(qt91004);
-            elecDashboardData.setQt91005(qt91005);
-            elecDashboardData.setQt91006(qt91006);
-            elecDashboardData.setQt91011(qt91011);
-            elecDashboardData.setQt91012(qt91012);
-            elecDashboardData.setQt91013(qt91013);
-            elecDashboardData.setAt83001(at83001);
-            elecDashboardData.setAt83002(at83002);
-            elecDashboardData.setAt83003(at83003);
-            elecDashboardData.setAt83004(at83004);
-            elecDashboardData.setQt12001(qt12001);
-            elecDashboardData.setQt12501(qt12501);
-            elecDashboardData.setQt12502(qt12502);
-            elecDashboardData.setQt22001(qt22001);
-            elecDashboardData.setQt22501(qt22501);
-            elecDashboardData.setQt22502(qt22502);
-            elecDashboardData.setQt32001(qt32001);
-            elecDashboardData.setQt32002(qt32002);
-            elecDashboardData.setQt32005(qt32005);
-            elecDashboardData.setQt32003(qt32003);
-            elecDashboardData.setQt32004(qt32004);
-            elecDashboardData.setAi82002(ai82002);
-            elecDashboardData.setAi82003(ai82003);
-            elecDashboardData.setAi82004(ai82004);
-            elecDashboardData.setAi82005(ai82005);
-            elecDashboardData.setAi82006(ai82006);
-            elecDashboardData.setAi82007(ai82007);
-            elecDashboardData.setAi82008(ai82008);
-            elecDashboardData.setAi82009(ai82009);
-            elecDashboardData.setAi82010(ai82010);
-            elecDashboardData.setAi82011(ai82011);
-            elecDashboardData.setAi82101(ai82101);
-            elecDashboardData.setAi82102(ai82102);
-            elecDashboardData.setAi82103(ai82103);
-            elecDashboardData.setAi82104(ai82104);
-            elecDashboardData.setAi82105(ai82105);
-            elecDashboardData.setAi82106(ai82106);
-            elecDashboardData.setAi82107(ai82107);
-            elecDashboardData.setAi82108(ai82108);
-            elecDashboardData.setAi82109(ai82109);
-            elecDashboardData.setAi82110(ai82110);
-            elecDashboardData.setAi82111(ai82111);
-            elecDashboardData.setAi82112(ai82112);
-            elecDashboardData.setAi82113(ai82113);
+            TElecDashboard.setQt61001(qt61001);
+            TElecDashboard.setQt61002(qt61002);
+            TElecDashboard.setQt61003(qt61003);
+            TElecDashboard.setQt61004(qt61004);
+            TElecDashboard.setQt61005(qt61005);
+            TElecDashboard.setQt61101(qt61101);
+            TElecDashboard.setQt61102(qt61102);
+            TElecDashboard.setQt61103(qt61103);
+            TElecDashboard.setQt61104(qt61104);
+            TElecDashboard.setQt61105(qt61105);
+            TElecDashboard.setQt76001(qt76001);
+            TElecDashboard.setQt76002(qt76002);
+            TElecDashboard.setQt76041(qt76041);
+            TElecDashboard.setQt80001(qt80001);
+            TElecDashboard.setQt80002(qt80002);
+            TElecDashboard.setQt80003(qt80003);
+            TElecDashboard.setQt91001(qt91001);
+            TElecDashboard.setQt91002(qt91002);
+            TElecDashboard.setQt91003(qt91003);
+            TElecDashboard.setQt91004(qt91004);
+            TElecDashboard.setQt91005(qt91005);
+            TElecDashboard.setQt91006(qt91006);
+            TElecDashboard.setQt91011(qt91011);
+            TElecDashboard.setQt91012(qt91012);
+            TElecDashboard.setQt91013(qt91013);
+            TElecDashboard.setAt83001(at83001);
+            TElecDashboard.setAt83002(at83002);
+            TElecDashboard.setAt83003(at83003);
+            TElecDashboard.setAt83004(at83004);
+            TElecDashboard.setQt12001(qt12001);
+            TElecDashboard.setQt12501(qt12501);
+            TElecDashboard.setQt12502(qt12502);
+            TElecDashboard.setQt22001(qt22001);
+            TElecDashboard.setQt22501(qt22501);
+            TElecDashboard.setQt22502(qt22502);
+            TElecDashboard.setQt32001(qt32001);
+            TElecDashboard.setQt32002(qt32002);
+            TElecDashboard.setQt32005(qt32005);
+            TElecDashboard.setQt32003(qt32003);
+            TElecDashboard.setQt32004(qt32004);
+            TElecDashboard.setAi82002(ai82002);
+            TElecDashboard.setAi82003(ai82003);
+            TElecDashboard.setAi82004(ai82004);
+            TElecDashboard.setAi82005(ai82005);
+            TElecDashboard.setAi82006(ai82006);
+            TElecDashboard.setAi82007(ai82007);
+            TElecDashboard.setAi82008(ai82008);
+            TElecDashboard.setAi82009(ai82009);
+            TElecDashboard.setAi82010(ai82010);
+            TElecDashboard.setAi82011(ai82011);
+            TElecDashboard.setAi82101(ai82101);
+            TElecDashboard.setAi82102(ai82102);
+            TElecDashboard.setAi82103(ai82103);
+            TElecDashboard.setAi82104(ai82104);
+            TElecDashboard.setAi82105(ai82105);
+            TElecDashboard.setAi82106(ai82106);
+            TElecDashboard.setAi82107(ai82107);
+            TElecDashboard.setAi82108(ai82108);
+            TElecDashboard.setAi82109(ai82109);
+            TElecDashboard.setAi82110(ai82110);
+            TElecDashboard.setAi82111(ai82111);
+            TElecDashboard.setAi82112(ai82112);
+            TElecDashboard.setAi82113(ai82113);
             // 1# HRSG
             String hrsg1Ai82201 = this.getCellData(sheet3, 92, 3);      // 1# HRSG AI82201
             String hrsg1Ai82202 = this.getCellData(sheet3, 93, 3);      // 1# HRSG AI82202
@@ -386,26 +397,26 @@ public class TestPullDataExcel {
             String hrsg1Air12556 = this.getCellData(sheet3, 109,3);     // 1# HRSG AIR12556
             String hrsg1Air12557 = this.getCellData(sheet3, 110,3);     // 1# HRSG AIR12557
             String hrsg1Air12558 = this.getCellData(sheet3, 111,3);     // 1# HRSG AIR12558
-            elecDashboardData.setHrsg1Ai82201(hrsg1Ai82201);
-            elecDashboardData.setHrsg1Ai82202(hrsg1Ai82202);
-            elecDashboardData.setHrsg1Ai82203(hrsg1Ai82203);
-            elecDashboardData.setHrsg1Ai82204(hrsg1Ai82204);
-            elecDashboardData.setHrsg1Ai82205(hrsg1Ai82205);
-            elecDashboardData.setHrsg1Ai82206(hrsg1Ai82206);
-            elecDashboardData.setHrsg1Ai82207(hrsg1Ai82207);
-            elecDashboardData.setHrsg1Ai82208(hrsg1Ai82208);
-            elecDashboardData.setHrsg1Ai82209(hrsg1Ai82209);
-            elecDashboardData.setHrsg1Ai82210(hrsg1Ai82210);
-            elecDashboardData.setHrsg1Ai82211(hrsg1Ai82211);
-            elecDashboardData.setHrsg1Ai82212(hrsg1Ai82212);
-            elecDashboardData.setHrsg1Air12551(hrsg1Air12551);
-            elecDashboardData.setHrsg1Air12552(hrsg1Air12552);
-            elecDashboardData.setHrsg1Air12553(hrsg1Air12553);
-            elecDashboardData.setHrsg1Air12554(hrsg1Air12554);
-            elecDashboardData.setHrsg1Air12555(hrsg1Air12555);
-            elecDashboardData.setHrsg1Air12556(hrsg1Air12556);
-            elecDashboardData.setHrsg1Air12557(hrsg1Air12557);
-            elecDashboardData.setHrsg1Air12558(hrsg1Air12558);
+            TElecDashboard.setHrsg1Ai82201(hrsg1Ai82201);
+            TElecDashboard.setHrsg1Ai82202(hrsg1Ai82202);
+            TElecDashboard.setHrsg1Ai82203(hrsg1Ai82203);
+            TElecDashboard.setHrsg1Ai82204(hrsg1Ai82204);
+            TElecDashboard.setHrsg1Ai82205(hrsg1Ai82205);
+            TElecDashboard.setHrsg1Ai82206(hrsg1Ai82206);
+            TElecDashboard.setHrsg1Ai82207(hrsg1Ai82207);
+            TElecDashboard.setHrsg1Ai82208(hrsg1Ai82208);
+            TElecDashboard.setHrsg1Ai82209(hrsg1Ai82209);
+            TElecDashboard.setHrsg1Ai82210(hrsg1Ai82210);
+            TElecDashboard.setHrsg1Ai82211(hrsg1Ai82211);
+            TElecDashboard.setHrsg1Ai82212(hrsg1Ai82212);
+            TElecDashboard.setHrsg1Air12551(hrsg1Air12551);
+            TElecDashboard.setHrsg1Air12552(hrsg1Air12552);
+            TElecDashboard.setHrsg1Air12553(hrsg1Air12553);
+            TElecDashboard.setHrsg1Air12554(hrsg1Air12554);
+            TElecDashboard.setHrsg1Air12555(hrsg1Air12555);
+            TElecDashboard.setHrsg1Air12556(hrsg1Air12556);
+            TElecDashboard.setHrsg1Air12557(hrsg1Air12557);
+            TElecDashboard.setHrsg1Air12558(hrsg1Air12558);
             // 2# HRSG
             String hrsg2Ai82301 = this.getCellData(sheet3, 113, 3);     // 2# HRSG AI82301
             String hrsg2Ai82302 = this.getCellData(sheet3, 114, 3);     // 2# HRSG AI82302
@@ -430,29 +441,29 @@ public class TestPullDataExcel {
             String hrsg2Qi22240 = this.getCellData(sheet3, 133, 3);     // 2# HRSG QI22240
             String hrsg2Qi22241 = this.getCellData(sheet3, 134, 3);     // 2# HRSG QI22241
             String hrsg2Qi22242 = this.getCellData(sheet3, 135, 3);     // 2# HRSG QI22242
-            elecDashboardData.setHrsg2Ai82301(hrsg2Ai82301);
-            elecDashboardData.setHrsg2Ai82302(hrsg2Ai82302);
-            elecDashboardData.setHrsg2Ai82303(hrsg2Ai82303);
-            elecDashboardData.setHrsg2Ai82304(hrsg2Ai82304);
-            elecDashboardData.setHrsg2Ai82305(hrsg2Ai82305);
-            elecDashboardData.setHrsg2Ai82306(hrsg2Ai82306);
-            elecDashboardData.setHrsg2Ai82307(hrsg2Ai82307);
-            elecDashboardData.setHrsg2Ai82308(hrsg2Ai82308);
-            elecDashboardData.setHrsg2Ai82309(hrsg2Ai82309);
-            elecDashboardData.setHrsg2Ai82310(hrsg2Ai82310);
-            elecDashboardData.setHrsg2Ai82311(hrsg2Ai82311);
-            elecDashboardData.setHrsg2Ai82312(hrsg2Ai82312);
-            elecDashboardData.setHrsg2Air22551(hrsg2Air22551);
-            elecDashboardData.setHrsg2Air22552(hrsg2Air22552);
-            elecDashboardData.setHrsg2Air22553(hrsg2Air22553);
-            elecDashboardData.setHrsg2Air22554(hrsg2Air22554);
-            elecDashboardData.setHrsg2Air22555(hrsg2Air22555);
-            elecDashboardData.setHrsg2Air22556(hrsg2Air22556);
-            elecDashboardData.setHrsg2Air22557(hrsg2Air22557);
-            elecDashboardData.setHrsg2AiR22558(hrsg2AiR22558);
-            elecDashboardData.setHrsg2Qi22240(hrsg2Qi22240);
-            elecDashboardData.setHrsg2Qi22241(hrsg2Qi22241);
-            elecDashboardData.setHrsg2Qi22242(hrsg2Qi22242);
+            TElecDashboard.setHrsg2Ai82301(hrsg2Ai82301);
+            TElecDashboard.setHrsg2Ai82302(hrsg2Ai82302);
+            TElecDashboard.setHrsg2Ai82303(hrsg2Ai82303);
+            TElecDashboard.setHrsg2Ai82304(hrsg2Ai82304);
+            TElecDashboard.setHrsg2Ai82305(hrsg2Ai82305);
+            TElecDashboard.setHrsg2Ai82306(hrsg2Ai82306);
+            TElecDashboard.setHrsg2Ai82307(hrsg2Ai82307);
+            TElecDashboard.setHrsg2Ai82308(hrsg2Ai82308);
+            TElecDashboard.setHrsg2Ai82309(hrsg2Ai82309);
+            TElecDashboard.setHrsg2Ai82310(hrsg2Ai82310);
+            TElecDashboard.setHrsg2Ai82311(hrsg2Ai82311);
+            TElecDashboard.setHrsg2Ai82312(hrsg2Ai82312);
+            TElecDashboard.setHrsg2Air22551(hrsg2Air22551);
+            TElecDashboard.setHrsg2Air22552(hrsg2Air22552);
+            TElecDashboard.setHrsg2Air22553(hrsg2Air22553);
+            TElecDashboard.setHrsg2Air22554(hrsg2Air22554);
+            TElecDashboard.setHrsg2Air22555(hrsg2Air22555);
+            TElecDashboard.setHrsg2Air22556(hrsg2Air22556);
+            TElecDashboard.setHrsg2Air22557(hrsg2Air22557);
+            TElecDashboard.setHrsg2AiR22558(hrsg2AiR22558);
+            TElecDashboard.setHrsg2Qi22240(hrsg2Qi22240);
+            TElecDashboard.setHrsg2Qi22241(hrsg2Qi22241);
+            TElecDashboard.setHrsg2Qi22242(hrsg2Qi22242);
             // 3# HRSG
             String hrsg3Ai82401 = this.getCellData(sheet3, 137, 3);;    // 3# HRSG AI82401
             String hrsg3Ai82402 = this.getCellData(sheet3, 138, 3);;    // 3# HRSG AI82402
@@ -477,31 +488,31 @@ public class TestPullDataExcel {
             String hrsg3Qi32240 = this.getCellData(sheet3, 157, 3);;    // 3# HRSG QI32240
             String hrsg3Qi32241 = this.getCellData(sheet3, 158, 3);;    // 3# HRSG QI32241
             String hrsg3Qi32242 = this.getCellData(sheet3, 159, 3);;    // 3# HRSG QI32242
-            elecDashboardData.setHrsg3Ai82401(hrsg3Ai82401);
-            elecDashboardData.setHrsg3Ai82402(hrsg3Ai82402);
-            elecDashboardData.setHrsg3Ai82403(hrsg3Ai82403);
-            elecDashboardData.setHrsg3Ai82404(hrsg3Ai82404);
-            elecDashboardData.setHrsg3Ai82405(hrsg3Ai82405);
-            elecDashboardData.setHrsg3Ai82406(hrsg3Ai82406);
-            elecDashboardData.setHrsg3Ai82407(hrsg3Ai82407);
-            elecDashboardData.setHrsg3Ai82408(hrsg3Ai82408);
-            elecDashboardData.setHrsg3Ai82409(hrsg3Ai82409);
-            elecDashboardData.setHrsg3Ai82410(hrsg3Ai82410);
-            elecDashboardData.setHrsg3Ai82411(hrsg3Ai82411);
-            elecDashboardData.setHrsg3Ai82412(hrsg3Ai82412);
-            elecDashboardData.setHrsg3Air32551(hrsg3Air32551);
-            elecDashboardData.setHrsg3Air32552(hrsg3Air32552);
-            elecDashboardData.setHrsg3Air32553(hrsg3Air32553);
-            elecDashboardData.setHrsg3Air32554(hrsg3Air32554);
-            elecDashboardData.setHrsg3Air32555(hrsg3Air32555);
-            elecDashboardData.setHrsg3Air32556(hrsg3Air32556);
-            elecDashboardData.setHrsg3Air32557(hrsg3Air32557);
-            elecDashboardData.setHrsg3Air32558(hrsg3Air32558);
-            elecDashboardData.setHrsg3Qi32240(hrsg3Qi32240);
-            elecDashboardData.setHrsg3Qi32241(hrsg3Qi32241);
-            elecDashboardData.setHrsg3Qi32242(hrsg3Qi32242);
+            TElecDashboard.setHrsg3Ai82401(hrsg3Ai82401);
+            TElecDashboard.setHrsg3Ai82402(hrsg3Ai82402);
+            TElecDashboard.setHrsg3Ai82403(hrsg3Ai82403);
+            TElecDashboard.setHrsg3Ai82404(hrsg3Ai82404);
+            TElecDashboard.setHrsg3Ai82405(hrsg3Ai82405);
+            TElecDashboard.setHrsg3Ai82406(hrsg3Ai82406);
+            TElecDashboard.setHrsg3Ai82407(hrsg3Ai82407);
+            TElecDashboard.setHrsg3Ai82408(hrsg3Ai82408);
+            TElecDashboard.setHrsg3Ai82409(hrsg3Ai82409);
+            TElecDashboard.setHrsg3Ai82410(hrsg3Ai82410);
+            TElecDashboard.setHrsg3Ai82411(hrsg3Ai82411);
+            TElecDashboard.setHrsg3Ai82412(hrsg3Ai82412);
+            TElecDashboard.setHrsg3Air32551(hrsg3Air32551);
+            TElecDashboard.setHrsg3Air32552(hrsg3Air32552);
+            TElecDashboard.setHrsg3Air32553(hrsg3Air32553);
+            TElecDashboard.setHrsg3Air32554(hrsg3Air32554);
+            TElecDashboard.setHrsg3Air32555(hrsg3Air32555);
+            TElecDashboard.setHrsg3Air32556(hrsg3Air32556);
+            TElecDashboard.setHrsg3Air32557(hrsg3Air32557);
+            TElecDashboard.setHrsg3Air32558(hrsg3Air32558);
+            TElecDashboard.setHrsg3Qi32240(hrsg3Qi32240);
+            TElecDashboard.setHrsg3Qi32241(hrsg3Qi32241);
+            TElecDashboard.setHrsg3Qi32242(hrsg3Qi32242);
             // 控制台打印电厂大屏数据
-            System.out.println(elecDashboardData.toString());
+//            System.out.println(TElecDashboard.toString());
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -511,7 +522,7 @@ public class TestPullDataExcel {
                 e.printStackTrace();
             }
         }
-        return elecDashboardData;
+        return TElecDashboard;
     }
 
     /**
@@ -547,4 +558,4 @@ public class TestPullDataExcel {
             return cellValue;
         }
     }
-}
+}

+ 0 - 290
src/main/java/io/renren/modules/test/TestPullDataCsv.java

@@ -1,290 +0,0 @@
-package io.renren.modules.test;
-
-import com.opencsv.CSVReader;
-import io.renren.modules.aspen.entity.TDashboarddayelecEntity;
-import io.renren.modules.aspen.service.TDashboarddayelecService;
-import io.renren.modules.sys.controller.AbstractController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.io.FileReader;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * 电厂大屏抓取数据测试类(.csv文件)
- *
- * @author Wang Zi Wen
- * @email wangggziwen@163.com
- * @date 2022/04/15 11:09:02
- */
-@Component
-@Configuration      //1.主要用于标记配置类,兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-public class TestPullDataCsv extends AbstractController {
-
-    @Autowired
-    private TDashboarddayelecService tDashboarddayelecService;
-
-    public static void main(String[] args) {
-//        TestPullDataCsv testPullDataCsv = new TestPullDataCsv();
-//        testPullDataCsv.getCsvData();
-    }
-
-//    @Scheduled(cron = "9,19,29,39,49,59 * * * * ?" )
-    public void getCsvData(){
-        logger.info("实时获取数据");
-//        String csvFile = "D://ssyFile/物料.csv";
-        String csvFile = "D://elecdashboardaspen/elecDashboardData1.csv";
-        TDashboarddayelecEntity tDashboarddayelecEntity = new TDashboarddayelecEntity();
-        CSVReader reader = null;
-        try {
-            reader = new CSVReader(new FileReader(csvFile));
-            String[] line;
-            //定义行数
-            int i = 0;
-            while ((line = reader.readNext()) != null) {
-                i++;
-                if (i == 2) {
-                    logger.info("第" + i + "行");
-                    for (int j = 2; j < 7; j++) {
-                        logger.info("读数:" + line[j]);
-                        if (line[j].equals("")) {
-                            line[j] = "0.0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0.0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setGtg1Lv(line[2]);
-                    tDashboarddayelecEntity.setGtg2Lv(line[3]);
-                    tDashboarddayelecEntity.setGtg3Lv(line[4]);
-                    tDashboarddayelecEntity.setStg1Lv(line[5]);
-                    tDashboarddayelecEntity.setMwhLv(line[6]);
-                }
-                if (i == 3) {
-                    logger.info("第" + i + "行");
-                    for (int j = 0; j < 6; j++) {
-                        logger.info("读数:" + line[j]);
-                        if (line[j].equals("")) {
-                            line[j] = "0.0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0.0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setGtg1Wr(line[2]);
-                    tDashboarddayelecEntity.setGtg2Wr(line[3]);
-                    tDashboarddayelecEntity.setGtg3Wr(line[4]);
-                    tDashboarddayelecEntity.setStg1Wr(line[5]);
-                }
-                if (i == 4) {
-                    logger.info("第" + i + "行");
-                    for (int j = 0; j < 6; j++) {
-                        logger.info("读数:" + line[j]);
-                        if (line[j].equals("")) {
-                            line[j] = "0.0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0.0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setMwhWr(line[6]);
-                }
-                if (i == 6) {
-                    logger.info("第" + i + "行");
-                    for (int j = 2; j < 7; j++) {
-                        logger.info("读数:" + line[j]);
-                        if (line[j].equals("")) {
-                            line[j] = "0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setHhp(line[2]);
-                    tDashboarddayelecEntity.setHp(line[3]);
-                    tDashboarddayelecEntity.setLp(line[4]);
-                    tDashboarddayelecEntity.setMp(line[5]);
-                    tDashboarddayelecEntity.setTotalConsumption(line[6]);
-                }
-                if (i == 9) {
-                    logger.info("第" + i + "行");
-                    for (int j = 2; j < 6; j++) {
-                        logger.info("读数:" + line[j]);
-                        if (line[j].equals("")) {
-                            line[j] = "0.0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0.0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-//                    Integer HhpNum=new Integer(line[2]).intValue();
-//                    Integer HpNum=new Integer(line[3]).intValue();
-//                    Integer LpNum=new Integer(line[4]).intValue();
-//                    Integer MpNum=new Integer(line[5]).intValue();
-                    tDashboarddayelecEntity.setHhpNum(line[2]);
-                    tDashboarddayelecEntity.setHpNum(line[3]);
-                    tDashboarddayelecEntity.setLpNum(line[4]);
-                    tDashboarddayelecEntity.setMpNum(line[5]);
-
-                }
-                if (i == 10) {
-                    logger.info("第" + i + "行");
-                    for (int j = 2; j < 6; j++) {
-                        logger.info("读数:" + line[j]);
-                        if (line[j].equals("")) {
-                            line[j] = "0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setHhpTemp(line[2]);
-                    tDashboarddayelecEntity.setHpTemp(line[3]);
-                    tDashboarddayelecEntity.setLpTemp(line[4]);
-                    tDashboarddayelecEntity.setMpTemp(line[5]);
-                }
-                /* SS */
-                if (i == 13) {
-                    logger.info("第" + i + "行");
-                    for(int j=2;j<5;j++){
-                        if (line[j].equals("")) {
-                            line[j] = "0.0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0.0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setShihua(line[2]);
-                    tDashboarddayelecEntity.setShiyou(line[3]);
-                    tDashboarddayelecEntity.setShunshiliang(line[4]);
-                }
-                if (i == 18) {
-                    logger.info("第" + i + "行");
-                    for(int j=2;j<6;j++){
-                        if (line[j].equals("")) {
-                            line[j] = "0.0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0.0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setYpg(line[2]);
-                    tDashboarddayelecEntity.setDaodianliang(line[3]);
-                    tDashboarddayelecEntity.setEveLec(line[4]);
-                    tDashboarddayelecEntity.setFenggucha(rounding(line[5]));
-                }
-                if (i == 20) {
-                    logger.info("第" + i + "行");
-                    for(int j=2;j<4;j++){
-                        if (line[j].equals("")) {
-                            line[j] = "0.0";
-                        }else {
-                            if (!Character.isDigit(line[j].charAt(0))) {
-                                line[j] = "0.0";
-                            }else {
-                                BigDecimal b = new BigDecimal(Double.parseDouble(line[j]));
-                                double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                line[j] = String.valueOf(f);
-                            }
-                        }
-                        logger.info(line[j]);
-                    }
-                    tDashboarddayelecEntity.setBycElec(line[2]);
-                    tDashboarddayelecEntity.setBocElec(line[3]);
-                }
-            }
-            tDashboarddayelecEntity.setCreatedate(new Date());
-            tDashboarddayelecEntity.setDataDate(new Date());
-            Calendar now = Calendar.getInstance();
-            tDashboarddayelecEntity.setDateDay(String.valueOf(now.get(Calendar.DAY_OF_MONTH)));
-            logger.info("dashboardData:" + tDashboarddayelecEntity);
-            tDashboarddayelecService.save(tDashboarddayelecEntity);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public String rounding(String lineNum) {
-        try {
-            logger.info("读数:" + lineNum);
-            if (lineNum.equals("")) {
-                lineNum = "0.0";
-            }else {
-                if (!Character.isDigit(lineNum.charAt(0))) {
-                    if ("-".equals(lineNum.substring(0,1))){
-                        BigDecimal b = new BigDecimal(Double.parseDouble(lineNum));
-                        double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                        lineNum = String.valueOf(f);
-                    }else {
-                        lineNum = "0.0";
-                    }
-                }else {
-                    BigDecimal b = new BigDecimal(Double.parseDouble(lineNum));
-                    double f = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                    lineNum = String.valueOf(f);
-                }
-            }
-            logger.info(lineNum);
-            return lineNum;
-        }catch (Exception e) {
-            logger.error(String.valueOf(e));
-            return "0.0";
-        }
-    }
-
-}

+ 21 - 0
src/main/resources/mapper/aspen/TElecdashboardRealtimeDao.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="io.renren.modules.aspen.dao.TElecdashboardRealtimeDao">
+
+    <insert id="insertTElecdashboardRealtime" parameterType="io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT SEQ_T_ELECDASHBOARD_REALTIME.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into T_ELECDASHBOARD_REALTIME
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="pullDate != null">pull_date,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="pullDate != null">#{pullDate},</if>
+        </trim>
+    </insert>
+
+</mapper>