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 |  651 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 610 insertions(+), 41 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 adf2d6c..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,21 @@
 package com.dy.rtuMw.server.rtuData.dbSv;
 
-import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
-import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
+import com.dy.common.util.NumUtil;
+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;
 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 +25,10 @@
  */
 @Service()
 public class DbSv {
+    @Autowired
+    private SeClientCardMapper seClientCardDao;//鍐滄埛姘村崱DAO
+    @Autowired
+    private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏矰AO
     @Autowired
     private PrControllerTrampMapper prControllerTrampMapperDao;//娴佹氮鎺у埗鍣―AO
     @Autowired
@@ -39,13 +46,51 @@
     @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
-    private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏�
+    private RmTimingReportHistoryMapper rmTimingReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
+    @Autowired
+    private RmTimingReportLastMapper rmTimingReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
+
+    @Autowired
+    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
     //@Lazy
@@ -56,6 +101,48 @@
     // 鍩虹鍔熻兘
     //
     ////////////////////////////////////////////////
+
+    /**
+     * 閫氳繃鐗╃悊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 = 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 ;
+    }
+    /**
+     * 閫氳繃铏氭嫙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 = 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 ;
+    }
+
+
     /**
      * 閫氳繃鎺у埗鍣ㄥ湴鍧�浠庢暟鎹簱琛ㄤ腑鏌ヨ鎺у埗鍣�
      * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
@@ -86,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) ;
     }
    /**
@@ -94,7 +184,7 @@
      */
     @Transactional(rollbackFor = Exception.class)
     public void updatePrConctrollerTramp(PrControllerTramp po){
-        this.prControllerTrampMapperDao.updateByPrimaryKeySelective(po) ;
+        this.prControllerTrampMapperDao.updateByPrimaryKey(po) ;
     }
 
 
@@ -105,11 +195,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) ;
         }
@@ -129,7 +219,7 @@
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateRmAlarmStateLast(RmAlarmStateLast po){
-        this.rmAlarmStateLastMapperDao.updateByPrimaryKeySelective(po) ;
+        this.rmAlarmStateLastMapperDao.updateByPrimaryKey(po) ;
     }
     /**
      * 淇濆瓨鎺у埗鍣ㄦ姤璀︿笌鐘舵�佸巻鍙茶褰�
@@ -145,17 +235,104 @@
      * @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) ;
     }
 
 
     /////////////////////////////////////////////////
     //
-    // 瀹氱偣鎶ユ暟鎹姛鑳�
+    // 瀹氱偣鎶ユ暟鎹姛鑳�(鍙湪鐜嬫睙娴风殑鍗忚鏈夋鏁版嵁)
     //
     ////////////////////////////////////////////////
 
+    /**
+     * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ュ巻鍙叉暟鎹�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmTimingReportHistory(RmTimingReportHistory po){
+        this.rmTimingReportHistoryDao.insert(po);
+    }
+
+    /**
+     * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
+     * @param intakeId
+     * @return
+     */
+    @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 saveRmTimingReportLast(RmTimingReportLast po) {
+        this.rmTimingReportLastDao.insert(po);
+    }
+
+    /**
+     * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ョ姜琛屾暟鎹�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRmTimingReportLast(RmTimingReportLast po) {
+        this.rmTimingReportLastDao.updateByPrimaryKey(po);
+    }
+
+    /////////////////////////////////////////////////
+    //
+    // 瀹氱偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
+    //
+    ////////////////////////////////////////////////
+
+    /**
+     * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ュ巻鍙叉暟鎹�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    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);
+    }
 
     /////////////////////////////////////////////////
     //
@@ -164,11 +341,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) ;
         }
@@ -188,7 +365,7 @@
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateRmOpenCloseValveLast(RmOpenCloseValveLast po){
-        this.rmOpenCloseValveLastMapperDao.updateByPrimaryKeySelective(po) ;
+        this.rmOpenCloseValveLastMapperDao.updateByPrimaryKey(po) ;
     }
     /**
      * 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶鏁版嵁涓殑鏈�鏂拌褰�
@@ -214,10 +391,8 @@
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateRmOpenCloseValveHistory(RmOpenCloseValveHistory po){
-        this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
+        this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKey(po) ;
     }
-
-
 
     /////////////////////////////////////////////////
     //
@@ -226,11 +401,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) ;
         }
@@ -250,7 +425,7 @@
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateRmWorkReportLast(RmWorkReportLast po){
-        this.rmWorkReportLastMapperDao.updateByPrimaryKeySelective(po) ;
+        this.rmWorkReportLastMapperDao.updateByPrimaryKey(po) ;
     }
     /**
      * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
@@ -261,6 +436,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 ;
+    }
+
 
     /////////////////////////////////////////////////
     //
@@ -269,11 +577,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) ;
         }
@@ -284,7 +592,7 @@
      * @param po
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveRmLossLast(RmLossLast po){
+    public void saveRmLossLast(RmLossDayLast po){
         this.rmLossLastMapperDao.insert(po) ;
     }
   /**
@@ -292,7 +600,7 @@
      * @param po
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveRmLossHistory(RmLossHistory po){
+    public void saveRmLossHistory(RmLossDay po){
         this.rmLossHistoryMapperDao.insert(po) ;
     }
     /**
@@ -300,16 +608,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) ;
     }
 
     /**
@@ -317,7 +625,7 @@
      * @param id
      * @return
      */
-    public RmLossHistory getRmLossHistory(Long id){
+    public RmLossDay getRmLossHistory(Long id){
         return rmLossHistoryMapperDao.selectByPrimaryKey(id) ;
     }
 
@@ -327,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) ;
         }
@@ -340,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) ;
     }
 
     //////////////////////////////////////////////////////
@@ -356,8 +924,9 @@
     public RmCommandHistory getCommandLog(String commandId){
         return rmCommandHistoryDao.selectByPrimaryKey(Long.parseLong(commandId)) ;
     }
+    @Transactional(rollbackFor = Exception.class)
     public void updateCommandLog(RmCommandHistory po){
-        rmCommandHistoryDao.updateByPrimaryKeySelective(po) ;
+        rmCommandHistoryDao.updateByPrimaryKey(po) ;
     }
 
 

--
Gitblit v1.8.0