设备版本号

smart-switch-service/src/main/java/com/ruoyi/iot/constants/ReceiveConstants.java

@@ -32,4 +32,7 @@ public class ReceiveConstants {
 
     // 数据点ID：CSQ
     public static final String DS_CSQ = "CSQ";
+
+    // 数据点ID：VER 版本号
+    public static final String DS_VER = "VER";
 }

smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java

@@ -29,6 +29,7 @@ public class IotDeviceInfo {
     private BigDecimal time;   // 剩余时间（秒）
     private String model;   // 型号
     private String wifi;    // WIFI
+    private String version; // 版本号
 
     public static IotDeviceInfo newDefaultInstance() {
         return IotDeviceInfo.builder()
@@ -41,6 +42,7 @@ public class IotDeviceInfo {
                 .set(DeviceOutageWay.IMMEDIATE.getValue())
                 .time(BigDecimal.ZERO)
                 .model(null)
+                .version(null)
                 .build();
     }
 

smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotConverterImpl.java

@@ -94,6 +94,9 @@ public class IotConverterImpl implements IotConverter {
                 case ReceiveConstants.DS_SSID:
                     device.setWifi(value);
                     break;
+                case ReceiveConstants.DS_VER:
+                    device.setVersion(value);
+                    break;
                 default:
                     break;
             }

smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java

@@ -242,4 +242,8 @@ public class Device extends BaseEntity
     @ApiModelProperty("月费")
     @Min(value = 0, message = "月费不允许小于0")
     private BigDecimal monthFee;
+
+    @Excel(name = "设备版本号")
+    @ApiModelProperty("设备版本号")
+    private String version;
 }

smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java

@@ -82,4 +82,7 @@ public class DeviceQuery extends Device {
 
     @ApiModelProperty("代理名称")
     private String agentName;
+
+    @ApiModelProperty("设备版本号")
+    private String version;
 }

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

@@ -42,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="lockUserId != null"> and sd.lock_user_id = #{lockUserId}</if>
         <if test="agentId != null "> and agent_id = #{agentId}</if>
         <if test="agentName != null  and agentName != ''"> and sua.user_name like concat('%', #{agentName}, '%')</if>
-        <if test="serviceMode != null  and serviceMode != ''"> and service_mode = #{serviceMode}</if>
+        <if test="serviceMode != null  and serviceMode != ''"> and sd.service_mode = #{serviceMode}</if>
+        <if test="version != null  and version != ''"> and sd.version like concat('%', #{version}, '%')</if>
         <if test="isArrears != null">
             <if test="isArrears">
                 and (sd.rent_time is null or sd.rent_time &lt;= now())
@@ -152,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sd.service_mode,
             sd.month_fee,
             sd.last_recover_time,
+            sd.version,
             sm.model_name as model,
             sm.picture as picture,
             sm.tags as  model_tags,
@@ -354,6 +356,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lastRecoverTime != null">last_recover_time,</if>
             <if test="onlineStatus1 != null">online_status1,</if>
             <if test="onlineStatus2 != null">online_status2,</if>
+            <if test="version != null">version,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="storeId != null">#{storeId},</if>
@@ -405,6 +408,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lastRecoverTime != null">#{lastRecoverTime},</if>
             <if test="onlineStatus1 != null">#{onlineStatus1},</if>
             <if test="onlineStatus2 != null">#{onlineStatus2},</if>
+            <if test="version != null">#{version},</if>
          </trim>
     </insert>
 
@@ -477,6 +481,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lastRecoverTime != null">last_recover_time = #{lastRecoverTime},</if>
             <if test="onlineStatus1 != null">online_status1 = #{onlineStatus1},</if>
             <if test="onlineStatus2 != null">online_status2 = #{onlineStatus2},</if>
+            <if test="version != null">version = #{version},</if>
         </trim>
         where device_id = #{deviceId}
     </update>

smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java

@@ -1009,6 +1009,7 @@ public class DeviceServiceImpl implements DeviceService
                     device.setRealTimePower(deviceInfo.getP());
                     device.setVoltage(deviceInfo.getV());
                     device.setElectricity(deviceInfo.getA());
+                    device.setVersion(deviceInfo.getVersion());
 
                     // 总用电量
                     if (deviceInfo.getW() != null) {

smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java

@@ -1124,9 +1124,9 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
 
                     if (withDevice) {
                         if (SuitFeeType.TIMING_COUNT.getType().equals(order.getSuitFeeType())) {
-                            deviceService.resetEle(device, true);
+                            deviceService.resetEle(device, false);
                         } else if(SuitFeeType.TIMING_TIME.getType().equals(order.getSuitFeeType())){
-                            deviceService.resetTime(device, true);
+                            deviceService.resetTime(device, false);
                         }
                         iotService.close(device);
                     }
@@ -1233,9 +1233,9 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
                     // 尝试设备清零时长、电量
                     if (withDevice) {
                         if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
-                            deviceService.resetTime(device, true);
+                            deviceService.resetTime(device, false);
                         } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
-                            deviceService.resetEle(device, true);
+                            deviceService.resetEle(device, false);
                         }
                     }