From 26d63d120e517624be6fcf70ae9620c3582a91dd Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 17:35:06 +0800
Subject: [PATCH] 2024-06-18 朱宝民 优化开关阀逻辑
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java | 116 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 32 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 7482f9d..602291e 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
@@ -5,19 +5,22 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.Command;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
+import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeVcMapper;
+import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+import com.dy.pipIrrGlobal.voRm.VoUnclosedParam;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
-import com.dy.pipIrrRemote.common.qo.OnLineIntakesQO;
+import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -34,17 +37,26 @@
@RequiredArgsConstructor
public class CommandSv extends ComSupport {
private final RmCommandHistoryMapper rmCommandHistoryMapper;
- private final PrControllerMapper prControllerMapper;
private final SeVirtualCardMapper seVirtualCardMapper;
private final PrIntakeMapper prIntakeMapper;
+ private final PrWaterPriceMapper prWaterPriceMapper;
+ private final PrIntakeVcMapper prIntakeVcMapper;
/**
- * 鏍规嵁鍙栨按鍙D鑾峰彇闃�鎺у櫒鍦板潃
- * @param intakeId 鍙栨按鍙D
- * @return 闃�鎺у櫒鍦板潃
+ * 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ * @param vcId
+ * @return
*/
- public String getRtuAddrByIntakeId(Long intakeId) {
- return prControllerMapper.getRtuAddrByIntakeId(intakeId);
+ public VoVirtualCard getVcById(Long vcId) {
+ return seVirtualCardMapper.getVcById(vcId);
+ }
+
+ /**
+ * 鑾峰彇姘翠环
+ * @return
+ */
+ public Double getPrice() {
+ return prWaterPriceMapper.getPrice();
}
/**
@@ -52,9 +64,9 @@
* @param po 鍛戒护鏃ュ織瀵硅薄
* @return 瀛楃涓茬被鍨嬬殑涓婚敭
*/
- public String insert(RmCommandHistory po) {
+ public Long insert(RmCommandHistory po) {
rmCommandHistoryMapper.insert(po);
- return (po.getId()).toString();
+ return po.getId();
}
/**
@@ -66,21 +78,12 @@
return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
}
-
/**
- * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍
+ * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級
* @param operator
* @return
*/
public List<VoUnclosedValve> getUnclosedValves(Long operator) {
- return rmCommandHistoryMapper.getUnclosedValves(operator);
- }
-
- /**
- * 鑾峰彇鍙栨按鍙ｅ垪琛�
- * @return
- */
- public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) {
Command com = new Command() ;
com.id = Command.defaultId;
com.code = "LCD0001";
@@ -100,20 +103,69 @@
jsonArray.add(jsonObject);
}
- qo.setOnLineMap(jsonArray.toJSONString());
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
- Long itemTotal = prIntakeMapper.getOnLineIntakesCount(params);
-
- QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = qo.pageSize ;
- rsVo.pageCurr = qo.pageCurr ;
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = prIntakeMapper.getOnLineIntakes(params);
- return rsVo;
+ System.out.println(jsonArray);
+ List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), operator);
+ if(res != null) {
+ return res;
+ } else {
+ return new ArrayList<>();
+ }
} else {
QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
- return rsVo;
+ return new ArrayList<>();
}
}
+ /**
+ * 淇敼鍛戒护鏃ュ織璁板綍锛屽洖璋冩姤閿欐椂灏嗗懡浠よ褰曠殑鎵ц缁撴灉鏀逛负澶辫触
+ * @param po
+ * @return
+ */
+ public Integer updateCommandResult(RmCommandHistory po) {
+ return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 鏍规嵁鍙栨按鍙D鑾峰彇涓庝箣缁戝畾铏氭嫙鍗D
+ * @param intakeId
+ * @return
+ */
+ public Long getVcIdByIntakeId(Long intakeId) {
+ return prIntakeVcMapper.getVcIdByIntakeId(intakeId);
+ }
+
+ /**
+ * 鏍规嵁鍙栨按鍙D鑾峰彇璇ュ彇姘村彛鏈叧闃�鍙傛暟锛屽钩鍙伴�夋嫨鍙栨按鍙ｅ叧闃�浣跨敤
+ * @param intakeId
+ * @return
+ */
+ public VoUnclosedParam getUncloseParam(Long intakeId) {
+ Command com = new Command() ;
+ com.id = Command.defaultId;
+ 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);
+
+ 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);
+ }
+
+ System.out.println(jsonArray);
+ return rmCommandHistoryMapper.getUncloseParam(jsonArray.toJSONString(), intakeId);
+ } else {
+ QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
+ VoUnclosedParam voUnclosedParam = new VoUnclosedParam();
+ return voUnclosedParam;
+ }
+
+ }
}
--
Gitblit v1.8.0