漏洞修复

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

@@ -203,17 +203,6 @@ public class QpBottleStorageController extends BaseController {
         taskDetail.setId(bottleStorageVO.getTaskDetailId());
         List<QpTaskDetail> detailList =  qpTaskDetailService.selectQpTaskDetailList(taskDetail);
         map.put("detailList", detailList.size()>0?detailList.get(0):taskDetail);
-        /*if(outVOList.size()>0 && StringUtils.isNotNull(outVOList.get(0).getTransportId())){
-            //人员详情
-            QpTransportUserVo user = qpTransportUserService.selectQpTransportUserById(outVOList.get(0).getTransportId());
-            map.put("user", user);
-        }
-
-        if(StringUtils.isNotNull(task.getCarId())){
-            //车辆详情
-            QpTransportCarVo carvo = qpTransportCarService.selectQpTransportCarById(task.getCarId());
-            map.put("car", carvo);
-        }*/
 
         return AjaxResult.success(map);
     }

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

@@ -1,14 +1,11 @@
 package com.zd.airbottle.domain;
 
-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.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;

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

@@ -1,14 +1,11 @@
 package com.zd.airbottle.domain;
 
-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.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;

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

@@ -1,8 +1,6 @@
 package com.zd.airbottle.domain;
 
-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.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -17,7 +15,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.poi.hpsf.Decimal;
 
 /**
  * <p>

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

@@ -1,8 +1,6 @@
 package com.zd.airbottle.domain;
 
-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.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -10,7 +8,6 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 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;
@@ -18,7 +15,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.poi.hpsf.Decimal;
 
 /**
  * <p>

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

@@ -1,8 +1,6 @@
 package com.zd.airbottle.domain;
 
-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.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -17,7 +15,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.poi.hpsf.Decimal;
 
 /**
  * <p>

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

@@ -1,9 +1,5 @@
 package com.zd.airbottle.domain.bo;
 
-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;

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

@@ -1,17 +1,10 @@
 package com.zd.airbottle.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 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 org.apache.poi.hpsf.Decimal;
-
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;

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

@@ -1,31 +0,0 @@
-package com.zd.airbottle.domain.vo;
-
-import com.zd.airbottle.domain.QpAirBottle;
-
-/**
- * 气瓶对象 qp_air_bottle
- *
- * @author zd
- * @date 2022-05-10
- */
-public class QpAirBottleVO extends QpAirBottle
-{
-    private String companyName;//商家名称
-    private String gasNorms;// 规格
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getGasNorms() {
-        return gasNorms;
-    }
-
-    public void setGasNorms(String gasNorms) {
-        this.gasNorms = gasNorms;
-    }
-}

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

@@ -469,7 +469,6 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         warningNoticeLogDto.setWarningTime(LocalDateTime.now());
         warningNoticeLogDto.setWarningWay(illegalRemoval);
         warningNoticeLogDto.setHolder(dbStock.getCreateName());
-//        warningNoticeLogDto.setDeposit(storageRVo.getLocation());
         warningNoticeLogDto.setMargin(dbStock.getGasPressure());
         warningNoticeLogDto.setSpecification(dbStock.getSize()+"");
         warningNoticeLogDto.setEntryTime(LocalDateTimeUtil.of(dbStock.getCreateTime()));
@@ -498,22 +497,6 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         }
         Long logId = (Long) resultData.getData();
 
-        //rfid门禁机报警
-//        R<Boolean> alarm = remoteRfidService.alarm(hardwareRfidDto);
-//        log.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
-
-        //摄像头录像
-//        ResultData<LabHardwareDto> cameraHardware = remoteLabHardwareService.findHardwareByType(storageRVo.getSubjectId(), 4, null, "2");
-//        if (HttpStatus.SUCCESS == cameraHardware.getCode()) {
-//            String ip = String.valueOf(cameraHardware.getData().getIpAddress());
-//            startVideo(ip);
-//            scheduledExecutorService.schedule(new TimerTask() {
-//                @Override
-//                public void run() {
-//                    stopVideo(ip, logId);
-//                }
-//            }, 30, TimeUnit.SECONDS);
-//        }
         //按照配置预警
         if (illegalRemoval != null) {
             String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-实验人员违规携带"+warningNoticeLogDto.getName()+"气瓶离开房间，发生时间：" + LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") + ",请尽快确认。";

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

@@ -80,7 +80,7 @@ public class QpFlowServiceImpl implements IQpFlowService
         QpFlow flow = new QpFlow();
         flow.setFlowType(qpFlow.getFlowType());
         List<QpFlow> list =  qpFlowMapper.selectQpFlowList(flow);
-        if(list.size()>0){
+        if(!list.isEmpty()){
             throw new ServiceException("该类型的流程已存在，无需重复添加！");
         }
 
@@ -93,14 +93,6 @@ public class QpFlowServiceImpl implements IQpFlowService
         qpFlow.setCreateUser(sysUser.getNickName());
         qpFlow.setCreateTime(new Date());
 
-        /*List<QpFlowDetail> listDetail = qpFlow.getFlowDetailList();
-        if(StringUtils.isNotEmpty(listDetail)){
-            for (QpFlowDetail detail:listDetail) {
-                // 审核流程详情表数据录入
-                detail.setUuid(uuid);
-                qpFlowDetailMapper.insertQpFlowDetail(detail);
-            }
-        }*/
         //流程数据录入
         return qpFlowMapper.insertQpFlow(qpFlow);
     }

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

@@ -138,15 +138,6 @@ public class QpTaskDetailServiceImpl implements IQpTaskDetailService {
         return qpTaskDetailMapper.selectRelationByDetailsId(id);
     }
 
-    /*//递归查询气瓶规格
-    public QpAirGoodsConfig recursionGoodsConfig(Long id) {
-        QpAirGoodsConfig goodsConfig = qpAirGoodsConfigMapper.selectQpAirGoodsConfigById(id);
-        if (goodsConfig.getParentId() == -1) {
-            return goodsConfig;
-        }
-        return recursionGoodsConfig(goodsConfig.getParentId());
-    }*/
-
     /**
      * 待办清单待入库列表
      *
@@ -159,19 +150,6 @@ public class QpTaskDetailServiceImpl implements IQpTaskDetailService {
         return qpTaskDetailMapper.selectQpTaskDetailStock(id);
     }
 
-    /*private List<QpAirGoodsConfigRelationVo> getQpAirGoodsConfigRelationVos(List<QpAirGoodsConfigRelationVo> list) {
-        if (!list.isEmpty()) {
-            for (QpAirGoodsConfigRelationVo qpAirGoodsConfigRelationVo : list) {
-                QpAirGoodsConfig gc = recursionGoodsConfig(qpAirGoodsConfigRelationVo.getParentId());
-                QpSpecificationDetail specificationDetail = qpSpecificationDetailMapper.selectQpSpecificationDetailById(gc.getConfigId());
-                if (specificationDetail != null) {
-                    qpAirGoodsConfigRelationVo.setParent(specificationDetail.getSpecValue());
-                }
-            }
-        }
-        return list;
-    }*/
-
     /***
      * 未派送
      * @param id