From 8d41510358147324436f7a0456278a9ef82a7f4a Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Thu, 16 Jan 2025 11:17:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 14 ++++++++++---- .../storage/mapper/mapping/TableGenMapper.xml | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index d3e75cb7..38ac01dd 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -1076,14 +1076,20 @@ public class SocketDevResponseService { int length = arrays.get(0).length; Integer[] maxArray = new Integer[length]; for (int i = 0; i < length; i++) { - int maxValue = Integer.MIN_VALUE; + int maxValue = -1; for (Integer[] array : arrays) { int value = array[i]; - if (value > maxValue) { - maxValue = value; + if(value != 4) { + if (value > maxValue) { + maxValue = value; + } } } - maxArray[i] = maxValue; + if(maxValue == -1){ + maxArray[i] = 4; + }else { + maxArray[i] = maxValue; + } } return maxArray; } diff --git a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml index 88f232b4..b18927d4 100644 --- a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml +++ b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml @@ -10,7 +10,7 @@ Sort int(4) NOT NULL COMMENT '总检测脚本中的测试项序号', AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表', 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相值', B_Value varchar(30) DEFAULT NULL COMMENT 'B相值', C_Value varchar(30) DEFAULT NULL COMMENT 'C相值',