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:
磷叶 2024-11-08 15:50:40 +08:00
parent 0109e30920
commit eb8f281092
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,4 +74,7 @@ public class SmModel extends BaseEntity
@ApiModelProperty("SN前缀")
private String snPrefix;
@ApiModelProperty("排序字段")
private Integer sort;
}

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

@ -21,6 +21,7 @@ public class SmModelBO extends SmModel {
bo.setServiceRate(getServiceRate());
bo.setProductId(getProductId());
bo.setSnPrefix(getSnPrefix());
bo.setSort(getSort());
return bo;
}
@ -38,6 +39,7 @@ public class SmModelBO extends SmModel {
bo.setServiceRate(getServiceRate());
bo.setProductId(getProductId());
bo.setSnPrefix(getSnPrefix());
bo.setSort(getSort());
return bo;
}
}

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

@ -25,10 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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
sm.sort
from sm_model sm
left join sm_device sd on sm.model_id = sd.model_id
</sql>
<sql id="searchCondition">
@ -52,13 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<include refid="searchCondition"/>
</where>
group by sm.model_id
</select>
<select id="selectSmModelByModelId" parameterType="Long" resultMap="SmModelResult">
<include refid="selectSmModelVo"/>
where sm.model_id = #{modelId}
group by sm.model_id
</select>
<select id="selectCount" resultType="java.lang.Integer">
@ -95,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="serviceRate != null">service_rate,</if>
<if test="productId != null">product_id,</if>
<if test="snPrefix != null">sn_prefix,</if>
<if test="sort != null">sort,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="modelName != null">#{modelName},</if>
@ -112,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="serviceRate != null">#{serviceRate},</if>
<if test="productId != null">#{productId},</if>
<if test="snPrefix != null">#{snPrefix},</if>
<if test="sort != null">#{sort},</if>
</trim>
</insert>
@ -133,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="serviceRate != null">service_rate = #{serviceRate},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="snPrefix != null">sn_prefix = #{snPrefix},</if>
<if test="sort != null">sort = #{sort},</if>
</trim>
where model_id = #{modelId}
</update>