气瓶问题修改

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

@@ -26,6 +26,7 @@ import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.constant.BaseConstants;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.ResultData;
+import com.zd.model.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
@@ -86,23 +87,30 @@ public class DbStockController extends AbstractController {
         if (count1 > 0) {
             return ResultData.fail("当前信标已绑定！");
         }
+        SysUser sysUser = tokenService.getLoginUser().getSysUser();
         //查询实验室所在学院
-        ResultData<List<CheckSubjectDto>> resultData = remoteLaboratoryService.findSubjectInfoList(String.valueOf(dbStockBo.getSubjectId()));
-        if (resultData != null && HttpStatus.SUCCESS == resultData.getCode()) {
-            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);
         dbStock.setCreateBy(getCurrentUserId());
         dbStock.setCreateName(getCurrentUserName());
+        ResultData<List<CheckSubjectDto>> resultData = remoteLaboratoryService.findSubjectInfoList(String.valueOf(dbStockBo.getSubjectId()));
+        if (resultData != null && HttpStatus.SUCCESS == resultData.getCode()) {
+            List<CheckSubjectDto> data = resultData.getData();
+            dbStock.setCollegeId(data.get(0).getDeptId());
+            dbStock.setCollegeName(data.get(0).getCollegeName());
+            dbStock.setRoomNum(data.get(0).getRoomNumber());
+        }
         if (dbStockService.save(dbStock)) {
             DbInOutRecord dbInOutRecord = new DbInOutRecord();
             BeanUtils.copyProperties(dbStockBo, dbInOutRecord);
+            if(sysUser != null){
+                dbInOutRecord.setOperator(sysUser.getNickName());
+                dbInOutRecord.setOperatorId(sysUser.getUserId());
+                dbInOutRecord.setPhone(sysUser.getPhonenumber());
+                dbInOutRecord.setCreateBy(sysUser.getUserId());
+                dbInOutRecord.setCreateName(sysUser.getUserName());
+            }
             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
@@ -127,9 +135,17 @@ public class DbStockController extends AbstractController {
         if(dbStockBo.getGasPressure() != null){
             dbStockService.update(new LambdaUpdateWrapper<DbStock>().set(DbStock::getGasPressure, dbStockBo.getGasPressure()).eq(DbStock::getGasPressure, dbStockBo.getGasPressure()));
         }
+        SysUser sysUser = tokenService.getLoginUser().getSysUser();
         if (dbStockService.removeById(stock.getId())) {
             DbInOutRecord dbInOutRecord = new DbInOutRecord();
-            BeanUtils.copyProperties(stock, dbInOutRecord);
+            BeanUtils.copyProperties(stock, dbInOutRecord,new String[] {"createBy","createTime","updateName","updateBy","updateTime","createName"});
+            if(sysUser != null){
+                dbInOutRecord.setOperator(sysUser.getNickName());
+                dbInOutRecord.setOperatorId(sysUser.getUserId());
+                dbInOutRecord.setPhone(sysUser.getPhonenumber());
+                dbInOutRecord.setCreateBy(sysUser.getUserId());
+                dbInOutRecord.setCreateName(sysUser.getUserName());
+            }
             dbInOutRecord.setType(2);
             dbInOutRecordService.save(dbInOutRecord);
             //解除信标

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.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -16,6 +17,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.poi.hpsf.Decimal;
 
 /**
  * <p>
@@ -72,7 +74,7 @@ public class DbInOutRecord extends Model<DbInOutRecord> {
     private String beaconTag;
 
     @ApiModelProperty("操作人id")
-    private String operatorId;
+    private Long operatorId;
 
     @ApiModelProperty("操作人")
     private String operator;
@@ -84,7 +86,7 @@ public class DbInOutRecord extends Model<DbInOutRecord> {
     private LocalDate validPeriod;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("创建人名称")
     private String createName;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbStock.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.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -17,6 +18,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.poi.hpsf.Decimal;
 
 /**
  * <p>
@@ -67,7 +69,7 @@ public class DbStock extends Model<DbStock> {
     private Boolean electronicTag;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("有效期限")
     private LocalDate validPeriod;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbUsageRecord.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.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -16,6 +17,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.poi.hpsf.Decimal;
 
 /**
  * <p>
@@ -45,7 +47,7 @@ public class DbUsageRecord extends Model<DbUsageRecord> {
     private String gasName;
 
     @ApiModelProperty("使用量")
-    private Integer usageAmount;
+    private BigDecimal usageAmount;
 
     @ApiModelProperty("级别（1普通纯 2实验纯 3高级纯）")
     private Integer level;
@@ -84,7 +86,7 @@ public class DbUsageRecord extends Model<DbUsageRecord> {
     private String phone;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")

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

@@ -9,8 +9,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.poi.hpsf.Decimal;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -66,7 +68,7 @@ public class DbInOutRecordBo{
     private String beaconTag;
 
     @ApiModelProperty("操作人id")
-    private String operatorId;
+    private Long operatorId;
 
     @ApiModelProperty("操作人")
     private String operator;
@@ -78,7 +80,7 @@ public class DbInOutRecordBo{
     private LocalDate validPeriod;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("创建人名称")
     private String createName;

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

@@ -13,8 +13,10 @@ import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -41,6 +43,9 @@ public class DbStockBo extends PageQuery implements Serializable {
     @ApiModelProperty("规格（5Mpa,10Mpa,15Mpa）")
     private Integer size;
 
+    @ApiModelProperty("气体成分")
+    private String gasComposition;
+
     @ApiModelProperty("气瓶颜色")
     private Integer bottleColour;
 
@@ -57,7 +62,7 @@ public class DbStockBo extends PageQuery implements Serializable {
     private Boolean electronicTag;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("有效期限")
     private LocalDate validPeriod;

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

@@ -11,8 +11,10 @@ import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -37,7 +39,7 @@ public class DbUsageRecordBo extends PageQuery implements Serializable {
     private String gasName;
 
     @ApiModelProperty("使用量")
-    private Integer usageAmount;
+    private BigDecimal usageAmount;
 
     @ApiModelProperty("级别（1普通纯 2实验纯 3高级纯）")
     private Integer level;
@@ -76,7 +78,7 @@ public class DbUsageRecordBo extends PageQuery implements Serializable {
     private String phone;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")

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

@@ -7,8 +7,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.poi.hpsf.Decimal;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -67,7 +69,7 @@ public class DbInOutRecordVo {
     private String beaconTag;
 
     @ApiModelProperty("操作人id")
-    private String operatorId;
+    private Long operatorId;
 
     @ApiModelProperty("操作人")
     private String operator;
@@ -79,7 +81,7 @@ public class DbInOutRecordVo {
     private LocalDate validPeriod;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("创建人名称")
     private String createName;

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

@@ -8,8 +8,10 @@ import com.zd.airbottle.domain.DbUsageRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -37,7 +39,7 @@ public class DbStockVo implements Serializable {
     private Integer size;
 
     @ApiModelProperty("气体压力")
-    private Integer gasPressure;
+    private BigDecimal gasPressure;
 
     @ApiModelProperty("信标标签")
     private String beaconTag;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -470,7 +470,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         warningNoticeLogDto.setWarningWay(illegalRemoval);
         warningNoticeLogDto.setHolder(dbStock.getCreateName());
 //        warningNoticeLogDto.setDeposit(storageRVo.getLocation());
-        warningNoticeLogDto.setMargin(new BigDecimal(dbStock.getGasPressure()));
+        warningNoticeLogDto.setMargin(dbStock.getGasPressure());
         warningNoticeLogDto.setSpecification(dbStock.getSize()+"");
         warningNoticeLogDto.setEntryTime(LocalDateTimeUtil.of(dbStock.getCreateTime()));
         warningNoticeLogDto.setBeaconTag(beaconTag);