东北大学气瓶模块对接修改2

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

@@ -63,7 +63,7 @@ public class DbStockController extends AbstractController {
     private TokenService tokenService;
 
     @Autowired
-    private static RedisService redisService;
+    private RedisService redisService;
 
     /**
      * 库存入库
@@ -76,6 +76,10 @@ public class DbStockController extends AbstractController {
     public ResultData in(@RequestBody DbStockBo dbStockBo) {
         //参数检查
         paramCheck.notNull(dbStockBo).strNotEmpty(dbStockBo.getGasName()).notNull(dbStockBo.getBeaconTag()).notNull(dbStockBo.getSubjectId());
+        long count = dbBeaconService.count(new LambdaQueryWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbStockBo.getBeaconTag()));
+        if (count == 0) {
+            return ResultData.fail("信标库中不存在此标签！");
+        }
         //验证信标
         long count1 = dbStockService.count(new LambdaQueryWrapper<DbStock>().eq(DbStock::getBeaconTag, dbStockBo.getBeaconTag()));
         if (count1 > 0) {
@@ -101,7 +105,7 @@ public class DbStockController extends AbstractController {
             dbInOutRecordService.save(dbInOutRecord);
             dbBeaconService.update(new LambdaUpdateWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbInOutRecord.getBeaconTag()).set(DbBeacon::getState, Boolean.TRUE).set(DbBeacon::getBindingTime, LocalDateTime.now()));
             //todo 重新加载入库的信标到redis  chai
-            new Thread(()->loadBeaconDate(dbStock)).start();
+            new Thread(() -> loadBeaconDate(dbStock)).start();
             return ResultData.success("操作成功");
         }
         return ResultData.fail("操作失败");
@@ -119,21 +123,24 @@ public class DbStockController extends AbstractController {
         //参数检查
         paramCheck.notNull(dbStockBo).notNull(dbStockBo.getId());
         DbStock stock = dbStockService.getById(dbStockBo.getId());
+        if(dbStockBo.getGasPressure() != null){
+            dbStockService.update(new LambdaUpdateWrapper<DbStock>().set(DbStock::getGasPressure, dbStockBo.getGasPressure()).eq(DbStock::getGasPressure, dbStockBo.getGasPressure()));
+        }
         if (dbStockService.removeById(stock.getId())) {
             DbInOutRecord dbInOutRecord = new DbInOutRecord();
             BeanUtils.copyProperties(stock, dbInOutRecord);
             dbInOutRecord.setType(2);
             dbInOutRecordService.save(dbInOutRecord);
+            //解除信标
             dbBeaconService.update(new LambdaUpdateWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbInOutRecord.getBeaconTag()).set(DbBeacon::getState, 0));
             //todo 重新加载入库的信标到redis  chai
-            new Thread(()->remBeaconDate(stock)).start();
+            new Thread(() -> remBeaconDate(stock)).start();
             return ResultData.success("出库成功");
         }
         return ResultData.fail("出库失败");
     }
 
 
-
     /**
      * 更新库存信息
      *
@@ -146,14 +153,19 @@ public class DbStockController extends AbstractController {
     public ResultData update(@RequestBody DbStockBo dbStockBo) {
         //参数检查
         paramCheck.notNull(dbStockBo).notNull(dbStockBo.getId()).notNull(dbStockBo.getBeaconTag());
+        long count1 = dbBeaconService.count(new LambdaQueryWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbStockBo.getBeaconTag()));
+        if (count1 == 0) {
+            return ResultData.fail("信标库中不存在此标签！");
+        }
         long count = dbStockService.count(new LambdaQueryWrapper<DbStock>().ne(DbStock::getBeaconTag, dbStockBo.getBeaconTag()).eq(DbStock::getBeaconTag, dbStockBo.getBeaconTag()));
         if (count > 0) {
-            return ResultData.success("信标标签已存在！");
+            return ResultData.fail("信标标签已绑定！");
         }
+        dbBeaconService.update(new LambdaUpdateWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbStockBo.getBeaconTag()).set(DbBeacon::getState, Boolean.TRUE).set(DbBeacon::getBindingTime, LocalDateTime.now()));
         //将旧的信标从redis中移除 chai
         DbStock oldDbStock = dbStockService.getById(dbStockBo.getId());
         if (dbStockService.update(new LambdaUpdateWrapper<DbStock>().eq(DbStock::getId, dbStockBo.getId()).set(DbStock::getBeaconTag, dbStockBo.getBeaconTag()))) {
-            redisService.deleteObject(BaseConstants.BEACON_MATE_DET+"~"+ oldDbStock.getBeaconTag()+"~"+oldDbStock.getSubjectId()+"~"+oldDbStock.getGasName());
+            redisService.deleteObject(BaseConstants.BEACON_MATE_DET + "~" + oldDbStock.getBeaconTag() + "~" + oldDbStock.getSubjectId() + "~" + oldDbStock.getGasName());
             //先把对应的信标提示语撤销
             List <Map<String,Object>> beaconNoticeList = redisService.getCacheObject(BaseConstants.BEACON_MATE_NOTICE+"~"+oldDbStock.getSubjectId());
             List <Map<String,Object>> newNoticeList = new ArrayList <>();
@@ -176,7 +188,7 @@ public class DbStockController extends AbstractController {
             }
             //todo 重新加载入库的信标到redis  chai
             DbStock newDbStock = dbStockService.getById(dbStockBo.getId());
-            new Thread(()->loadBeaconDate(newDbStock)).start();
+            new Thread(() -> loadBeaconDate(newDbStock)).start();
             return ResultData.success("操作成功");
         }
         return ResultData.fail("操作失败");
@@ -195,10 +207,14 @@ public class DbStockController extends AbstractController {
         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);
+        BeanUtils.copyProperties(dbStock, dbStockVo);
+        if (dbUsageRecord != null) {
+            dbStockVo.setUser(dbUsageRecord.getCreateName());
+            dbStockVo.setLastUseTime(dbUsageRecord.getCreateTime());
+        }
+        List<DbUsageRecord> list = dbUsageRecordService.list(new LambdaQueryWrapper<DbUsageRecord>().eq(DbUsageRecord::getStcokId, dbStock.getId()).orderByDesc(DbUsageRecord::getId));
+        dbStockVo.setDbUsageRecordList(list);
+        return ResultData.success(dbStockVo);
     }
 
     /**
@@ -241,7 +257,10 @@ public class DbStockController extends AbstractController {
         LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DbStock::getBeaconTag, BeaconTag);
         DbStock dbStock = dbStockService.getOne(queryWrapper);
-        return ResultData.success(dbStock);
+        if (dbStock != null) {
+            return ResultData.success(dbStock);
+        }
+        return ResultData.fail("信标未绑定库存信息！");
     }
 
     /**
@@ -257,18 +276,17 @@ public class DbStockController extends AbstractController {
         LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DbStock::getSubjectId, subId);
         List<DbStock> list = dbStockService.list(queryWrapper);
-        Map <String,List<DbStock>> dbStockMap = Optional.ofNullable(list).orElseGet(Collections::emptyList).stream()
-                .collect(Collectors.groupingBy(DbStock::getGasName));
-        Map<String,Object> allMap = new HashMap <>();
-        allMap.put("total",list.size());
-        List<Map<String,Object>> classifyList = new ArrayList <>();
-        dbStockMap.forEach((key,value)->{
-            Map<String,Object> classifyMap = new HashMap <>();
-            classifyMap.put("name",key);
-            classifyMap.put("bottleSize",value.size());
+        Map<String, List<DbStock>> dbStockMap = Optional.ofNullable(list).orElseGet(Collections::emptyList).stream().collect(Collectors.groupingBy(DbStock::getGasName));
+        Map<String, Object> allMap = new HashMap<>();
+        allMap.put("total", list.size());
+        List<Map<String, Object>> classifyList = new ArrayList<>();
+        dbStockMap.forEach((key, value) -> {
+            Map<String, Object> classifyMap = new HashMap<>();
+            classifyMap.put("name", key);
+            classifyMap.put("bottleSize", value.size());
             classifyList.add(classifyMap);
         });
-        allMap.put("classifyList",classifyList);
+        allMap.put("classifyList", classifyList);
         return ResultData.success(allMap);
     }
 
@@ -295,14 +313,14 @@ public class DbStockController extends AbstractController {
      * @param dbStock
      * @return
      */
-    public void loadBeaconDate(DbStock dbStock){
+    public void loadBeaconDate(DbStock dbStock) {
         //查询库存信标列表，存入redis
         LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DbStock::getSubjectId, dbStock.getSubjectId());
         List<DbStock> list = dbStockService.list(queryWrapper);
-        redisService.setCacheObject(BaseConstants.BEACON_MATE_INFO+"~"+ dbStock.getSubjectId(),list, 7L, TimeUnit.DAYS);
+        redisService.setCacheObject(BaseConstants.BEACON_MATE_INFO + "~" + dbStock.getSubjectId(), list, 7L, TimeUnit.DAYS);
         //将提交的库存数据，存入redis
-        redisService.setCacheObject(BaseConstants.BEACON_MATE_DET+"~"+ dbStock.getBeaconTag()+"~"+dbStock.getSubjectId()+"~"+dbStock.getGasName(),dbStock.getBeaconTag(), 120L, TimeUnit.SECONDS);
+        redisService.setCacheObject(BaseConstants.BEACON_MATE_DET + "~" + dbStock.getBeaconTag() + "~" + dbStock.getSubjectId() + "~" + dbStock.getGasName(), dbStock.getBeaconTag(), 120L, TimeUnit.SECONDS);
     }
 
     /**
@@ -311,14 +329,14 @@ public class DbStockController extends AbstractController {
      * @param dbStock
      * @return
      */
-    public void remBeaconDate(DbStock dbStock){
+    public void remBeaconDate(DbStock dbStock) {
         //查询库存信标列表，存入redis
         LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DbStock::getSubjectId, dbStock.getSubjectId());
         List<DbStock> list = dbStockService.list(queryWrapper);
-        redisService.setCacheObject(BaseConstants.BEACON_MATE_INFO+"~"+ dbStock.getSubjectId(),list, 7L, TimeUnit.DAYS);
+        redisService.setCacheObject(BaseConstants.BEACON_MATE_INFO + "~" + dbStock.getSubjectId(), list, 7L, TimeUnit.DAYS);
         //将信标从redis中移除
-        redisService.deleteObject(BaseConstants.BEACON_MATE_DET+"~"+ dbStock.getBeaconTag()+"~"+dbStock.getSubjectId()+"~"+dbStock.getGasName());
+        redisService.deleteObject(BaseConstants.BEACON_MATE_DET + "~" + dbStock.getBeaconTag() + "~" + dbStock.getSubjectId() + "~" + dbStock.getGasName());
     }
 
     /**

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

@@ -1,9 +1,12 @@
 package com.zd.airbottle.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zd.airbottle.domain.DbStock;
 import com.zd.airbottle.domain.DbUsageRecord;
 import com.zd.airbottle.domain.bo.DbUsageRecordBo;
+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;
@@ -33,6 +36,9 @@ public class DbUsageRecordController extends AbstractController {
     @Autowired
     private DbUsageRecordService dbUsageRecordService;
 
+    @Autowired
+    private DbStockService dbStockService;
+
     /**
      * 添加使用记录
      *
@@ -48,6 +54,9 @@ public class DbUsageRecordController extends AbstractController {
         DbUsageRecord dbUsageRecord = new DbUsageRecord();
         BeanUtils.copyProperties(dbUsageRecordBo, dbUsageRecord);
         if (dbUsageRecordService.save(dbUsageRecord)) {
+            if(dbUsageRecord.getGasPressure() != null){
+                dbStockService.update(new LambdaUpdateWrapper<DbStock>().eq(DbStock::getId,dbUsageRecordBo.getId()).set(DbStock::getGasPressure,dbUsageRecord.getGasPressure()));
+            }
             return ResultData.success("操作成功");
         }
         return ResultData.fail("操作失败");

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

@@ -53,22 +53,18 @@ public class DbBeacon extends Model<DbBeacon> {
     private String createName;
 
     @ApiModelProperty("创建人ID")
-    @TableField(fill = FieldFill.INSERT)
     private Long createBy;
 
     @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改人名称")
     private String updateName;
 
     @ApiModelProperty("修改人ID")
-    @TableField(fill = FieldFill.UPDATE)
     private Long updateBy;
 
     @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;
 
     @ApiModelProperty("备注")

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

@@ -53,22 +53,18 @@ public class DbBottleType extends Model<DbBottleType> {
     private String createName;
 
     @ApiModelProperty("创建人ID")
-    @TableField(fill = FieldFill.INSERT)
     private Long createBy;
 
     @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改人名称")
     private String updateName;
 
     @ApiModelProperty("修改人ID")
-    @TableField(fill = FieldFill.UPDATE)
     private Long updateBy;
 
     @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;
 
     @ApiModelProperty("是否删除（0否 1是）")

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -80,7 +81,7 @@ public class DbInOutRecord extends Model<DbInOutRecord> {
     private String phone;
 
     @ApiModelProperty("有效期限")
-    private LocalDateTime validPeriod;
+    private LocalDate validPeriod;
 
     @ApiModelProperty("气体压力")
     private Integer gasPressure;
@@ -89,22 +90,18 @@ public class DbInOutRecord extends Model<DbInOutRecord> {
     private String createName;
 
     @ApiModelProperty("创建人ID")
-    @TableField(fill = FieldFill.INSERT)
     private Long createBy;
 
     @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改人名称")
     private String updateName;
 
     @ApiModelProperty("修改人ID")
-    @TableField(fill = FieldFill.UPDATE)
     private Long updateBy;
 
     @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;
 
     @ApiModelProperty("备注")

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

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -50,7 +52,7 @@ public class DbStock extends Model<DbStock> {
     private String gasComposition;
 
     @ApiModelProperty("气瓶颜色")
-    private String bottleColour;
+    private Integer bottleColour;
 
     @ApiModelProperty("手轮（0否 1是）")
     private Boolean handwheel;
@@ -68,7 +70,7 @@ public class DbStock extends Model<DbStock> {
     private Integer gasPressure;
 
     @ApiModelProperty("有效期限")
-    private LocalDateTime validPeriod;
+    private LocalDate validPeriod;
 
     @ApiModelProperty("信标标签")
     private String beaconTag;
@@ -92,22 +94,19 @@ public class DbStock extends Model<DbStock> {
     private String createName;
 
     @ApiModelProperty("创建人ID")
-    @TableField(fill = FieldFill.INSERT)
     private Long createBy;
 
     @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改人名称")
     private String updateName;
 
     @ApiModelProperty("修改人ID")
-    @TableField(fill = FieldFill.UPDATE)
     private Long updateBy;
 
     @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;
 
     @ApiModelProperty("备注")

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

@@ -98,22 +98,18 @@ public class DbUsageRecord extends Model<DbUsageRecord> {
     private String createName;
 
     @ApiModelProperty("创建人ID")
-    @TableField(fill = FieldFill.INSERT)
     private Long createBy;
 
     @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改人名称")
     private String updateName;
 
     @ApiModelProperty("修改人ID")
-    @TableField(fill = FieldFill.UPDATE)
     private Long updateBy;
 
     @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;
 
     @ApiModelProperty("备注")

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

@@ -11,6 +11,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -74,7 +75,7 @@ public class DbInOutRecordBo{
     private String phone;
 
     @ApiModelProperty("有效期限")
-    private LocalDateTime validPeriod;
+    private LocalDate validPeriod;
 
     @ApiModelProperty("气体压力")
     private Integer gasPressure;
@@ -83,22 +84,18 @@ public class DbInOutRecordBo{
     private String createName;
 
     @ApiModelProperty("创建人ID")
-    @TableField(fill = FieldFill.INSERT)
     private Long createBy;
 
     @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改人名称")
     private String updateName;
 
     @ApiModelProperty("修改人ID")
-    @TableField(fill = FieldFill.UPDATE)
     private Long updateBy;
 
     @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;
 
     @ApiModelProperty("备注")

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

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -41,7 +42,7 @@ public class DbStockBo extends PageQuery implements Serializable {
     private Integer size;
 
     @ApiModelProperty("气瓶颜色")
-    private String bottleColour;
+    private Integer bottleColour;
 
     @ApiModelProperty("手轮（0否 1是）")
     private Boolean handwheel;
@@ -59,8 +60,7 @@ public class DbStockBo extends PageQuery implements Serializable {
     private Integer gasPressure;
 
     @ApiModelProperty("有效期限")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime validPeriod;
+    private LocalDate validPeriod;
 
     @ApiModelProperty("信标标签")
     private String beaconTag;

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

@@ -4,6 +4,7 @@ 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.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.model.page.PageQuery;
@@ -78,9 +79,11 @@ public class DbUsageRecordBo extends PageQuery implements Serializable {
     private Integer gasPressure;
 
     @ApiModelProperty("开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime startTime;
 
     @ApiModelProperty("结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime endTime;
 
     @ApiModelProperty("使用图片")

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

@@ -9,6 +9,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -75,7 +76,7 @@ public class DbInOutRecordVo {
     private String phone;
 
     @ApiModelProperty("有效期限")
-    private LocalDateTime validPeriod;
+    private LocalDate validPeriod;
 
     @ApiModelProperty("气体压力")
     private Integer gasPressure;

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

@@ -4,12 +4,14 @@ 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 com.zd.airbottle.domain.DbUsageRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @Description 库存详情vo
@@ -55,5 +57,8 @@ public class DbStockVo implements Serializable {
     @ApiModelProperty("最后使用时间")
     private LocalDateTime lastUseTime;
 
+    @ApiModelProperty("使用记录")
+    private List<DbUsageRecord> dbUsageRecordList;
+
 
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -66,6 +66,8 @@ public class WarningNoticeLogController extends AbstractController {
     public ResultData update(@RequestBody WarningNoticeLogDto warningNoticeLogDto){
         WarningNoticeLog warningNoticeLog = new WarningNoticeLog();
         BeanUtils.copyProperties(warningNoticeLogDto,warningNoticeLog);
+        warningNoticeLog.setUpdateName(getCurrentUserName());
+        warningNoticeLog.setUpdateTime(LocalDateTime.now());
         boolean b = warningNoticeLogService.updateById(warningNoticeLog);
         if (b) {
             WarningNoticeLog noticeLog = warningNoticeLogService.getById(warningNoticeLog.getId());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/WarningNoticeLogVO.java

@@ -159,4 +159,10 @@ public class WarningNoticeLogVO {
 
     @ApiModelProperty(value = "日期")
     private String yearMonth;
+
+    @ApiModelProperty("修改人名称")
+    private String updateName;
+
+    @ApiModelProperty("修改时间")
+    private LocalDateTime updateTime;
 }