From df847a2500eb99f890bf3847ac2cc49a92c0d221 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 23 Sep 2024 13:47:03 +0800
Subject: [PATCH] 增加2022高标准过滤及发送打印
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java
index 807c1ac..16d0726 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java
@@ -126,7 +126,7 @@
JSONObject jsonObject = ztData.getJSONObject(i);
Map<String,Object> map = new HashMap<>();
// 水库信息设置
- flag = waterInfoSet(jsonObject, map,flag);
+ flag = waterInfoSet(jsonObject, map);
if (flag) {
// 测点信息设置
flag = pointValueInfoSet(jsonObject, map, type,flag);
@@ -134,6 +134,7 @@
if (flag) {
map.put("batchId",UUID.randomUUID());
map.put("serialNo",getSerialNo());
+ log.info("发送数据：{}",map);
// 发送请求
String response = sendPostJsonRequest(OpenApiConstant.POINT_VALUE_INLET_URL, map);
JSONObject parseObject = JSON.parseObject(response);
@@ -149,23 +150,27 @@
* @param jsonObject
* @param map
*/
- private boolean waterInfoSet(JSONObject jsonObject, Map<String, Object> map,boolean flag) {
+ private boolean waterInfoSet(JSONObject jsonObject, Map<String, Object> map) {
String rz = jsonObject.getString("rz");
- flag = false;
- if (!Strings.isBlank(rz)) {
- flag = true;
- String res_cd = replaceSpecialStr(jsonObject.getString("res_cd"));
- List<Map<String, Object>> waterLevelInfoList = new ArrayList<>();
- Map<String, Object> waterLevelInfoMap = new HashMap<>();
- waterLevelInfoMap.put("damCode", res_cd);
- waterLevelInfoMap.put("waterLevel", jsonObject.getString("rz"));
- waterLevelInfoMap.put("waterLevelTime", jsonObject.getString("rz_tm"));
- waterLevelInfoMap.put("rainCondition", jsonObject.getString("drp"));
- waterLevelInfoMap.put("rainConditionTime", jsonObject.getString("drp_tm"));
- waterLevelInfoList.add(waterLevelInfoMap);
- map.put("waterLevelInfo", waterLevelInfoList);
+ if(Strings.isBlank(rz)){
+ return false;
}
- return flag;
+ // 需要过滤2022高标准水库才发送
+ String res_cd = replaceSpecialStr(jsonObject.getString("res_cd"));
+ String flag = openApiMapper.getResInfoBy2022(res_cd);
+ if (Strings.isBlank(flag)){
+ return false;
+ }
+ List<Map<String, Object>> waterLevelInfoList = new ArrayList<>();
+ Map<String, Object> waterLevelInfoMap = new HashMap<>();
+ waterLevelInfoMap.put("damCode", res_cd);
+ waterLevelInfoMap.put("waterLevel", jsonObject.getString("rz"));
+ waterLevelInfoMap.put("waterLevelTime", jsonObject.getString("rz_tm"));
+ waterLevelInfoMap.put("rainCondition", jsonObject.getString("drp"));
+ waterLevelInfoMap.put("rainConditionTime", jsonObject.getString("drp_tm"));
+ waterLevelInfoList.add(waterLevelInfoMap);
+ map.put("waterLevelInfo", waterLevelInfoList);
+ return true;
}
/**
--
Gitblit v1.9.3