东北大学气瓶修改提交2

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

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
  * @Date 2023/10/18 10:03
  * @Version 2.0
  */
-@Api("东北大学信标")
+@Api(tags = "东北大学信标")
 @RestController
 @RequestMapping("/beacon")
 public class DbBeaconController extends AbstractController {

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

@@ -34,7 +34,7 @@ public class DbBottleTypeController extends AbstractController {
     private DbBottleTypeService dbBottleTypeService;
 
     /**
-     * 添加气瓶
+     * 添加气瓶类型
      *
      * @param dbBottleTypeBo
      * @return

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

@@ -1,30 +1,19 @@
 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.DbBeacon;
 import com.zd.airbottle.domain.DbInOutRecord;
-import com.zd.airbottle.domain.DbStock;
-import com.zd.airbottle.domain.bo.DbInOutRecordBo;
 import com.zd.airbottle.domain.bo.DbInOutRecordParam;
-import com.zd.airbottle.service.DbBeaconService;
 import com.zd.airbottle.service.DbInOutRecordService;
-import com.zd.airbottle.service.DbStockService;
 import com.zd.airbottle.utils.PageUtil;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.AbstractController;
-import com.zd.laboratory.api.dto.CheckSubjectDto;
-import com.zd.laboratory.api.feign.RemoteLaboratoryService;
-import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.ResultData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Objects;
 
 /**

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

@@ -78,11 +78,10 @@ public class DbStockController extends AbstractController {
         }
         DbStock dbStock = new DbStock();
         BeanUtils.copyProperties(dbStockBo, dbStock);
-        SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        dbStock.setCreateBy(sysUser.getUserId());
-        dbStock.setCreateName(sysUser.getUserName());
-        tokenService.getLoginUser().getSysUser().getPhonenumber();
-//        dbStock.setph(get());
+//        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);

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

@@ -45,7 +45,6 @@ public class DbUsageRecordController extends AbstractController {
     public ResultData add(@RequestBody DbUsageRecordBo dbUsageRecordBo) {
         //参数检查
         paramCheck.notNull(dbUsageRecordBo).notNull(dbUsageRecordBo.getStartTime()).notNull(dbUsageRecordBo.getEndTime());
-
         DbUsageRecord dbUsageRecord = new DbUsageRecord();
         BeanUtils.copyProperties(dbUsageRecordBo, dbUsageRecord);
         if (dbUsageRecordService.save(dbUsageRecord)) {

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

@@ -1,91 +0,0 @@
-package com.zd.airbottle.domain.bo;
-
-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.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @Description TODO
- * @Author hzw
- * @Date 2023/10/17 10:57
- * @Version 2.0
- */
-@Data
-public class DbInOutRecordBo {
-
-    @ApiModelProperty("主键id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty("库存id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long stockId;
-
-    @ApiModelProperty("级别（1入库 2出库）")
-    private Integer type;
-
-    @ApiModelProperty("气体名称")
-    private String gasName;
-
-    @ApiModelProperty("级别（1普通纯 2实验纯 3高级纯）")
-    private Integer level;
-
-    @ApiModelProperty("规格（5Mpa,10Mpa,15Mpa）")
-    private Integer size;
-
-    @ApiModelProperty("气体成分")
-    private String gasComposition;
-
-    @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("有效期限")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    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("操作人id")
-    private String operatorId;
-
-    @ApiModelProperty("操作人")
-    private String operator;
-
-    @ApiModelProperty("备注")
-    private String remark;
-}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbStockBo.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.airbottle.utils.PageUtil;
@@ -58,6 +59,7 @@ public class DbStockBo extends PageQuery implements Serializable {
     private Integer gasPressure;
 
     @ApiModelProperty("有效期限")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime validPeriod;
 
     @ApiModelProperty("信标标签")

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

@@ -8,6 +8,7 @@
         <result column="gas_name" property="gasName" />
         <result column="level" property="level" />
         <result column="size" property="size" />
+        <result column="gas_composition" property="gasComposition" />
         <result column="bottle_colour" property="bottleColour" />
         <result column="handwheel" property="handwheel" />
         <result column="fixed" property="fixed" />