From b1dc9988b9587add132a01faa6bc09e162fe1491 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 七月 2024 21:39:38 +0800
Subject: [PATCH] 1、开关阀报中增加农户关联； 2、工作报中增加农户关联； 3、取水口损失流量完善； 4、实现取水日取水量统计。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 273 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 233 insertions(+), 40 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 6def3c1..a83efff 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
@@ -1,18 +1,25 @@
package com.dy.rtuMw.server.rtuData.dbSv;
+import com.dy.common.util.NumUtil;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pipIrrGlobal.daoBa.BaClientMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
import com.dy.pipIrrGlobal.daoRm.*;
+import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.pipIrrGlobal.pojoRm.*;
+import com.dy.pipIrrGlobal.pojoSe.SeClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Author liurunyu
@@ -23,6 +30,10 @@
@Service()
public class DbSv {
@Autowired
+ private SeClientCardMapper seClientCardMapperDao;//鍐滄埛姘村崱DAO
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardMapper;//鍐滄埛铏氭嫙姘村崱DAO
+ @Autowired
private PrControllerTrampMapper prControllerTrampMapperDao;//娴佹氮鎺у埗鍣―AO
@Autowired
private PrControllerMapper prControllerMapperDao ;//鎺у埗鍣―AO
@@ -30,10 +41,6 @@
private RmAlarmStateLastMapper rmAlarmStateLastMapperDao ;//鎺у埗鍣ㄦ渶鏂版姤璀﹀拰鐘舵�丏AO
@Autowired
private RmAlarmStateHistoryMapper rmAlarmStateHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙叉姤璀﹀拰鐘舵�丏AO
- @Autowired
- private RmAutoReportLastMapper rmAutoReportLastMapperDao ;//鎺у埗鍣ㄦ渶鏂颁笂鎶ユ暟鎹瓺AO
- @Autowired
- private RmAutoReportHistoryMapper rmAutoReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙蹭笂鎶ユ暟鎹瓺AO
@Autowired
private RmOpenCloseValveLastMapper rmOpenCloseValveLastMapperDao ;//鎺у埗鍣ㄦ渶鏂板紑鍏抽榾涓婃姤鏁版嵁DAO
@Autowired
@@ -43,6 +50,10 @@
@Autowired
private RmWorkReportHistoryMapper rmWorkReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插伐浣滄姤鏁版嵁DAO
@Autowired
+ private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapperDao ;//鍙栨按鍙ｅ彇姘村拰婕忔崯缁熻鏈�鏂版暟鎹瓺AO
+ @Autowired
+ private RmIntakeAmountDayMapper rmIntakeAmountDayMapperDao ;//鍙栨按鍙ｅ彇姘村拰婕忔崯缁熻DAO
+ @Autowired
private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
@Autowired
private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
@@ -50,6 +61,16 @@
private RmCommandHistoryMapper rmCommandHistoryDao ;//杩滅▼鍛戒护鏃ュ織鐩稿叧
@Autowired
private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏�
+
+ @Autowired
+ private RmTimingReportHistoryMapper rmTimingReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
+ @Autowired
+ private RmTimingReportLastMapper rmTimingReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
+
+ @Autowired
+ private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 鏁寸偣涓婃姤鍘嗗彶鏁版嵁DAO
+ @Autowired
+ private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
//@Autowired
//@Lazy
@@ -60,6 +81,46 @@
// 鍩虹鍔熻兘
//
////////////////////////////////////////////////
+
+ /**
+ * 閫氳繃鐗╃悊IC鍦板潃鍙婂崱鍙峰緱鍒板啘鎴穒d鍜屽鍚�
+ * @param icCardAddr
+ * @param icCardNo
+ * @return
+ */
+ public SeClient getClientIdAndNameByCardAddrAndCardNo(String icCardAddr, String icCardNo){
+ SeClient vo = null ;
+ if(NumUtil.isPlusIntNumber(icCardNo)){
+ Long icCardNoLong = Long.parseLong(icCardNo) ;
+ Map<String, Object> map = seClientCardMapperDao.getClientIdAndNameByCardAddrAndCardNo(icCardAddr, icCardNoLong) ;
+ if(map != null && map.size() > 0) {
+ vo = new SeClient() ;
+ vo.setId(Long.parseLong(map.get("clientId").toString()));
+ vo.setName(map.get("clientName").toString());
+ }
+ }
+ return vo ;
+ }
+ /**
+ * 閫氳繃铏氭嫙IC鍗″彿寰楀埌鍐滄埛id鍜屽鍚�
+ * @param icCardNo
+ * @return
+ */
+ public SeClient getClientIdAndNameByVsCardNo(String icCardNo){
+ SeClient vo = null ;
+ if(NumUtil.isPlusIntNumber(icCardNo)){
+ Long icCardNoLong = Long.parseLong(icCardNo) ;
+ Map<String, Object> map = seVirtualCardMapper.getClientIdAndNameByVsCardNo(icCardNoLong) ;
+ if(map != null && map.size() > 0) {
+ vo = new SeClient() ;
+ vo.setId(Long.parseLong(map.get("clientId").toString()));
+ vo.setName(map.get("clientName").toString());
+ }
+ }
+ return vo ;
+ }
+
+
/**
* 閫氳繃鎺у埗鍣ㄥ湴鍧�浠庢暟鎹簱琛ㄤ腑鏌ヨ鎺у埗鍣�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
@@ -98,7 +159,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updatePrConctrollerTramp(PrControllerTramp po){
- this.prControllerTrampMapperDao.updateByPrimaryKeySelective(po) ;
+ this.prControllerTrampMapperDao.updateByPrimaryKey(po) ;
}
@@ -109,11 +170,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) ;
}
@@ -133,7 +194,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmAlarmStateLast(RmAlarmStateLast po){
- this.rmAlarmStateLastMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmAlarmStateLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 淇濆瓨鎺у埗鍣ㄦ姤璀︿笌鐘舵�佸巻鍙茶褰�
@@ -156,48 +217,97 @@
/////////////////////////////////////////////////
//
- // 涓诲姩涓婃姤鏁版嵁鍔熻兘
+ // 瀹氱偣鎶ユ暟鎹姛鑳�(鍙湪鐜嬫睙娴风殑鍗忚鏈夋鏁版嵁)
//
////////////////////////////////////////////////
+
/**
- * 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param rtuAddr
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ュ巻鍙叉暟鎹�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmTimingReportHistory(RmTimingReportHistory po){
+ this.rmTimingReportHistoryDao.insert(po);
+ }
+
+ /**
+ * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
+ * @param intakeId
* @return
*/
- public RmAutoReportLast getRmAutoReportLast(String rtuAddr){
- List<RmAutoReportLast> list = rmAutoReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ @Transactional(rollbackFor = Exception.class)
+ public RmTimingReportLast getRmTimingReportLast(Long intakeId) {
+ List<RmTimingReportLast> list = this.rmTimingReportLastDao.getRmTimingReportLast(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
return null ;
}
+
/**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ユ渶鏂版暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmAutoReportLast(RmAutoReportLast po){
- this.rmAutoReportLastMapperDao.insert(po) ;
+ public void saveRmTimingReportLast(RmTimingReportLast po) {
+ this.rmTimingReportLastDao.insert(po);
}
+
/**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ョ姜琛屾暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmAutoReportLast(RmAutoReportLast po){
- this.rmAutoReportLastMapperDao.updateByPrimaryKeySelective(po) ;
+ public void updateRmTimingReportLast(RmTimingReportLast po) {
+ this.rmTimingReportLastDao.updateByPrimaryKey(po);
}
+
+ /////////////////////////////////////////////////
+ //
+ // 鏁寸偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
+ //
+ ////////////////////////////////////////////////
+
/**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
+ * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ュ巻鍙叉暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmAutoReportHistory(RmAutoReportHistory po){
- this.rmAutoReportHistoryMapperDao.insert(po) ;
+ public void saveRmOnHourReportHistory(RmOnHourReportHistory po){
+ this.rmOnHourReportHistoryDao.insert(po);
}
+ /**
+ * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
+ * @param intakeId
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public RmOnHourReportLast getRmOnHourReportLast(Long intakeId) {
+ List<RmOnHourReportLast> list = this.rmOnHourReportLastDao.getRmOnHourReportLast(intakeId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ユ渶鏂版暟鎹�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmOnHourReportLast(RmOnHourReportLast po) {
+ this.rmOnHourReportLastDao.insert(po);
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ョ姜琛屾暟鎹�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmOnHourReportLast(RmOnHourReportLast po) {
+ this.rmOnHourReportLastDao.updateByPrimaryKey(po);
+ }
/////////////////////////////////////////////////
//
@@ -206,11 +316,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) ;
}
@@ -230,7 +340,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmOpenCloseValveLast(RmOpenCloseValveLast po){
- this.rmOpenCloseValveLastMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmOpenCloseValveLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶鏁版嵁涓殑鏈�鏂拌褰�
@@ -256,10 +366,8 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmOpenCloseValveHistory(RmOpenCloseValveHistory po){
- this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKey(po) ;
}
-
-
/////////////////////////////////////////////////
//
@@ -268,11 +376,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) ;
}
@@ -292,7 +400,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmWorkReportLast(RmWorkReportLast po){
- this.rmWorkReportLastMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmWorkReportLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
@@ -303,6 +411,91 @@
this.rmWorkReportHistoryMapperDao.insert(po) ;
}
+ /////////////////////////////////////////////////
+ //
+ // 鍙栨按鍙ｆ棩鍙栨按閲忕粺璁″姛鑳�
+ //
+ ////////////////////////////////////////////////
+ /**
+ * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * @param intakeId
+ * @return
+ */
+ public RmIntakeAmountDayLast getRmIntakeAmountLast(Long intakeId){
+ List<RmIntakeAmountDayLast> list = rmIntakeAmountDayLastMapperDao.selectByIntakeId(intakeId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmIntakeAmountLast(RmIntakeAmountDayLast po){
+ this.rmIntakeAmountDayLastMapperDao.insert(po) ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmIntakeAmountDay(RmIntakeAmountDay po){
+ this.rmIntakeAmountDayMapperDao.insert(po) ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmIntakeAmountLast(RmIntakeAmountDay po){
+ this.rmIntakeAmountDayMapperDao.updateByPrimaryKey(po) ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmIntakeAmountDay(RmIntakeAmountDay po){
+ this.rmIntakeAmountDayMapperDao.updateByPrimaryKey(po) ;
+ }
+
+ /**
+ * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬渶鏂拌褰�
+ * @param id
+ * @return
+ */
+ public RmIntakeAmountDay getRmIntakeAmountDay(Long id){
+ return rmIntakeAmountDayMapperDao.selectByPrimaryKey(id) ;
+ }
+
+
+ /**
+ * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * @param dt
+ * @return
+ */
+ public RmIntakeAmountDay getRmIntakeAmountLastByDate(Date dt){
+ List<RmIntakeAmountDay> list = rmIntakeAmountDayMapperDao.selectByDate(dt) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+
+ /**
+ * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬煇鏃ヨ褰�
+ * @param dt
+ * @return
+ */
+ public RmIntakeAmountDay getRmIntakeAmountDayByDate(Date dt){
+ List<RmIntakeAmountDay> list = rmIntakeAmountDayMapperDao.selectByDate(dt) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
/////////////////////////////////////////////////
//
@@ -311,11 +504,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) ;
}
@@ -343,7 +536,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmLossLast(RmLossLast po){
- this.rmLossLastMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmLossLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
@@ -351,7 +544,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmLossHistory(RmLossHistory po){
- this.rmLossHistoryMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmLossHistoryMapperDao.updateByPrimaryKey(po) ;
}
/**
@@ -399,7 +592,7 @@
return rmCommandHistoryDao.selectByPrimaryKey(Long.parseLong(commandId)) ;
}
public void updateCommandLog(RmCommandHistory po){
- rmCommandHistoryDao.updateByPrimaryKeySelective(po) ;
+ rmCommandHistoryDao.updateByPrimaryKey(po) ;
}
--
Gitblit v1.8.0