From 56259e44d2ed2f7b1f9dfc65995c28ae371695af 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: Mon, 17 Mar 2025 10:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E6=96=B0=E5=A2=9E=E8=8A=AF?=
 =?UTF-8?q?=E7=89=87=E5=8E=82=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java  | 4 ++++
 .../main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml  | 3 ++-
 .../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  | 7 ++++++-
 .../src/main/resources/application-druid-test.yml          | 4 ++--
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
index ac69cd0c..7417af20 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
@@ -34,6 +34,10 @@ public class DeviceVO extends Device implements IotDevice {
     @ApiModelProperty("型号")
     private String model;
 
+    @ApiModelProperty("型号芯片厂商")
+    @JsonView({DeviceView.SuitList.class, JsonViewProfile.App.class})
+    private String modelChip;
+
     @ApiModelProperty("所属用户名称")
     @JsonView(DeviceView.SuitList.class)
     private String userName;
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
index 60393ae0..4bacf109 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sm.tags as  model_tags,
             sm.product_id as model_product_id,
             sm.app_ids as model_app_ids,
+            sm.chip as model_chip,
             ss.name as store_name,
             ss.contact_name as store_contact_name,
             ss.contact_mobile as store_contact_mobile,
@@ -764,7 +765,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <!-- selectCountGroupBy --> 
+    <!-- selectCountGroupBy -->
 
     <select id="selectCountGroupBy">
         select
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 c30527b6..d653e616 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
@@ -80,4 +80,7 @@ public class SmModel extends BaseEntity
 
     @ApiModelProperty("应用ID")
     private List<Long> appIds;
+
+    @ApiModelProperty("芯片厂商")
+    private String chip;
 }
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 039012ad..ec44ac72 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
@@ -23,6 +23,7 @@ public class SmModelBO extends SmModel {
         bo.setSnPrefix(getSnPrefix());
         bo.setSort(getSort());
         bo.setAppIds(getAppIds());
+        bo.setChip(getChip());
         return bo;
     }
 
@@ -42,6 +43,7 @@ public class SmModelBO extends SmModel {
         bo.setSnPrefix(getSnPrefix());
         bo.setSort(getSort());
         bo.setAppIds(getAppIds());
+        bo.setChip(getChip());
         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 d0bbecd5..79061234 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
@@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.product_id,
                sm.sn_prefix,
                sm.sort,
-               sm.app_ids
+               sm.app_ids,
+               sm.chip
         from sm_model sm
     </sql>
 
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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>
+        <if test="chip != null  and chip != ''"> and sm.chip = #{chip}</if>
         <if test="deleted == null">and sm.deleted = false</if>
         <if test="deleted != null">and sm.deleted = #{deleted}</if>
         <if test="modelIds != null and modelIds.size() > 0">
@@ -101,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="snPrefix != null">sn_prefix,</if>
             <if test="sort != null">sort,</if>
             <if test="appIds != null">app_ids,</if>
+            <if test="chip != null">chip,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="modelName != null">#{modelName},</if>
@@ -120,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="snPrefix != null">#{snPrefix},</if>
             <if test="sort != null">#{sort},</if>
             <if test="appIds != null">#{appIds,typeHandler=com.ruoyi.system.mapper.typehandler.LongSplitListTypeHandler},</if>
+            <if test="chip != null">#{chip},</if>
          </trim>
     </insert>
 
@@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="snPrefix != null">sn_prefix = #{snPrefix},</if>
             <if test="sort != null">sort = #{sort},</if>
             <if test="appIds != null">app_ids = #{appIds,typeHandler=com.ruoyi.system.mapper.typehandler.LongSplitListTypeHandler},</if>
+            <if test="chip != null">chip = #{chip},</if>
         </trim>
         where model_id = #{modelId}
     </update>
diff --git a/smart-switch-web/src/main/resources/application-druid-test.yml b/smart-switch-web/src/main/resources/application-druid-test.yml
index 17a9fbb4..6ef91a65 100644
--- a/smart-switch-web/src/main/resources/application-druid-test.yml
+++ b/smart-switch-web/src/main/resources/application-druid-test.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://106.75.233.135:3306/smart-switch-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://182.44.76.215:3306/smart-switch-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 9671e015b05b3f11
+                password: 6d0848fd18c2f59f
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