From 9c32918e2d2db0dcc8b3a3af2be72831252019d9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 08 二月 2025 09:28:02 +0800
Subject: [PATCH] 涉嫌偷水功能完善代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java | 91 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
index 8c07568..be352d7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -16,8 +16,8 @@
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voRm.VoCommand;
+import com.dy.pipIrrGlobal.voRm.VoRtuAndVc;
import com.dy.pipIrrGlobal.voRm.VoUnclosedParam;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
@@ -30,7 +30,6 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -120,31 +119,45 @@
com.code = "LCD0001";
com.type = "innerCommand";
comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
-
JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+
+ JSONArray jsonArray = new JSONArray();
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);
-
- 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);
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
+ if(attachment != null) {
+ attachment.forEach((key, value) -> {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("rtuAddr", key);
+ jsonObject.put("isOnLine", value);
+ jsonArray.add(jsonObject);
+ });
}
+ //System.out.println(jsonArray);
+ }
- System.out.println(jsonArray);
- List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), operator);
+ /**
+ * 鑾峰彇鏈叧闃�鐨凴TU鍦板潃鍜岃櫄鎷熷崱缂栧彿瀵规暟缁�
+ * 閬嶅巻鏁扮粍鑾峰彇鏈�鍚庡懡浠ゆ棩蹇桰D闆嗗悎
+ */
+ List<VoRtuAndVc> rtus = rmCommandHistoryMapper.getUnclosedRtus(operator);
+ String comIds = "";
+ if(rtus != null && rtus.size() > 0) {
+ for (int i = 0; i < rtus.size(); i++) {
+ Long comId = rmCommandHistoryMapper.getLastComId(rtus.get(i).getRtuAddr(), rtus.get(i).getVcNum());
+ if(comId > 0) {
+ comIds = comIds + "\"" + comId + "\",";
+ }
+ }
+ }
+
+ if(comIds.length() > 0) {
+ comIds = comIds.substring(0, comIds.length()-1);
+ List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), comIds);
if(res != null) {
return res;
- } else {
- return new ArrayList<>();
}
- } else {
- QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
- return new ArrayList<>();
}
+ return new ArrayList<>();
}
/**
@@ -188,25 +201,24 @@
comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
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);
- 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);
+ JSONArray jsonArray = new JSONArray();
+ if(response != null && response.getString("code").equals("0001")) {
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
+ if(attachment != null) {
+ attachment.forEach((key, value) -> {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("rtuAddr", key);
+ jsonObject.put("isOnLine", value);
+ jsonArray.add(jsonObject);
+ });
}
System.out.println(jsonArray);
- return rmCommandHistoryMapper.getUncloseParam(jsonArray.toJSONString(), intakeId);
- } else {
- QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
- VoUnclosedParam voUnclosedParam = new VoUnclosedParam();
- return voUnclosedParam;
+ //} else {
+ // VoUnclosedParam voUnclosedParam = new VoUnclosedParam();
+ // return voUnclosedParam;
}
-
+ return rmCommandHistoryMapper.getUncloseParam(jsonArray.toJSONString(), intakeId);
}
/**
@@ -225,16 +237,7 @@
*/
public QueryResultVo<List<VoCommand>> getCommandHistories(QoCommand query) {
// 瀹屽杽鏌ヨ璧锋鏃堕棿
- String timeStart = query.getTimeStart();
- String timeStop = query.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- query.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- query.setTimeStop(timeStop);
- }
+ query.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(query);
--
Gitblit v1.8.0