Sfoglia il codice sorgente

添加设备是否冷冻机
是否有玻璃加热

李进 1 anno fa
parent
commit
705d54c9d2

+ 10 - 0
device-api-service/src/main/java/com/xy/entity/DeviceSysinfo.java

@@ -116,6 +116,16 @@ public class DeviceSysinfo {
      */
     private Boolean isHaveLightSecond;
 
+    /**
+     * 是否冷冻机
+     */
+    private Boolean isHaveFreeze;
+
+    /**
+     * 是否有玻璃加热
+     */
+    private Boolean isHaveHeat;
+
     /**
      * 设备型号
      */

+ 4 - 1
device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -45,7 +45,8 @@
             <result column="sim_company" property="simCompany"/>
             <result column="disk_space" property="diskSpace"/>
             <result column="memery_space" property="memerySpace"/>
-            <result column="sysinfo_create_time" property="createTime"/>
+            <result column="is_have_freeze" property="isHaveFreeze"/>
+            <result column="is_have_heat" property="isHaveHeat"/>
         </association>
         <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
             <result column="sys_start_time" property="sysStartTime"/>
@@ -116,6 +117,8 @@
         sysinfo.disk_space,
         sysinfo.memery_space,
         sysinfo.create_time as sysinfo_create_time,
+        sysinfo.is_have_freeze,
+        sysinfo.is_have_heat,
         status.sys_start_time,
         status.sys_cur_time,
         status.sys_power,

+ 6 - 0
device-api/src/main/java/com/xy/dto/DeviceSysinfoDto.java

@@ -110,6 +110,12 @@ public class DeviceSysinfoDto {
         @ApiModelProperty("是否可调副灯")
         private Boolean isHaveLightSecond;
 
+        @ApiModelProperty("是否冷冻机")
+        private Boolean isHaveFreeze;
+
+        @ApiModelProperty("是否有玻璃加热")
+        private Boolean isHaveHeat;
+
         @ApiModelProperty("设备型号")
         private String deviceModel;