From 923db614cdf3740916859f70c058b78136c4efa5 Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Wed, 20 Apr 2022 10:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8C=87=E7=A4=BA=E7=81=AF=E3=80=81?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E3=80=91=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: weizhihong <weizhihong@joylink.club>
---
 .../joylink/rtss/dao/AssistIndicatorDAO.java  |  1 +
 .../AssistButtonIndicatorService.java         |  2 ++
 .../mybatis/mapper/AssistButtonDAO.xml        | 32 +++++++++----------
 .../mybatis/mapper/AssistIndicatorDAO.xml     | 32 +++++++++----------
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/dao/AssistIndicatorDAO.java b/src/main/java/club/joylink/rtss/dao/AssistIndicatorDAO.java
index 8fecb536c..97311325d 100644
--- a/src/main/java/club/joylink/rtss/dao/AssistIndicatorDAO.java
+++ b/src/main/java/club/joylink/rtss/dao/AssistIndicatorDAO.java
@@ -9,4 +9,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface AssistIndicatorDAO extends MyBatisBaseDao<IndicatorSection, Long, IndicatorSectionExample> {
+
 }
\ No newline at end of file
diff --git a/src/main/java/club/joylink/rtss/services/AssistButtonIndicatorService.java b/src/main/java/club/joylink/rtss/services/AssistButtonIndicatorService.java
index 776aa8100..6927e0665 100644
--- a/src/main/java/club/joylink/rtss/services/AssistButtonIndicatorService.java
+++ b/src/main/java/club/joylink/rtss/services/AssistButtonIndicatorService.java
@@ -54,6 +54,7 @@ public class AssistButtonIndicatorService implements IAssistButtonIndicatorServi
 
     @Override
     public String saveIndicatorSection(Long mapId, IndicatorSection vo) {
+        vo.setMapId(mapId);
         if (!CollectionUtils.isEmpty(vo.getSectionList())) {
             vo.setSectionsCode(String.join(",", vo.getSectionList()));
         }
@@ -96,6 +97,7 @@ public class AssistButtonIndicatorService implements IAssistButtonIndicatorServi
 
     @Override
     public String saveButtonStand(Long mapId, ButtonStand vo) {
+        vo.setMapId(mapId);
         int line;
         if (vo.getId() != null) {
             line = assistButtonDAO.updateByPrimaryKey(vo);
diff --git a/src/main/resources/mybatis/mapper/AssistButtonDAO.xml b/src/main/resources/mybatis/mapper/AssistButtonDAO.xml
index bc2751da3..7f13518d9 100644
--- a/src/main/resources/mybatis/mapper/AssistButtonDAO.xml
+++ b/src/main/resources/mybatis/mapper/AssistButtonDAO.xml
@@ -3,8 +3,8 @@
 <mapper namespace="club.joylink.rtss.dao.AssistButtonDAO">
 
     <resultMap id="ButtonBaseResultMap" type="club.joylink.rtss.entity.ButtonStand">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="map_id" jdbcType="INTEGER" property="mapId"/>
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="map_id" jdbcType="BIGINT" property="mapId"/>
         <result column="button_code" jdbcType="VARCHAR" property="buttonCode"/>
         <result column="stand_code" jdbcType="VARCHAR" property="standCode"/>
         <result column="next_stand_code" jdbcType="VARCHAR" property="nextStandCode"/>
@@ -101,15 +101,15 @@
         </if>
     </select>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ButtonBaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ButtonBaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from button_stand_route
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
     </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from button_stand_route where id = #{id,jdbcType=INTEGER}
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from button_stand_route where id = #{id,jdbcType=BIGINT}
     </delete>
 
     <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.CgyRecordExample">
@@ -123,7 +123,7 @@
             useGeneratedKeys="true">
         insert into button_stand_route (map_id, button_code,stand_code,next_stand_code,pre_stand_code)
         values (
-        #{mapId,jdbcType=INTEGER}, #{buttonCode,jdbcType=VARCHAR}, #{standCode,jdbcType=VARCHAR},
+        #{mapId,jdbcType=BIGINT}, #{buttonCode,jdbcType=VARCHAR}, #{standCode,jdbcType=VARCHAR},
         #{nextStandCode,jdbcType=VARCHAR}, #{preStandCode,jdbcType=VARCHAR}
         )
     </insert>
@@ -139,7 +139,7 @@
             <if test="preStandCode != null">pre_stand_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="mapId != null">#{mapId,jdbcType=INTEGER},</if>
+            <if test="mapId != null">#{mapId,jdbcType=BIGINT},</if>
             <if test="buttonCode != null">#{buttonCode,jdbcType=VARCHAR},</if>
             <if test="standCode != null">#{standCode,jdbcType=VARCHAR},</if>
             <if test="nextStandCode != null">#{nextStandCode,jdbcType=VARCHAR},</if>
@@ -158,10 +158,10 @@
         update button_stand_route
         <set>
             <if test="record.id != null">
-                id = #{record.id,jdbcType=INTEGER},
+                id = #{record.id,jdbcType=BIGINT},
             </if>
             <if test="record.mapId != null">
-                map_id = #{record.mapId,jdbcType=INTEGER},
+                map_id = #{record.mapId,jdbcType=BIGINT},
             </if>
             <if test="record.buttonCode != null">
                 button_code = #{record.buttonCode,jdbcType=VARCHAR},
@@ -183,8 +183,8 @@
 
     <update id="updateByExample" parameterType="map">
         update button_stand_route
-        set id = #{record.id,jdbcType=INTEGER},
-        map_id = #{record.mapId,jdbcType=INTEGER},
+        set id = #{record.id,jdbcType=BIGINT},
+        map_id = #{record.mapId,jdbcType=BIGINT},
         button_code = #{record.buttonCode,jdbcType=VARCHAR},
         stand_code = #{record.standCode,jdbcType=VARCHAR},
         next_stand_code = #{record.nextStandCode,jdbcType=VARCHAR},
@@ -198,7 +198,7 @@
         update button_stand_route
         <set>
             <if test="mapId != null">
-                map_id = #{mapId,jdbcType=INTEGER},
+                map_id = #{mapId,jdbcType=BIGINT},
             </if>
             <if test="buttonCode != null">
                 button_code = #{buttonCode,jdbcType=VARCHAR},
@@ -213,16 +213,16 @@
                 pre_stand_code = #{preStandCode,jdbcType=VARCHAR},
             </if>
         </set>
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
     </update>
 
     <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.ButtonStand">
         update button_stand_route
-        set map_id = #{mapId,jdbcType=INTEGER},
+        set map_id = #{mapId,jdbcType=BIGINT},
         button_code = #{buttonCode,jdbcType=VARCHAR},
         stand_code = #{standCode,jdbcType=VARCHAR},
         next_stand_code = #{nextStandCode,jdbcType=VARCHAR},
         pre_stand_code = #{preStandCode,jdbcType=VARCHAR}
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
     </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/AssistIndicatorDAO.xml b/src/main/resources/mybatis/mapper/AssistIndicatorDAO.xml
index 70efefdc2..316f421b4 100644
--- a/src/main/resources/mybatis/mapper/AssistIndicatorDAO.xml
+++ b/src/main/resources/mybatis/mapper/AssistIndicatorDAO.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="club.joylink.rtss.dao.AssistIndicatorDAO">
     <resultMap id="IndicatorBaseResultMap" type="club.joylink.rtss.entity.IndicatorSection">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="map_id" jdbcType="INTEGER" property="mapId"/>
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="map_id" jdbcType="BIGINT" property="mapId"/>
         <result column="indicator_code" jdbcType="VARCHAR" property="indicatorCode"/>
         <result column="sections_code" jdbcType="VARCHAR" property="sectionsCode"/>
         <result column="stand_code" jdbcType="VARCHAR" property="standCode"/>
@@ -102,15 +102,15 @@
         </if>
     </select>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="IndicatorBaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="IndicatorBaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from indicator_section_stand_route
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
     </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from indicator_section_stand_route where id = #{id,jdbcType=INTEGER}
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from indicator_section_stand_route where id = #{id,jdbcType=BIGINT}
     </delete>
 
     <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.IndicatorSectionExample">
@@ -126,7 +126,7 @@
         map_id, indicator_code, sections_code, stand_code, next_stand_code,pre_stand_code, route_code
         )
         values (
-        #{mapId,jdbcType=INTEGER}, #{indicatorCode,jdbcType=VARCHAR}, #{sectionsCode,jdbcType=VARCHAR},
+        #{mapId,jdbcType=BIGINT}, #{indicatorCode,jdbcType=VARCHAR}, #{sectionsCode,jdbcType=VARCHAR},
         #{standCode,jdbcType=VARCHAR},#{nextStandCode,jdbcType=VARCHAR}, #{preStandCode,jdbcType=VARCHAR},
         #{routeCode,jdbcType=VARCHAR}
         )
@@ -146,7 +146,7 @@
             <if test="routeCode != null">route_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="mapId != null">#{mapId,jdbcType=INTEGER},</if>
+            <if test="mapId != null">#{mapId,jdbcType=BIGINT},</if>
             <if test="indicatorCode != null">#{indicatorCode,jdbcType=VARCHAR},</if>
             <if test="sectionsCode != null">#{sectionsCode,jdbcType=VARCHAR},</if>
             <if test="standCode != null">#{standCode,jdbcType=VARCHAR},</if>
@@ -168,10 +168,10 @@
         update indicator_section_stand_route
         <set>
             <if test="record.id != null">
-                id = #{record.id,jdbcType=INTEGER},
+                id = #{record.id,jdbcType=BIGINT},
             </if>
             <if test="record.mapId != null">
-                map_id = #{record.mapId,jdbcType=INTEGER},
+                map_id = #{record.mapId,jdbcType=BIGINT},
             </if>
             <if test="indicatorCode != null">
                 indicator_code = #{record.indicatorCode,jdbcType=VARCHAR},
@@ -199,8 +199,8 @@
 
     <update id="updateByExample" parameterType="map">
         update indicator_section_stand_route
-        set id = #{record.id,jdbcType=INTEGER},
-        map_id = #{record.mapId,jdbcType=INTEGER},
+        set id = #{record.id,jdbcType=BIGINT},
+        map_id = #{record.mapId,jdbcType=BIGINT},
         indicator_code = #{record.indicatorCode,jdbcType=VARCHAR},
         sections_code = #{record.sectionsCode,jdbcType=VARCHAR},
         stand_code = #{record.standCode,jdbcType=VARCHAR},
@@ -216,7 +216,7 @@
         update indicator_section_stand_route
         <set>
             <if test="mapId != null">
-                map_id = #{mapId,jdbcType=INTEGER},
+                map_id = #{mapId,jdbcType=BIGINT},
             </if>
             <if test="indicatorCode != null">
                 indicator_code = #{indicatorCode,jdbcType=VARCHAR},
@@ -237,19 +237,19 @@
                 route_code = #{routeCode,jdbcType=VARCHAR},
             </if>
         </set>
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
     </update>
 
     <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.IndicatorSection">
         update indicator_section_stand_route
         set
-        map_id = #{mapId,jdbcType=INTEGER},
+        map_id = #{mapId,jdbcType=BIGINT},
         indicator_code = #{indicatorCode,jdbcType=VARCHAR},
         sections_code = #{sectionsCode,jdbcType=VARCHAR},
         stand_code = #{standCode,jdbcType=VARCHAR},
         next_stand_code = #{nextStandCode,jdbcType=VARCHAR},
         pre_stand_code = #{preStandCode,jdbcType=VARCHAR},
         route_code = #{routeCode,jdbcType=VARCHAR}
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
     </update>
 </mapper>
\ No newline at end of file