From 9281643d18bc2e0aaffed3c5f216d1df12d68424 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 18 一月 2024 09:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
index 42a8910..11928ca 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
@@ -1,6 +1,8 @@
 package com.dy.pipIrrProject.intakeController;
 
+import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
 import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;
+import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
 import com.dy.pipIrrGlobal.pojoPr.PrIntakeController;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,9 @@
 public class IntakeControllerSv {
     @Autowired
     private PrIntakeControllerMapper prIntakeControllerMapper;
+
+    @Autowired
+    private PrControllerTrampMapper prControllerTrampMapper;
 
     /**
      * 鏍规嵁鍙栨按鍙g紪鍙枫�佹帶鍒跺櫒缂栧彿銆佹搷浣滅被鍒幏鍙栬褰曟暟閲�
@@ -59,4 +64,31 @@
     List<Map<String, Object>> getBindsByControllerId(Long controllerId) {
         return prIntakeControllerMapper.getBindsByControllerId(controllerId);
     }
+
+    /**
+     * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒鍦板潃
+     * @param controllerId 娴佹氮鎺у埗鍣ㄧ紪鍙�
+     * @return 娴佹氮鎺у埗鍣ㄥ湴鍧�
+     */
+    //public String getTrampRtuAddr(Long controllerId) {
+    //    return prControllerTrampMapper.getTrampRtuAddr(controllerId);
+    //}
+
+    /**
+     * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒淇℃伅
+     * @param controllerId
+     * @return
+     */
+    public PrControllerTramp getTrampControllerInfo(Long controllerId) {
+        return prControllerTrampMapper.getTrampControllerInfo(controllerId);
+    }
+
+    /**
+     * 鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙峰垹闄ゆ祦娴帶鍒跺櫒璁板綍
+     * @param controllerId
+     * @return
+     */
+    public Integer deleteTrampController(Long controllerId) {
+        return prControllerTrampMapper.deleteByPrimaryKey(controllerId);
+    }
 }

--
Gitblit v1.8.0