增加机柜门

device-api-service/src/main/java/com/xy/entity/DeviceStatus.java

@@ -188,4 +188,13 @@ public class DeviceStatus {
      */
     private Boolean isPay;
 
+    /**
+     * 机柜左门状态
+     */
+    private Integer jg1LockStateL;
+
+    /**
+     * 机柜右门状态
+     */
+    private Integer jg1LockStateR;
 }

device-api-service/src/main/java/com/xy/service/DeviceStatusServiceImpl.java

@@ -50,8 +50,6 @@ public class DeviceStatusServiceImpl extends ServiceImpl<DeviceStatusMapper, Dev
 
     private DeviceTempRecordsServiceImpl deviceTempRecordsService;
 
-    private ActivityInfoService activityInfoService;
-
     private DeviceConfigServiceImpl deviceConfigService;
 
     private DeviceEventMsgService deviceEventMsgService;

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

@@ -83,6 +83,8 @@
             <result column="after_fill_stock" property="afterFillStock"/>
             <result column="stock_status" property="stockStatus"/>
             <result column="is_use_battery" property="isUseBattery"/>
+            <result column="jg1_lock_state_l" property="jg1LockStateL"/>
+            <result column="jg1_lock_state_r" property="jg1LockStateR"/>
         </association>
         <association property="deviceRegister" javaType="com.xy.dto.DeviceRegisterDto$Vo">
             <result column="register_num" property="registerNum"/>
@@ -213,6 +215,8 @@
         status.after_fill_stock,
         status.stock_status,
         status.is_use_battery,
+        status.jg1_lock_state_l,
+        status.jg1_lock_state_r,
         mp.place_name,
         ml.line_name as place_line_name,
         sr.name as district_name

device-api/src/main/java/com/xy/dto/DeviceStatusDto.java

@@ -159,6 +159,12 @@ public class DeviceStatusDto {
         @ApiModelProperty("是否可交易")
         private Boolean isPay;
 
+        @ApiModelProperty("机柜左门状态")
+        private Integer jg1LockStateL;
+
+        @ApiModelProperty("机柜右门状态")
+        private Integer jg1LockStateR;
+
         @ApiModelProperty("更新时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;