src/main/java/com/fzzy/protocol/ProtocolUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/protocol/fzzydatabase/FzzyDatabaseGatewayGrainService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application-proGateway.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/protocol/ProtocolUtils.java
@@ -51,8 +51,14 @@ public static synchronized BaseReqData getSyncReq(String depotId) { log.info(JSON.toJSONString(contextSyncReqMap)); //contextSyncReqMap.get(depotId); return contextSyncReqMap.get(depotId); } public static synchronized BaseReqData delSyncReq(String depotId) { log.info(JSON.toJSONString(contextSyncReqMap)); //contextSyncReqMap.get(depotId); return contextSyncReqMap.remove(depotId); } public static void addTh2Map(String deviceId, THDto thDto) { contextThMap.put(deviceId, thDto); src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
@@ -100,6 +100,7 @@ log.error("--粮情封装解析,未获取到请求相关参数----"); return; } ProtocolUtils.delSyncReq(response.getHouseId()); log.info(reqData.toString()); int cableZ = Integer.valueOf(response.getLay()); src/main/java/com/fzzy/protocol/fzzydatabase/FzzyDatabaseGatewayGrainService.java
@@ -185,7 +185,13 @@ if (min == ReMessageBuilder.MIN_TEMP) { min = 0.0; } //遍历温度点位,异常温度点使用平均温 for( GrainTemp temp : temperature){ Double curTemp2 = Double.valueOf(temp.getTemperature()); if(!(curTemp2 > 3 && curTemp2 < 40)){ temp.setTemperature(outPut.getAvgTemperature()); } } outPut.setTemperature(temperature); outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + ""); outPut.setMinTemperature(min + ""); src/main/resources/application-proGateway.yml
@@ -5,13 +5,13 @@ datasource: #主数据源 primary: url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8 url: jdbc:mysql://127.0.0.1:3306/igds_api_2023?useUnicode=true&useSSL=false&characterEncoding=utf-8 username: root password: Abc123.. driver-class-name: com.mysql.jdbc.Driver #次数据源 secondary: url: jdbc:mysql://127.0.0.1:3306/igdsv4?useUnicode=true&useSSL=false&characterEncoding=utf-8 url: jdbc:mysql://127.0.0.1:3306/igds_3.5?useUnicode=true&useSSL=false&characterEncoding=utf-8 username: root password: Abc123.. @@ -48,7 +48,6 @@ timeout: 6000 kafka: bootstrap-servers: 103.203.217.16:9092 enabled: false producer: retries: 0 acks: 1 @@ -69,6 +68,7 @@ auto-offset-reset: latest key-deserializer: org.apache.kafka.common.serialization.StringDeserializer value-deserializer: org.apache.kafka.common.serialization.StringDeserializer mqtt: host: tcp://127.0.0.1:1883 username: admin @@ -90,7 +90,7 @@ publicKeysStorePath: D:/IGDS/license/publicCerts.keystore igds: default: companyId: 5338 companyId: 5308 file-path: D:/app/igds-api img-path: D:/IGDS/FILE/ weather-url: https://v1.yiketianqi.com/api?unescape=1&version=v61&appid={appId}&appsecret={appsecret}&cityid={cityid}