From e29ff6ff2de584854531e443ed4d8da0347e08bd Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 10:40:59 +0800
Subject: [PATCH] 优化接口 小程序下的获得全部取水口接口与项目管理下的获得全部取水口接口同步
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index d36d3ce..7bbc8ea 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -6,11 +6,13 @@
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.mw.protocol.Command;
import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.config.DingTalk;
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import lombok.extern.slf4j.Slf4j;
@@ -26,7 +28,9 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
/**
* @author wuzeyu
@@ -161,8 +165,8 @@
*
* @return 鎵�鏈夊彇姘村彛闆嗗悎
*/
- public QueryResultVo<List<PrIntake>> selectAll() {
- QueryResultVo<List<PrIntake>> rsVo = new QueryResultVo<>();
+ public QueryResultVo<List<VoAllIntake>> selectAll() {
+ QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
rsVo.obj = this.prIntakeMapper.selectAll();
return rsVo;
}
@@ -272,31 +276,22 @@
com.code = "LCD0001";
com.type = "innerCommand";
JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
- if (response != null && response.getString("code").equals("0001")) {
- //JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
- JSONArray jsonArray = new JSONArray();
+ JSONArray jsonArray = new JSONArray();
+ if (response != null && response.getString("code").equals("0001")) {
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
if(attachment != null) {
- //HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
- //for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
- // JSONObject jsonObject = new JSONObject();
- // jsonObject.put("rtuAddr", entry.getKey());
- // jsonObject.put("isOnLine", entry.getValue());
- // jsonArray.add(jsonObject);
- //}
attachment.forEach((key, value) -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put("rtuAddr", key);
jsonObject.put("isOnLine", value);
jsonArray.add(jsonObject);
-
});
}
- return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
- } else {
- return new ArrayList<>();
+ //} else {
+ // return new ArrayList<>();
}
+ return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
}
/**
@@ -317,6 +312,11 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ if(response == null) {
+ return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�");
+ }
+
return response.getBody();
}
--
Gitblit v1.8.0