检查预警值，如果实时数据超出预警值范围，插入预警数据

src/main/java/io/renren/RenrenApplication.java

@@ -8,8 +8,9 @@
 
 package io.renren;
 
-import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
 import io.renren.modules.aspen.core.utils.DashboardDataPullUtils;
+import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
+import io.renren.modules.aspen.entity.base.TElecdashboard;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -21,17 +22,11 @@ public class RenrenApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(RenrenApplication.class, args);
-        System.out.println("==========数据抓取测试==========");
-        System.out.println("----------csv----------");
+        System.out.println("========== result of getCsvData(TElecdashboard tElecDashboard) ==========");
         DashboardDataPullUtils dashboardDataPullUtils = new DashboardDataPullUtils();
-        System.out.println("-> Sheet 1");
-        dashboardDataPullUtils.getCsvData1();
-        System.out.println("-> Sheet 2");
-        dashboardDataPullUtils.getCsvData2();
-        System.out.println("-> Sheet 3");
-        dashboardDataPullUtils.getCsvData3();
-        System.out.println("----------excel----------");
-        dashboardDataPullUtils.getExcelData(new TElecdashboardRealtimeEntity());
+        TElecdashboard csvData = dashboardDataPullUtils.getCsvData(new TElecdashboardRealtimeEntity());
+        System.out.println(csvData);
+        System.out.println("========== result of getCsvData(TElecdashboard tElecDashboard) ==========");
     }
 
 }

src/main/java/io/renren/modules/aspen/controller/TElecdashboardDayController.java

