From 86719a90118b4b458ae593b53457f23c11ee8d44 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 七月 2024 15:27:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 312 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 228 insertions(+), 84 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..97bada3 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,22 @@
package com.dy.rtuMw.server.rtuData.dbSv;
+import com.dy.common.util.NumUtil;
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.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
@@ -22,6 +26,10 @@
*/
@Service()
public class DbSv {
+ @Autowired
+ private SeClientCardMapper seClientCardMapperDao;//鍐滄埛姘村崱DAO
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardMapper;//鍐滄埛铏氭嫙姘村崱DAO
@Autowired
private PrControllerTrampMapper prControllerTrampMapperDao;//娴佹氮鎺у埗鍣―AO
@Autowired
@@ -39,9 +47,17 @@
@Autowired
private RmWorkReportHistoryMapper rmWorkReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插伐浣滄姤鏁版嵁DAO
@Autowired
- private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
+ private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapperDao ;//鍙栨按鍙ｅ彇姘寸粺璁℃渶鏂版暟鎹瓺AO
@Autowired
- private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
+ private RmIntakeAmountDayMapper rmIntakeAmountDayMapperDao ;//鍙栨按鍙ｅ彇姘村拰婕忔崯缁熻DAO
+ @Autowired
+ private RmClientAmountDayLastMapper rmClientAmountDayLastMapperDao ;//鍐滄埛鏃ョ敤姘撮噺缁熻鏈�鏂版暟鎹瓺AO
+ @Autowired
+ private RmClientAmountDayMapper rmClientAmountDayMapperDao ;//鍐滄埛鏃ョ敤姘撮噺缁熻鏁版嵁DAO
+ @Autowired
+ private RmLossDayLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
+ @Autowired
+ private RmLossDayMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
@Autowired
private RmCommandHistoryMapper rmCommandHistoryDao ;//杩滅▼鍛戒护鏃ュ織鐩稿叧
@Autowired
@@ -57,11 +73,6 @@
@Autowired
private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
- @Autowired
- private RmOpenCloseHistoryMapper rmOpenCloseHistoryDao;
- @Autowired
- private RmOpenCloseLastMapper rmOpenCloseLastDao;
-
//@Autowired
//@Lazy
//private DbSv sv ;
@@ -71,6 +82,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 鎺у埗鍣ㄥ湴鍧�
@@ -109,7 +160,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updatePrConctrollerTramp(PrControllerTramp po){
- this.prControllerTrampMapperDao.updateByPrimaryKeySelective(po) ;
+ this.prControllerTrampMapperDao.updateByPrimaryKey(po) ;
}
@@ -120,11 +171,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) ;
}
@@ -144,7 +195,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmAlarmStateLast(RmAlarmStateLast po){
- this.rmAlarmStateLastMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmAlarmStateLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 淇濆瓨鎺у埗鍣ㄦ姤璀︿笌鐘舵�佸巻鍙茶褰�
@@ -182,12 +233,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) ;
}
@@ -209,7 +260,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmTimingReportLast(RmTimingReportLast po) {
- this.rmTimingReportLastDao.updateByPrimaryKeySelective(po);
+ this.rmTimingReportLastDao.updateByPrimaryKey(po);
}
/////////////////////////////////////////////////
@@ -229,12 +280,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) ;
}
@@ -256,7 +307,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmOnHourReportLast(RmOnHourReportLast po) {
- this.rmOnHourReportLastDao.updateByPrimaryKeySelective(po);
+ this.rmOnHourReportLastDao.updateByPrimaryKey(po);
}
/////////////////////////////////////////////////
@@ -266,11 +317,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) ;
}
@@ -290,7 +341,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmOpenCloseValveLast(RmOpenCloseValveLast po){
- this.rmOpenCloseValveLastMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmOpenCloseValveLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶鏁版嵁涓殑鏈�鏂拌褰�
@@ -316,47 +367,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmOpenCloseValveHistory(RmOpenCloseValveHistory po){
- 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);
+ this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKey(po) ;
}
/////////////////////////////////////////////////
@@ -366,11 +377,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) ;
}
@@ -390,7 +401,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void updateRmWorkReportLast(RmWorkReportLast po){
- this.rmWorkReportLastMapperDao.updateByPrimaryKeySelective(po) ;
+ this.rmWorkReportLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
@@ -401,6 +412,139 @@
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(RmIntakeAmountDayLast po){
+ this.rmIntakeAmountDayLastMapperDao.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 clientId
+ * @return
+ */
+ public RmClientAmountDayLast getRmClientAmountLast(Long clientId){
+ List<RmClientAmountDayLast> list = rmClientAmountDayLastMapperDao.selectByClientId(clientId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmClientAmountLast(RmClientAmountDayLast po){
+ this.rmClientAmountDayLastMapperDao.insert(po) ;
+ }
+ /**
+ * 淇濆瓨璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmClientAmountDay(RmClientAmountDay po){
+ this.rmClientAmountDayMapperDao.insert(po) ;
+ }
+ /**
+ * 鏇存柊鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmClientAmountLast(RmClientAmountDayLast po){
+ this.rmClientAmountDayLastMapperDao.updateByPrimaryKey(po) ;
+ }
+ /**
+ * 鏇存柊璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmClientAmountDay(RmClientAmountDay po){
+ this.rmClientAmountDayMapperDao.updateByPrimaryKey(po) ;
+ }
+
+ /**
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
+ * @param id
+ * @return
+ */
+ public RmClientAmountDay getRmClientAmountDay(Long id){
+ return rmClientAmountDayMapperDao.selectByPrimaryKey(id) ;
+ }
+
+
+ /**
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
+ * @param clientId
+ * @param dt
+ * @return
+ */
+ public RmClientAmountDay getRmClientAmountByClientAndDate(Long clientId, Date dt){
+ List<RmClientAmountDay> list = rmClientAmountDayMapperDao.selectByClientAndDate(clientId, dt) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+
/////////////////////////////////////////////////
//
@@ -409,11 +553,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmLossLast getRmLossLast(String rtuAddr){
- List<RmLossLast> list = rmLossLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmLossDayLast getRmLossLast(Long intakeId){
+ List<RmLossDayLast> list = rmLossLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -424,7 +568,7 @@
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmLossLast(RmLossLast po){
+ public void saveRmLossLast(RmLossDayLast po){
this.rmLossLastMapperDao.insert(po) ;
}
/**
@@ -432,7 +576,7 @@
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmLossHistory(RmLossHistory po){
+ public void saveRmLossHistory(RmLossDay po){
this.rmLossHistoryMapperDao.insert(po) ;
}
/**
@@ -440,16 +584,16 @@
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmLossLast(RmLossLast po){
- this.rmLossLastMapperDao.updateByPrimaryKeySelective(po) ;
+ public void updateRmLossLast(RmLossDayLast po){
+ this.rmLossLastMapperDao.updateByPrimaryKey(po) ;
}
/**
* 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmLossHistory(RmLossHistory po){
- this.rmLossHistoryMapperDao.updateByPrimaryKeySelective(po) ;
+ public void updateRmLossHistory(RmLossDay po){
+ this.rmLossHistoryMapperDao.updateByPrimaryKey(po) ;
}
/**
@@ -457,7 +601,7 @@
* @param id
* @return
*/
- public RmLossHistory getRmLossHistory(Long id){
+ public RmLossDay getRmLossHistory(Long id){
return rmLossHistoryMapperDao.selectByPrimaryKey(id) ;
}
@@ -467,8 +611,8 @@
* @param dt
* @return
*/
- public RmLossLast getRmLossLastByDate(Date dt){
- List<RmLossLast> list = rmLossLastMapperDao.selectByDate(dt) ;
+ public RmLossDayLast getRmLossLastByDate(Date dt){
+ List<RmLossDayLast> list = rmLossLastMapperDao.selectByDate(dt) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -480,8 +624,8 @@
* @param dt
* @return
*/
- public RmLossHistory getRmLossHistoryByDate(Date dt){
- List<RmLossHistory> list = rmLossHistoryMapperDao.selectByDate(dt) ;
+ public RmLossDay getRmLossHistoryByDate(Date dt){
+ List<RmLossDay> list = rmLossHistoryMapperDao.selectByDate(dt) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -497,7 +641,7 @@
return rmCommandHistoryDao.selectByPrimaryKey(Long.parseLong(commandId)) ;
}
public void updateCommandLog(RmCommandHistory po){
- rmCommandHistoryDao.updateByPrimaryKeySelective(po) ;
+ rmCommandHistoryDao.updateByPrimaryKey(po) ;
}
--
Gitblit v1.8.0