ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码调整

Browse Source
This commit is contained in:
chendaofei
2025-01-08 09:47:05 +08:00
parent a5227c372f
commit 28b8ca4ea7
6 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml
View File

@@ -14,7 +14,7 @@
B_Value varchar(30) DEFAULT NULL COMMENT 'B相值',
C_Value varchar(30) DEFAULT NULL COMMENT 'C相值',
T_Value varchar(30) DEFAULT NULL COMMENT 'T相值(没有相别的则存这里)',
PRIMARY KEY (Monitor_Id, Time_Id, Script_Id, Sort, Data_Type)
PRIMARY KEY (Monitor_Id, Time_Id, Script_Id, Sort, AD_Type)
) COMMENT='监测数据表';
</update>
@@ -37,7 +37,7 @@
B_Value json NULL COMMENT 'B相值',
C_Value json NULL COMMENT 'C相值',
T_Value json NULL COMMENT 'T相值(没有相别的则存这里)',
PRIMARY KEY (Monitor_Id, Script_Id, Sort, Data_Type)
PRIMARY KEY (Monitor_Id, Script_Id, Sort, AD_Type)
) COMMENT='监测数据表';
</update>

4
storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java
View File

@@ -44,7 +44,7 @@ public class TableGenServiceImpl implements TableGenService {
" Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',\n" +
" Result_Flag int(1) NULL COMMENT '0.不合格 1.合格',\n" +
A+B+C+
" PRIMARY KEY (Monitor_Id, Script_Id, Sort, Data_Type)\n" +
" PRIMARY KEY (Monitor_Id,Time_Id, Script_Id, Sort, AD_Type)\n" +
") COMMENT='监测数据表';";
tableGenMapper.genAdHarmonicTable(sql);
@@ -57,7 +57,7 @@ public class TableGenServiceImpl implements TableGenService {
" Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',\n" +
" Result_Flag int(1) NOT NULL COMMENT '0.不合格 1.合格',\n" +
A+B+C+
" PRIMARY KEY (Monitor_Id, Script_Id, Sort, Data_Type)\n" +
" PRIMARY KEY (Monitor_Id, Script_Id, Sort, AD_Type)\n" +
") COMMENT='监测数据表';";
tableGenMapper.genAdHarmonicTable(sql2);
}