From d66bb81290ae2cd751eb132b93ed2331a0d1ee1b Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 1 Nov 2024 13:30:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E6=A1=A9=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E6=96=B0=E5=A2=9Eiccid=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/pile/domain/PileBasicInfo.java    |  6 ++++++
 .../main/resources/mapper/pile/PileBasicInfoMapper.xml | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java
index a38c4877d..bb37f666b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java
@@ -86,6 +86,12 @@ public class PileBasicInfo extends BaseEntity {
 	@Excel(name = "sim卡id")
 	private Long simId;
 
+	/**
+	 * sim卡iccId
+	 */
+	@Excel(name = "iccId")
+	private String iccId;
+
 	/**
 	 * 运营商id
 	 */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
index a573d4bef..ef9b5527c 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="licenceId"    column="licence_id"    />
         <result property="modelId"    column="model_id"    />
         <result property="simId"    column="sim_id"    />
+        <result property="iccId"    column="iccid"    />
         <result property="merchantId"    column="merchant_id"    />
         <result property="stationId"    column="station_id"    />
         <result property="faultReason"    column="fault_reason"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id, sn, name, business_type, secret_key, software_protocol, production_date, licence_id, model_id, sim_id,
-        merchant_id, station_id, fault_reason, create_by, create_time, update_by, update_time, del_flag, remark
+        iccid, merchant_id, station_id, fault_reason, create_by, create_time, update_by, update_time, del_flag, remark
     </sql>
 
     <sql id="selectPileBasicInfoVo">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 -->         <if test="licenceId != null "> and licence_id = #{licenceId}</if>
             <if test="modelId != null "> and model_id = #{modelId}</if>
             <if test="simId != null "> and sim_id = #{simId}</if>
+            <if test="iccId != null "> and iccid = #{iccId}</if>
             <if test="merchantId != null "> and merchant_id = #{merchantId}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="faultReason != null  and faultReason != ''"> and fault_reason = #{faultReason}</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="licenceId != null">licence_id,</if>
             <if test="modelId != null">model_id,</if>
             <if test="simId != null">sim_id,</if>
+            <if test="iccId != null">iccid,</if>
             <if test="merchantId != null">merchant_id,</if>
             <if test="stationId != null">station_id,</if>
             <if test="faultReason != null">fault_reason,</if>
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="licenceId != null">#{licenceId},</if>
             <if test="modelId != null">#{modelId},</if>
             <if test="simId != null">#{simId},</if>
+            <if test="iccId != null">#{iccId},</if>
             <if test="merchantId != null">#{merchantId},</if>
             <if test="stationId != null">#{stationId},</if>
             <if test="faultReason != null">#{faultReason},</if>
@@ -122,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="licenceId != null">licence_id = #{licenceId},</if>
             <if test="modelId != null">model_id = #{modelId},</if>
             <if test="simId != null">sim_id = #{simId},</if>
+            <if test="iccId != null">iccid = #{iccId},</if>
             <if test="merchantId != null">merchant_id = #{merchantId},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="faultReason != null">fault_reason = #{faultReason},</if>
@@ -202,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="batchInsertPileBasicInfo">
         insert into pile_basic_info
-            (sn, name, business_type, secret_key, software_protocol, production_date, licence_id, model_id, sim_id,
+            (sn, name, business_type, secret_key, software_protocol, production_date, licence_id, model_id, sim_id, iccid,
             merchant_id, station_id, fault_reason, create_by, update_by, del_flag, remark)
         values
         <foreach collection="infoList" item="item" separator=",">
@@ -216,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.licenceId,jdbcType=BIGINT},
                 #{item.modelId,jdbcType=BIGINT},
                 #{item.simId,jdbcType=BIGINT},
+                #{item.iccId,jdbcType=VARCHAR},
                 #{item.merchantId,jdbcType=BIGINT},
                 #{item.stationId,jdbcType=BIGINT},
                 #{item.faultReason,jdbcType=VARCHAR},