From f0587cf7a0e902cd3f1ae7bd34ee77484376808a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 03 六月 2024 11:11:43 +0800
Subject: [PATCH] 2024-06-03 朱宝民 解决营销模块报PrControllerMapper不能注入的问题
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 cf75af5..ee47423 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,13 +5,16 @@
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.VoUnclosedValve;
+import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
import com.dy.pipIrrRemote.common.qo.OnLineIntakesQO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -35,17 +38,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();
}
/**
@@ -53,9 +65,9 @@
* @param po 鍛戒护鏃ュ織瀵硅薄
* @return 瀛楃涓茬被鍨嬬殑涓婚敭
*/
- public String insert(RmCommandHistory po) {
+ public Long insert(RmCommandHistory po) {
rmCommandHistoryMapper.insert(po);
- return (po.getId()).toString();
+ return po.getId();
}
/**
@@ -161,6 +173,7 @@
jsonArray.add(jsonObject);
}
+ System.out.println(jsonArray);
List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), operator);
if(res != null) {
return res;
@@ -173,4 +186,21 @@
}
}
+ /**
+ * 淇敼鍛戒护鏃ュ織璁板綍锛屽洖璋冩姤閿欐椂灏嗗懡浠よ褰曠殑鎵ц缁撴灉鏀逛负澶辫触
+ * @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);
+ }
}
--
Gitblit v1.8.0