新增气瓶新项目

pom.xml

@@ -29,7 +29,7 @@
         <kaptcha.version>2.3.2</kaptcha.version>
         <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
         <druid.version>1.2.6</druid.version>
-        <dynamic-ds.version>3.4.1</dynamic-ds.version>
+        <dynamic-ds.version>3.5.2</dynamic-ds.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <velocity.version>1.7</velocity.version>
@@ -49,6 +49,8 @@
         <docker.registry>registry.cn-hangzhou.aliyuncs.com</docker.registry>
         <docker.registry.username>zd-push@1603061150808095.onaliyun.com</docker.registry.username>
         <docker.registry.password>zd123456..</docker.registry.password>
+        <nacos.host>192.168.1.88</nacos.host>
+        <redis.host>192.168.1.43</redis.host>
         <docker.namespace>zd-yun</docker.namespace>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>

zd-common/zd-common-core/src/main/java/com/zd/common/core/web/domain/BaseBean.java

@@ -0,0 +1,96 @@
+package com.zd.common.core.web.domain;
+
+import cn.hutool.core.date.CalendarUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zd.common.core.utils.IdGen;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据主键
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long id;
+
+    /**
+     * 创建者 -只读
+     */
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 是否为新记录
+     */
+    protected transient boolean isNewRecord;
+
+    /**
+     * 是否为新记录
+     *
+     * @return boolean
+     */
+    public boolean isNewRecord() {
+        return this.isNewRecord || this.getId() == null;
+    }
+
+    /**
+     * 设置基本属性
+     *
+     * @param userCode        用户编码
+     */
+    public void setCommonValue(String userCode) {
+        Date currentDate = CalendarUtil.calendar().getTime();
+        if (this.isNewRecord()) {
+            this.setId(IdGen.snowflakeId());
+            this.setNewRecord(true);
+            this.createBy = userCode;
+            this.createTime = currentDate;
+        }else {
+            this.updateBy = userCode;
+            this.updateTime = currentDate;
+        }
+    }
+
+    /**
+     * 置空属性
+     */
+    public void clearCommonValue() {
+        this.createBy = null;
+        this.createTime = null;
+        this.updateBy = null;
+        this.updateTime = null;
+    }
+}

zd-modules/pom.xml

@@ -26,6 +26,7 @@
         <module>zd-message</module>
         <module>zd-netty</module>
         <module>zd-smartlock</module>
+        <module>zd-bottle-parent</module>
     </modules>
     <dependencies>
         <dependency>

zd-modules/zd-bottle-parent/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>zd-modules</artifactId>
+        <groupId>com.zd</groupId>
+        <version>3.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zd-bottle-parent</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>zd-bottle</module>
+        <module>zd-bottle-api</module>
+    </modules>
+</project>

zd-modules/zd-bottle-parent/zd-bottle-api/pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>zd-bottle-parent</artifactId>
+        <groupId>com.zd</groupId>
+        <version>3.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zd-bottle-api</artifactId>
+
+    <dependencies>
+        <!-- zd Common DataSource -->
+        <dependency>
+            <groupId>com.zd</groupId>
+            <artifactId>zd-common-datasource</artifactId>
+        </dependency>
+
+        <!-- zd Common DataScope -->
+        <dependency>
+            <groupId>com.zd</groupId>
+            <artifactId>zd-common-datascope</artifactId>
+        </dependency>
+
+        <!-- zd Common Log -->
+        <dependency>
+            <groupId>com.zd</groupId>
+            <artifactId>zd-common-log</artifactId>
+        </dependency>
+
+        <!-- zd Common Swagger -->
+        <dependency>
+            <groupId>com.zd</groupId>
+            <artifactId>zd-common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd</groupId>
+            <artifactId>zd-common-resultdata</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/AlarmRecord.java

