From 007bb91e70a5129304de1837f60161c6f5f3ad4f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 10:25:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index 17081dc..54646cf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -11,9 +11,11 @@
import com.dy.pipIrrGlobal.command.enums.LastOperateENUM;
import com.dy.pipIrrGlobal.command.result.CommandResultCode;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
+import com.dy.pipIrrGlobal.daoPr.PrCommonIntakesMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoPr.PrCommonIntakes;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
@@ -78,6 +80,9 @@
@Autowired
private SeVirtualCardMapper seVirtualCardMapper;
+
+ @Autowired
+ private PrCommonIntakesMapper prCommonIntakesMapper;
public static ComSupport comSupport;
@@ -249,6 +254,10 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ if(response == null) {
+ return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�");
+ }
return response.getBody();
}
@@ -278,6 +287,9 @@
RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
rmCommandHistoryMapper.insert(rmCommandHistory);
comId = rmCommandHistory.getComId();
+
+ // 娣诲姞甯哥敤鍙栨按鍙ｆ垨鏇存柊浣跨敤淇℃伅
+ addCommonIntake(operator, intakeId);
/**
* 澶勭悊鍥炶皟
@@ -357,4 +369,25 @@
return response_CallBack;
}
+
+ /**
+ * 娣诲姞甯哥敤鍙栨按鍙ｆ垨鏇存柊浣跨敤淇℃伅
+ * @param intakeId
+ * @return
+ */
+ public Integer addCommonIntake(Long operatorId, Long intakeId) {
+ PrCommonIntakes commonIntake = prCommonIntakesMapper.selectByOperatorAndIntake(operatorId, intakeId);
+ if(commonIntake == null) {
+ commonIntake = new PrCommonIntakes();
+ commonIntake.setOperatorId(operatorId);
+ commonIntake.setIntakeId(intakeId);
+ commonIntake.setLastUsedTime(new Date());
+ commonIntake.setUsageCount(1);
+ return prCommonIntakesMapper.insert(commonIntake);
+ }
+
+ commonIntake.setLastUsedTime(new Date());
+ commonIntake.setUsageCount(commonIntake.getUsageCount() + 1);
+ return prCommonIntakesMapper.updateByPrimaryKeySelective(commonIntake);
+ }
}
--
Gitblit v1.8.0