From b5b296cc01699f96029b07073fe9d0078bedd445 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 26 二月 2024 16:32:35 +0800
Subject: [PATCH] 2024-02-26 朱宝民 解决添加用户主键不自动创建的问题，部分微信支付代码

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java |   90 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
index c645532..86b05f5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
@@ -2,11 +2,22 @@
 
 import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
 import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
+import com.dy.pipIrrGlobal.daoRm.RmAlarmStateHistoryMapper;
+import com.dy.pipIrrGlobal.daoRm.RmAlarmStateLastMapper;
+import com.dy.pipIrrGlobal.daoRm.RmAutoReportHistoryMapper;
+import com.dy.pipIrrGlobal.daoRm.RmAutoReportLastMapper;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
 import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
+import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
+import com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -22,18 +33,26 @@
     private PrControllerTrampMapper prControllerTrampMapperDao;//娴佹氮鎺у埗鍣―AO
     @Autowired
     private PrControllerMapper prControllerMapperDao ;//鎺у埗鍣―AO
-
     @Autowired
-    @Lazy
-    private DbSv sv ;
+    private RmAlarmStateLastMapper rmAlarmStateLastMapperDao ;//鎺у埗鍣ㄦ渶鏂版姤璀﹀拰鐘舵�丏AO
+    @Autowired
+    private RmAlarmStateHistoryMapper rmAlarmStateHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙叉姤璀﹀拰鐘舵�丏AO
+    @Autowired
+    private RmAutoReportLastMapper rmAutoReportLastMapperDao ;//鎺у埗鍣ㄦ渶鏂颁笂鎶ユ暟鎹瓺AO
+    @Autowired
+    private RmAutoReportHistoryMapper rmAutoReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙蹭笂鎶ユ暟鎹瓺AO
+
+    //@Autowired
+    //@Lazy
+    //private DbSv sv ;
 
     /**
      * 閫氳繃鎺у埗鍣ㄥ湴鍧�浠庢暟鎹簱琛ㄤ腑鏌ヨ鎺у埗鍣�
      * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
      * @return 鎺у埗鍣�
      */
-    public PrController getPrControllerByRtuAddr(String rtuAddr){
-        List<PrController> list = this.prControllerMapperDao.selectPrControllerByRtuAddr(rtuAddr) ;
+    public PrController getControllersByRtuAddrAndIntakeNotNull(String rtuAddr){
+        List<PrController> list = this.prControllerMapperDao.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
         if(list != null && list.size() > 0){
             return list.get(0) ;
         }
@@ -45,20 +64,75 @@
      * @return 娴佹氮鎺у埗鍣�
      */
     public PrControllerTramp getPrControllerTrampByRtuAddr(String rtuAddr){
-        List<PrControllerTramp> list = this.prControllerTrampMapperDao.selectPrControllerTrampByRtuAddr(rtuAddr) ;
+        List<PrControllerTramp> list = this.prControllerTrampMapperDao.getPrControllerTrampByRtuAddr(rtuAddr) ;
         if(list != null && list.size() > 0){
             return list.get(0) ;
         }
         return null ;
     }
-
-
     /**
      * 淇濆瓨娴佹氮鎺у埗鍣�
      * @param po
      */
+    @Transactional(rollbackFor = Exception.class)
     public void savePrConctrollerTramp(PrControllerTramp po){
         this.prControllerTrampMapperDao.insert(po) ;
     }
+    /**
+     * 寰楀埌鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹渶鏂拌褰�
+     * @param rtuAddr
+     * @return
+     */
+    public RmAlarmStateLast getRmLastAlarmState(String rtuAddr){
+        List<RmAlarmStateLast> list = rmAlarmStateLastMapperDao.selectByRtuAddr(rtuAddr) ;
+        if(list != null && list.size() > 0){
+            return list.get(0) ;
+        }
+        return null ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmAlarmStateLast(RmAlarmStateLast po){
+        this.rmAlarmStateLastMapperDao.insert(po) ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄦ姤璀︿笌鐘舵�佸巻鍙茶褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmAlarmStateHistory(RmAlarmStateHistory po){
+        this.rmAlarmStateHistoryMapperDao.insert(po) ;
+    }
+    /**
+     * 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+     * @param rtuAddr
+     * @return
+     */
+    public RmAutoReportLast getRmLastAutoReport(String rtuAddr){
+        List<RmAutoReportLast> list = rmAutoReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
+        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) ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmAutoReportHistory(RmAutoReportHistory po){
+        this.rmAutoReportHistoryMapperDao.insert(po) ;
+    }
 
 }

--
Gitblit v1.8.0