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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wr
2025-01-16 11:18:08 +08:00
parent 5b6ddacbf7 8d41510358
commit de53e41f2c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -1076,15 +1076,21 @@ public class SocketDevResponseService {
int length = arrays.get(0).length; int length = arrays.get(0).length;
Integer[] maxArray = new Integer[length]; Integer[] maxArray = new Integer[length];
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
int maxValue = Integer.MIN_VALUE; int maxValue = -1;
for (Integer[] array : arrays) { for (Integer[] array : arrays) {
int value = array[i]; int value = array[i];
if(value != 4) {
if (value > maxValue) { if (value > maxValue) {
maxValue = value; maxValue = value;
} }
} }
}
if(maxValue == -1){
maxArray[i] = 4;
}else {
maxArray[i] = maxValue; maxArray[i] = maxValue;
} }
}
return maxArray; return maxArray;
} }

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

@@ -10,7 +10,7 @@
Sort int(4) NOT NULL COMMENT '总检测脚本中的测试项序号', Sort int(4) NOT NULL COMMENT '总检测脚本中的测试项序号',
AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表', AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表',
Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表', Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',
Result_Flag int(1) COMMENT '1不合格 2合格 4无法处理', Result_Flag int(1) NULL COMMENT '1不合格 2合格 4无法处理',
A_Value varchar(30) DEFAULT NULL COMMENT 'A相值', A_Value varchar(30) DEFAULT NULL COMMENT 'A相值',
B_Value varchar(30) DEFAULT NULL COMMENT 'B相值', B_Value varchar(30) DEFAULT NULL COMMENT 'B相值',
C_Value varchar(30) DEFAULT NULL COMMENT 'C相值', C_Value varchar(30) DEFAULT NULL COMMENT 'C相值',