@@ -0,0 +1,42 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
+/**
+ * <p>
+ * 报警记录表
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "AlarmRecord对象", description = "报警记录表")
+@EqualsAndHashCode(callSuper = true)
+public class AlarmRecord extends BaseBean{
+
+    @ApiModelProperty("数据主键，关联其他业务表中的数据id")
+    private Long masterId;
+
+    @ApiModelProperty("电子标签")
+    private String electronicTag;
+
+    @ApiModelProperty("报警类型;1:出门,2:进门")
+    private Byte type;
+
+    @ApiModelProperty("产品类型;1:气瓶,2:其他")
+    private Byte productType;
+
+    @ApiModelProperty("报警时间")
+    private Timestamp alarmTime;
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorage.java

@@ -0,0 +1,113 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * <p>
+ * 气瓶入库表
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "BottleStorage对象", description = "气瓶入库表")
+@EqualsAndHashCode(callSuper = true)
+public class BottleStorage extends BaseBean {
+
+    @ApiModelProperty("是否有手轮 1有 0无")
+    private Short isHandwheel;
+
+    @ApiModelProperty("是否固定 1.是 0 否")
+    private Short isFixed;
+
+    @ApiModelProperty("电子标签 1有 0没有")
+    private Short isElectronicTag;
+
+    @ApiModelProperty("状态标牌 1有 0 没有 ")
+    private Short isStatusSign;
+
+    @ApiModelProperty("是否已拍照 1已拍照  0未拍照")
+    private Short isPhoto;
+
+    @ApiModelProperty("气表压力")
+    private BigDecimal gasPressure;
+
+    @ApiModelProperty("检验有效期(开始时间)")
+    private Date validateStartTime;
+
+    @ApiModelProperty("检验有效期(结束时间)")
+    private Date validateEndTime;
+
+    @ApiModelProperty("电子标签")
+    private String electronicTag;
+
+    @ApiModelProperty("余量是否符合 0符合  1不符合")
+    private Integer isSurplus;
+
+    @ApiModelProperty("当前压力值")
+    private BigDecimal currentPressure;
+
+    @ApiModelProperty("气瓶编号")
+    private String airNumber;
+
+    @ApiModelProperty("验收备注")
+    private String validateRemark;
+
+    @ApiModelProperty("拒收图片")
+    private String rejectionApplyImg;
+
+    @ApiModelProperty("拒收原因")
+    private String rejectionApplyRemark;
+
+    @ApiModelProperty("拒收申请人")
+    private Long rejectionApplyUserid;
+
+    @ApiModelProperty("拒收发起时间")
+    private Timestamp rejectionApplyTime;
+
+    @ApiModelProperty("拒收处理人id")
+    private Long rejectionUserid;
+
+    @ApiModelProperty("拒收处理时间")
+    private Timestamp rejectionTime;
+
+    @ApiModelProperty("待办清单详情表id")
+    private Long taskDetailId;
+
+    @ApiModelProperty("入库状态 1闲置 2使用 3出库")
+    private Integer storageStatus;
+
+    @ApiModelProperty("气瓶状态 0入库 1问题气瓶")
+    private Long airStatus;
+
+    @ApiModelProperty("待办清单id")
+    private Long taskId;
+
+    @ApiModelProperty("入库人id")
+    private Long storageUserid;
+
+    @ApiModelProperty("气瓶id")
+    private Long airBottleId;
+
+    @ApiModelProperty("气体名称")
+    private String airBottleName;
+
+    @ApiModelProperty("规格详情")
+    private String specificationName;
+
+    @ApiModelProperty("气瓶配置表id")
+    private Long airBottleConfigId;
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorageError.java

@@ -0,0 +1,49 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * <p>
+ * 气瓶异常记录表
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "BottleStorageError对象", description = "气瓶异常记录表")
+@EqualsAndHashCode(callSuper = true)
+public class BottleStorageError extends BaseBean {
+
+    @ApiModelProperty("气瓶入库ID")
+    private Long storageId;
+
+    @ApiModelProperty("实验地点")
+    private String location;
+
+    @ApiModelProperty("实验室id")
+    private Long locationId;
+
+    @ApiModelProperty("修改前")
+    private BigDecimal beforeEdit;
+
+    @ApiModelProperty("修改后")
+    private BigDecimal afterEdit;
+
+    @ApiModelProperty("操作时间")
+    private Timestamp opTime;
+
+    @ApiModelProperty("联系方式")
+    private String phone;
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorageOut.java

@@ -0,0 +1,76 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * <p>
+ * 气瓶出库表
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "BottleStorageOut对象", description = "气瓶出库表")
+@EqualsAndHashCode(callSuper = true)
+public class BottleStorageOut extends BaseBean{
+
+    @ApiModelProperty("操作人")
+    private String applyUserName;
+
+    private Long applyUserid;
+
+    @ApiModelProperty("联系方式")
+    private String phone;
+
+    @ApiModelProperty("入库表id")
+    private Long storageId;
+
+    @ApiModelProperty("运输车辆id")
+    private Long carId;
+
+    @ApiModelProperty("车辆号码")
+    private String carNumber;
+
+    @ApiModelProperty("运输人员id")
+    private Long transportId;
+
+    @ApiModelProperty("运输人员姓名")
+    private String transportName;
+
+    @ApiModelProperty("处理人id")
+    private Long disposeUserid;
+
+    @ApiModelProperty("处理人姓名")
+    private String disposeUsername;
+
+    @ApiModelProperty("处理时间")
+    private Timestamp disposeTime;
+
+    @ApiModelProperty("实际出库时间")
+    private Timestamp completeTime;
+
+    @ApiModelProperty("实际出库确认用户id")
+    private Long completeUserid;
+
+    @ApiModelProperty("实际出库确认用户")
+    private String completeUsername;
+
+    @ApiModelProperty("出库气压")
+    private BigDecimal pressure;
+
+    @ApiModelProperty("出库状态 0待回收  1已确认 2已出库")
+    private Long outStatus;
+
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/RfidTag.java

@@ -0,0 +1,31 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * RFID标签管理
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "RfidTag对象", description = "RFID标签管理")
+@EqualsAndHashCode(callSuper = true)
+public class RfidTag extends BaseBean {
+
+    @ApiModelProperty("标签内码")
+    private String tagCode;
+
+    @ApiModelProperty("是否绑定 1绑定  0未绑定")
+    private Short isBind;
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UseRecord.java

@@ -0,0 +1,67 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * <p>
+ * 使用记录表
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "UseRecord对象", description = "使用记录表")
+@EqualsAndHashCode(callSuper = true)
+public class UseRecord extends BaseBean {
+
+    @ApiModelProperty("联系人")
+    private String contacts;
+
+    @ApiModelProperty("使用人id")
+    private Long userId;
+
+    @ApiModelProperty("联系方式")
+    private String phone;
+
+    @ApiModelProperty("实验地点")
+    private String location;
+
+    @ApiModelProperty("实验室id")
+    private Long subjectId;
+
+    @ApiModelProperty("气瓶入库ID")
+    private Long storageId;
+
+    @ApiModelProperty("使用前照片")
+    private String beforeUsePic;
+
+    @ApiModelProperty("使用前气压")
+    private BigDecimal beforeUse;
+
+    @ApiModelProperty("使用后照片")
+    private String afterUsePic;
+
+    @ApiModelProperty("使用后气压")
+    private BigDecimal afterUse;
+
+    @ApiModelProperty("使用量")
+    private BigDecimal amount;
+
+    @ApiModelProperty("使用时间")
+    private Timestamp useTime;
+
+    @ApiModelProperty("归还时间")
+    private Timestamp backTime;
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UsegasApply.java

@@ -0,0 +1,101 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用气申请表
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "UsegasApply对象", description = "用气申请表")
+@EqualsAndHashCode(callSuper = true)
+public class UsegasApply extends BaseBean {
+
+    @ApiModelProperty("实验地点")
+    private String location;
+
+    @ApiModelProperty("实验室id")
+    private Long subjectId;
+
+    @ApiModelProperty("申请人")
+    private String applyUser;
+
+    @ApiModelProperty("申请人id")
+    private Long userId;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("联系方式")
+    private String phone;
+
+    @ApiModelProperty("期限开始")
+    private Date startTime;
+
+    @ApiModelProperty("期限结束")
+    private Date endTime;
+
+    @ApiModelProperty("气体用途")
+    private String gasUse;
+
+    @ApiModelProperty("申请凭证")
+    private String applyCertificate;
+
+    @ApiModelProperty("安全措施")
+    private String safetyPrecautions;
+
+    @ApiModelProperty("气体id")
+    private Long useGasId;
+
+    @ApiModelProperty("气体名称")
+    private String useGasName;
+
+    @ApiModelProperty("审核状态 0 未审核  1.通过 2.驳回")
+    private Short leadAuditStaus;
+
+    @ApiModelProperty("审核人id")
+    private Long leadAuditUserid;
+
+    @ApiModelProperty("审核人（实验室）")
+    private String leadAuditUsername;
+
+    @ApiModelProperty("审核时间")
+    private Timestamp leadAuditTime;
+
+    @ApiModelProperty("原因（实验室负责人）")
+    private String leadAuditCause;
+
+    @ApiModelProperty("审核状态 0 未审核 1.通过 2.驳回")
+    private Short centerAuditStatus;
+
+    @ApiModelProperty("审核人id")
+    private Long centerAuditUserid;
+
+    @ApiModelProperty("审核人（实验中心）")
+    private String centerAuditUsername;
+
+    @ApiModelProperty("审核时间")
+    private Timestamp centerAuditTime;
+
+    @ApiModelProperty("原因（实验中心）")
+    private String centerAuditCause;
+
+}

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UsegasAuditRecord.java

@@ -0,0 +1,48 @@
+package com.zd.bottle.domain;
+
+import com.zd.common.core.web.domain.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
+/**
+ * <p>
+ * 用气审核表
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "UsegasAuditRecord对象", description = "用气审核表")
+@EqualsAndHashCode(callSuper = true)
+public class UsegasAuditRecord extends BaseBean {
+
+    @ApiModelProperty("审核人id")
+    private Long auditUserid;
+
+    @ApiModelProperty("审核人")
+    private String auditUser;
+
+    @ApiModelProperty("审核时间")
+    private Timestamp auditTime;
+
+    @ApiModelProperty("审核状态（0未审核1.通过 2.驳回）")
+    private Long auditStatus;
+
+    @ApiModelProperty("审核说明")
+    private String remark;
+
+    @ApiModelProperty("用户申请id")
+    private Long usegasApplyId;
+
+    @ApiModelProperty("1实验室负责人 2实验中心")
+    private Integer auditType;
+}

zd-modules/zd-bottle-parent/zd-bottle/pom.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>zd-bottle-parent</artifactId>
+        <groupId>com.zd</groupId>
+        <version>3.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zd-bottle</artifactId>
+
+    <dependencies>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-spring-context</artifactId>
+            <version>0.2.3-RC1</version>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${dynamic-ds.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd</groupId>
+            <artifactId>zd-bottle-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 打包时跳过test插件，不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <!--            <plugin>-->
+            <!--                <groupId>io.fabric8</groupId>-->
+            <!--                <artifactId>docker-maven-plugin</artifactId>-->
+            <!--                <version>${docker.maven.verion}</version>-->
+            <!--                <executions>-->
+            <!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+            <!--                    <execution>-->
+            <!--                        <id>default</id>-->
+            <!--                        <phase>package</phase>-->
+            <!--                        <goals>-->
+            <!--                            <goal>remove</goal>-->
+            <!--                            <goal>build</goal>-->
+            <!--                            <goal>push</goal>-->
+            <!--                        </goals>-->
+            <!--                    </execution>-->
+            <!--                </executions>-->
+            <!--                <configuration>-->
+            <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
+            <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
+            <!--                    <authConfig>-->
+            <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
+            <!--                        <username>${docker.registry.username}</username>-->
+            <!--                        <password>${docker.registry.password}</password>-->
+            <!--                    </authConfig>-->
+            <!--                    <images>-->
+            <!--                        <image>-->
+            <!--                            &lt;!&ndash; [命名空间] / [镜像名称：版本号] &ndash;&gt;-->
+            <!--                            <name>${docker.registry}/${docker.namespace}/${project.artifactId}</name>-->
+            <!--                            &lt;!&ndash; 仓库地址 &ndash;&gt;-->
+            <!--                            <registry>${docker.registry}</registry>-->
+            <!--                            <build>-->
+            <!--                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>-->
+            <!--                                <tags>-->
+            <!--                                    <tag>${project.version}</tag>-->
+            <!--                                </tags>-->
+            <!--                            </build>-->
+            <!--                        </image>-->
+            <!--                    </images>-->
+            <!--                    <buildArgs>-->
+            <!--                        &lt;!&ndash; dockerfile参数，指定jar路径 &ndash;&gt;-->
+            <!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+            <!--                    </buildArgs>-->
+            <!--                </configuration>-->
+            <!--            </plugin>-->
+        </plugins>
+    </build>
+
+</project>

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/ZdBottleApplication.java

@@ -0,0 +1,28 @@
+package com.zd.bottle;
+
+import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
+import com.zd.common.security.annotation.EnableCustomConfig;
+import com.zd.common.security.annotation.EnableRyFeignClients;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * Application
+ *
+ * @author hanson
+ * @since  2022/9/8
+ */
+@EnableCustomConfig
+@EnableRyFeignClients
+@SpringBootApplication
+@EnableScheduling
+@NacosPropertySource(dataId = "zd-bottle", autoRefreshed = true)
+@Slf4j
+public class ZdBottleApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(ZdBottleApplication.class, args);
+        log.info("(♥◠‿◠)ﾉﾞ  气瓶模块启动成功   ლ(´ڡ`ლ)ﾞ");
+    }
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/AlarmRecordController.java

