From 5184b06bd43c44e65d5a9af5f1719411fdbe52e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 8 Nov 2024 14:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9E=8B=E5=8F=B7SN=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/ss/model/domain/SmModel.java     | 3 +++
 .../src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java   | 2 ++
 .../main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml    | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java
index b1cb05b7..ade49d45 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java
@@ -71,4 +71,7 @@ public class SmModel extends BaseEntity
     @ApiModelProperty("OneNet产品ID")
     @NotBlank(message = "OneNet产品ID不允许为空", groups = {ValidGroup.Create.class})
     private String productId;
+
+    @ApiModelProperty("SN前缀")
+    private String snPrefix;
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java
index 1b94c1e7..6b0669fb 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java
@@ -20,6 +20,7 @@ public class SmModelBO extends SmModel {
         bo.setServiceType(getServiceType());
         bo.setServiceRate(getServiceRate());
         bo.setProductId(getProductId());
+        bo.setSnPrefix(getSnPrefix());
         return bo;
     }
 
@@ -36,6 +37,7 @@ public class SmModelBO extends SmModel {
         bo.setServiceType(getServiceType());
         bo.setServiceRate(getServiceRate());
         bo.setProductId(getProductId());
+        bo.setSnPrefix(getSnPrefix());
         return bo;
     }
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml
index a7fa05cd..b788bc74 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.service_type,
                sm.service_rate,
                sm.product_id,
+               sm.sn_prefix,
                count(case when sd.activation_time is not null and sd.deleted = false then sd.device_id end) as activation_count,
                count(case when sd.online_status = '1' and sd.activation_time  is not null and sd.deleted = false then sd.device_id end) as online_count
         from sm_model sm
@@ -32,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="searchCondition">
         <if test="modelName != null  and modelName != ''"> and sm.model_name like concat('%', #{modelName}, '%')</if>
+        <if test="snPrefix != null  and snPrefix != ''"> and sm.sn_prefix like concat('%', #{snPrefix}, '%')</if>
         <if test="model != null  and model != ''"> and sm.model = #{model}</if>
         <if test="serviceType != null  and serviceType != ''"> and sm.service_type = #{serviceType}</if>
         <if test="productId != null  and productId != ''"> and sm.product_id = #{productId}</if>
@@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serviceType != null">service_type,</if>
             <if test="serviceRate != null">service_rate,</if>
             <if test="productId != null">product_id,</if>
+            <if test="snPrefix != null">sn_prefix,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="modelName != null">#{modelName},</if>
@@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serviceType != null">#{serviceType},</if>
             <if test="serviceRate != null">#{serviceRate},</if>
             <if test="productId != null">#{productId},</if>
+            <if test="snPrefix != null">#{snPrefix},</if>
          </trim>
     </insert>
 
@@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serviceType != null">service_type = #{serviceType},</if>
             <if test="serviceRate != null">service_rate = #{serviceRate},</if>
             <if test="productId != null">product_id = #{productId},</if>
+            <if test="snPrefix != null">sn_prefix = #{snPrefix},</if>
         </trim>
         where model_id = #{modelId}
     </update>