From d2fc819dc069c7b8d338ae52a90a7f38704fac08 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 226 insertions(+), 4 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 b2a6a43..a07d3ea 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,13 +1,11 @@
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.daoPr.*;
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.pojoPr.*;
import com.dy.pipIrrGlobal.pojoRm.*;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoCardInfo1;
@@ -71,6 +69,27 @@
private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
@Autowired
private RmOnHourReportLastMapper rmOnHourReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
+
+ @Autowired
+ private PrStManureMapper prStManureDao; //姘磋偉鏈篋AO
+ @Autowired
+ private PrStSoilMapper prStSoilDao; //澧掓儏绔橠AO
+ @Autowired
+ private PrStWeatherMapper prStWeatherDao; //姘旇薄绔橠AO
+ @Autowired
+ private RmManureLastMapper rmManureLastDao; //姘磋偉DAO
+ @Autowired
+ private RmManureHistoryMapper rmManureHistoryDao; //姘磋偉DAO
+ @Autowired
+ private RmSoilLastMapper rmSoilLastDao; //澧掓儏DAO
+ @Autowired
+ private RmSoilHistoryMapper rmSoilHistoryDao; //澧掓儏DAO
+ @Autowired
+ private RmSoilDayMapper rmSoilDayDao; //澧掓儏DAO
+ @Autowired
+ private RmWeatherLastMapper rmWeatherLastDao; //姘旇薄DAO
+ @Autowired
+ private RmWeatherHistoryMapper rmWeatherHistoryDao; //姘旇薄DAO
//@Autowired
@@ -694,6 +713,209 @@
seVirtualCardDao.updateMoney(id,remainMoney);
}
+
+ //////////////////////////////////////////////////////
+ //
+ // 姘磋偉鏁版嵁鐩稿叧
+ //
+ //////////////////////////////////////////////////////
+ /**
+ * 閫氳繃FBox搴忓垪鍙峰緱鍒版按鑲ユ満瀹炰綋
+ * @param fboxId FBox搴忓垪鍙�
+ * @param no 缂栧彿
+ * @return 姘磋偉鏈哄疄浣�
+ */
+ public PrStManure getStManureByFBoxIdAndNo(String fboxId, Integer no){
+ List<PrStManure> list = this.prStManureDao.selectStPoByFBoxIdAndNo(fboxId, no) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 鏌ヨ涓婃姤鏈�鏂版暟鎹�
+ * @param stManureId
+ * @return
+ */
+ public RmManureLast getRmManureLast(Long stManureId) {
+ List<RmManureLast> list = this.rmManureLastDao.selectRmManureLast(stManureId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmManureHistory(RmManureHistory po) {
+ this.rmManureHistoryDao.insert(po);
+ }
+
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmManureLast(RmManureLast po) {
+ this.rmManureLastDao.insert(po);
+ }
+ /**
+ * 鏇存柊鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmManureLast(RmManureLast po){
+ this.rmManureLastDao.updateByPrimaryKey(po) ;
+ }
+
+
+ //////////////////////////////////////////////////////
+ //
+ // 澧掓儏鏁版嵁鐩稿叧
+ //
+ //////////////////////////////////////////////////////
+ /**
+ * 閫氳繃FBox搴忓垪鍙峰緱鍒板鎯呯珯瀹炰綋
+ * @param fboxId FBox搴忓垪鍙�
+ * @param no 缂栧彿
+ * @return 姘磋偉鏈哄疄浣�
+ */
+ public PrStSoil getStSoilByFBoxIdAndNo(String fboxId, Integer no){
+ List<PrStSoil> list = this.prStSoilDao.selectStPoByFBoxIdAndNo(fboxId, no) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 鏌ヨ涓婃姤鏈�鏂版暟鎹�
+ * @param stSoilId
+ * @return
+ */
+ public RmSoilLast getRmSoilLast(Long stSoilId) {
+ List<RmSoilLast> list = this.rmSoilLastDao.selectRmSoilLast(stSoilId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmSoilHistory(RmSoilHistory po) {
+ this.rmSoilHistoryDao.insert(po);
+ }
+
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmSoilLast(RmSoilLast po) {
+ this.rmSoilLastDao.insert(po);
+ }
+ /**
+ * 鏇存柊鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmSoilLast(RmSoilLast po){
+ this.rmSoilLastDao.updateByPrimaryKey(po) ;
+ }
+
+ /**
+ * 鏌ヨ涓婃姤鏃ユ暟鎹�
+ * @param stSoilId
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public RmSoilDay getRmSoilDay(Long stSoilId, Integer nowYmd) {
+ List<RmSoilDay> list = this.rmSoilDayDao.selectRmSoilDay(stSoilId, nowYmd) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鏃ヨ褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmSoilDay(RmSoilDay po) {
+ this.rmSoilDayDao.insert(po);
+ }
+ /**
+ * 鏇存柊鏃ヨ褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmSoilDay(RmSoilDay po){
+ this.rmSoilDayDao.updateByPrimaryKey(po) ;
+ }
+
+
+
+ //////////////////////////////////////////////////////
+ //
+ // 姘旇薄鏁版嵁鐩稿叧
+ //
+ //////////////////////////////////////////////////////
+ /**
+ * 閫氳繃FBox搴忓垪鍙峰緱鍒版皵璞＄珯瀹炰綋
+ * @param fboxId FBox搴忓垪鍙�
+ * @param no 缂栧彿
+ * @return 姘磋偉鏈哄疄浣�
+ */
+ public PrStWeather getStWeatherByFBoxIdAndNo(String fboxId, Integer no){
+ List<PrStWeather> list = this.prStWeatherDao.selectStPoByFBoxIdAndNo(fboxId, no) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+
+ /**
+ * 鏌ヨ涓婃姤鏈�鏂版暟鎹�
+ * @param stWeatherId
+ * @return
+ */
+ public RmWeatherLast getRmWeatherLast(Long stWeatherId) {
+ List<RmWeatherLast> list = this.rmWeatherLastDao.selectRmWeatherLast(stWeatherId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmWeatherHistory(RmWeatherHistory po) {
+ this.rmWeatherHistoryDao.insert(po);
+ }
+
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmWeatherLast(RmWeatherLast po) {
+ this.rmWeatherLastDao.insert(po);
+ }
+ /**
+ * 鏇存柊鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmWeatherLast(RmWeatherLast po){
+ this.rmWeatherLastDao.updateByPrimaryKey(po) ;
+ }
+
//////////////////////////////////////////////////////
//
// 鍛戒护鏃ュ織鐩稿叧
--
Gitblit v1.8.0