@@ -32,7 +32,7 @@ public class TElecdashboardDayController {
     @Scheduled(cron = "0 0 8 * * ?")
     public void getExcelDataEveryDay(){
         DashboardDataPullUtils dashboardDataPullUtils = new DashboardDataPullUtils();
-        TElecdashboard tElecdashboard = dashboardDataPullUtils.getExcelData(new TElecdashboardDayEntity());
+        TElecdashboard tElecdashboard = dashboardDataPullUtils.getCsvData(new TElecdashboardDayEntity());
         TElecdashboardDayEntity tElecdashboardDayEntity = (TElecdashboardDayEntity) tElecdashboard;
         tElecdashboardDayService.insertTElecdashboardDay(tElecdashboardDayEntity);
     }

src/main/java/io/renren/modules/aspen/controller/TElecdashboardHourController.java

@@ -32,7 +32,7 @@ public class TElecdashboardHourController {
     @Scheduled(cron = "0 0 */1 * * ?")
     public void getExcelDataEveryHour(){
         DashboardDataPullUtils dashboardDataPullUtils = new DashboardDataPullUtils();
-        TElecdashboard tElecdashboard = dashboardDataPullUtils.getExcelData(new TElecdashboardHourEntity());
+        TElecdashboard tElecdashboard = dashboardDataPullUtils.getCsvData(new TElecdashboardHourEntity());
         TElecdashboardHourEntity tElecdashboardHourEntity = (TElecdashboardHourEntity) tElecdashboard;
         tElecdashboardHourService.insertTElecdashboardHour(tElecdashboardHourEntity);
     }

src/main/java/io/renren/modules/aspen/controller/TElecdashboardRealtimeController.java

@@ -14,6 +14,7 @@ import io.renren.modules.aspen.core.constant.AlarmValue;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 
 /**
@@ -41,7 +42,7 @@ public class TElecdashboardRealtimeController {
     public void getExcelDataEvery5Seconds(){
         DashboardDataPullUtils dashboardDataPullUtils = new DashboardDataPullUtils();
         // 抓取实时数据
-        TElecdashboard tElecdashboard = dashboardDataPullUtils.getExcelData(new TElecdashboardRealtimeEntity());
+        TElecdashboard tElecdashboard = dashboardDataPullUtils.getCsvData(new TElecdashboardRealtimeEntity());
         TElecdashboardRealtimeEntity tElecdashboardRealtimeEntity = (TElecdashboardRealtimeEntity) tElecdashboard;
         // 存入数据库
         tElecdashboardRealtimeService.insertTElecdashboardRealtime(tElecdashboardRealtimeEntity);
@@ -57,34 +58,20 @@ public class TElecdashboardRealtimeController {
     private void checkAlarmValue(TElecdashboardRealtimeEntity tElecdashboardRealtimeEntity) {
         // 清空电厂大屏预警表
         tElecdashboardAlarmService.deleteTElecdashboardAlarm();
-        // 预警值
-        ArrayList<String> alarmValueList = new ArrayList();
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61001());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61002());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61003());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61004());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61005());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61101());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61102());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61103());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61104());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt61105());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt76001());
-        alarmValueList.add(tElecdashboardRealtimeEntity.getQt76002());
-        // 位号
-        ArrayList<String> codeList = new ArrayList();
-        alarmValueList.add("QT61001");
-        alarmValueList.add("QT61002");
-        alarmValueList.add("QT61003");
-        alarmValueList.add("QT61004");
-        alarmValueList.add("QT61005");
-        alarmValueList.add("QT61101");
-        alarmValueList.add("QT61102");
-        alarmValueList.add("QT61103");
-        alarmValueList.add("QT61104");
-        alarmValueList.add("QT61105");
-        alarmValueList.add("QT76001");
-        alarmValueList.add("QT76002");
+        // 预警值list
+        ArrayList<String> alarmValueList = new ArrayList<String>(Arrays.asList(
+                        tElecdashboardRealtimeEntity.getQt61001(), tElecdashboardRealtimeEntity.getQt61002(),
+                        tElecdashboardRealtimeEntity.getQt61003(), tElecdashboardRealtimeEntity.getQt61004(),
+                        tElecdashboardRealtimeEntity.getQt61005(), tElecdashboardRealtimeEntity.getQt61101(),
+                        tElecdashboardRealtimeEntity.getQt61102(), tElecdashboardRealtimeEntity.getQt61103(),
+                        tElecdashboardRealtimeEntity.getQt61104(), tElecdashboardRealtimeEntity.getQt61105(),
+                        tElecdashboardRealtimeEntity.getQt76001(), tElecdashboardRealtimeEntity.getQt76002()
+        ));
+        // 位号list
+        ArrayList<String> codeList = new ArrayList<String>(Arrays.asList(
+                        "QT61001", "QT61002", "QT61003", "QT61004", "QT61005", "QT61101",
+                        "QT61102", "QT61103", "QT61104", "QT61105", "QT76001", "QT76002"
+        ));
         for (int i = 0; i < alarmValueList.size(); i++) {
             // 空值或错误值，不处理
             if ("".equals(alarmValueList.get(i)) || "#NAME?".equals(alarmValueList.get(i))) {
@@ -92,8 +79,8 @@ public class TElecdashboardRealtimeController {
             }
             // 小于最小值或大于最大值，插入预警数据
             if (
-                    AlarmValue.valueOf(codeList.get(i)).getMin() >= Double.parseDouble(alarmValueList.get(i))
-                    || AlarmValue.valueOf(codeList.get(i)).getMax() <= Double.parseDouble(alarmValueList.get(i))
+                    AlarmValue.valueOf(codeList.get(i)).getMin() > Double.parseDouble(alarmValueList.get(i))
+                    || AlarmValue.valueOf(codeList.get(i)).getMax() < Double.parseDouble(alarmValueList.get(i))
             ) {
                 tElecdashboardAlarmService.insertTElecdashboardAlarm(new TElecdashboardAlarmEntity(
                         alarmValueList.get(i),

src/main/java/io/renren/modules/aspen/core/utils/DashboardDataPullUtils.java

@@ -1,6 +1,7 @@
 package io.renren.modules.aspen.core.utils;
 
 import com.opencsv.CSVReader;
+import io.renren.modules.aspen.entity.TElecdashboardRealtimeEntity;
 import io.renren.modules.aspen.entity.base.TElecdashboard;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
@@ -22,22 +23,120 @@ import java.util.Date;
 public class DashboardDataPullUtils {
 
     /**
-     * 抓取csv数据（sheet 1）
+     * 抓取csv数据
+     *
+     * @param tElecDashboard 电厂大屏数据
+     * @return 电厂大屏数据
+     */
+    public TElecdashboard getCsvData(TElecdashboard tElecDashboard) {
+        tElecDashboard.setPullDate(new Date());
+        TElecdashboard intermediate1 = this.getCsvSheet1(tElecDashboard);
+        TElecdashboard intermediate2 = this.getCsvSheet2(intermediate1);
+        TElecdashboard result = this.getCsvSheet3(intermediate2);
+        return result;
+    }
+
+    /**
+     * 抓取csv数据（Sheet 1）
+     *
+     * @param tElecDashboard 电厂大屏数据
+     * @return 电厂大屏数据
      */
-    public void getCsvData1(){
-        String csvFile = "C://elecdashboard/elecDashboardData1.csv";
+    public TElecdashboard getCsvSheet1(TElecdashboard tElecDashboard){
+        String csvFile = "C://elecdashboard/Sheet1.csv";
         CSVReader reader = null;
         try {
             reader = new CSVReader(new FileReader(csvFile));
             String[] line;
             int i = 0;
+//            System.out.println("-> Sheet 1");
             while ((line = reader.readNext()) != null) {
                 i++;
                 if (i == 3) {
-                    System.out.println("第" + i + "行");
-                    for (int j = 2; j < 7; j++) {
-                        System.out.println("第" + (j + 1) + "格:" + line[j]);
-                    }
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 7; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setGtg1PowerGenLevel(line[2]);
+                    tElecDashboard.setGtg2PowerGenLevel(line[3]);
+                    tElecDashboard.setGtg3PowerGenLevel(line[4]);
+                    tElecDashboard.setStgPowerGenLevel(line[5]);
+                    tElecDashboard.setTotalPowerGen(line[6]);
+                }
+                if (i == 4) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 7; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setGtg1Efficiency(line[2]);
+                    tElecDashboard.setGtg2Efficiency(line[3]);
+                    tElecDashboard.setGtg3Efficiency(line[4]);
+                    tElecDashboard.setStgEfficiency(line[5]);
+                    tElecDashboard.setTotalEfficiency(line[6]);
+                }
+                if (i == 7) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 6; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setSteamHhp(line[2]);
+                    tElecDashboard.setSteamHp (line[3]);
+                    tElecDashboard.setSteamMp (line[4]);
+                    tElecDashboard.setSteamLp (line[5]);
+                }
+                if (i == 10) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 6; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setGasRealTime(line[2]);
+                    tElecDashboard.setGasLeft(line[3]);
+                    tElecDashboard.setGasUsed(line[4]);
+                    tElecDashboard.setGasPlan(line[5]);
+                }
+                if (i == 12) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 6; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setGasElec(line[2]);
+                    tElecDashboard.setGasSynGas(line[3]);
+                    tElecDashboard.setGasU2(line[4]);
+                    tElecDashboard.setGasStyrene(line[5]);
+                }
+                if (i == 15) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 6; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setElecPowerGen(line[2]);
+                    tElecDashboard.setElecPowerSwitch(line[3]);
+                    tElecDashboard.setElecUsed(line[4]);
+                    tElecDashboard.setElecDiff(line[5]);
+                }
+                if (i == 17) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 4; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setElecBycUsed(line[2]);
+                    tElecDashboard.setElecBocUsed(line[3]);
+                }
+                if (i == 20) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 4; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setCarbonUsed(line[2]);
+                    tElecDashboard.setCarbonRealTime(line[3]);
+                }
+                if (i == 23) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 4; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setSub(line[2]);
+                    tElecDashboard.setSubFurnaceLoad(line[3]);
                 }
             }
         } catch (IOException e) {
@@ -48,26 +147,85 @@ public class DashboardDataPullUtils {
             } catch (IOException e) {
                 e.printStackTrace();
             }
+            return tElecDashboard;
         }
     }
 
     /**
-     * 抓取csv数据（sheet 2）
+     * 抓取csv数据（Sheet 2）
+     *
+     * @param tElecDashboard 电厂大屏数据
+     * @return 电厂大屏数据
      */
