chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

型号新增芯片厂商

Browse Source
This commit is contained in:
磷叶 2025-03-17 10:11:05 +08:00
parent be81427dad
commit 56259e44d2
6 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
View File

@ -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;

3
smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
View File

@ -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

3
smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java
View File

@ -80,4 +80,7 @@ public class SmModel extends BaseEntity
@ApiModelProperty("应用ID")
private List<Long> appIds;
@ApiModelProperty("芯片厂商")
private String chip;
}

2
smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java
View File

@ -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;
}
}

7
smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml
View File

@ -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>

4
smart-switch-web/src/main/resources/application-druid-test.yml
View File

@ -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:
# 从数据源开关/默认关闭