From 9308557e9616507c6046fadeab6e754af81a8fa2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:35:01 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java | 27 +--------------------------
1 files changed, 1 insertions(+), 26 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 dd734a3..9cbb39f 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
@@ -122,18 +122,10 @@
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();
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);
@@ -198,18 +190,10 @@
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();
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);
@@ -244,16 +228,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