From fdecbc710888e8f048f08ec16428f192b8251dfe Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 08 七月 2024 11:30:54 +0800
Subject: [PATCH] 2024-07-08 朱宝民 优化根据指定条件获取水卡列表接口
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 81 +++++++++-------------------------------
1 files changed, 18 insertions(+), 63 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index 773046e..b3dc1df 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -57,11 +57,6 @@
@Autowired
private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
- @Autowired
- private RmOpenCloseHistoryMapper rmOpenCloseHistoryDao;
- @Autowired
- private RmOpenCloseLastMapper rmOpenCloseLastDao;
-
//@Autowired
//@Lazy
//private DbSv sv ;
@@ -120,11 +115,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹渶鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmAlarmStateLast getRmAlarmStateLast(String rtuAddr){
- List<RmAlarmStateLast> list = rmAlarmStateLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmAlarmStateLast getRmAlarmStateLast(Long intakeId){
+ List<RmAlarmStateLast> list = rmAlarmStateLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -182,12 +177,12 @@
/**
* 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public RmTimingReportLast getRmTimingReportLast(String rtuAddr) {
- List<RmTimingReportLast> list = this.rmTimingReportLastDao.getRmTimingReportLast(rtuAddr) ;
+ public RmTimingReportLast getRmTimingReportLast(Long intakeId) {
+ List<RmTimingReportLast> list = this.rmTimingReportLastDao.getRmTimingReportLast(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -229,12 +224,12 @@
/**
* 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public RmOnHourReportLast getRmOnHourReportLast(String rtuAddr) {
- List<RmOnHourReportLast> list = this.rmOnHourReportLastDao.getRmOnHourReportLast(rtuAddr) ;
+ public RmOnHourReportLast getRmOnHourReportLast(Long intakeId) {
+ List<RmOnHourReportLast> list = this.rmOnHourReportLastDao.getRmOnHourReportLast(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -266,11 +261,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmOpenCloseValveLast getRmOpenCloseValveLast(String rtuAddr){
- List<RmOpenCloseValveLast> list = rmOpenCloseValveLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmOpenCloseValveLast getRmOpenCloseValveLast(Long intakeId){
+ List<RmOpenCloseValveLast> list = rmOpenCloseValveLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -319,46 +314,6 @@
this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
}
- /**
- * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveRmOpenCloseLast(RmOpenCloseLast po){
- this.rmOpenCloseLastDao.insert(po) ;
- }
-
- /**
- * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶璁板綍(202404)
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveRmOpenCloseHistory(RmOpenCloseHistory po){
- this.rmOpenCloseHistoryDao.insert(po) ;
- }
-
- /**
- * 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
- * @param rtuAddr
- * @return
- */
- public RmOpenCloseLast getRmOpenCloseLast(String rtuAddr){
- List<RmOpenCloseLast> list = rmOpenCloseLastDao.getRmOpenCloseReportLast(rtuAddr);
- if(list != null && list.size() > 0){
- return list.get(0) ;
- }
- return null ;
- }
-
- /**
- * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void updateRmOpenCloseLast(RmOpenCloseLast po){
- this.rmOpenCloseLastDao.updateByPrimaryKeySelective(po);
- }
-
/////////////////////////////////////////////////
//
// 宸ヤ綔鎶ユ暟鎹姛鑳�
@@ -366,11 +321,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmWorkReportLast getRmWorkReportLast(String rtuAddr){
- List<RmWorkReportLast> list = rmWorkReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmWorkReportLast getRmWorkReportLast(Long intakeId){
+ List<RmWorkReportLast> list = rmWorkReportLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -409,11 +364,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmLossLast getRmLossLast(String rtuAddr){
- List<RmLossLast> list = rmLossLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmLossLast getRmLossLast(Long intakeId){
+ List<RmLossLast> list = rmLossLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
--
Gitblit v1.8.0