Browse Source

修改建表和初始化语句

lixing 3 years ago
parent
commit
ad930c735e
2 changed files with 113 additions and 105 deletions
  1. 111 103
      src/main/resources/db/init/data.sql
  2. 2 2
      src/main/resources/db/init/table.sql

+ 111 - 103
src/main/resources/db/init/data.sql

@@ -176,163 +176,171 @@ VALUES ('ACCCOT_ApproachTempContinuousOperation', '逼近温度运行持续时
 REPLACE INTO `monitor_indicator`
 VALUES ('ACCCOT_ApproachTempDayAvg', '逼近温度日维度平均值阈值', 'ACCCOT', '℃', NULL, 'Eqwb', NULL, NULL, NULL, NULL, NULL, 1);
 REPLACE INTO `calculate_method`
-VALUES ('1', '冷水出口温度', '${obj;CurrentTime;15min;InfoCode;chillWaterOutTemp}', 'ACATAH_ChillWaterOutTemp', 1, 'Eqdx',
-        NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('1', '冷水出口温度', '${obj;CurrentTime;15min;InfoCode;chillWaterOutTemp}', 'ACATAH_ChillWaterOutTemp', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('10', '回风焓值', '${obj;CurrentTime;15min;InfoCode;returnAirH}', 'ACATAH_ReturnAirH', 1, 'Eqdx', NULL, 'systemId',
-        '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('10', '回风焓值', '${obj;CurrentTime;15min;InfoCode;returnAirH}', 'ACATAH_ReturnAirH', '1', 'Eqdx', null,
+        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
+REPLACE INTO `calculate_method`
+VALUES ('100', '新风阀开度测试', '${obj;CurrentTime;15min;InfoCode;freshAirValveOpening}', 'ACATAH_FreshAirValveOpening', '1',
+        'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
+REPLACE INTO `calculate_method`
+VALUES ('105', '回风CO2浓度测试', '${obj;CurrentTime;15min;InfoCode;returnAirCO2}', 'ACATAH_ReturnAirCO2', '1', 'Eqdx', null,
+        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
 VALUES ('11', '(当前时刻室内焓值-上一时刻室内焓值)的绝对值',
-        '${obj;CurrentTime;1h;InfoCode;returnAirH}-${obj;LastTime;1h;InfoCode;returnAirH}',
-        'ACATAH_ReturnAirHdifference', 1, 'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId',
-        '2021-09-20 17:14:18', 1);
+        '[${obj;CurrentTime;15min;InfoCode;returnAirH}-${obj;Last15MinTime;15min;InfoCode;returnAirH}]',
+        'ACATAH_ReturnAirHdifference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('12', '回风温度', '${obj;CurrentTime;15min;InfoCode;returnAirTemp}', 'ACATAH_ReturnAirTemp', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('12', '回风温度', '${obj;CurrentTime;15min;InfoCode;returnAirTemp}', 'ACATAH_ReturnAirTemp', '1', 'Eqdx', null,
+        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
 VALUES ('13', '(当前时刻回风温度-上一时刻回风温度)的绝对值',
-        '${obj;CurrentTime;1h;InfoCode;returnAirTemp}-${obj;LastTime;1h;InfoCode;returnAirTemp}',
-        'ACATAH_ReturnAirTempdifference', 1, 'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId',
-        '2021-09-20 17:14:18', 1);
+        '[${obj;CurrentTime;15min;InfoCode;returnAirTemp}-${obj;Last15MinTime;15min;InfoCode;returnAirTemp}]',
+        'ACATAH_ReturnAirTempdifference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('14', '回风温度设定', '${obj;CurrentTime;15min;InfoCode;returnAirTempSet}', 'ACATAH_ReturnAirTempSet', 1, 'Eqdx',
-        NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('14', '回风温度设定', '${obj;CurrentTime;15min;InfoCode;returnAirTempSet}', 'ACATAH_ReturnAirTempSet', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('15', '回风阀开度', '${obj;CurrentTime;15min;InfoCode;returnAirValveOpening}', 'ACATAH_ReturnAirValveOpening', 1,
-        'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('15', '回风阀开度', '${obj;CurrentTime;15min;InfoCode;returnAirValveOpening}', 'ACATAH_ReturnAirValveOpening', '1',
+        'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('16', '运行状态', '${obj;CurrentTime;15min;InfoCode;runStatus}', 'ACATAH_RunStatus', 1, 'Eqdx', NULL, 'systemId',
-        '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('16', '运行状态', '${obj;CurrentTime;15min;InfoCode;runStatus}', 'ACATAH_RunStatus', '1', 'Eqdx', null, 'systemId',
+        '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('17', '季节转换设定', '${obj;CurrentTime;15min;InfoCode;seasonChangeSet}', 'ACATAH_SeasonChangeSet', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('17', '季节转换设定', '${obj;CurrentTime;15min;InfoCode;seasonChangeSet}', 'ACATAH_SeasonChangeSet', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('18', '送风温度', '${obj;CurrentTime;15min;InfoCode;supplyAirTemp}', 'ACATAH_SupplyAirTemp', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('18', '送风温度', '${obj;CurrentTime;15min;InfoCode;supplyAirTemp}', 'ACATAH_SupplyAirTemp', '1', 'Eqdx', null,
+        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
 VALUES ('19', '(当前时刻送风温度-上一时刻送风温度)的绝对值',
-        '${obj;CurrentTime;1h;InfoCode;supplyAirTemp}-${obj;LastTime;1h;InfoCode;supplyAirTemp}',
-        'ACATAH_SupplyAirTempdifference', 1, 'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId',
-        '2021-09-20 17:14:18', 1);
+        '[${obj;CurrentTime;15min;InfoCode;supplyAirTemp}-${obj;Last15MinTime;15min;InfoCode;supplyAirTemp}]',
+        'ACATAH_SupplyAirTempdifference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
 VALUES ('2', '(当前时刻出水温度-上一时刻出水温度)的绝对值',
-        '${obj;CurrentTime;1h;InfoCode;chillWaterOutTemp}-${obj;LastTime;1h;InfoCode;chillWaterOutTemp}',
-        'ACATAH_ChillWaterOutTempdifference', 1, 'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId',
-        '2021-09-20 17:14:18', 1);
+        '[${obj;CurrentTime;15min;InfoCode;chillWaterOutTemp}-${obj;Last15MinTime;15min;InfoCode;chillWaterOutTemp}]',
+        'ACATAH_ChillWaterOutTempdifference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('20', '送风温度设定', '${obj;CurrentTime;15min;InfoCode;supplyAirTempSet}', 'ACATAH_SupplyAirTempSet', 1, 'Eqdx',
-        NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('20', '送风温度设定', '${obj;CurrentTime;15min;InfoCode;supplyAirTempSet}', 'ACATAH_SupplyAirTempSet', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('21', '送风机频率', '${obj;CurrentTime;15min;InfoCode;supplyFanFreq}', 'ACATAH_SupplyFanFreq', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('21', '送风机频率', '${obj;CurrentTime;15min;InfoCode;supplyFanFreq}', 'ACATAH_SupplyFanFreq', '1', 'Eqdx', null,
+        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('22', '冷水出口温度', '${obj;CurrentTime;15min;InfoCode;chillWaterOutTemp}', 'ACATFU_ChillWaterOutTemp', 1, 'Eqdx',
-        NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('22', '冷水出口温度', '${obj;CurrentTime;15min;InfoCode;chillWaterOutTemp}', 'ACATFU_ChillWaterOutTemp', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
 VALUES ('23', '(当前时刻出水温度-上一时刻出水温度)的绝对值',
-        '${obj;CurrentTime;1h;InfoCode;chillWaterOutTemp}-${obj;LastTime;1h;InfoCode;chillWaterOutTemp}',
-        'ACATFU_ChillWaterOutTempdifference', 1, 'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId',
-        '2021-09-20 17:14:18', 1);
+        '[${obj;CurrentTime;15min;InfoCode;chillWaterOutTemp}-${obj;Last15MinTime;15min;InfoCode;chillWaterOutTemp}]',
+        'ACATFU_ChillWaterOutTempdifference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('24', '冷水阀开度', '${obj;CurrentTime;15min;InfoCode;chillWaterValveOpening}', 'ACATFU_ChillWaterValveOpening', 1,
-        'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('24', '冷水阀开度', '${obj;CurrentTime;15min;InfoCode;chillWaterValveOpening}', 'ACATFU_ChillWaterValveOpening', '1',
+        'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('25', '手自动状态', '${obj;CurrentTime;15min;InfoCode;manualAutoStatus}', 'ACATFU_ManualAutoStatus', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('25', '手自动状态', '${obj;CurrentTime;15min;InfoCode;manualAutoStatus}', 'ACATFU_ManualAutoStatus', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('26', '运行状态', '${obj;CurrentTime;15min;InfoCode;runStatus}', 'ACATFU_RunStatus', 1, 'Eqdx', NULL, 'systemId',
-        '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('26', '运行状态', '${obj;CurrentTime;15min;InfoCode;runStatus}', 'ACATFU_RunStatus', '1', 'Eqdx', null, 'systemId',
+        '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('27', '季节转换设定', '${obj;CurrentTime;15min;InfoCode;seasonChangeSet}', 'ACATFU_SeasonChangeSet', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('27', '季节转换设定', '${obj;CurrentTime;15min;InfoCode;seasonChangeSet}', 'ACATFU_SeasonChangeSet', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('28', '送风温度', '${obj;CurrentTime;15min;InfoCode;supplyAirTemp}', 'ACATFU_SupplyAirTemp', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('28', '送风温度', '${obj;CurrentTime;15min;InfoCode;supplyAirTemp}', 'ACATFU_SupplyAirTemp', '1', 'Eqdx', null,
+        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
 VALUES ('29', '(当前时刻送风温度-上一时刻送风温度)的绝对值',
-        '${obj;CurrentTime;1h;InfoCode;supplyAirTemp}-${obj;LastTime;1h;InfoCode;supplyAirTemp}',
-        'ACATFU_SupplyAirTempdifference', 1, 'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId',
-        '2021-09-20 17:14:18', 1);
+        '[${obj;CurrentTime;15min;InfoCode;supplyAirTemp}-${obj;Last15MinTime;15min;InfoCode;supplyAirTemp}]',
+        'ACATFU_SupplyAirTempdifference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('3', '冷水阀开度', '${obj;CurrentTime;15min;InfoCode;chillWaterValveOpening}', 'ACATAH_ChillWaterValveOpening', 1,
-        'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('3', '冷水阀开度', '${obj;CurrentTime;15min;InfoCode;chillWaterValveOpening}', 'ACATAH_ChillWaterValveOpening', '1',
+        'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('30', '送风温度设定', '${obj;CurrentTime;15min;InfoCode;supplyAirTempSet}', 'ACATFU_SupplyAirTempSet', 1, 'Eqdx',
-        NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('30', '送风温度设定', '${obj;CurrentTime;15min;InfoCode;supplyAirTempSet}', 'ACATFU_SupplyAirTempSet', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('31', '冷凝器换热端差日维度平均值阈值', NULL, 'ACCCAC_CondHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('31', '冷凝器换热端差日维度平均值阈值', null, 'ACCCAC_CondHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('32', '冷凝器运行持续时间', NULL, 'ACCCAC_CondContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('32', '冷凝器运行持续时间', null, 'ACCCAC_CondContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('33', '蒸发器换热端差日维度平均值阈值', NULL, 'ACCCAC_EvapHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('33', '蒸发器换热端差日维度平均值阈值', null, 'ACCCAC_EvapHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('34', '蒸发器运行持续时间', NULL, 'ACCCAC_EvapContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('34', '蒸发器运行持续时间', null, 'ACCCAC_EvapContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('35', '冷凝器换热端差日维度平均值阈值', NULL, 'ACCCCC_CondHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('35', '冷凝器换热端差日维度平均值阈值', null, 'ACCCCC_CondHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('36', '冷凝器运行持续时间', NULL, 'ACCCCC_CondContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('36', '冷凝器运行持续时间', null, 'ACCCCC_CondContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('37', '蒸发器换热端差日维度平均值阈值', NULL, 'ACCCCC_EvapHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('37', '蒸发器换热端差日维度平均值阈值', null, 'ACCCCC_EvapHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('38', '蒸发器运行持续时间', NULL, 'ACCCCC_EvapContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('38', '蒸发器运行持续时间', null, 'ACCCCC_EvapContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('39', '冷凝器换热端差日维度平均值阈值', NULL, 'ACCCPC_CondHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('39', '冷凝器换热端差日维度平均值阈值', null, 'ACCCPC_CondHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('4', '新风焓值', '${obj;CurrentTime;15min;InfoCode;freshAirH}', 'ACATAH_FreshAirH', 1, 'Eqdx', NULL, 'systemId',
-        '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('4', '新风焓值', '${obj;CurrentTime;15min;InfoCode;freshAirH}', 'ACATAH_FreshAirH', '1', 'Eqdx', null, 'systemId',
+        '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('40', '冷凝器运行持续时间', NULL, 'ACCCPC_CondContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('40', '冷凝器运行持续时间', null, 'ACCCPC_CondContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('41', '蒸发器换热端差日维度平均值阈值', NULL, 'ACCCPC_EvapHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('41', '蒸发器换热端差日维度平均值阈值', null, 'ACCCPC_EvapHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('42', '蒸发器运行持续时间', NULL, 'ACCCPC_EvapContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('42', '蒸发器运行持续时间', null, 'ACCCPC_EvapContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('43', '冷凝器换热端差日维度平均值阈值', NULL, 'ACCCSC_CondHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('43', '冷凝器换热端差日维度平均值阈值', null, 'ACCCSC_CondHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('44', '冷凝器运行持续时间', NULL, 'ACCCSC_CondContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('44', '冷凝器运行持续时间', null, 'ACCCSC_CondContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('45', '蒸发器换热端差日维度平均值阈值', NULL, 'ACCCSC_EvapHeatTransferDayAvg', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('45', '蒸发器换热端差日维度平均值阈值', null, 'ACCCSC_EvapHeatTransferDayAvg', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('46', '蒸发器运行持续时间', NULL, 'ACCCSC_EvapContinuousOperation', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('46', '蒸发器运行持续时间', null, 'ACCCSC_EvapContinuousOperation', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('47', '逼近温度日维度平均值阈值', NULL, 'ACCCOT_ApproachTempDayAvg', 1, 'Eqwb', NULL, 'systemId', '2021-11-02 15:10:00',
-        'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('47', '逼近温度日维度平均值阈值', null, 'ACCCOT_ApproachTempDayAvg', '1', 'Eqwb', null, 'systemId', '2021-11-02 15:10:00',
+        'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('48', '逼近温度运行持续时间', NULL, 'ACCCOT_ApproachTempContinuousOperation', 1, 'Eqwb', NULL, 'systemId',
-        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', 1);
+VALUES ('48', '逼近温度运行持续时间', null, 'ACCCOT_ApproachTempContinuousOperation', '1', 'Eqwb', null, 'systemId',
+        '2021-11-02 15:10:00', 'systemId', '2021-11-02 15:10:00', '1');
 REPLACE INTO `calculate_method`
-VALUES ('5', '连续时刻室外焓值差', '${obj;Last15MinTime;15min;InfoCode;freshAirH}-${obj;CurrentTime;15min;InfoCode;freshAirH}', 'ACATAH_FreshAirHdifference', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('5', '连续时刻室外焓值差', '${obj;Last15MinTime;15min;InfoCode;freshAirH}-${obj;CurrentTime;15min;InfoCode;freshAirH}',
+        'ACATAH_FreshAirHdifference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('6', '新风阀开度', '${obj;CurrentTime;15min;InfoCode;freshAirValveOpening}', 'ACATAH_FreshAirValveOpening', 1,
-        'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('6', '新风阀开度', '${obj;CurrentTime;15min;InfoCode;freshAirValveOpening}', 'ACATAH_FreshAirValveOpening', '1',
+        'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('7', '手自动状态', '${obj;CurrentTime;15min;InfoCode;manualAutoStatus}', 'ACATAH_ManualAutoStatus', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('7', '手自动状态', '${obj;CurrentTime;15min;InfoCode;manualAutoStatus}', 'ACATAH_ManualAutoStatus', '1', 'Eqdx',
+        null, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
-VALUES ('8', '回风CO2浓度', '${obj;CurrentTime;15min;InfoCode;returnAirCO2}', 'ACATAH_ReturnAirCO2', 1, 'Eqdx', NULL,
-        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', 1);
+VALUES ('8', '回风CO2浓度', '${obj;CurrentTime;15min;InfoCode;returnAirCO2}', 'ACATAH_ReturnAirCO2', '1', 'Eqdx', null,
+        'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18', '1');
 REPLACE INTO `calculate_method`
 VALUES ('9', '(当前时刻CO2浓度-上一时刻CO2浓度)的绝对值',
-        '${obj;CurrentTime;1h;InfoCode;returnAirCO2}-${obj;LastTime;1h;InfoCode;returnAirCO2}',
-        'ACATAH_ReturnAirCO2difference', 1, 'Eqdx', NULL, 'systemId', '2021-09-20 17:13:56', 'systemId',
-        '2021-09-20 17:14:18', 1);
+        '[${obj;CurrentTime;15min;InfoCode;returnAirCO2}-${obj;Last15MinTime;15min;InfoCode;returnAirCO2}]',
+        'ACATAH_ReturnAirCO2difference', '1', 'Eqdx', null, 'systemId', '2021-09-20 17:13:56', 'systemId',
+        '2021-09-20 17:14:18', '1');
+
 
 REPLACE INTO `obj_group`
 VALUES ('1', '组合式空调机组', 'ACATAH', 'installType: "1"', '0', 'Eqdx', NULL, NULL, NULL, NULL, NULL, 1);

+ 2 - 2
src/main/resources/db/init/table.sql

@@ -4,12 +4,12 @@ CREATE TABLE IF NOT EXISTS `alarm_condition_v2`
     `info_codes`         json             DEFAULT NULL COMMENT '包含的参数',
     `trigger_frontend`   json             DEFAULT NULL COMMENT '触发条件-前端展示',
     `trigger_backend`    text COMMENT '触发条件-后端使用',
-    `trigger_rules`      varchar(255)     DEFAULT NULL COMMENT '触发规则-中文描述',
+    `trigger_rules`      text     DEFAULT NULL COMMENT '触发规则-中文描述',
     `trigger_uphold`     int(11)          DEFAULT '0' COMMENT '持续多久后触发',
     `end_uphold`         int(11)          DEFAULT NULL COMMENT '持续多久后恢复',
     `end_frontend`       json             DEFAULT NULL COMMENT '恢复条件-前端',
     `end_backend`        text COMMENT '恢复条件-后端',
-    `end_rules`          varchar(255)     DEFAULT NULL COMMENT '恢复规则-中文描述',
+    `end_rules`          text     DEFAULT NULL COMMENT '恢复规则-中文描述',
     `alarm_level`        varchar(10)      DEFAULT NULL COMMENT '报警等级',
     `effect_time_type`   varchar(10)      DEFAULT NULL COMMENT '生效时间类型',
     `effect_time_detail` json             DEFAULT NULL COMMENT '生效时间详情',