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

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

@@ -98,7 +98,14 @@ public class DbBeaconController extends AbstractController {
     public ResultData find(@RequestParam("id") Long id) {
         paramCheck.notNull(id);
         DbBeacon dbBeacon = dbBeaconService.getById(id);
-        return ResultData.success(dbBeacon);
+        DbBeaconPrintVo dbBeaconPrintVo = new DbBeaconPrintVo();
+        if (dbBeacon.getState()) {
+            //已绑定 查库存
+            DbStock dbStock = dbStockService.getOne(new LambdaQueryWrapper<DbStock>().eq(DbStock::getBeaconTag, dbBeacon.getBeaconTag()));
+            BeanUtils.copyProperties(dbStock, dbBeaconPrintVo);
+        }
+        BeanUtils.copyProperties(dbBeacon, dbBeaconPrintVo);
+        return ResultData.success(dbBeaconPrintVo);
     }
 
     /**

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

@@ -49,7 +49,7 @@ public class DbInOutRecordController extends AbstractController {
      * @param dbInOutRecordParam
      * @return
      */
-    @ApiOperation(value = "获取出入库list", notes = "参数说明：searchValue 关键字")
+    @ApiOperation(value = "获取出入库list", notes = "参数说明：type 类型（1入库 2出库） 必填, searchValue 关键字,collegeId 学院id，startTime 开始时间，endTime 结束时间")
     @PostMapping(value = "/list")
     public ResultData list(@RequestBody DbInOutRecordParam dbInOutRecordParam) {
         //查询条件

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

@@ -91,14 +91,13 @@ public class DbStockController extends AbstractController {
         }
         DbStock dbStock = new DbStock();
         BeanUtils.copyProperties(dbStockBo, dbStock);
-//        SysUser sysUser = tokenService.getLoginUser().getSysUser();
         dbStock.setCreateBy(getCurrentUserId());
         dbStock.setCreateName(getCurrentUserName());
-//        tokenService.getLoginUser().getSysUser().getPhonenumber();
         if (dbStockService.save(dbStock)) {
             DbInOutRecord dbInOutRecord = new DbInOutRecord();
             BeanUtils.copyProperties(dbStockBo, dbInOutRecord);
             dbInOutRecord.setType(1);
+            dbInOutRecord.setPhone(tokenService.getLoginUser().getSysUser().getPhonenumber());
             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
@@ -114,7 +113,7 @@ public class DbStockController extends AbstractController {
      * @param dbStockBo
      * @return
      */
-    @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 备注 ")
+    @ApiOperation(value = "库存出库", notes = "参数说明：id 必填 ")
     @PostMapping(value = "/out")
     public ResultData out(@RequestBody DbStockBo dbStockBo) {
         //参数检查
@@ -185,7 +184,7 @@ public class DbStockController extends AbstractController {
      * @param dbStockParam
      * @return
      */
-    @ApiOperation(value = "获取库存list", notes = "参数说明：searchValue 关键字")
+    @ApiOperation(value = "获取库存list", notes = "参数说明：searchValue 关键字,collegeId 学院id，startTime 开始时间，endTime 结束时间")
     @PostMapping(value = "/list")
     public ResultData list(@RequestBody DbStockParam dbStockParam) {
         //查询条件
@@ -198,7 +197,7 @@ public class DbStockController extends AbstractController {
             queryWrapper.eq(DbStock::getCollegeId, dbStockParam.getCollegeId());
         }
         if (Objects.nonNull(dbStockParam.getStartTime()) && Objects.nonNull(dbStockParam.getEndTime())) {
-            queryWrapper.between(DbStock::getValidPeriod, dbStockParam.getStartTime(), dbStockParam.getEndTime());
+            queryWrapper.between(DbStock::getCreateTime, dbStockParam.getStartTime(), dbStockParam.getEndTime());
         }
         //倒叙
         queryWrapper.orderByDesc(DbStock::getId);

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

@@ -94,7 +94,7 @@ public class DbUsageRecordController extends AbstractController {
      * @param dbUsageRecordBo
      * @return
      */
-    @ApiOperation(value = "获取使用记录列表", notes = "参数说明：searchValue 关键字")
+    @ApiOperation(value = "获取使用记录列表", notes = "参数说明：searchValue 关键字,collegeId 学院id，startTime 开始时间，endTime 结束时间")
     @PostMapping(value = "/list")
     public ResultData list(@RequestBody DbUsageRecordBo dbUsageRecordBo) {
         //查询条件

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

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @ApiModel("出入库记录列表请求参数")
 public class DbInOutRecordParam extends PageQuery implements Serializable {
 
-    @ApiModelProperty("级别（1入库 2出库）")
+    @ApiModelProperty("类型（1入库 2出库）")
     private Integer type;
 
     @ApiModelProperty("学院id")