From f74db84df0e3797e0a2db1faa50adcb778a5150a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 11:33:35 +0800
Subject: [PATCH] 1、完善水肥、墒情、气象相关Mapper代码； 2、解决表阀一体机远程关阀出现的订单号不一致专制不能关阀问题（王江海测试发现）。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 317 insertions(+), 35 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 847d2b8..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,18 +1,14 @@
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.daoPr.*;
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.pojoPr.*;
import com.dy.pipIrrGlobal.pojoRm.*;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
+import com.dy.pipIrrGlobal.voSe.VoCardInfo1;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,9 +26,9 @@
@Service()
public class DbSv {
@Autowired
- private SeClientCardMapper seClientCardMapperDao;//鍐滄埛姘村崱DAO
+ private SeClientCardMapper seClientCardDao;//鍐滄埛姘村崱DAO
@Autowired
- private SeVirtualCardMapper seVirtualCardMapper;//鍐滄埛铏氭嫙姘村崱DAO
+ private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏矰AO
@Autowired
private PrControllerTrampMapper prControllerTrampMapperDao;//娴佹氮鎺у埗鍣―AO
@Autowired
@@ -58,13 +54,11 @@
@Autowired
private RmClientAmountDayMapper rmClientAmountDayMapperDao ;//鍐滄埛鏃ョ敤姘撮噺缁熻鏁版嵁DAO
@Autowired
- private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
+ private RmLossDayLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
@Autowired
- private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
+ private RmLossDayMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
@Autowired
private RmCommandHistoryMapper rmCommandHistoryDao ;//杩滅▼鍛戒护鏃ュ織鐩稿叧
- @Autowired
- private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏�
@Autowired
private RmTimingReportHistoryMapper rmTimingReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
@@ -72,9 +66,31 @@
private RmTimingReportLastMapper rmTimingReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
@Autowired
- private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 鏁寸偣涓婃姤鍘嗗彶鏁版嵁DAO
+ private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
@Autowired
- private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
+ 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
//@Lazy
@@ -96,11 +112,12 @@
SeClient vo = null ;
if(NumUtil.isPlusIntNumber(icCardNo)){
Long icCardNoLong = Long.parseLong(icCardNo) ;
- Map<String, Object> map = seClientCardMapperDao.getClientIdAndNameByCardAddrAndCardNo(icCardAddr, icCardNoLong) ;
+ Map<String, Object> map = seClientCardDao.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());
+ vo.setAddress(map.get("clientAddress").toString());
}
}
return vo ;
@@ -114,11 +131,12 @@
SeClient vo = null ;
if(NumUtil.isPlusIntNumber(icCardNo)){
Long icCardNoLong = Long.parseLong(icCardNo) ;
- Map<String, Object> map = seVirtualCardMapper.getClientIdAndNameByVsCardNo(icCardNoLong) ;
+ Map<String, Object> map = seVirtualCardDao.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());
+ vo.setAddress(map.get("clientAddress").toString());
}
}
return vo ;
@@ -155,6 +173,9 @@
*/
@Transactional(rollbackFor = Exception.class)
public void savePrConctrollerTramp(PrControllerTramp po){
+ if(po.getOrgTag().trim().length() > 2) {
+ po.setOrgTag("DY");
+ }
this.prControllerTrampMapperDao.insert(po) ;
}
/**
@@ -214,8 +235,8 @@
* @param intakeId
*/
@Transactional(rollbackFor = Exception.class)
- public void updateVirCardNoUseState(Long intakeId){
- this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ;
+ public void updateVirCardNoUseState(Long intakeId, Date now){
+ this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId, now) ;
}
@@ -268,12 +289,12 @@
/////////////////////////////////////////////////
//
- // 鏁寸偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
+ // 瀹氱偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
//
////////////////////////////////////////////////
/**
- * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ュ巻鍙叉暟鎹�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ュ巻鍙叉暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -282,7 +303,7 @@
}
/**
- * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
+ * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
* @param intakeId
* @return
*/
@@ -296,7 +317,7 @@
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ユ渶鏂版暟鎹�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ユ渶鏂版暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -305,7 +326,7 @@
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ョ姜琛屾暟鎹�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ョ姜琛屾暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -559,8 +580,8 @@
* @param intakeId
* @return
*/
- public RmLossLast getRmLossLast(Long intakeId){
- List<RmLossLast> list = rmLossLastMapperDao.selectByIntakeId(intakeId) ;
+ public RmLossDayLast getRmLossLast(Long intakeId){
+ List<RmLossDayLast> list = rmLossLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -571,7 +592,7 @@
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmLossLast(RmLossLast po){
+ public void saveRmLossLast(RmLossDayLast po){
this.rmLossLastMapperDao.insert(po) ;
}
/**
@@ -579,7 +600,7 @@
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmLossHistory(RmLossHistory po){
+ public void saveRmLossHistory(RmLossDay po){
this.rmLossHistoryMapperDao.insert(po) ;
}
/**
@@ -587,7 +608,7 @@
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmLossLast(RmLossLast po){
+ public void updateRmLossLast(RmLossDayLast po){
this.rmLossLastMapperDao.updateByPrimaryKey(po) ;
}
/**
@@ -595,7 +616,7 @@
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmLossHistory(RmLossHistory po){
+ public void updateRmLossHistory(RmLossDay po){
this.rmLossHistoryMapperDao.updateByPrimaryKey(po) ;
}
@@ -604,7 +625,7 @@
* @param id
* @return
*/
- public RmLossHistory getRmLossHistory(Long id){
+ public RmLossDay getRmLossHistory(Long id){
return rmLossHistoryMapperDao.selectByPrimaryKey(id) ;
}
@@ -614,8 +635,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) ;
}
@@ -627,12 +648,272 @@
* @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) ;
}
return null ;
+ }
+
+ //////////////////////////////////////////////////////
+ //
+ // IC鍗＄浉鍏�
+ //
+ //////////////////////////////////////////////////////
+ /**
+ * 寰楀埌鍐滄埛鍗�
+ * @param cardAddr
+ * @param cardNo
+ * @return
+ */
+ public VoCardInfo1 getIcCard(String cardAddr, String cardNo){
+ if(NumUtil.isPlusIntNumber(cardNo)){
+ Long icCardNoLong = Long.parseLong(cardNo) ;
+ List<VoCardInfo1> list = seClientCardDao.getCardsByAddrAndNum(cardAddr, icCardNoLong) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ }
+ return null ;
+ }
+ /**
+ * 寰楀埌鍐滄埛铏氭嫙鍗�
+ * @param cardNo
+ * @return
+ */
+ public VoCardInfo1 getVirIcCard(String cardNo){
+ if(NumUtil.isPlusIntNumber(cardNo)){
+ Long icCardNoLong = Long.parseLong(cardNo) ;
+ List<VoCardInfo1> list = seVirtualCardDao.getCardsByNum(icCardNoLong) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ }
+ return null ;
+ }
+
+ /**
+ * 鏇存柊瀹炰綋鍗″墿浣欓噾棰�
+ * @param id
+ * @param remainMoney
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateIcCardRemainMoney(Long id , Double remainMoney){
+ seClientCardDao.updateMoney(id,remainMoney);
+ }
+
+ /**
+ * 鏇存柊铏氭嫙鍗″墿浣欓噾棰�
+ * @param id
+ * @param remainMoney
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateVirIcCardRemainMoney(Long id , Double remainMoney){
+ 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) ;
}
//////////////////////////////////////////////////////
@@ -643,6 +924,7 @@
public RmCommandHistory getCommandLog(String commandId){
return rmCommandHistoryDao.selectByPrimaryKey(Long.parseLong(commandId)) ;
}
+ @Transactional(rollbackFor = Exception.class)
public void updateCommandLog(RmCommandHistory po){
rmCommandHistoryDao.updateByPrimaryKey(po) ;
}
--
Gitblit v1.8.0