-    public void getCsvData2(){
-        String csvFile = "C://elecdashboard/elecDashboardData2.csv";
+    public TElecdashboard getCsvSheet2(TElecdashboard tElecDashboard){
+        String csvFile = "C://elecdashboard/Sheet2.csv";
         CSVReader reader = null;
         try {
             reader = new CSVReader(new FileReader(csvFile));
             String[] line;
             int i = 0;
+//            System.out.println("-> Sheet 2");
             while ((line = reader.readNext()) != null) {
                 i++;
                 if (i == 3) {
-                    System.out.println("第" + i + "行");
-                    for (int j = 1; j < 6; j++) {
-                        System.out.println("第" + (j + 1) + "格:" + line[j]);
-                    }
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 1; j < 6; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setHhpPphhp(line[1]);
+                    tElecDashboard.setHhpAaae(line[2]);
+                    tElecDashboard.setHhpGaa(line[3]);
+                    tElecDashboard.setHhpSyn(line[4]);
+                    tElecDashboard.setHhpP3802(line[5]);
+                }
+                if (i == 6) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 1; j < 8; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setHpLpg(line[1]);
+                    tElecDashboard.setHpSub(line[2]);
+                    tElecDashboard.setHpNg(line[3]);
+                    tElecDashboard.setHpJ1501(line[4]);
+                    tElecDashboard.setHpJ1504In(line[5]);
+                    tElecDashboard.setHpJ1504Out(line[6]);
+                    tElecDashboard.setHpUser(line[7]);
+                }
+                if (i == 9) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 1; j < 9; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setMpNcipMp(line[1]);
+                    tElecDashboard.setMp150511(line[2]);
+                    tElecDashboard.setMp150512(line[3]);
+                    tElecDashboard.setMpPpMp(line[4]);
+                    tElecDashboard.setMpP9801In(line[5]);
+                    tElecDashboard.setMpP9801Out(line[6]);
+                    tElecDashboard.setMpJ1502(line[7]);
+                    tElecDashboard.setMpUser(line[8]);
+                }
+                if (i == 12) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 1; j < 9; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setLpPpLp(line[1]);
+                    tElecDashboard.setLpEmpty(line[2]);
+                    tElecDashboard.setLpMpLetdown(line[3]);
+                    tElecDashboard.setLpJ1509(line[4]);
+                    tElecDashboard.setLpJ1503(line[5]);
+                    tElecDashboard.setLpLdpeTs(line[6]);
+                    tElecDashboard.setLpLdpeDm(line[7]);
+                    tElecDashboard.setLpUser(line[8]);
+                }
+                if (i == 15) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 1; j < 3; j++) {
+//                        System.out.println("第" + (j + 1) + "格:" + line[j]);
+//                    }
+                    tElecDashboard.setBccSyn(line[1]);
+                    tElecDashboard.setBccYpc(line[2]);
                 }
             }
         } catch (IOException e) {
@@ -78,27 +236,234 @@ public class DashboardDataPullUtils {
             } catch (IOException e) {
                 e.printStackTrace();
             }
+            return tElecDashboard;
         }
     }
 
     /**
-     * 抓取csv数据（sheet 3）
+     * 抓取csv数据（Sheet 3）
+     *
+     * @param tElecDashboard 电厂大屏数据
+     * @return 电厂大屏数据
      */
