东北大学提交

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbBeaconController.java

@@ -43,7 +43,7 @@ public class DbBeaconController extends AbstractController {
      * @param dbBeaconBo
      * @return
      */
-    @ApiOperation(value = "新增信标", notes = "参数说明： ")
+    @ApiOperation(value = "新增信标", notes = "参数说明： beaconTag 信标标签")
     @Log(title = "新增信标", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     public ResultData add(@RequestBody DbBeaconBo dbBeaconBo) {
@@ -55,6 +55,7 @@ public class DbBeaconController extends AbstractController {
         }
         DbBeacon dbBeacon = new DbBeacon();
         BeanUtils.copyProperties(dbBeaconBo, dbBeacon);
+        dbBeacon.setState(Boolean.FALSE);
         if (dbBeaconService.save(dbBeacon)) {
             return ResultData.success("操作成功");
         }
@@ -64,16 +65,17 @@ public class DbBeaconController extends AbstractController {
 
     /**
      * 更新信标
+     *
      * @param dbBeaconBo
      * @return
      */
-    @ApiOperation(value = "更新信标", notes = "参数说明：id 必填 ")
+    @ApiOperation(value = "更新信标", notes = "参数说明：id 必填 , beaconTag 信标标签")
     @Log(title = "更新信标", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/update")
     public ResultData update(@RequestBody DbBeaconBo dbBeaconBo) {
         //参数检查
         paramCheck.notNull(dbBeaconBo).notNull(dbBeaconBo.getId()).strNotEmpty(dbBeaconBo.getBeaconTag());
-        long count = dbBeaconService.count(new LambdaQueryWrapper<DbBeacon>().ne(DbBeacon::getBeaconTag,dbBeaconBo.getId()).eq(DbBeacon::getBeaconTag, dbBeaconBo.getBeaconTag()));
+        long count = dbBeaconService.count(new LambdaQueryWrapper<DbBeacon>().ne(DbBeacon::getBeaconTag, dbBeaconBo.getId()).eq(DbBeacon::getBeaconTag, dbBeaconBo.getBeaconTag()));
         if (count > 0) {
             return ResultData.fail("当前信标码已存在！");
         }
@@ -150,7 +152,7 @@ public class DbBeaconController extends AbstractController {
         paramCheck.strNotEmpty(beaconTag);
         DbBeacon dbBeacon = dbBeaconService.getOne(new LambdaQueryWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, beaconTag));
         DbBeaconPrintVo dbBeaconPrintVo = new DbBeaconPrintVo();
-        if(dbBeacon.getState().equals(1)){
+        if (dbBeacon.getState()) {
             //已绑定 查库存
             DbStock dbStock = dbStockService.getOne(new LambdaQueryWrapper<DbStock>().eq(DbStock::getBeaconTag, beaconTag));
             BeanUtils.copyProperties(dbStock, dbBeaconPrintVo);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbBottleTypeController.java

@@ -2,7 +2,6 @@ package com.zd.airbottle.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zd.airbottle.domain.DbBottleType;
 import com.zd.airbottle.domain.bo.DbBottleTypeBo;
 import com.zd.airbottle.service.DbBottleTypeService;
@@ -12,8 +11,6 @@ import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.AbstractController;
 import com.zd.model.domain.ResultData;
-import com.zd.model.page.PageDomain;
-import com.zd.model.page.PageQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
@@ -46,8 +43,7 @@ public class DbBottleTypeController extends AbstractController {
         //参数检查
         paramCheck.notNull(dbBottleTypeBo).strNotEmpty(dbBottleTypeBo.getGasName()).notNull(dbBottleTypeBo.getLevel()).notNull(dbBottleTypeBo.getSize());
         //验证是否重复
-        long count = dbBottleTypeService.count(new LambdaQueryWrapper<DbBottleType>().eq(DbBottleType::getGasName,dbBottleTypeBo.getGasName())
-                .eq(DbBottleType::getLevel, dbBottleTypeBo.getLevel()).eq(DbBottleType::getSize, dbBottleTypeBo.getSize()));
+        long count = dbBottleTypeService.count(new LambdaQueryWrapper<DbBottleType>().eq(DbBottleType::getGasName, dbBottleTypeBo.getGasName()).eq(DbBottleType::getLevel, dbBottleTypeBo.getLevel()).eq(DbBottleType::getSize, dbBottleTypeBo.getSize()));
         if (count > 0) {
             return ResultData.fail("已存在相同气瓶类型");
         }
@@ -74,8 +70,7 @@ public class DbBottleTypeController extends AbstractController {
         //参数检查
         paramCheck.notNull(dbBottleTypeBo).notNull(dbBottleTypeBo.getId()).strNotEmpty(dbBottleTypeBo.getGasName()).notNull(dbBottleTypeBo.getLevel()).notNull(dbBottleTypeBo.getSize());
         //验证是否重复
-        long count = dbBottleTypeService.count(new LambdaQueryWrapper<DbBottleType>().ne(DbBottleType::getId,dbBottleTypeBo.getId()).eq(DbBottleType::getGasName,dbBottleTypeBo.getGasName())
-                .eq(DbBottleType::getLevel, dbBottleTypeBo.getLevel()).eq(DbBottleType::getSize, dbBottleTypeBo.getSize()));
+        long count = dbBottleTypeService.count(new LambdaQueryWrapper<DbBottleType>().ne(DbBottleType::getId, dbBottleTypeBo.getId()).eq(DbBottleType::getGasName, dbBottleTypeBo.getGasName()).eq(DbBottleType::getLevel, dbBottleTypeBo.getLevel()).eq(DbBottleType::getSize, dbBottleTypeBo.getSize()));
         if (count > 0) {
             return ResultData.fail("已存在相同气瓶类型");
         }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStockController.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zd.airbottle.domain.DbBeacon;
 import com.zd.airbottle.domain.DbInOutRecord;
 import com.zd.airbottle.domain.DbStock;
+import com.zd.airbottle.domain.DbUsageRecord;
 import com.zd.airbottle.domain.bo.DbStockBo;
 import com.zd.airbottle.domain.bo.DbStockParam;
+import com.zd.airbottle.domain.vo.DbStockVo;
 import com.zd.airbottle.service.DbBeaconService;
 import com.zd.airbottle.service.DbInOutRecordService;
 import com.zd.airbottle.service.DbStockService;
+import com.zd.airbottle.service.DbUsageRecordService;
 import com.zd.airbottle.utils.PageUtil;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.log.BusinessType;
@@ -28,6 +31,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,6 +51,9 @@ public class DbStockController extends AbstractController {
     private DbBeaconService dbBeaconService;
     @Autowired
     private DbInOutRecordService dbInOutRecordService;
+
+    @Autowired
+    private DbUsageRecordService dbUsageRecordService;
     @Autowired
     private RemoteLaboratoryService remoteLaboratoryService;
 
@@ -59,7 +66,7 @@ public class DbStockController extends AbstractController {
      * @param dbStockBo
      * @return
      */
-    @ApiOperation(value = "库存入库", notes = "参数说明：gasName 气体名称，level 级别，size 规格，bottleCode 气瓶编号 ")
+    @ApiOperation(value = "库存入库", notes = "参数说明：gasName 气体名称，level 级别，size 规格，gasComposition 气体成分,bottleColour 气瓶颜色,handwheel 手轮（0否 1是）,fixed 固定（0否 1是）,statusLabel 状态标牌（0否 1是），electronicTag 电子标签（0否 1是）,gasPressure 气体压力,validPeriod 有效期限,beaconTag 信标标签,subjectId 实验室id,subjectName 实验室名称,remark 备注 ")
     @PostMapping(value = "/enter")
     public ResultData in(@RequestBody DbStockBo dbStockBo) {
         //参数检查
@@ -75,6 +82,7 @@ public class DbStockController extends AbstractController {
             List<CheckSubjectDto> data = resultData.getData();
             dbStockBo.setCollegeId(data.get(0).getDeptId());
             dbStockBo.setCollegeName(data.get(0).getCollegeName());
+            dbStockBo.setRoomNum(data.get(0).getRoomNumber());
         }
         DbStock dbStock = new DbStock();
         BeanUtils.copyProperties(dbStockBo, dbStock);
@@ -87,7 +95,7 @@ public class DbStockController extends AbstractController {
             BeanUtils.copyProperties(dbStockBo, dbInOutRecord);
             dbInOutRecord.setType(1);
             dbInOutRecordService.save(dbInOutRecord);
-            dbBeaconService.update(new LambdaUpdateWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbInOutRecord.getBeaconTag()).set(DbBeacon::getState, 1));
+            dbBeaconService.update(new LambdaUpdateWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbInOutRecord.getBeaconTag()).set(DbBeacon::getState, Boolean.TRUE).set(DbBeacon::getBindingTime, LocalDateTime.now()));
             return ResultData.success("操作成功");
         }
         return ResultData.fail("操作失败");
@@ -99,7 +107,7 @@ public class DbStockController extends AbstractController {
      * @param dbStockBo
      * @return
      */
-    @ApiOperation(value = "库存出库", notes = "参数说明：gasName 气体名称，level 级别，size 规格，bottleCode 气瓶编号 ")
+    @ApiOperation(value = "库存出库", notes = "参数说明：id 必填，gasName 气体名称，level 级别，size 规格，gasComposition 气体成分,bottleColour 气瓶颜色,handwheel 手轮（0否 1是）,fixed 固定（0否 1是）,statusLabel 状态标牌（0否 1是），electronicTag 电子标签（0否 1是）,gasPressure 气体压力,validPeriod 有效期限,beaconTag 信标标签,subjectId 实验室id,subjectName 实验室名称,remark 备注 ")
     @PostMapping(value = "/out")
     public ResultData out(@RequestBody DbStockBo dbStockBo) {
         //参数检查
@@ -124,7 +132,7 @@ public class DbStockController extends AbstractController {
      * @Param [dbStockBo]
      * @Return com.zd.model.domain.ResultData
      **/
-    @ApiOperation(value = "更新库存信息", notes = "参数说明：id 必填 ")
+    @ApiOperation(value = "更新库存信息", notes = "参数说明：id 必填，gasName 气体名称，level 级别，size 规格，gasComposition 气体成分,bottleColour 气瓶颜色,handwheel 手轮（0否 1是）,fixed 固定（0否 1是）,statusLabel 状态标牌（0否 1是），electronicTag 电子标签（0否 1是）,gasPressure 气体压力,validPeriod 有效期限,beaconTag 信标标签,subjectId 实验室id,subjectName 实验室名称,remark 备注 ")
     @Log(title = "更新库存信息", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/update")
     public ResultData update(@RequestBody DbStockBo dbStockBo) {
@@ -151,6 +159,11 @@ public class DbStockController extends AbstractController {
     public ResultData find(@RequestParam("id") Long id) {
         paramCheck.notNull(id);
         DbStock dbStock = dbStockService.getById(id);
+        DbUsageRecord dbUsageRecord = dbUsageRecordService.getOne(new LambdaQueryWrapper<DbUsageRecord>().eq(DbUsageRecord::getStcokId, dbStock.getId()).orderByDesc(DbUsageRecord::getId).last("limit 1"));
+        DbStockVo dbStockVo = new DbStockVo();
+        BeanUtils.copyProperties(dbStock,dbStockVo);
+        dbStockVo.setUser(dbUsageRecord.getCreateName());
+        dbStockVo.setLastUseTime(dbUsageRecord.getCreateTime());
         return ResultData.success(dbStock);
     }
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbBeacon.java

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -30,6 +33,7 @@ public class DbBeacon extends Model<DbBeacon> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbBottleType.java

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -30,6 +33,7 @@ public class DbBottleType extends Model<DbBottleType> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbInOutRecord.java

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -30,6 +33,7 @@ public class DbInOutRecord extends Model<DbInOutRecord> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbStock.java

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -30,6 +33,7 @@ public class DbStock extends Model<DbStock> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbUsageRecord.java

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -30,9 +33,13 @@ public class DbUsageRecord extends Model<DbUsageRecord> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
+    @ApiModelProperty("库存id")
+    private Long stcokId;
+
     @ApiModelProperty("气体名称")
     private String gasName;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbBeaconBo.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +25,7 @@ import java.time.LocalDateTime;
 public class DbBeaconBo extends PageQuery implements Serializable {
 
     @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("信标标签")

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbStockParam.java

@@ -1,5 +1,7 @@
 package com.zd.airbottle.domain.bo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +21,7 @@ import java.time.LocalDateTime;
 public class DbStockParam extends PageQuery implements Serializable {
 
     @ApiModelProperty("学院id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long collegeId;
 
     @ApiModelProperty("开始时间")

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbUsageRecordBo.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,9 +25,13 @@ import java.time.LocalDateTime;
 public class DbUsageRecordBo extends PageQuery implements Serializable {
 
     @ApiModelProperty("主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
+    @ApiModelProperty("库存id")
+    private Long stcokId;
+
     @ApiModelProperty("气体名称")
     private String gasName;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/DbStockVo.java

@@ -1,114 +1,59 @@
 package com.zd.airbottle.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * <p>
- * 库存表
- * </p>
- *
- * @author hzw
- * @since 2023-10-16
+ * @Description 库存详情vo
+ * @Author hzw
+ * @Date 2023/10/19 9:50
+ * @Version 2.0
  */
 @Data
-@ApiModel(value = "DbStock对象", description = "库存表")
-public class DbStockVo implements Serializable{
-
-    private static final long serialVersionUID = 1L;
+@ApiModel("库存详情vo")
+public class DbStockVo implements Serializable {
 
     @ApiModelProperty("主键id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    @ApiModelProperty("气瓶编号")
-    private Long bottleCode;
-
     @ApiModelProperty("气体名称")
     private String gasName;
 
-    @ApiModelProperty("级别（）")
+    @ApiModelProperty("级别（1普通纯 2实验纯 3高级纯）")
     private Integer level;
 
-    @ApiModelProperty("规格")
+    @ApiModelProperty("规格（5Mpa,10Mpa,15Mpa）")
     private Integer size;
 
-    @ApiModelProperty("气瓶颜色")
-    private String bottleColour;
-
-    @ApiModelProperty("手轮（0否 1是）")
-    private Boolean handwheel;
-
-    @ApiModelProperty("固定（0否 1是）")
-    private Boolean fixed;
-
-    @ApiModelProperty("状态标牌（0否 1是）")
-    private Boolean statusLabel;
-
-    @ApiModelProperty("电子标签（0否 1是）")
-    private Boolean electronicTag;
-
     @ApiModelProperty("气体压力")
     private Integer gasPressure;
 
-    @ApiModelProperty("有效期限")
-    private LocalDateTime validPeriod;
-
     @ApiModelProperty("信标标签")
     private String beaconTag;
 
-    @ApiModelProperty("学院id")
-    private Long collegeId;
-
     @ApiModelProperty("学院名称")
     private String collegeName;
 
-    @ApiModelProperty("实验室id")
-    private Long subjectId;
-
     @ApiModelProperty("实验室名称")
     private String subjectName;
 
     @ApiModelProperty("房间号")
     private String roomNum;
 
-    @ApiModelProperty("创建人名称")
-    private String createName;
-
-    @ApiModelProperty("创建人ID")
-    private Long createBy;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("修改人名称")
-    private String updateName;
-
-    @ApiModelProperty("修改人ID")
-    private Long updateBy;
-
-    @ApiModelProperty("修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty("备注")
-    private String remark;
+    @ApiModelProperty("使用人")
+    private String user;
 
-    @ApiModelProperty("数量")
-    private int totalNum;
+    @ApiModelProperty("最后使用时间")
+    private LocalDateTime lastUseTime;
 
-    @ApiModelProperty("实验室级别")
-    private String subjectLevel;
 
-    @ApiModelProperty("实验室类型")
-    private String subjectType;
 }

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/DbUsageRecordMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.zd.airbottle.domain.DbUsageRecord">
         <id column="id" property="id" />
+        <result column="stcok_id" property="stcokId" />
         <result column="gas_name" property="gasName" />
         <result column="usage_amount" property="usageAmount" />
         <result column="level" property="level" />
@@ -34,7 +35,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, gas_name, usage_amount, level, size, bottle_code, gas_composition, college_id, college_name, subject_id, subject_name, room_num, beacon_tag, operator_id, operator, phone, gas_pressure, start_time, end_time, usage_img, create_name, create_by, create_time, update_name, update_by, update_time, remark
+        id, stcok_id, gas_name, usage_amount, level, size, bottle_code, gas_composition, college_id, college_name, subject_id, subject_name, room_num, beacon_tag, operator_id, operator, phone, gas_pressure, start_time, end_time, usage_img, create_name, create_by, create_time, update_name, update_by, update_time, remark
     </sql>
 
 </mapper>