From 925d24f668ba713b1e0c4660d960a8800dda602a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 12:05:31 +0800
Subject: [PATCH] 配置不进行验证token验证的路径

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index a663b66..9f98c8b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -9,6 +9,7 @@
     <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
     <result column="protocol" jdbcType="VARCHAR" property="protocol" />
     <result column="findDt" jdbcType="TIMESTAMP" property="findDt" />
+    <result column="orgTag" jdbcType="VARCHAR" property="orgTag" />
     <result column="addWays" jdbcType="TINYINT" property="addWays" />
     <result column="operator" jdbcType="BIGINT" property="operator" />
     <result column="operateDt" jdbcType="TIMESTAMP" property="operateDt" />
@@ -22,7 +23,7 @@
 
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, intakeId, rtuAddr, protocol, findDt, addWays, `operator`, operateDt, deleted
+    id, intakeId, rtuAddr, protocol, findDt, orgTag, addWays, `operator`, operateDt, deleted
   </sql>
   <sql id="Part_Column_List">
     <!--@mbg.generated-->
@@ -43,12 +44,13 @@
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
     <!--@mbg.generated-->
     insert into pr_controller (id, intakeId, rtuAddr,
-      protocol, findDt, addWays,
+      protocol, findDt, orgTag, addWays,
       `operator`, operateDt, deleted
       )
     values (#{id,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR},
-      #{protocol,jdbcType=VARCHAR}, #{findDt,jdbcType=TIMESTAMP}, #{addWays,jdbcType=TINYINT},
-      #{operator,jdbcType=BIGINT}, #{operateDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
+      #{protocol,jdbcType=VARCHAR}, #{findDt,jdbcType=TIMESTAMP}, #{orgTag,jdbcType=VARCHAR},
+      #{addWays,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{operateDt,jdbcType=TIMESTAMP},
+      #{deleted,jdbcType=TINYINT}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
@@ -69,6 +71,9 @@
       </if>
       <if test="findDt != null">
         findDt,
+      </if>
+      <if test="orgTag != null">
+        orgTag,
       </if>
       <if test="addWays != null">
         addWays,
@@ -98,6 +103,9 @@
       </if>
       <if test="findDt != null">
         #{findDt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgTag != null">
+        #{orgTag,jdbcType=VARCHAR},
       </if>
       <if test="addWays != null">
         #{addWays,jdbcType=TINYINT},
@@ -129,6 +137,9 @@
       <if test="findDt != null">
         findDt = #{findDt,jdbcType=TIMESTAMP},
       </if>
+     <if test="orgTag != null">
+       orgTag = #{orgTag,jdbcType=VARCHAR},
+      </if>
       <if test="addWays != null">
         addWays = #{addWays,jdbcType=TINYINT},
       </if>
@@ -151,6 +162,7 @@
       rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
       protocol = #{protocol,jdbcType=VARCHAR},
       findDt = #{findDt,jdbcType=TIMESTAMP},
+      orgTag = #{orgTag,jdbcType=VARCHAR},
       addWays = #{addWays,jdbcType=TINYINT},
       `operator` = #{operator,jdbcType=BIGINT},
       operateDt = #{operateDt,jdbcType=TIMESTAMP},
@@ -205,7 +217,7 @@
         con.protocol,
         inta.remarks,
         rtus.isOnLine,
-        (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
+        (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) AS bindNumber,
         con.findDt AS findDt
     FROM pr_controller con
         LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
@@ -231,7 +243,7 @@
         AND rtus.isOnLine = #{isOnLine}
       </if>
       <if test = "bindNumber != null and bindNumber > 0">
-        AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) = ${bindNumber}
+        AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) = ${bindNumber}
       </if>
     </where>
     ORDER BY con.operateDt DESC
@@ -248,11 +260,16 @@
   </select>
 
   <!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->
-  <select id="getControllersByRtuAddrAndIntakeNotNull" parameterType="java.lang.String" resultMap="PartResultMap">
-    SELECT
-    <include refid="Part_Column_List">
-    </include>
-    FROM pr_controller WHERE deleted = 0 AND intakeId is not null AND rtuAddr=#{rtuAddr,jdbcType=VARCHAR}
+  <select id="getControllersByRtuAddrAndIntakeNotNull" parameterType="java.lang.String" resultType="com.dy.pipIrrGlobal.pojoPr.PrController">
+    SELECT tb.id id,
+    tb.rtuAddr rtuAddr,
+    tb.intakeId intakeId,
+    tb.findDt findDt,
+    tb.operateDt operateDt,
+    itb.name intakeName
+    FROM pr_controller tb
+    INNER JOIN pr_intake itb on tb.intakeId = itb.id
+    WHERE tb.deleted = 0 AND tb.intakeId is not null AND tb.rtuAddr=#{rtuAddr,jdbcType=VARCHAR}
   </select>
 
   <!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->

--
Gitblit v1.8.0