-    public void getCsvData3(){
-        String csvFile = "C://elecdashboard/elecDashboardData3.csv";
+    public TElecdashboard getCsvSheet3(TElecdashboard tElecDashboard){
+        String csvFile = "C://elecdashboard/Sheet3.csv";
         CSVReader reader = null;
         try {
             reader = new CSVReader(new FileReader(csvFile));
             String[] line;
             int i = 0;
+//            System.out.println("-> Sheet 3");
             while ((line = reader.readNext()) != null) {
                 i++;
                 if (i == 2) {
-                    System.out.println("第" + i + "行");
-                    for (int j = 2; j < 5; j++) {
-                        System.out.println("第" + (j + 1) + "列: " + line[j]);
-                    }
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 5; j++) {
+//                        System.out.println("第" + (j + 1) + "列: " + line[j]);
+//                    }
+                    tElecDashboard.setHrsg1SmokeConvert(line[2]);
+                    tElecDashboard.setHrsg1So2Convert(line[3]);
+                    tElecDashboard.setHrsg1NoxConvert(line[4]);
+                }
+
+                if (i == 3) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 5; j++) {
+//                        System.out.println("第" + (j + 1) + "列: " + line[j]);
+//                    }
+                    tElecDashboard.setHrsg2SmokeConvert(line[2]);
+                    tElecDashboard.setHrsg2So2Convert(line[3]);
+                    tElecDashboard.setHrsg2NoxConvert(line[4]);
                 }
+
+                if (i == 4) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 5; j++) {
+//                        System.out.println("第" + (j + 1) + "列: " + line[j]);
+//                    }
+                    tElecDashboard.setHrsg3SmokeConvert(line[2]);
+                    tElecDashboard.setHrsg3So2Convert(line[3]);
+                    tElecDashboard.setHrsg3NoxConvert(line[4]);
+                }
+
+                if (i == 7) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 4; j++) {
+//                        System.out.println("第" + (j + 1) + "列: " + line[j]);
+//                    }
+                    tElecDashboard.setRainPh(line[2]);
+                    tElecDashboard.setRainCod(line[3]);
+                }
+
+                if (i == 10) {
+//                    System.out.println("第" + i + "行");
+//                    for (int j = 2; j < 4; j++) {
+//                        System.out.println("第" + (j + 1) + "列: " + line[j]);
+//                    }
+                    tElecDashboard.setWastePh(line[2]);
+                    tElecDashboard.setWasteCod(line[3]);
+                }
+
+//                for (int x = 12; x < 160; x++) {
+//                    if (x == 27 || x == 91 || x == 112 || x == 136) {
+//                        continue;
+//                    }
+//                    if (i == x) {
+//                        System.out.println("第" + i + "行");
+//                        for (int j = 3; j < 4; j++) {
+//                            System.out.println("第" + (j + 1) + "列: " + line[j]);
+//                        }
+//                    }
+//                }
+
+                if (i == 12) { tElecDashboard.setGtg45ha1(line[3]); }
+                if (i == 13) { tElecDashboard.setGtg45ha2(line[3]); }
+                if (i == 14) { tElecDashboard.setGtg45ha3(line[3]); }
+                if (i == 15) { tElecDashboard.setGtg45ha4(line[3]); }
+                if (i == 16) { tElecDashboard.setGtg45ha5(line[3]); }
+                if (i == 17) { tElecDashboard.setGtg45ha6(line[3]); }
+                if (i == 18) { tElecDashboard.setGtg45ha7(line[3]); }
+                if (i == 19) { tElecDashboard.setGtg45ha8(line[3]); }
+                if (i == 20) { tElecDashboard.setGtg45ha9(line[3]); }
+                if (i == 21) { tElecDashboard.setGtg45ht1(line[3]); }
+                if (i == 22) { tElecDashboard.setGtg45ht2(line[3]); }
+                if (i == 23) { tElecDashboard.setGtg45ht3(line[3]); }
+                if (i == 24) { tElecDashboard.setGtg45ht4(line[3]); }
+                if (i == 25) { tElecDashboard.setGtg45ht5(line[3]); }
+                if (i == 26) { tElecDashboard.setGtg45ht6(line[3]); }
+
+                if (i == 28) { tElecDashboard.setQt61001(line[3]); }
+                if (i == 29) { tElecDashboard.setQt61002(line[3]); }
+                if (i == 30) { tElecDashboard.setQt61003(line[3]); }
+                if (i == 31) { tElecDashboard.setQt61004(line[3]); }
+                if (i == 32) { tElecDashboard.setQt61005(line[3]); }
+                if (i == 33) { tElecDashboard.setQt61101(line[3]); }
+                if (i == 34) { tElecDashboard.setQt61102(line[3]); }
+                if (i == 35) { tElecDashboard.setQt61103(line[3]); }
+                if (i == 36) { tElecDashboard.setQt61104(line[3]); }
+                if (i == 37) { tElecDashboard.setQt61105(line[3]); }
+                if (i == 38) { tElecDashboard.setQt76001(line[3]); }
+                if (i == 39) { tElecDashboard.setQt76002(line[3]); }
+                if (i == 40) { tElecDashboard.setQt76041(line[3]); }
+                if (i == 41) { tElecDashboard.setQt80001(line[3]); }
+                if (i == 42) { tElecDashboard.setQt80002(line[3]); }
+                if (i == 43) { tElecDashboard.setQt80003(line[3]); }
+                if (i == 44) { tElecDashboard.setQt91001(line[3]); }
+                if (i == 45) { tElecDashboard.setQt91002(line[3]); }
+                if (i == 46) { tElecDashboard.setQt91003(line[3]); }
+                if (i == 47) { tElecDashboard.setQt91004(line[3]); }
+                if (i == 48) { tElecDashboard.setQt91005(line[3]); }
+                if (i == 49) { tElecDashboard.setQt91006(line[3]); }
+                if (i == 50) { tElecDashboard.setQt91011(line[3]); }
+                if (i == 51) { tElecDashboard.setQt91012(line[3]); }
+                if (i == 52) { tElecDashboard.setQt91013(line[3]); }
+                if (i == 53) { tElecDashboard.setAt83001(line[3]); }
+                if (i == 54) { tElecDashboard.setAt83002(line[3]); }
+                if (i == 55) { tElecDashboard.setAt83003(line[3]); }
+                if (i == 56) { tElecDashboard.setAt83004(line[3]); }
+                if (i == 57) { tElecDashboard.setQt12001(line[3]); }
+                if (i == 58) { tElecDashboard.setQt12501(line[3]); }
+                if (i == 59) { tElecDashboard.setQt12502(line[3]); }
+                if (i == 60) { tElecDashboard.setQt22001(line[3]); }
+                if (i == 61) { tElecDashboard.setQt22501(line[3]); }
+                if (i == 62) { tElecDashboard.setQt22502(line[3]); }
+                if (i == 63) { tElecDashboard.setQt32001(line[3]); }
+                if (i == 64) { tElecDashboard.setQt32002(line[3]); }
+                if (i == 65) { tElecDashboard.setQt32005(line[3]); }
+                if (i == 66) { tElecDashboard.setQt32003(line[3]); }
+                if (i == 67) { tElecDashboard.setQt32004(line[3]); }
+                if (i == 68) { tElecDashboard.setAi82002(line[3]); }
+                if (i == 69) { tElecDashboard.setAi82003(line[3]); }
+                if (i == 70) { tElecDashboard.setAi82004(line[3]); }
+                if (i == 71) { tElecDashboard.setAi82005(line[3]); }
+                if (i == 72) { tElecDashboard.setAi82006(line[3]); }
+                if (i == 73) { tElecDashboard.setAi82007(line[3]); }
+                if (i == 74) { tElecDashboard.setAi82008(line[3]); }
+                if (i == 75) { tElecDashboard.setAi82009(line[3]); }
+                if (i == 76) { tElecDashboard.setAi82010(line[3]); }
+                if (i == 77) { tElecDashboard.setAi82011(line[3]); }
+                if (i == 78) { tElecDashboard.setAi82101(line[3]); }
+                if (i == 79) { tElecDashboard.setAi82102(line[3]); }
+                if (i == 80) { tElecDashboard.setAi82103(line[3]); }
+                if (i == 81) { tElecDashboard.setAi82104(line[3]); }
+                if (i == 82) { tElecDashboard.setAi82105(line[3]); }
+                if (i == 83) { tElecDashboard.setAi82106(line[3]); }
+                if (i == 84) { tElecDashboard.setAi82107(line[3]); }
+                if (i == 85) { tElecDashboard.setAi82108(line[3]); }
+                if (i == 86) { tElecDashboard.setAi82109(line[3]); }
+                if (i == 87) { tElecDashboard.setAi82110(line[3]); }
+                if (i == 88) { tElecDashboard.setAi82111(line[3]); }
+                if (i == 89) { tElecDashboard.setAi82112(line[3]); }
+                if (i == 90) { tElecDashboard.setAi82113(line[3]); }
+
+                if (i == 92) { tElecDashboard.setHrsg1Ai82201(line[3]); }
+                if (i == 93) { tElecDashboard.setHrsg1Ai82202(line[3]); }
+                if (i == 94) { tElecDashboard.setHrsg1Ai82203(line[3]); }
+                if (i == 95) { tElecDashboard.setHrsg1Ai82204(line[3]); }
+                if (i == 96) { tElecDashboard.setHrsg1Ai82205(line[3]); }
+                if (i == 97) { tElecDashboard.setHrsg1Ai82206(line[3]); }
+                if (i == 98) { tElecDashboard.setHrsg1Ai82207(line[3]); }
+                if (i == 99) { tElecDashboard.setHrsg1Ai82208(line[3]); }
+                if (i == 100) { tElecDashboard.setHrsg1Ai82209(line[3]); }
+                if (i == 101) { tElecDashboard.setHrsg1Ai82210(line[3]); }
+                if (i == 102) { tElecDashboard.setHrsg1Ai82211(line[3]); }
+                if (i == 103) { tElecDashboard.setHrsg1Ai82212(line[3]); }
+                if (i == 104) { tElecDashboard.setHrsg1Air12551(line[3]); }
+                if (i == 105) { tElecDashboard.setHrsg1Air12552(line[3]); }
+                if (i == 106) { tElecDashboard.setHrsg1Air12553(line[3]); }
+                if (i == 107) { tElecDashboard.setHrsg1Air12554(line[3]); }
+                if (i == 108) { tElecDashboard.setHrsg1Air12555(line[3]); }
+                if (i == 109) { tElecDashboard.setHrsg1Air12556(line[3]); }
+                if (i == 110) { tElecDashboard.setHrsg1Air12557(line[3]); }
+                if (i == 111) { tElecDashboard.setHrsg1Air12558(line[3]); }
+
+                if (i == 113) { tElecDashboard.setHrsg2Ai82301(line[3]); }
+                if (i == 114) { tElecDashboard.setHrsg2Ai82302(line[3]); }
+                if (i == 115) { tElecDashboard.setHrsg2Ai82303(line[3]); }
+                if (i == 116) { tElecDashboard.setHrsg2Ai82304(line[3]); }
+                if (i == 117) { tElecDashboard.setHrsg2Ai82305(line[3]); }
+                if (i == 118) { tElecDashboard.setHrsg2Ai82306(line[3]); }
+                if (i == 119) { tElecDashboard.setHrsg2Ai82307(line[3]); }
+                if (i == 120) { tElecDashboard.setHrsg2Ai82308(line[3]); }
+                if (i == 121) { tElecDashboard.setHrsg2Ai82309(line[3]); }
+                if (i == 122) { tElecDashboard.setHrsg2Ai82310(line[3]); }
+                if (i == 123) { tElecDashboard.setHrsg2Ai82311(line[3]); }
+                if (i == 124) { tElecDashboard.setHrsg2Ai82312(line[3]); }
+                if (i == 125) { tElecDashboard.setHrsg2Air22551(line[3]); }
+                if (i == 126) { tElecDashboard.setHrsg2Air22552(line[3]); }
+                if (i == 127) { tElecDashboard.setHrsg2Air22553(line[3]); }
+                if (i == 128) { tElecDashboard.setHrsg2Air22554(line[3]); }
+                if (i == 129) { tElecDashboard.setHrsg2Air22555(line[3]); }
+                if (i == 130) { tElecDashboard.setHrsg2Air22556(line[3]); }
+                if (i == 131) { tElecDashboard.setHrsg2Air22557(line[3]); }
+                if (i == 132) { tElecDashboard.setHrsg2Air22558(line[3]); }
+                if (i == 133) { tElecDashboard.setHrsg2Qi22240(line[3]); }
+                if (i == 134) { tElecDashboard.setHrsg2Qi22241(line[3]); }
+                if (i == 135) { tElecDashboard.setHrsg2Qi22242(line[3]); }
+
+                if (i == 137) { tElecDashboard.setHrsg3Ai82401(line[3]); }
+                if (i == 138) { tElecDashboard.setHrsg3Ai82402(line[3]); }
+                if (i == 139) { tElecDashboard.setHrsg3Ai82403(line[3]); }
+                if (i == 140) { tElecDashboard.setHrsg3Ai82404(line[3]); }
+                if (i == 141) { tElecDashboard.setHrsg3Ai82405(line[3]); }
+                if (i == 142) { tElecDashboard.setHrsg3Ai82406(line[3]); }
+                if (i == 143) { tElecDashboard.setHrsg3Ai82407(line[3]); }
+                if (i == 144) { tElecDashboard.setHrsg3Ai82408(line[3]); }
+                if (i == 145) { tElecDashboard.setHrsg3Ai82409(line[3]); }
+                if (i == 146) { tElecDashboard.setHrsg3Ai82410(line[3]); }
+                if (i == 147) { tElecDashboard.setHrsg3Ai82411(line[3]); }
+                if (i == 148) { tElecDashboard.setHrsg3Ai82412(line[3]); }
+                if (i == 149) { tElecDashboard.setHrsg3Air32551(line[3]); }
+                if (i == 150) { tElecDashboard.setHrsg3Air32552(line[3]); }
+                if (i == 151) { tElecDashboard.setHrsg3Air32553(line[3]); }
+                if (i == 152) { tElecDashboard.setHrsg3Air32554(line[3]); }
+                if (i == 153) { tElecDashboard.setHrsg3Air32555(line[3]); }
+                if (i == 154) { tElecDashboard.setHrsg3Air32556(line[3]); }
+                if (i == 155) { tElecDashboard.setHrsg3Air32557(line[3]); }
+                if (i == 156) { tElecDashboard.setHrsg3Air32558(line[3]); }
+                if (i == 157) { tElecDashboard.setHrsg3Qi32240(line[3]); }
+                if (i == 158) { tElecDashboard.setHrsg3Qi32241(line[3]); }
+                if (i == 159) { tElecDashboard.setHrsg3Qi32242(line[3]); }
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -108,6 +473,7 @@ public class DashboardDataPullUtils {
             } catch (IOException e) {
                 e.printStackTrace();
             }
+            return tElecDashboard;
         }
     }
 

src/main/resources/mapper/aspen/TElecdashboardRealtimeDao.xml.xml → src/main/resources/mapper/aspen/TElecdashboardAlarmDao.xml

@@ -9,12 +9,14 @@
         </selectKey>
         insert into t_elecdashboard_alarm
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="alarmValue != null">alarm_value,</if>
             <if test="alarmTime != null">alarm_time,</if>
             <if test="code != null">code,</if>
             <if test="description != null">description,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="alarmValue != null">#{alarmValue},</if>
             <if test="alarmTime != null">#{alarmTime},</if>
             <if test="code != null">#{code},</if>