@@ -0,0 +1,68 @@
+package com.zd.bottle.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zd.bottle.domain.AlarmRecord;
+import com.zd.bottle.service.AlarmRecordService;
+import com.zd.common.core.domain.R;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.common.log.annotation.Log;
+import com.zd.common.log.enums.BusinessType;
+import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.system.api.domain.InventoryTag;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>
+ * 报警记录表 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@Api(tags = "【报警记录】")
+@RequestMapping("/alarmRecord")
+public class AlarmRecordController extends BaseController<AlarmRecord> {
+
+    @Resource
+    private AlarmRecordService alarmRecordService;
+
+    /**
+     * 查询报警记录列表
+     */
+    @PreAuthorize(hasPermi = "airbottle:alarm:record:list")
+    @GetMapping("/list")
+    @ApiOperation(value = "查询报警记录列表")
+    public TableDataInfo<AlarmRecord> list(AlarmRecord alarmRecord) {
+        List<AlarmRecord> list = alarmRecordService.list(new LambdaQueryWrapper<>(alarmRecord));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出报警记录列表
+     */
+    @ApiOperation(value = "导出报警记录列表")
+    @PreAuthorize(hasPermi = "airbottle:alarm:record:export")
+    @Log(title = "报警记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AlarmRecord alarmRecord) throws IOException {
+    }
+
+    /**
+     * 识别器新增报警记录
+     */
+    @ApiOperation(value = "识别器新增报警记录")
+    @Log(title = "识别器新增报警记录", businessType = BusinessType.INSERT)
+    @PostMapping("remote/add")
+    public R<Boolean> remoteAdd(@RequestBody InventoryTag tag) {
+        return R.ok();
+    }
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageController.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.controller;
+
+import com.zd.bottle.domain.BottleStorage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zd.common.core.web.controller.BaseController;
+
+/**
+ * <p>
+ * 气瓶入库表 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@RequestMapping("/bottleStorage")
+public class BottleStorageController extends BaseController<BottleStorage> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageErrorController.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.controller;
+
+import com.zd.bottle.domain.BottleStorageError;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zd.common.core.web.controller.BaseController;
+
+/**
+ * <p>
+ * 气瓶异常记录表 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@RequestMapping("/bottleStorageError")
+public class BottleStorageErrorController extends BaseController<BottleStorageError> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageOutController.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.controller;
+
+import com.zd.bottle.domain.BottleStorageOut;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zd.common.core.web.controller.BaseController;
+
+/**
+ * <p>
+ * 气瓶出库表 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@RequestMapping("/bottleStorageOut")
+public class BottleStorageOutController extends BaseController<BottleStorageOut> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/RfidTagController.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.controller;
+
+import com.zd.bottle.domain.RfidTag;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zd.common.core.web.controller.BaseController;
+
+/**
+ * <p>
+ * RFID标签管理 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@RequestMapping("/rfidTag")
+public class RfidTagController extends BaseController<RfidTag> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UseRecordController.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.controller;
+
+import com.zd.bottle.domain.UseRecord;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zd.common.core.web.controller.BaseController;
+
+/**
+ * <p>
+ * 使用记录表 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@RequestMapping("/useRecord")
+public class UseRecordController extends BaseController<UseRecord> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasApplyController.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.controller;
+
+import com.zd.bottle.domain.UsegasApply;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zd.common.core.web.controller.BaseController;
+
+/**
+ * <p>
+ * 用气申请表 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@RequestMapping("/usegasApply")
+public class UsegasApplyController extends BaseController<UsegasApply> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasAuditRecordController.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.controller;
+
+import com.zd.bottle.domain.UsegasAuditRecord;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zd.common.core.web.controller.BaseController;
+
+/**
+ * <p>
+ * 用气审核表 前端控制器
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@RestController
+@RequestMapping("/usegasAuditRecord")
+public class UsegasAuditRecordController extends BaseController<UsegasAuditRecord> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/AlarmRecordMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.AlarmRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警记录表 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface AlarmRecordMapper extends BaseMapper<AlarmRecord> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/BottleStorageErrorMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.BottleStorageError;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 气瓶异常记录表 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface BottleStorageErrorMapper extends BaseMapper<BottleStorageError> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/BottleStorageMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.BottleStorage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 气瓶入库表 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface BottleStorageMapper extends BaseMapper<BottleStorage> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/BottleStorageOutMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.BottleStorageOut;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 气瓶出库表 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface BottleStorageOutMapper extends BaseMapper<BottleStorageOut> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/RfidTagMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.RfidTag;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * RFID标签管理 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface RfidTagMapper extends BaseMapper<RfidTag> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/UseRecordMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.UseRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 使用记录表 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface UseRecordMapper extends BaseMapper<UseRecord> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/UsegasApplyMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.UsegasApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用气申请表 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface UsegasApplyMapper extends BaseMapper<UsegasApply> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/UsegasAuditRecordMapper.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.mapper;
+
+import com.zd.bottle.domain.UsegasAuditRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用气审核表 Mapper 接口
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface UsegasAuditRecordMapper extends BaseMapper<UsegasAuditRecord> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/AlarmRecordService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.AlarmRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报警记录表 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface AlarmRecordService extends IService<AlarmRecord> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/BottleStorageErrorService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.BottleStorageError;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 气瓶异常记录表 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface BottleStorageErrorService extends IService<BottleStorageError> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/BottleStorageOutService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.BottleStorageOut;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 气瓶出库表 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface BottleStorageOutService extends IService<BottleStorageOut> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/BottleStorageService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.BottleStorage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 气瓶入库表 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface BottleStorageService extends IService<BottleStorage> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/RfidTagService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.RfidTag;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * RFID标签管理 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface RfidTagService extends IService<RfidTag> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/UseRecordService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.UseRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 使用记录表 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface UseRecordService extends IService<UseRecord> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/UsegasApplyService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.UsegasApply;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用气申请表 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface UsegasApplyService extends IService<UsegasApply> {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/UsegasAuditRecordService.java

@@ -0,0 +1,16 @@
+package com.zd.bottle.service;
+
+import com.zd.bottle.domain.UsegasAuditRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用气审核表 服务类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+public interface UsegasAuditRecordService extends IService<UsegasAuditRecord> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.AlarmRecord;
+import com.zd.bottle.mapper.AlarmRecordMapper;
+import com.zd.bottle.service.AlarmRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报警记录表 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, AlarmRecord> implements AlarmRecordService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageErrorServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.BottleStorageError;
+import com.zd.bottle.mapper.BottleStorageErrorMapper;
+import com.zd.bottle.service.BottleStorageErrorService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 气瓶异常记录表 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErrorMapper, BottleStorageError> implements BottleStorageErrorService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageOutServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.BottleStorageOut;
+import com.zd.bottle.mapper.BottleStorageOutMapper;
+import com.zd.bottle.service.BottleStorageOutService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 气瓶出库表 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class BottleStorageOutServiceImpl extends ServiceImpl<BottleStorageOutMapper, BottleStorageOut> implements BottleStorageOutService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.BottleStorage;
+import com.zd.bottle.mapper.BottleStorageMapper;
+import com.zd.bottle.service.BottleStorageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 气瓶入库表 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, BottleStorage> implements BottleStorageService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/RfidTagServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.RfidTag;
+import com.zd.bottle.mapper.RfidTagMapper;
+import com.zd.bottle.service.RfidTagService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * RFID标签管理 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> implements RfidTagService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.UseRecord;
+import com.zd.bottle.mapper.UseRecordMapper;
+import com.zd.bottle.service.UseRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 使用记录表 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord> implements UseRecordService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UsegasApplyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.UsegasApply;
+import com.zd.bottle.mapper.UsegasApplyMapper;
+import com.zd.bottle.service.UsegasApplyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用气申请表 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class UsegasApplyServiceImpl extends ServiceImpl<UsegasApplyMapper, UsegasApply> implements UsegasApplyService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UsegasAuditRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zd.bottle.service.impl;
+
+import com.zd.bottle.domain.UsegasAuditRecord;
+import com.zd.bottle.mapper.UsegasAuditRecordMapper;
+import com.zd.bottle.service.UsegasAuditRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用气审核表 服务实现类
+ * </p>
+ *
+ * @author hanson
+ * @since 2022-09-08
+ */
+@Service
+public class UsegasAuditRecordServiceImpl extends ServiceImpl<UsegasAuditRecordMapper, UsegasAuditRecord> implements UsegasAuditRecordService {
+
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/bootstrap.yml

@@ -0,0 +1,30 @@
+# Tomcat
+server:
+  port: 9401
+# Spring
+#logging:
+#  level:
+#    root: debug
+spring:
+  application:
+    # 应用名称
+    name: zd-bottle
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
+      config:
+        # 配置中心地址
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
+        # 配置文件格式
+        file-extension: yml
+        # 动态刷新
+        refresh-enabled: true
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/zd-airbottle"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.zd" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="error"/>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/AlarmRecordMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.AlarmRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.AlarmRecord">
+        <result column="id" property="id" />
+        <result column="master_id" property="masterId" />
+        <result column="electronic_tag" property="electronicTag" />
+        <result column="type" property="type" />
+        <result column="product_type" property="productType" />
+        <result column="alarm_time" property="alarmTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        master_id, electronic_tag, type, product_type, alarm_time
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageErrorMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.BottleStorageErrorMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.BottleStorageError">
+        <result column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="storage_id" property="storageId" />
+        <result column="location" property="location" />
+        <result column="location_id" property="locationId" />
+        <result column="before_edit" property="beforeEdit" />
+        <result column="after_edit" property="afterEdit" />
+        <result column="op_time" property="opTime" />
+        <result column="phone" property="phone" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_by,
+        storage_id, location, location_id, before_edit, after_edit, op_time, phone
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageMapper.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.BottleStorageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.BottleStorage">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="is_handwheel" property="isHandwheel" />
+        <result column="is_fixed" property="isFixed" />
+        <result column="is_electronic_tag" property="isElectronicTag" />
+        <result column="is_status_sign" property="isStatusSign" />
+        <result column="is_photo" property="isPhoto" />
+        <result column="gas_pressure" property="gasPressure" />
+        <result column="validate_start_time" property="validateStartTime" />
+        <result column="validate_end_time" property="validateEndTime" />
+        <result column="electronic_tag" property="electronicTag" />
+        <result column="is_surplus" property="isSurplus" />
+        <result column="current_pressure" property="currentPressure" />
+        <result column="air_number" property="airNumber" />
+        <result column="validate_remark" property="validateRemark" />
+        <result column="rejection_apply_img" property="rejectionApplyImg" />
+        <result column="rejection_apply_remark" property="rejectionApplyRemark" />
+        <result column="rejection_apply_userid" property="rejectionApplyUserid" />
+        <result column="rejection_apply_time" property="rejectionApplyTime" />
+        <result column="rejection_userid" property="rejectionUserid" />
+        <result column="rejection_time" property="rejectionTime" />
+        <result column="task_detail_id" property="taskDetailId" />
+        <result column="storage_status" property="storageStatus" />
+        <result column="air_status" property="airStatus" />
+        <result column="task_id" property="taskId" />
+        <result column="storage_userid" property="storageUserid" />
+        <result column="air_bottle_id" property="airBottleId" />
+        <result column="air_bottle_name" property="airBottleName" />
+        <result column="specification_name" property="specificationName" />
+        <result column="air_bottle_config_id" property="airBottleConfigId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        is_handwheel, is_fixed, is_electronic_tag, is_status_sign, is_photo, gas_pressure, validate_start_time, validate_end_time, electronic_tag, is_surplus, current_pressure, air_number, validate_remark, rejection_apply_img, rejection_apply_remark, rejection_apply_userid, rejection_apply_time, rejection_userid, rejection_time, task_detail_id, storage_status, air_status, task_id, storage_userid, air_bottle_id, air_bottle_name, specification_name, air_bottle_config_id
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageOutMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.BottleStorageOutMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.BottleStorageOut">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="apply_user_name" property="applyUserName" />
+        <result column="apply_userid" property="applyUserid" />
+        <result column="phone" property="phone" />
+        <result column="storage_id" property="storageId" />
+        <result column="car_id" property="carId" />
+        <result column="car_number" property="carNumber" />
+        <result column="transport_id" property="transportId" />
+        <result column="transport_name" property="transportName" />
+        <result column="dispose_userid" property="disposeUserid" />
+        <result column="dispose_username" property="disposeUsername" />
+        <result column="dispose_time" property="disposeTime" />
+        <result column="complete_time" property="completeTime" />
+        <result column="complete_userid" property="completeUserid" />
+        <result column="complete_username" property="completeUsername" />
+        <result column="pressure" property="pressure" />
+        <result column="out_status" property="outStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        apply_user_name, apply_userid, phone, storage_id, car_id, car_number, transport_id, transport_name, dispose_userid, dispose_username, dispose_time, complete_time, complete_userid, complete_username, pressure, out_status
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/RfidTagMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.RfidTagMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.RfidTag">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="tag_code" property="tagCode" />
+        <result column="is_bind" property="isBind" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        tag_code, is_bind
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UseRecordMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.UseRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.UseRecord">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="contacts" property="contacts" />
+        <result column="user_id" property="userId" />
+        <result column="phone" property="phone" />
+        <result column="location" property="location" />
+        <result column="subject_id" property="subjectId" />
+        <result column="storage_id" property="storageId" />
+        <result column="before_use_pic" property="beforeUsePic" />
+        <result column="before_use" property="beforeUse" />
+        <result column="after_use_pic" property="afterUsePic" />
+        <result column="after_use" property="afterUse" />
+        <result column="amount" property="amount" />
+        <result column="use_time" property="useTime" />
+        <result column="back_time" property="backTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        create_by,
+        update_by,
+        update_time,
+        contacts, user_id, phone, location, subject_id, storage_id, before_use_pic, before_use, after_use_pic, after_use, amount, use_time, back_time
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasApplyMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.UsegasApplyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.UsegasApply">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="location" property="location" />
+        <result column="subject_id" property="subjectId" />
+        <result column="apply_user" property="applyUser" />
+        <result column="user_id" property="userId" />
+        <result column="dept_id" property="deptId" />
+        <result column="dept_name" property="deptName" />
+        <result column="phone" property="phone" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="gas_use" property="gasUse" />
+        <result column="apply_certificate" property="applyCertificate" />
+        <result column="safety_precautions" property="safetyPrecautions" />
+        <result column="use_gas_id" property="useGasId" />
+        <result column="use_gas_name" property="useGasName" />
+        <result column="lead_audit_staus" property="leadAuditStaus" />
+        <result column="lead_audit_userid" property="leadAuditUserid" />
+        <result column="lead_audit_username" property="leadAuditUsername" />
+        <result column="lead_audit_time" property="leadAuditTime" />
+        <result column="lead_audit_cause" property="leadAuditCause" />
+        <result column="center_audit_status" property="centerAuditStatus" />
+        <result column="center_audit_userid" property="centerAuditUserid" />
+        <result column="center_audit_username" property="centerAuditUsername" />
+        <result column="center_audit_time" property="centerAuditTime" />
+        <result column="center_audit_cause" property="centerAuditCause" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        location, subject_id, apply_user, user_id, dept_id, dept_name, phone, start_time, end_time, gas_use, apply_certificate, safety_precautions, use_gas_id, use_gas_name, lead_audit_staus, lead_audit_userid, lead_audit_username, lead_audit_time, lead_audit_cause, center_audit_status, center_audit_userid, center_audit_username, center_audit_time, center_audit_cause
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasAuditRecordMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zd.bottle.mapper.UsegasAuditRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zd.bottle.domain.UsegasAuditRecord">
+        <result column="id" property="id" />
+        <result column="audit_userid" property="auditUserid" />
+        <result column="audit_user" property="auditUser" />
+        <result column="audit_time" property="auditTime" />
+        <result column="audit_status" property="auditStatus" />
+        <result column="remark" property="remark" />
+        <result column="usegas_apply_id" property="usegasApplyId" />
+        <result column="audit_type" property="auditType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        audit_userid, audit_user, audit_time, audit_status, remark, usegas_apply_id, audit_type
+    </sql>
+
+</mapper>

zd-modules/zd-bottle-parent/zd-bottle/wait-for-it.sh

@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi