From 06d4284e08bbc77eb6aeaac8a1ef9e4a8cca2982 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 31 Jul 2024 15:10:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B024=E5=B9=B44?= =?UTF-8?q?=E6=9C=88=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chenxuan/config/RestTemplateConfig.java | 4 ++-- .../com/chenxuan/timeTask/DeviceSmoothing.java | 4 +--- .../com/chenxuan/timeTask/EvalParamTask.java | 5 +++++ src/main/resources/application.yml | 16 ++++++++-------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/chenxuan/config/RestTemplateConfig.java b/src/main/java/com/chenxuan/config/RestTemplateConfig.java index 04ac686..2d48ef2 100644 --- a/src/main/java/com/chenxuan/config/RestTemplateConfig.java +++ b/src/main/java/com/chenxuan/config/RestTemplateConfig.java @@ -22,8 +22,8 @@ public class RestTemplateConfig { @Bean public ClientHttpRequestFactory simpleClientHttpRequestFactory(){ SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - factory.setReadTimeout(5000);//单位为ms - factory.setConnectTimeout(5000);//单位为ms + factory.setReadTimeout(15000);//单位为ms + factory.setConnectTimeout(15000);//单位为ms return factory; } } \ No newline at end of file diff --git a/src/main/java/com/chenxuan/timeTask/DeviceSmoothing.java b/src/main/java/com/chenxuan/timeTask/DeviceSmoothing.java index 5745a7b..17a28bc 100644 --- a/src/main/java/com/chenxuan/timeTask/DeviceSmoothing.java +++ b/src/main/java/com/chenxuan/timeTask/DeviceSmoothing.java @@ -156,9 +156,7 @@ public class DeviceSmoothing { List amplitudes = new ArrayList<>(centerReals.size()); // 只获取幅值 centerReals.stream().forEach(real -> { - amplitudes.add(new BigDecimal(real.getTemp())); - amplitudes.add(new BigDecimal(real.getHumidity())); - centerRealDto.setId(real.getId()); + amplitudes.add(new BigDecimal(real.getMaxAmplitude())); }); calculateCenter(centerRealDto, amplitudes, 8); } diff --git a/src/main/java/com/chenxuan/timeTask/EvalParamTask.java b/src/main/java/com/chenxuan/timeTask/EvalParamTask.java index ff15390..d288000 100644 --- a/src/main/java/com/chenxuan/timeTask/EvalParamTask.java +++ b/src/main/java/com/chenxuan/timeTask/EvalParamTask.java @@ -22,6 +22,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; @@ -357,7 +358,11 @@ public class EvalParamTask { List amplitudes = new ArrayList<>(noiseReals.size()); // 只获取幅值 noiseReals.stream().forEach(real -> { + if (StringUtils.isEmpty(real.getMaxAmplitude())||"nan".equals(real.getMaxAmplitude())){ + real.setMaxAmplitude("0"); + } amplitudes.add(new BigDecimal(real.getMaxAmplitude())); + }); return calculateData(amplitudes, child, 8); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c9d0525..e938706 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -15,15 +15,15 @@ spring: druid: master: # url: jdbc:mysql://192.168.1.11:3306/sjzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true - url: jdbc:mysql://192.168.135.81:3306/sjzd-hp0209?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + url: jdbc:mysql://192.168.1.21:3306/sjzd-hp0209?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true username: root password: 123456 slave: # 从数据源开关/默认关闭 enabled: false - url: - username: - password: + url: #jdbc:mysql://192.168.135.81:3306/sjzd-yx0811?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + username: #root + password: #123456 # 初始连接数 initial-size: 20 # 最小连接池数量 @@ -140,21 +140,21 @@ remote: #新增用户后在两个系统中同步 user: # add: http://192.168.1.12:7000/frame-base-control/sysUserRemoter/addUser - add: http://192.168.128.86:10080/frame-base-control/sysUserRemoter/addUser + add: http://192.168.1.22:8084/frame-base-control/sysUserRemoter/addUser #在二期中新增主设备信息，同步至声级震动系统中 transformer: # query: http://192.168.1.12:7000/busi-back-control/remote/busiTransformerRemote/findTransformerSubTree - query: http://192.168.129.213:10080/busi-back-control/remote/busiTransformerRemote/findTransformerSubTree + query: http://192.168.1.22:8084/busi-back-control/remote/busiTransformerRemote/findTransformerSubTree #声级震动每天计算权重系数，同步到二期系统接口 mainDevice: # add: http://192.168.1.12:7000/busi-back-control/api/transformerEvaluationResults/add - add: http://192.168.128.86:10080/busi-back-control/api/transformerEvaluationResults/add + add: http://192.168.1.22:8084/busi-back-control/api/transformerEvaluationResults/add # add: #从二期系统获取变压器工作状态同步到声级震动系统中接口 iecBaseConf: # get: http://192.168.1.12:7000/busi-back-control/api/IecBaseConf/getIecBydworkParamWorks # get: http://192.168.1.12:10080/busi-back-control/api/IecBaseConf/getIecBydworkParamWorks - get: + get: http://192.168.1.22:8084/busi-back-control/api/IecBaseConf/getIecBydworkParamWorks #matLab输入值 range.acc: 250