bug

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/AlarmRecord.java

@@ -40,4 +40,13 @@ public class AlarmRecord extends BaseBean{
 
     @ApiModelProperty("报警时间")
     private Date alarmTime;
+
+    /**
+     * 报警开始时间
+     */
+    private transient String startTime;
+    /**
+     * 报警结束时间
+     */
+    private transient String endTime;
 }

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorage.java

@@ -66,36 +66,9 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("验收备注")
     private String validateRemark;
 
-    @ApiModelProperty("拒收图片")
-    private String rejectionApplyImg;
-
-    @ApiModelProperty("拒收原因")
-    private String rejectionApplyRemark;
-
-    @ApiModelProperty("拒收申请人")
-    private Long rejectionApplyUserid;
-
-    @ApiModelProperty("拒收发起时间")
-    private Date rejectionApplyTime;
-
-    @ApiModelProperty("拒收处理人id")
-    private Long rejectionUserid;
-
-    @ApiModelProperty("拒收处理时间")
-    private Date rejectionTime;
-
-    @ApiModelProperty("待办清单详情表id")
-    private Long taskDetailId;
-
     @ApiModelProperty("入库状态 1闲置 2使用 3出库")
     private Integer storageStatus;
 
-    @ApiModelProperty("气瓶状态 0入库 1问题气瓶")
-    private Long airStatus;
-
-    @ApiModelProperty("待办清单id")
-    private Long taskId;
-
     @ApiModelProperty("入库人id")
     private Long inUserId;
 
@@ -109,13 +82,13 @@ public class BottleStorage extends BaseBean {
     private Long airBottleId;
 
     @ApiModelProperty("气体名称")
-    private String airBottleName;
+    private String airName;
 
     @ApiModelProperty("气体组分")
     private String airComponent;
 
     @ApiModelProperty("规格详情")
-    private String specificationName;
+    private String configName;
 
     @ApiModelProperty("出库人id")
     private Long outUserId;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/AlarmRecordVo.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -31,57 +32,12 @@ public class AlarmRecordVo {
      */
     @ApiModelProperty(value = "数据主键，关联其他业务表中的数据id")
     private Long masterId;
-    /**
-     * 报警类型;1:出门,2:进门
-     */
-    @ApiModelProperty(value = "报警类型;1:出门,2:进门")
-    private Integer type;
-    /**
-     * 产品类型;1:气瓶,2:其他
-     */
-    @ApiModelProperty(value = "产品类型;1:气瓶,2:其他")
-    private Integer productType;
-
-    /**
-     * 当前使用人
-     */
-    @Excel(name = "当前使用人" )
-    @ApiModelProperty(value = "当前使用人")
-    private String currentUser;
-    /**
-     * 联系方式
-     */
-    @Excel(name = "联系方式" )
-    @ApiModelProperty(value = "联系方式")
-    private String currentPhone;
-
-    /**
-     * 气瓶所有人id
-     */
-    @ApiModelProperty(value = "气瓶所有人id")
-    private Long ownerId;
-
-    /**
-     * 气瓶所有人
-     */
-    @Excel(name = "气瓶所有人" )
-    @ApiModelProperty(value = "气瓶所有人")
-    private String owner;
 
-    /**
-     * 联系方式
-     */
-    @Excel(name = "联系方式" )
-    @ApiModelProperty(value = "联系方式")
-    private String ownerPhone;
-
-    /**
-     * 实验地点
-     */
-    @Excel(name = "实验地点" )
-    @ApiModelProperty(value = "实验地点")
-    private String location;
+    @ApiModelProperty("电子标签")
+    private String electronicTag;
 
+    @ApiModelProperty("气瓶编号")
+    private String airNumber;
     /**
      * 气体名称
      */
@@ -94,11 +50,15 @@ public class AlarmRecordVo {
     @Excel(name = "气瓶级别/规格" )
     @ApiModelProperty(value = "气瓶规格")
     private String configName;
+
+    @ApiModelProperty("产品类型;1:气瓶,2:其他")
+    private Byte productType;
+
     /**
      * 气瓶余量
      */
     @ApiModelProperty(value = "气瓶余量")
-    private Double currentPressure;
+    private BigDecimal currentPressure;
 
     /**
      * 气瓶余量导出字段

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageVo.java

@@ -0,0 +1,50 @@
+package com.zd.bottle.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class BottleStorageVo {
+
+    private Long id;
+    /** 气瓶编号 */
+    @Excel(name = "气瓶编号")
+    @ApiModelProperty(value = "气瓶编号")
+    private String airNumber;
+    /**
+     * 气瓶名称（冗余字段）
+     */
+    @ApiModelProperty(value = "气瓶名称")
+    private String airName;
+    /** 气瓶规格名称 */
+    @Excel(name = "气体级别/规格")
+    @ApiModelProperty(value = "气瓶规格名称")
+    private String configName;
+
+    /** 使用人数 */
+    @ApiModelProperty(value = "使用人数")
+    private Integer numberPersons;
+
+    /** 当前压力值 */
+    @Excel(name = "当前压力值")
+    @ApiModelProperty(value = "当前压力值")
+    private Double currentPressure;
+
+    /**
+     * 管理端端查询冗余字段
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "管理端端查询冗余字段（最后使用时间）")
+    private Date lastTime;
+
+    /** 入库状态 1闲置 2使用 3出库 */
+    @ApiModelProperty(value = "入库状态 1空闲 2使用中 3已出库")
+    private Integer storageStatus;
+}