From fe1e65520172d8c365d2fe75a843a44243f4faf6 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 20:31:48 +0800
Subject: [PATCH] 2024-10-28 代码优化
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 80 +++++++++++++++-------------------------
1 files changed, 30 insertions(+), 50 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 1bbe943..d36d3ce 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
@@ -13,7 +13,6 @@
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
-import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -134,44 +133,15 @@
* @return 鍙栨按鍙ｈ褰曞垪琛�
*/
public QueryResultVo<List<VoIntake>> getIntakes(QueryVo queryVo) {
- Command com = new Command();
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
- BaseResponse baseResponse = sendCom2Mw(com);
- JSONObject response = (JSONObject) JSON.toJSON(baseResponse);
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ Long itemTotal = prIntakeMapper.getRecordCount(params);
- if (response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
-
- JSONArray jsonArray = new JSONArray();
-
- 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);
- }
- }
-
- queryVo.setOnLineMap(jsonArray.toJSONString());
-
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
- Long itemTotal = prIntakeMapper.getRecordCount(params);
-
- QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize;
- rsVo.pageCurr = queryVo.pageCurr;
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = prIntakeMapper.getIntakes(params);
- return rsVo;
- } else {
- QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>();
- return rsVo;
- }
+ QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = prIntakeMapper.getIntakes(params);
+ return rsVo;
}
/**
@@ -249,11 +219,12 @@
}
/**
+ * 姝ゅ姛鑳藉凡缍撶Щ妞嶅埌remote妯″鐨凪onitroSv涓�
+ *
* 鑾峰彇鍙栨按鍙ｅ垪琛�
*
* @return
- */
- public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) {
+ public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) {
Command com = new Command();
com.id = Command.defaultId;
com.code = "LCD0001";
@@ -287,8 +258,8 @@
QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
return rsVo;
}
- }
-
+ }
+ */
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
*
@@ -301,17 +272,26 @@
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");
- HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
+ //JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
JSONArray jsonArray = new JSONArray();
- 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);
+ 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 {
--
Gitblit v1.8.0