省市及监管单位统计页面 相关接口开发

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderAreaDataDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶区域统计表
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderAreaDataDto", description="气瓶区域统计表")
+public class CylinderAreaDataDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "区域名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "企业数量")
+    private Long unitNum;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "父节点区域编码")
+    private String parentRegionCode;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "气瓶数量")
+    private Long cylinderNum;
+
+    @ApiModelProperty(value = "预警数量")
+    private Long warnNum;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingCheckDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 液化气体气瓶充装信息-充装后复查
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingCheckDto", description="液化气体气瓶充装信息-充装后复查")
+public class CylinderFillingCheckDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "充装后复查ID")
+    private String fillingCheckId;
+
+    @ApiModelProperty(value = "充装企业名称")
+    private String fillingUnitName;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    private String sequenceCode;
+
+    @ApiModelProperty(value = "充装量在规定范围内")
+    private Integer withinScope;
+
+    @ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
+    private Integer sealedState;
+
+    @ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
+    private Integer defective;
+
+    @ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
+    private Integer abnormalTemperature;
+
+    @ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
+    private Integer warningSign;
+
+    @ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
+    private String compliance;
+
+    @ApiModelProperty(value = "检查人员姓名")
+    private String inspector;
+
+    @ApiModelProperty(value = "检查时间")
+    private String inspectionDate;
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String appId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶充装信息--充装前检查
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingDto", description="气瓶充装信息--充装前检查")
+public class CylinderFillingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "充装前检查Id")
+    private String fillingBeforeId;
+
+    @ApiModelProperty(value = "充装企业名称")
+    private String fillingUnitName;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    private String sequenceCode;
+
+    @ApiModelProperty(value = "是否在检验有效期以内")
+    private String isValid;
+
+    @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
+    private Integer same;
+
+    @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
+    private Integer isRegulations;
+
+    @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
+    private Integer isComplianceWithgbt;
+
+    @ApiModelProperty(value = "气瓶内有无剩余压力")
+    private Integer haveStillPressure;
+
+    @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
+    private Integer isComplete;
+
+    @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
+    private Integer haveSecurityDocuments;
+
+    @ApiModelProperty(value = "检查人员姓名")
+    private String inspectorUser;
+
+    @ApiModelProperty(value = "检查时间")
+    private String inspectionDate;
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String appId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingExamineDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 液化气体气瓶充装信息审核
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingExamineDto", description="液化气体气瓶充装信息审核")
+public class CylinderFillingExamineDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "充装信息审核ID")
+    private String fillingExamineId;
+
+    @ApiModelProperty(value = "充装企业名称")
+    private String fillingUnitName;
+
+    @ApiModelProperty(value = "报表生成时间")
+    private String fillingAuditDate;
+
+    @ApiModelProperty(value = "充装审核报表附件地址")
+    private String fillingAuditUrl;
+
+    @ApiModelProperty(value = "充装审核报表附件名称")
+    private String fillingAuditName;
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String appId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingRecordDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 液化气体气瓶充装信息-充装记录
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingRecordDto", description="液化气体气瓶充装信息-充装记录")
+public class CylinderFillingRecordDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "充装记录Id")
+    private String fillingRecordId;
+
+    @ApiModelProperty(value = "充装企业名称")
+    private String fillingUnitName;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "气瓶品种")
+    private String cylinderVariety;
+
+    @ApiModelProperty(value = "二维码编号")
+    private String qrCode;
+
+    @ApiModelProperty(value = "电子标签编号")
+    private String electronicLabelCode;
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    private String sequenceCode;
+
+    @ApiModelProperty(value = "单位内部编号")
+    private String unitInnerCode;
+
+    @ApiModelProperty(value = "产权单位")
+    private String propertyUnit;
+
+    @ApiModelProperty(value = "充装开始时间")
+    private String fillingStarttime;
+
+    @ApiModelProperty(value = "充装结束时间")
+    private String fillingEndtime;
+
+    @ApiModelProperty(value = "充装人员姓名")
+    private String fillingUser;
+
+    @ApiModelProperty(value = "充装量（Kg）")
+    private Double fillingQuantity;
+
+    @ApiModelProperty(value = "室温")
+    private Double temperature;
+
+    @ApiModelProperty(value = "异常情况")
+    private Integer abnormal;
+
+    @ApiModelProperty(value = "异常情况")
+    private String abnormalStr;
+
+
+    @ApiModelProperty(value = "充装前检查时间")
+    private String inspectionDate;
+
+   @ApiModelProperty(value = "充装前检查结果")
+   private String fillingResult;
+
+    @ApiModelProperty(value = "充装前检查人员")
+    private String inspectorUser;
+
+    @ApiModelProperty(value = "充装后检查人员姓名")
+    private String inspector;
+
+    @ApiModelProperty(value = "充装后检查时间")
+    private String inspectionDateAfter;
+
+    @ApiModelProperty(value = "充装后检查结果")
+    private String checkResult;
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "1初次同步数据   2上层系统已同步数据   0已删除数据")
+    private Integer syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String appId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingUnloadDataDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶充卸统计表
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingUnloadDataDto", description="气瓶充卸统计表")
+public class CylinderFillingUnloadDataDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "充装总量")
+    private Double fillingSum;
+
+    @ApiModelProperty(value = "卸液总量")
+    private Double unloadSum;
+
+    @ApiModelProperty(value = "充卸日期")
+    private Date statisDate;
+
+    @ApiModelProperty(value = "充卸日期字符串")
+    private String statisDateStr;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "充卸年份")
+    private String statisYear;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "充卸月份")
+    private String statisMonth;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDataDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶总量统计表
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderInfoDataDto", description="气瓶总量统计表")
+public class CylinderInfoDataDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "气瓶总量")
+    private Long totalSum;
+
+    @ApiModelProperty(value = "气瓶增减数量")
+    private Long changeSum;
+
+    @ApiModelProperty(value = "增减环比")
+    private String changePercent;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInspectionDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶检验信息
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderInspectionDto", description="气瓶检验信息")
+public class CylinderInspectionDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "检验信息ID")
+    private String inspectionId;
+
+    @ApiModelProperty(value = "检验单位")
+    private String inspectionUnit;
+
+    @ApiModelProperty(value = "产权单位名称")
+    private String propertyUnitName;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    private String sequenceCode;
+
+    @ApiModelProperty(value = "检验日期")
+    private String inspectionDate;
+
+    @ApiModelProperty(value = "下次检验日期")
+    private String nextInspectionDate;
+
+    @ApiModelProperty(value = "检验结果")
+    private String inspectionResult;
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String appId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderIntegrityDataDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶数据完整度表
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderIntegrityDataDto", description="气瓶数据完整度表")
+public class CylinderIntegrityDataDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "企业名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "数据完整度")
+    private Double integrity;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderTagsDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶标签信息
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderTagsDto", description="气瓶标签信息")
+public class CylinderTagsDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "标签ID")
+    private String tagId;
+
+    @ApiModelProperty(value = "产权单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    private String sequenceCode;
+
+    @ApiModelProperty(value = "二维码编号")
+    private String qrCode;
+
+    @ApiModelProperty(value = "电子标签编号")
+    private String electronicLabelCode;
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String appId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderUnitDataDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 企业总量统计表
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderUnitDataDto", description="企业总量统计表")
+public class CylinderUnitDataDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "企业总量")
+    private Long totalSum;
+
+    @ApiModelProperty(value = "企业增减数量")
+    private Long changeSum;
+
+    @ApiModelProperty(value = "增减环比")
+    private String changePercent;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderUnloadFakeDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 卸液数据表-假数据
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderUnloadFakeDto", description="卸液数据表-假数据")
+public class CylinderUnloadFakeDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "卸液量")
+    private Double unloadNum;
+
+    @ApiModelProperty(value = "卸液日期")
+    private Date unloadTime;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitInfoDto.java

@@ -165,4 +165,7 @@ public class UnitInfoDto extends BaseDto {
  @ApiModelProperty(value = "提交时间")
  private Date submitTime;
 
+ @ApiModelProperty(value = "驳回id")
+ private String callbackId;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderAreaData.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶区域统计表
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_area_data")
+public class CylinderAreaData extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 区域名称
+     */
+	@TableField("area_name")
+    private String areaName;
+
+    /**
+     * 企业数量
+     */
+	@TableField("unit_num")
+    private Long unitNum;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 父节点区域编码
+     */
+	@TableField("parent_region_code")
+    private String parentRegionCode;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 气瓶数量
+     */
+	@TableField("cylinder_num")
+    private Long cylinderNum;
+
+    /**
+     * 预警数量
+     */
+	@TableField("warn_num")
+    private Long warnNum;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFilling.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+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.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶充装信息--充装前检查
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode()
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling")
+public class CylinderFilling  {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    @TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
+    protected Date recDate;
+
+    @TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
+    protected String recUserId;
+
+
+    /**
+     * 充装前检查Id
+     */
+	@TableField("filling_before_id")
+    private String fillingBeforeId;
+
+    /**
+     * 充装企业名称
+     */
+	@TableField("filling_unit_name")
+    private String fillingUnitName;
+
+    /**
+     * 出厂编号
+     */
+	@TableField("factory_num")
+    private String factoryNum;
+
+    /**
+     * 气瓶唯一标识码
+     */
+	@TableField("sequence_code")
+    private String sequenceCode;
+
+    /**
+     * 是否在检验有效期以内
+     */
+	@TableField("is_valid")
+    private String isValid;
+
+    /**
+     * 警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致
+     */
+	@TableField("same")
+    private Integer same;
+
+    /**
+     * 气瓶外表面的颜色标志是否符合规定
+     */
+	@TableField("is_regulations")
+    private Integer isRegulations;
+
+    /**
+     * 气瓶瓶阀的出气口螺纹型式是否符合GB/T15383
+     */
+	@TableField("is_compliance_withGBT")
+    private Integer isComplianceWithgbt;
+
+    /**
+     * 气瓶内有无剩余压力
+     */
+	@TableField("have_still_pressure")
+    private Integer haveStillPressure;
+
+    /**
+     * 气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷
+     */
+	@TableField("is_complete")
+    private Integer isComplete;
+
+    /**
+     * 气瓶的安全附件齐全并符合安全要求
+     */
+	@TableField("have_security_documents")
+    private Integer haveSecurityDocuments;
+
+    /**
+     * 检查人员姓名
+     */
+	@TableField("inspector_user")
+    private String inspectorUser;
+
+    /**
+     * 检查时间
+     */
+	@TableField("inspection_date")
+    private String inspectionDate;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 0-新增   1-更新  2-删除
+     */
+	@TableField("sync_state")
+    private Integer syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingCheck.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 液化气体气瓶充装信息-充装后复查
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling_check")
+public class CylinderFillingCheck extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 充装后复查ID
+     */
+	@TableField("filling_check_id")
+    private String fillingCheckId;
+
+    /**
+     * 充装企业名称
+     */
+	@TableField("filling_unit_name")
+    private String fillingUnitName;
+
+    /**
+     * 出厂编号
+     */
+	@TableField("factory_num")
+    private String factoryNum;
+
+    /**
+     * 气瓶唯一标识码
+     */
+	@TableField("sequence_code")
+    private String sequenceCode;
+
+    /**
+     * 充装量在规定范围内
+     */
+	@TableField("within_scope")
+    private Integer withinScope;
+
+    /**
+     * 瓶阀及其与瓶口连接的密封良好
+     */
+	@TableField("sealed_state")
+    private Integer sealedState;
+
+    /**
+     * 瓶体未出现鼓包变形或泄露等严重缺陷
+     */
+	@TableField("defective")
+    private Integer defective;
+
+    /**
+     * 瓶体温度没有异常升高的迹象
+     */
+	@TableField("abnormal_temperature")
+    private Integer abnormalTemperature;
+
+    /**
+     * 气瓶粘贴警示标签和充装标签
+     */
+	@TableField("warning_sign")
+    private Integer warningSign;
+
+    /**
+     * 液化气瓶充装量符合有关规定，充装后逐瓶称重
+     */
+	@TableField("compliance")
+    private String compliance;
+
+    /**
+     * 检查人员姓名
+     */
+	@TableField("inspector")
+    private String inspector;
+
+    /**
+     * 检查时间
+     */
+	@TableField("inspection_date")
+    private String inspectionDate;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 0-新增   1-更新  2-删除
+     */
+	@TableField("sync_state")
+    private Integer syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingExamine.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 液化气体气瓶充装信息审核
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling_examine")
+public class CylinderFillingExamine extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 充装信息审核ID
+     */
+	@TableField("filling_examine_id")
+    private String fillingExamineId;
+
+    /**
+     * 充装企业名称
+     */
+	@TableField("filling_unit_name")
+    private String fillingUnitName;
+
+    /**
+     * 报表生成时间
+     */
+	@TableField("filling_audit_date")
+    private String fillingAuditDate;
+
+    /**
+     * 充装审核报表附件地址
+     */
+	@TableField("filling_audit_url")
+    private String fillingAuditUrl;
+
+    /**
+     * 充装审核报表附件名称
+     */
+	@TableField("filling_audit_name")
+    private String fillingAuditName;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 0-新增   1-更新  2-删除
+     */
+	@TableField("sync_state")
+    private Integer syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingRecord.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 液化气体气瓶充装信息-充装记录
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling_record")
+public class CylinderFillingRecord extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 充装记录Id
+     */
+	@TableField("filling_record_id")
+    private String fillingRecordId;
+
+    /**
+     * 充装企业名称
+     */
+	@TableField("filling_unit_name")
+    private String fillingUnitName;
+
+    /**
+     * 出厂编号
+     */
+	@TableField("factory_num")
+    private String factoryNum;
+
+    /**
+     * 气瓶唯一标识码
+     */
+	@TableField("sequence_code")
+    private String sequenceCode;
+
+    /**
+     * 充装开始时间
+     */
+	@TableField("filling_startTime")
+    private String fillingStarttime;
+
+    /**
+     * 充装结束时间
+     */
+	@TableField("filling_endTime")
+    private String fillingEndtime;
+
+    /**
+     * 充装人员姓名
+     */
+	@TableField("filling_user")
+    private String fillingUser;
+
+    /**
+     * 充装量（Kg）
+     */
+	@TableField("filling_quantity")
+    private Double fillingQuantity;
+
+    /**
+     * 室温
+     */
+	@TableField("temperature")
+    private Double temperature;
+
+    /**
+     * 异常情况
+     */
+	@TableField("abnormal")
+    private Integer abnormal;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 1初次同步数据   2上层系统已同步数据   0已删除数据
+     */
+	@TableField("sync_state")
+    private Integer syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingUnloadData.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶充卸统计表
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling_unload_data")
+public class CylinderFillingUnloadData extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 充装总量
+     */
+	@TableField("filling_sum")
+    private Double fillingSum;
+
+    /**
+     * 卸液总量
+     */
+	@TableField("unload_sum")
+    private Double unloadSum;
+
+    /**
+     * 充卸日期
+     */
+	@TableField("statis_date")
+    private Date statisDate;
+
+    /**
+     * 充卸日期字符串
+     */
+	@TableField("statis_date_str")
+    private String statisDateStr;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 充卸年份
+     */
+	@TableField("statis_year")
+    private String statisYear;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 充卸月份
+     */
+	@TableField("statis_month")
+    private String statisMonth;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java

@@ -153,4 +153,10 @@ public class CylinderInfo  {
      */
     @TableField("app_id")
     private String appId;
+
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfoData.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶总量统计表
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_info_data")
+public class CylinderInfoData extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 气瓶总量
+     */
+	@TableField("total_sum")
+    private Long totalSum;
+
+    /**
+     * 气瓶增减数量
+     */
+	@TableField("change_sum")
+    private Long changeSum;
+
+    /**
+     * 增减环比
+     */
+	@TableField("change_percent")
+    private String changePercent;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInspection.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶检验信息
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_inspection")
+public class CylinderInspection extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 检验信息ID
+     */
+	@TableField("inspection_id")
+    private String inspectionId;
+
+    /**
+     * 检验单位
+     */
+	@TableField("inspection_unit")
+    private String inspectionUnit;
+
+    /**
+     * 产权单位名称
+     */
+	@TableField("property_unit_name")
+    private String propertyUnitName;
+
+    /**
+     * 出厂编号
+     */
+	@TableField("factory_num")
+    private String factoryNum;
+
+    /**
+     * 气瓶唯一标识码
+     */
+	@TableField("sequence_code")
+    private String sequenceCode;
+
+    /**
+     * 检验日期
+     */
+	@TableField("inspection_date")
+    private String inspectionDate;
+
+    /**
+     * 下次检验日期
+     */
+	@TableField("next_inspection_date")
+    private String nextInspectionDate;
+
+    /**
+     * 检验结果
+     */
+	@TableField("inspection_result")
+    private String inspectionResult;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 0-新增   1-更新  2-删除
+     */
+	@TableField("sync_state")
+    private Integer syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderIntegrityData.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶数据完整度表
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_integrity_data")
+public class CylinderIntegrityData extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业名称
+     */
+	@TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 数据完整度
+     */
+	@TableField("integrity")
+    private Double integrity;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderTags.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+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.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶标签信息
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode()
+@Accessors(chain = true)
+@TableName("tz_cylinder_tags")
+public class CylinderTags {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    @TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
+    protected Date recDate;
+
+    @TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
+    protected String recUserId;
+
+    /**
+     * 标签ID
+     */
+	@TableField("tag_id")
+    private String tagId;
+
+    /**
+     * 产权单位名称
+     */
+	@TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 出厂编号
+     */
+	@TableField("factory_num")
+    private String factoryNum;
+
+    /**
+     * 气瓶唯一标识码
+     */
+	@TableField("sequence_code")
+    private String sequenceCode;
+
+    /**
+     * 二维码编号
+     */
+	@TableField("qrCode")
+    private String qrCode;
+
+    /**
+     * 电子标签编号
+     */
+	@TableField("electronic_label_code")
+    private String electronicLabelCode;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 0-新增   1-更新  2-删除
+     */
+	@TableField("sync_state")
+    private Integer syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnit.java

@@ -183,4 +183,9 @@ public class CylinderUnit  {
     @TableField("latitude")
     private String latitude;
 
+    /**
+     * 数据完整度
+     */
+    @TableField("integrity")
+    private Double integrity;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnitData.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 企业总量统计表
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_unit_data")
+public class CylinderUnitData extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业总量
+     */
+	@TableField("total_sum")
+    private Long totalSum;
+
+    /**
+     * 企业增减数量
+     */
+	@TableField("change_sum")
+    private Long changeSum;
+
+    /**
+     * 增减环比
+     */
+    @TableField("change_percent")
+    private String changePercent;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnloadFake.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 卸液数据表-假数据
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_unload_fake")
+public class CylinderUnloadFake extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 卸液量
+     */
+	@TableField("unload_num")
+    private Double unloadNum;
+
+    /**
+     * 卸液日期
+     */
+	@TableField("unload_time")
+    private Date unloadTime;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfo.java

@@ -257,4 +257,10 @@ public class UnitInfo extends BaseEntity {
     @TableField("submit_time")
     private Date submitTime;
 
+    /**
+     * 驳回id
+     */
+    @TableField("callback_id")
+    private String callbackId;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderAreaDataMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderAreaData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶区域统计表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+public interface CylinderAreaDataMapper extends BaseMapper<CylinderAreaData> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingCheckMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 液化气体气瓶充装信息-充装后复查 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderFillingCheckMapper extends BaseMapper<CylinderFillingCheck> {
+
+    Double queryIntegirtyByAppId(String appId);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingExamineMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingExamine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 液化气体气瓶充装信息审核 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderFillingExamineMapper extends BaseMapper<CylinderFillingExamine> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFilling;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶充装信息--充装前检查 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderFillingMapper extends BaseMapper<CylinderFilling> {
+
+    Double queryIntegirtyByAppId(String appId);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingRecordMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingRecordDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 液化气体气瓶充装信息-充装记录 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingRecord> {
+
+    Double queryIntegirtyByAppId(String appId);
+
+    Double getFillingSum(@Param("regionCode") String r,@Param("time") Date time);
+
+    /**
+     * 根据查询条件返回充装记录信息
+     * @param page
+     * @param sortParam
+     * @param sortRule
+     * @return
+     */
+    Page<List<CylinderFillingRecordDto>> queryListByQueryDto(IPage<CylinderFillingRecordDto> page,
+                                                             @Param("fillingUnitName") String fillingUnitName,
+                                                             @Param("propertyUnit") String propertyUnit,
+                                                             @Param("factoryNum") String factoryNum,
+                                                             @Param("cylinderVariety") String cylinderVariety,
+                                                             @Param("qrCode") String qrCode,
+                                                             @Param("electronicLabelCode") String electronicLabelCode,
+                                                             @Param("sequenceCode") String sequenceCode,
+                                                             @Param("unitInnerCode") String unitInnerCode,
+                                                             @Param("fillingStartTime") String fillingStartTime,
+                                                             @Param("fillingEndTime") String fillingEndTime,
+                                                             @Param("sortParam") String sortParam,
+                                                             @Param("sortRule") String sortRule,
+                                                             @Param("appId") String appId
+                                                             );
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingUnloadDataMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingUnloadData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶充卸统计表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+public interface CylinderFillingUnloadDataMapper extends BaseMapper<CylinderFillingUnloadData> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderInfoDataMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfoData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶总量统计表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderInfoDataMapper extends BaseMapper<CylinderInfoData> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderInfoMapper.java

@@ -22,4 +22,26 @@ public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
      */
     Map<String, Long> queryNumAndOutOfDateNum(@Param("sequenceNbr")  Long sequenceNbr);
 
+    /**
+     * 获取上个月气瓶总量
+     * @return
+     */
+    Integer getLastMonthInfoTotal(@Param("regionCode") String regionCode);
+
+    /**
+     * 获取上上个月气瓶总量
+     * @return
+     */
+    Integer getMonthBeforeLastInfoTotal(@Param("regionCode")String regionCode);
+
+    /**
+     * 根据regionCode 获取气瓶数量
+     * @param regionCode
+     * @return
+     */
+    Integer getInfoTotalByRegionCode(@Param("regionCode") String regionCode);
+
+    Double queryIntegirtyByAppId(@Param("appId")  String appId);
+
+    Integer getWarnNum(String code);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderInspectionMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInspection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶检验信息 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderInspectionMapper extends BaseMapper<CylinderInspection> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderIntegrityDataMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderIntegrityData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶数据完整度表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+public interface CylinderIntegrityDataMapper extends BaseMapper<CylinderIntegrityData> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderTagsMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderTags;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 气瓶标签信息 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderTagsMapper extends BaseMapper<CylinderTags> {
+
+    Double queryIntegirtyByAppId(@Param("appId") String appId);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderUnitDataMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnitData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 企业总量统计表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface CylinderUnitDataMapper extends BaseMapper<CylinderUnitData> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderUnitMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
 
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 气瓶企业信息 Mapper 接口
@@ -11,4 +12,24 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CylinderUnitMapper extends BaseMapper<CylinderUnit> {
 
+    /**
+     * 获取上个月企业总量
+     * @return
+     */
+    Integer getLastMonthUnitTotal(@Param("regionCode") String regionCode);
+
+    /**
+     * 获取上上个月企业总量
+     * @return
+     */
+    Integer getMonthBeforeLastUnitTotal(@Param("regionCode") String regionCode);
+
+    /**
+     * 根据regioncode 获取企业总量
+     * @param regionCode
+     * @return
+     */
+    Integer getUnitTotalByRegionCode(@Param("regionCode") String regionCode);
+
+    Integer getWarnNum(String code);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderUnloadFakeMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnloadFake;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 卸液数据表-假数据 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+public interface CylinderUnloadFakeMapper extends BaseMapper<CylinderUnloadFake> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderAreaDataService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶区域统计表接口类
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+public interface ICylinderAreaDataService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderFillingCheckService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 液化气体气瓶充装信息-充装后复查接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderFillingCheckService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderFillingExamineService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 液化气体气瓶充装信息审核接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderFillingExamineService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderFillingRecordService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 液化气体气瓶充装信息-充装记录接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderFillingRecordService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderFillingService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶充装信息--充装前检查接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderFillingService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderFillingUnloadDataService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶充卸统计表接口类
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+public interface ICylinderFillingUnloadDataService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderInfoDataService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶总量统计表接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderInfoDataService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderInspectionService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶检验信息接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderInspectionService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderIntegrityDataService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶数据完整度表接口类
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+public interface ICylinderIntegrityDataService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderTagsService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶标签信息接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderTagsService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderUnitDataService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 企业总量统计表接口类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+public interface ICylinderUnitDataService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderUnloadFakeService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 卸液数据表-假数据接口类
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+public interface ICylinderUnloadFakeService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderAreaDataMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderAreaDataMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingCheckMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingCheckMapper">
+
+    <select id="queryIntegirtyByAppId" resultType="java.lang.Double">
+        SELECT AVG(integrity) AS score_avg FROM tz_cylinder_filling_check t where t.app_id = #{appId} AND
+         DATE_SUB(CURDATE(), INTERVAL 30 DAY) <![CDATA[ <= ]]> date(t.sync_date);
+    </select>
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingExamineMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingExamineMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingMapper">
+
+    <select id="queryIntegirtyByAppId" resultType="java.lang.Double">
+        SELECT AVG(integrity) AS score_avg FROM tz_cylinder_filling t where t.app_id = #{appId} AND
+         DATE_SUB(CURDATE(), INTERVAL 30 DAY) <![CDATA[ <= ]]> date(t.sync_date);
+    </select>
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingRecordMapper">
+
+    <select id="queryIntegirtyByAppId" resultType="java.lang.Double">
+        SELECT AVG(integrity) AS score_avg FROM tz_cylinder_filling_record t where t.app_id = #{appId} AND
+         DATE_SUB(CURDATE(), INTERVAL 30 DAY) <![CDATA[ <= ]]> date(t.sync_date);
+    </select>
+
+    <select id="getFillingSum" resultType="java.lang.Double">
+        select ifnull(sum(r.filling_quantity),0) from tz_cylinder_filling_record r where date_format(r.filling_endTime,'%Y-%m-%d') = date_format(#{time},'%Y-%m-%d') and app_id in (
+        select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
+        )
+    </select>
+
+
+    <select id="queryListByQueryDto" resultType="java.util.Map">
+        SELECT
+        r.sequence_nbr AS sequenceNbr,
+        r.filling_unit_name AS fillingUnitName,
+        r.factory_num AS factoryNum,
+        CASE
+        i.cylinder_variety
+        WHEN 1 THEN
+        '无缝气瓶'
+        WHEN 2 THEN
+        '焊接气瓶'
+        WHEN 3 THEN
+        '缠绕气瓶'
+        WHEN 4 THEN
+        '绝热气瓶'
+        WHEN 5 THEN
+        '内装填料气瓶'
+        ELSE
+        ''
+        END AS cylinderVariety,
+        i.qrCode AS qrCode,
+        i.electronic_label_code AS electronicLabelCode,
+        r.sequence_code AS sequenceCode,
+        i.unit_inner_code AS unitInnerCode,
+        u.unit_name AS propertyUnit,
+        r.filling_startTime AS fillingStarttime,
+        r.filling_endTime AS fillingEndtime,
+        r.filling_user AS fillingUser,
+        r.filling_quantity AS fillingQuantity,
+        r.temperature AS temperature,
+        case r.abnormal
+        WHEN 0 THEN
+        '有异常'
+        WHEN 1 THEN
+        '正常'
+        ELSE
+        ''
+        END AS abnormalStr,
+        b.inspection_date as inspectionDate,
+        b.inspector_user as inspector_user,
+        (b.is_valid+b.same+b.is_regulations+b.is_complete+b.have_still_pressure+b.is_complete+b.have_security_documents) as count,
+        case b.is_valid+b.same+b.is_regulations+b.is_complete+b.have_still_pressure+b.is_complete+b.have_security_documents
+        when 7 then '合格'
+        else
+        '不合格'
+        end as fillingResult,
+        af.inspector as inspector,
+        af.inspection_date as inspectionDateAfter,
+        case af.within_scope+af.sealed_state+af.defective+af.abnormal_temperature+af.warning_sign
+        when 5 then '合格'
+        else
+        '不合格'
+        end as checkResult
+        FROM
+        tz_cylinder_filling_record r
+        left join tz_cylinder_unit u on u.app_id = r.app_id
+        left join tz_cylinder_info i on r.sequence_code = i.sequence_code
+        inner join tz_cylinder_filling b on b.sequence_code = r.sequence_code AND
+        date_format(`b`.`inspection_date`,'%Y-%m-%d') = date_format(`r`.`filling_startTime`,'%Y-%m-%d')
+        inner join tz_cylinder_filling_check af on af.sequence_code = r.sequence_code AND
+        date_format(`af`.`inspection_date`,'%Y-%m-%d') = date_format(`r`.`filling_startTime`,'%Y-%m-%d')
+        WHERE r.app_id = #{appId} AND date_format(`r`.`filling_startTime`,'%Y-%m-%d') >= '2022-03-01'
+        <if test="fillingUnitName != null and fillingUnitName != ''">
+            AND r.filling_unit_name like
+            CONCAT(CONCAT('%',#{fillingUnitName}),'%')
+        </if>
+        <if test="propertyUnit != null and propertyUnit != ''">
+            AND u.unit_name like
+            CONCAT(CONCAT('%',#{propertyUnit}),'%')
+        </if>
+        <if test="factoryNum != null and factoryNum != ''">
+            AND r.factory_num like
+            CONCAT(CONCAT('%',#{factoryNum}),'%')
+        </if>
+        <if test="fillingStartTime != null ">
+            and #{fillingStartTime} <![CDATA[ <= ]]>
+            r.filling_startTime
+        </if>
+        <if test="fillingEndTime != null ">
+            and r.filling_endTime <![CDATA[ <= ]]>
+            #{fillingEndTime}
+        </if>
+        <if test="cylinderVariety != null and cylinderVariety != ''">
+            AND i.cylinder_variety = #{cylinderVariety}
+        </if>
+        <if test="qrCode != null and qrCode != ''">
+            AND i.qrCode like CONCAT(CONCAT('%',#{qrCode}),'%')
+        </if>
+        <if test="electronicLabelCode != null and electronicLabelCode != ''">
+            AND i.electronic_label_code like
+            CONCAT(CONCAT('%',#{electronicLabelCode}),'%')
+        </if>
+        <if test="sequenceCode != null and sequenceCode != ''">
+            AND r.sequence_code like
+            CONCAT(CONCAT('%',#{sequenceCode}),'%')
+        </if>
+        <if test="unitInnerCode != null and unitInnerCode != ''">
+            AND i.unit_inner_code like
+            CONCAT(CONCAT('%',#{unitInnerCode}),'%')
+        </if>
+        <if test="sortParam != null and sortParam != '' and sortRule != null and sortRule != ''    ">
+            ORDER BY  ${sortParam}  ${sortRule}
+        </if>
+    </select>
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingUnloadDataMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingUnloadDataMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoDataMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInfoDataMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -21,5 +21,32 @@
         )
     </select>
 
+    <select id="getLastMonthInfoTotal" resultType="java.lang.Integer">
+        select IFNULL(count(sequence_nbr), 0) from tz_cylinder_info where PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( sync_date, '%Y%m' ) ) =1 AND app_id in (
+        select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
+        )
+    </select>
+
+    <select id="getMonthBeforeLastInfoTotal" resultType="java.lang.Integer">
+        select IFNULL(count(sequence_nbr), 0) from tz_cylinder_info where PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( sync_date, '%Y%m' ) ) =2 AND app_id in (
+        select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
+        )
+    </select>
+
+    <select id="getInfoTotalByRegionCode" resultType="java.lang.Integer">
+        select count(sequence_nbr) from tz_cylinder_info where app_id in (
+        select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
+        )
+    </select>
+
+    <select id="queryIntegirtyByAppId" resultType="java.lang.Double">
+         SELECT AVG(integrity) AS score_avg FROM tz_cylinder_info t where t.app_id = #{appId}
+    </select>
+
+    <select id="getWarnNum" resultType="java.lang.Integer">
+        select count(1) from view_cylider_outofdate v where v.app_id in (
+            select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
+        )
+    </select>
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInspectionMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInspectionMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderIntegrityDataMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderIntegrityDataMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderTagsMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderTagsMapper">
+
+
+    <select id="queryIntegirtyByAppId" resultType="java.lang.Double">
+        SELECT AVG(integrity) AS score_avg FROM tz_cylinder_tags t where t.app_id = #{appId}
+    </select>
+
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderUnitDataMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderUnitDataMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderUnitMapper.xml

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderUnitMapper">
 
+    <select id="getLastMonthUnitTotal" resultType="java.lang.Integer">
+        select IFNULL(count(sequence_nbr), 0) from tz_cylinder_unit where PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( sync_date, '%Y%m' ) ) =1 AND region_code like CONCAT('%',#{regionCode},'%')
+    </select>
+
+    <select id="getMonthBeforeLastUnitTotal" resultType="java.lang.Integer">
+        select IFNULL(count(sequence_nbr), 0) from tz_cylinder_unit where PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( sync_date, '%Y%m' ) ) =2 AND region_code like CONCAT('%',#{regionCode},'%')
+    </select>
+
+    <select id="getUnitTotalByRegionCode" resultType="java.lang.Integer">
+        select count(sequence_nbr) from tz_cylinder_unit where region_code like CONCAT('%',#{regionCode},'%')
+    </select>
+
+    <select id="getWarnNum" resultType="java.lang.Integer">
+        select count(1) from view_unit_outofdate v where v.app_id in (
+            select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
+        )
+    </select>
+
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderUnloadFakeMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderUnloadFakeMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsAuthServiceImpl.java

@@ -60,10 +60,15 @@ public class TzsAuthServiceImpl implements TzsAuthService {
     public List<String> getUserRegionCode() {
         List<String> regionList = new ArrayList<>();
         AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-        regionList.add("610100");
-        regionList.add("610300");
-        regionList.add("610725");
-        regionList.add("610822");
+        CompanyModel userCompany = me.getCompanys().get(0);
+        String regions = userCompany.getRegionSeq();
+        if(regions != null) {
+            String[] regionsId = regions.split(",");
+            for(String regionId:regionsId) {
+                RegionModel region = Systemctl.regionClient.getRegion(Long.valueOf(regionId)).getResult();
+                regionList.add(region.getRegionCode() + "");
+            }
+        }
         return regionList;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/BeanDtoVoUtils.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentInform;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
 import com.yeejoin.amos.boot.module.tzs.flc.api.enums.EquipmentStatusEnum;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -270,8 +271,14 @@ public class BeanDtoVoUtils {
                 } else if(2 == item.getUnitStatus()) {
                     target.setStatusStr("已驳回");
                 }
-
-                target.setFullAddress(item.getProvince() + item.getCity() + item.getDistrict() + item.getStree() + item.getCommunity() + item.getAddress());
+                StringBuffer sb = new StringBuffer();
+                sb.append(StringUtils.isNotBlank(item.getProvince()) ? item.getProvince() : "");
+                sb.append(StringUtils.isNotBlank(item.getCity()) ? item.getCity() : "");
+                sb.append(StringUtils.isNotBlank(item.getDistrict()) ? item.getDistrict() : "");
+                sb.append(StringUtils.isNotBlank(item.getStree()) ? item.getStree() : "");
+                sb.append(StringUtils.isNotBlank(item.getCommunity()) ? item.getCommunity() : "");
+                sb.append(StringUtils.isNotBlank(item.getAddress()) ? item.getAddress() : "");
+                target.setFullAddress(sb.toString());
                 target.setAdminLoginPwd(null);
                 return target;
             } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderAreaDataController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderAreaDataServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderAreaDataDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶区域统计表
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@RestController
+@Api(tags = "气瓶区域统计表Api")
+@RequestMapping(value = "/cylinder-area-data")
+public class CylinderAreaDataController extends BaseController {
+
+    @Autowired
+    CylinderAreaDataServiceImpl cylinderAreaDataServiceImpl;
+
+    /**
+     * 新增气瓶区域统计表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶区域统计表", notes = "新增气瓶区域统计表")
+	public ResponseModel<CylinderAreaDataDto> save(@RequestBody CylinderAreaDataDto model) {
+	    model = cylinderAreaDataServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶区域统计表", notes = "根据sequenceNbr更新气瓶区域统计表")
+	public ResponseModel<CylinderAreaDataDto> updateBySequenceNbrCylinderAreaData(@RequestBody CylinderAreaDataDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderAreaDataServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶区域统计表", notes = "根据sequenceNbr删除气瓶区域统计表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderAreaDataServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶区域统计表",  notes = "根据sequenceNbr查询单个气瓶区域统计表")
+	public ResponseModel<CylinderAreaDataDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderAreaDataServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶区域统计表分页查询",  notes = "气瓶区域统计表分页查询")
+	public ResponseModel<Page<CylinderAreaDataDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderAreaDataDto> page = new Page<CylinderAreaDataDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderAreaDataServiceImpl.queryForCylinderAreaDataPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶区域统计表列表全部数据查询",   notes = "气瓶区域统计表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderAreaDataDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderAreaDataServiceImpl.queryForCylinderAreaDataList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderFillingUnloadDataController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderFillingUnloadDataServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingUnloadDataDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶充卸统计表
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@RestController
+@Api(tags = "气瓶充卸统计表Api")
+@RequestMapping(value = "/cylinder-filling-unload-data")
+public class CylinderFillingUnloadDataController extends BaseController {
+
+    @Autowired
+    CylinderFillingUnloadDataServiceImpl cylinderFillingUnloadDataServiceImpl;
+
+    /**
+     * 新增气瓶充卸统计表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶充卸统计表", notes = "新增气瓶充卸统计表")
+	public ResponseModel<CylinderFillingUnloadDataDto> save(@RequestBody CylinderFillingUnloadDataDto model) {
+	    model = cylinderFillingUnloadDataServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶充卸统计表", notes = "根据sequenceNbr更新气瓶充卸统计表")
+	public ResponseModel<CylinderFillingUnloadDataDto> updateBySequenceNbrCylinderFillingUnloadData(@RequestBody CylinderFillingUnloadDataDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶充卸统计表", notes = "根据sequenceNbr删除气瓶充卸统计表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderFillingUnloadDataServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶充卸统计表",  notes = "根据sequenceNbr查询单个气瓶充卸统计表")
+	public ResponseModel<CylinderFillingUnloadDataDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶充卸统计表分页查询",  notes = "气瓶充卸统计表分页查询")
+	public ResponseModel<Page<CylinderFillingUnloadDataDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderFillingUnloadDataDto> page = new Page<CylinderFillingUnloadDataDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataServiceImpl.queryForCylinderFillingUnloadDataPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶充卸统计表列表全部数据查询",   notes = "气瓶充卸统计表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderFillingUnloadDataDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataServiceImpl.queryForCylinderFillingUnloadDataList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoDataController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderInfoDataServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDataDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶总量统计表
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@RestController
+@Api(tags = "气瓶总量统计表Api")
+@RequestMapping(value = "/cylinder-info-data")
+public class CylinderInfoDataController extends BaseController {
+
+    @Autowired
+    CylinderInfoDataServiceImpl cylinderInfoDataServiceImpl;
+
+    /**
+     * 新增气瓶总量统计表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶总量统计表", notes = "新增气瓶总量统计表")
+	public ResponseModel<CylinderInfoDataDto> save(@RequestBody CylinderInfoDataDto model) {
+	    model = cylinderInfoDataServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶总量统计表", notes = "根据sequenceNbr更新气瓶总量统计表")
+	public ResponseModel<CylinderInfoDataDto> updateBySequenceNbrCylinderInfoData(@RequestBody CylinderInfoDataDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderInfoDataServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶总量统计表", notes = "根据sequenceNbr删除气瓶总量统计表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderInfoDataServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶总量统计表",  notes = "根据sequenceNbr查询单个气瓶总量统计表")
+	public ResponseModel<CylinderInfoDataDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderInfoDataServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶总量统计表分页查询",  notes = "气瓶总量统计表分页查询")
+	public ResponseModel<Page<CylinderInfoDataDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderInfoDataDto> page = new Page<CylinderInfoDataDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderInfoDataServiceImpl.queryForCylinderInfoDataPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶总量统计表列表全部数据查询",   notes = "气瓶总量统计表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderInfoDataDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderInfoDataServiceImpl.queryForCylinderInfoDataList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderIntegrityDataController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderIntegrityDataServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderIntegrityDataDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶数据完整度表
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@RestController
+@Api(tags = "气瓶数据完整度表Api")
+@RequestMapping(value = "/cylinder-integrity-data")
+public class CylinderIntegrityDataController extends BaseController {
+
+    @Autowired
+    CylinderIntegrityDataServiceImpl cylinderIntegrityDataServiceImpl;
+
+    /**
+     * 新增气瓶数据完整度表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶数据完整度表", notes = "新增气瓶数据完整度表")
+	public ResponseModel<CylinderIntegrityDataDto> save(@RequestBody CylinderIntegrityDataDto model) {
+	    model = cylinderIntegrityDataServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶数据完整度表", notes = "根据sequenceNbr更新气瓶数据完整度表")
+	public ResponseModel<CylinderIntegrityDataDto> updateBySequenceNbrCylinderIntegrityData(@RequestBody CylinderIntegrityDataDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶数据完整度表", notes = "根据sequenceNbr删除气瓶数据完整度表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderIntegrityDataServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶数据完整度表",  notes = "根据sequenceNbr查询单个气瓶数据完整度表")
+	public ResponseModel<CylinderIntegrityDataDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶数据完整度表分页查询",  notes = "气瓶数据完整度表分页查询")
+	public ResponseModel<Page<CylinderIntegrityDataDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderIntegrityDataDto> page = new Page<CylinderIntegrityDataDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataServiceImpl.queryForCylinderIntegrityDataPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶数据完整度表列表全部数据查询",   notes = "气瓶数据完整度表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderIntegrityDataDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataServiceImpl.queryForCylinderIntegrityDataList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderUnitDataController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnitDataServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDataDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 企业总量统计表
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@RestController
+@Api(tags = "企业总量统计表Api")
+@RequestMapping(value = "/cylinder-unit-data")
+public class CylinderUnitDataController extends BaseController {
+
+    @Autowired
+    CylinderUnitDataServiceImpl cylinderUnitDataServiceImpl;
+
+    /**
+     * 新增企业总量统计表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增企业总量统计表", notes = "新增企业总量统计表")
+	public ResponseModel<CylinderUnitDataDto> save(@RequestBody CylinderUnitDataDto model) {
+	    model = cylinderUnitDataServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新企业总量统计表", notes = "根据sequenceNbr更新企业总量统计表")
+	public ResponseModel<CylinderUnitDataDto> updateBySequenceNbrCylinderUnitData(@RequestBody CylinderUnitDataDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderUnitDataServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除企业总量统计表", notes = "根据sequenceNbr删除企业总量统计表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderUnitDataServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个企业总量统计表",  notes = "根据sequenceNbr查询单个企业总量统计表")
+	public ResponseModel<CylinderUnitDataDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderUnitDataServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "企业总量统计表分页查询",  notes = "企业总量统计表分页查询")
+	public ResponseModel<Page<CylinderUnitDataDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderUnitDataDto> page = new Page<CylinderUnitDataDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderUnitDataServiceImpl.queryForCylinderUnitDataPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "企业总量统计表列表全部数据查询",   notes = "企业总量统计表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderUnitDataDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderUnitDataServiceImpl.queryForCylinderUnitDataList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderUnloadFakeController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnloadFakeServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnloadFakeDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 卸液数据表-假数据
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@RestController
+@Api(tags = "卸液数据表-假数据Api")
+@RequestMapping(value = "/cylinder-unload-fake")
+public class CylinderUnloadFakeController extends BaseController {
+
+    @Autowired
+    CylinderUnloadFakeServiceImpl cylinderUnloadFakeServiceImpl;
+
+    /**
+     * 新增卸液数据表-假数据
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增卸液数据表-假数据", notes = "新增卸液数据表-假数据")
+	public ResponseModel<CylinderUnloadFakeDto> save(@RequestBody CylinderUnloadFakeDto model) {
+	    model = cylinderUnloadFakeServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新卸液数据表-假数据", notes = "根据sequenceNbr更新卸液数据表-假数据")
+	public ResponseModel<CylinderUnloadFakeDto> updateBySequenceNbrCylinderUnloadFake(@RequestBody CylinderUnloadFakeDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderUnloadFakeServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除卸液数据表-假数据", notes = "根据sequenceNbr删除卸液数据表-假数据")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderUnloadFakeServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个卸液数据表-假数据",  notes = "根据sequenceNbr查询单个卸液数据表-假数据")
+	public ResponseModel<CylinderUnloadFakeDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderUnloadFakeServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "卸液数据表-假数据分页查询",  notes = "卸液数据表-假数据分页查询")
+	public ResponseModel<Page<CylinderUnloadFakeDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderUnloadFakeDto> page = new Page<CylinderUnloadFakeDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderUnloadFakeServiceImpl.queryForCylinderUnloadFakePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "卸液数据表-假数据列表全部数据查询",   notes = "卸液数据表-假数据列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderUnloadFakeDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderUnloadFakeServiceImpl.queryForCylinderUnloadFakeList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoApproveController.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.UnitInfoApproveServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,9 +20,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 企业信息审批意见表
  *

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

@@ -12,7 +12,6 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAuthServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
-import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
@@ -117,6 +116,16 @@ public class UnitInfoController extends BaseController {
 	public ResponseModel<Collection<CompanyModel>> getManagermentTree() {
 		Collection<CompanyModel> result = null;
 		result = Privilege.companyClient.companyTreeWithoutAuth().getResult();
+		// 隐藏company 数据
+		Iterator<CompanyModel> it = result.iterator();
+		while(it.hasNext()) {
+			CompanyModel temp = it.next();
+			if(temp.getLevel().equals("emergencyCenter")  || temp.getLevel().equals("company")) {
+				it.remove();
+			} else {
+				this.dealCompanyTree(temp);
+			}
+		}
 		return ResponseHelper.buildResponse(result);
 	}
 
@@ -589,5 +598,54 @@ public class UnitInfoController extends BaseController {
 		return ResponseHelper.buildResponse(result);
 	}
 
+	/**
+	 * 根据uuid 获取 注册信息
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getUnitInfo/{uuid}")
+	@ApiOperation(httpMethod = "GET", value = "根据uuid 获取注册信息", notes = "根据uuid 获取注册信息")
+	public ResponseModel hasExistUnitWithId( @PathVariable String uuid) {
+		UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getCallbackId,uuid).eq(UnitInfo::getUnitStatus,"2"));
+		if(temp != null) {
+			return CommonResponseUtil.success(temp);
+		} else {
+			return CommonResponseUtil.failure("未找到该企业信息单，请确认链接地址或该单据已重新提交");
+		}
+	}
+
+
+	private void dealCompanyTree(CompanyModel company) {
+		if(!company.getLevel().equals("emergencyCenter") && !company.getLevel().equals("company")) {
+			// 判断子节点是否是headquarter
+			Collection children = company.getChildren();
+			Iterator<Map> it = children.iterator();
+			while(it.hasNext()) {
+				Map temp =  it.next();
+				if(company.getLevel().equals("emergencyCenter")  || company.getLevel().equals("company")) {
+					it.remove();
+				} else {
+					this.dealCompanyTree(temp);
+				}
+			}
+		} else {
+			return;
+		}
+	}
+	private void dealCompanyTree(Map company) {
+		// 判断子节点是否是headquarter
+		Collection children = (Collection) company.get("children");
+		Iterator<Map> it = children.iterator();
+		while(it.hasNext()) {
+			Map temp = it.next();
+			if(temp.get("level").equals("emergencyCenter") || temp.get("level").equals("company")) {
+				it.remove();
+			} else {
+				this.dealCompanyTree(temp);
+			}
+		}
+	}
+
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderAreaDataServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderAreaData;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderAreaDataMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderAreaDataService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderAreaDataDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶区域统计表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@Service
+public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto,CylinderAreaData,CylinderAreaDataMapper> implements ICylinderAreaDataService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderAreaDataDto> queryForCylinderAreaDataPage(Page<CylinderAreaDataDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderAreaDataDto> queryForCylinderAreaDataList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingCheckServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingCheck;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingCheckMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingCheckService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingCheckDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 液化气体气瓶充装信息-充装后复查服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderFillingCheckServiceImpl extends BaseService<CylinderFillingCheckDto,CylinderFillingCheck,CylinderFillingCheckMapper> implements ICylinderFillingCheckService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingCheckDto> queryForCylinderFillingCheckPage(Page<CylinderFillingCheckDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingCheckDto> queryForCylinderFillingCheckList()   {
+        return this.queryForList("" , false);
+    }
+
+    public Double queryIntegirtyByAppId(String appId) {
+        return this.baseMapper.queryIntegirtyByAppId(appId);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingExamineServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingExamine;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingExamineMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingExamineService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingExamineDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 液化气体气瓶充装信息审核服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderFillingExamineServiceImpl extends BaseService<CylinderFillingExamineDto,CylinderFillingExamine,CylinderFillingExamineMapper> implements ICylinderFillingExamineService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingExamineDto> queryForCylinderFillingExaminePage(Page<CylinderFillingExamineDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingExamineDto> queryForCylinderFillingExamineList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingRecordMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingRecordService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingRecordDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 液化气体气瓶充装信息-充装记录服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillingRecordDto,CylinderFillingRecord,CylinderFillingRecordMapper> implements ICylinderFillingRecordService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingRecordDto> queryForCylinderFillingRecordPage(Page<CylinderFillingRecordDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingRecordDto> queryForCylinderFillingRecordList()   {
+        return this.queryForList("" , false);
+    }
+
+    public Double queryIntegirtyByAppId(String appId) {
+        return this.baseMapper.queryIntegirtyByAppId(appId);
+    }
+
+    public Double getFillingSum(String r, Date time) {
+        return this.baseMapper.getFillingSum(r,time);
+    }
+
+    public Page<CylinderFillingRecordDto> queryListByQueryDto(Page<CylinderFillingRecordDto> page, CylinderFillingRecordDto cylinderFillingRecordDto, String sortParam, String sortRule) {
+        Page<List<CylinderFillingRecordDto>>list = this.baseMapper.queryListByQueryDto(page,cylinderFillingRecordDto.getFillingUnitName(),cylinderFillingRecordDto.getPropertyUnit(),cylinderFillingRecordDto.getFactoryNum(),
+                cylinderFillingRecordDto.getCylinderVariety(), cylinderFillingRecordDto.getQrCode(), cylinderFillingRecordDto.getElectronicLabelCode(),cylinderFillingRecordDto.getSequenceCode(),cylinderFillingRecordDto.getUnitInnerCode(),
+                cylinderFillingRecordDto.getFillingStarttime(), cylinderFillingRecordDto.getFillingEndtime(), sortParam,sortRule,cylinderFillingRecordDto.getAppId());
+        Page<CylinderFillingRecordDto> page1 = new Page<>();
+        List<CylinderFillingRecordDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(list.getRecords()),CylinderFillingRecordDto.class);
+        page1.setCurrent(page.getCurrent());
+        page1.setSize(page.getSize());
+        page1.setTotal(list.getTotal());
+        page1.setRecords(resultDtoList);
+        return  page1;
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFilling;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶充装信息--充装前检查服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderFillingServiceImpl extends BaseService<CylinderFillingDto,CylinderFilling,CylinderFillingMapper> implements ICylinderFillingService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingDto> queryForCylinderFillingPage(Page<CylinderFillingDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingDto> queryForCylinderFillingList()   {
+        return this.queryForList("" , false);
+    }
+
+    public Double queryIntegirtyByAppId(String appId) {
+        return this.baseMapper.queryIntegirtyByAppId(appId);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingUnloadDataServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingUnloadData;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingUnloadDataMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingUnloadDataService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingUnloadDataDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶充卸统计表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@Service
+public class CylinderFillingUnloadDataServiceImpl extends BaseService<CylinderFillingUnloadDataDto,CylinderFillingUnloadData,CylinderFillingUnloadDataMapper> implements ICylinderFillingUnloadDataService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingUnloadDataDto> queryForCylinderFillingUnloadDataPage(Page<CylinderFillingUnloadDataDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingUnloadDataDto> queryForCylinderFillingUnloadDataList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoDataServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfoData;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInfoDataMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInfoDataService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDataDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶总量统计表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderInfoDataServiceImpl extends BaseService<CylinderInfoDataDto,CylinderInfoData,CylinderInfoDataMapper> implements ICylinderInfoDataService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderInfoDataDto> queryForCylinderInfoDataPage(Page<CylinderInfoDataDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderInfoDataDto> queryForCylinderInfoDataList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInspectionServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInspection;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInspectionMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInspectionService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInspectionDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶检验信息服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderInspectionServiceImpl extends BaseService<CylinderInspectionDto,CylinderInspection,CylinderInspectionMapper> implements ICylinderInspectionService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderInspectionDto> queryForCylinderInspectionPage(Page<CylinderInspectionDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderInspectionDto> queryForCylinderInspectionList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderIntegrityDataServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderIntegrityData;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderIntegrityDataMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderIntegrityDataService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderIntegrityDataDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶数据完整度表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-08
+ */
+@Service
+public class CylinderIntegrityDataServiceImpl extends BaseService<CylinderIntegrityDataDto,CylinderIntegrityData,CylinderIntegrityDataMapper> implements ICylinderIntegrityDataService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderIntegrityDataDto> queryForCylinderIntegrityDataPage(Page<CylinderIntegrityDataDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderIntegrityDataDto> queryForCylinderIntegrityDataList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderTagsServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderTags;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderTagsMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderTagsService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderTagsDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶标签信息服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderTagsServiceImpl extends BaseService<CylinderTagsDto,CylinderTags,CylinderTagsMapper> implements ICylinderTagsService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderTagsDto> queryForCylinderTagsPage(Page<CylinderTagsDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderTagsDto> queryForCylinderTagsList()   {
+        return this.queryForList("" , false);
+    }
+
+    public Double queryIntegirtyByAppId(String appId) {
+        return this.baseMapper.queryIntegirtyByAppId(appId);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderUnitDataServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnitData;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderUnitDataMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderUnitDataService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDataDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 企业总量统计表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-04
+ */
+@Service
+public class CylinderUnitDataServiceImpl extends BaseService<CylinderUnitDataDto,CylinderUnitData,CylinderUnitDataMapper> implements ICylinderUnitDataService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderUnitDataDto> queryForCylinderUnitDataPage(Page<CylinderUnitDataDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderUnitDataDto> queryForCylinderUnitDataList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderUnitServiceImpl.java

@@ -30,4 +30,29 @@ public class CylinderUnitServiceImpl extends BaseService<CylinderUnitDto,Cylinde
     public List<CylinderUnitDto> queryForCylinderUnitList()   {
         return this.queryForList("" , false);
     }
+
+    /**
+     * 获取上个月气瓶企业总量
+     * @return
+     */
+    public Integer getLastMonthUnitTotal(String regionCode) {
+        return baseMapper.getLastMonthUnitTotal(regionCode);
+    }
+
+    /**
+     * 获取上上个月气瓶企业总量
+     * @return
+     */
+    public Integer getMonthBeforeLastUnitTotal(String regionCode) {
+        return baseMapper.getMonthBeforeLastUnitTotal(regionCode);
+    }
+
+    public Integer getUnitTotalByRegionCode(String regionCode) {
+        return baseMapper.getUnitTotalByRegionCode(regionCode);
+    }
+
+
+    public Integer getWarnNum(String code) {
+        return baseMapper.getWarnNum(code);
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderUnloadFakeServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnloadFake;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderUnloadFakeMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderUnloadFakeService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnloadFakeDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 卸液数据表-假数据服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-09
+ */
+@Service
+public class CylinderUnloadFakeServiceImpl extends BaseService<CylinderUnloadFakeDto,CylinderUnloadFake,CylinderUnloadFakeMapper> implements ICylinderUnloadFakeService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderUnloadFakeDto> queryForCylinderUnloadFakePage(Page<CylinderUnloadFakeDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderUnloadFakeDto> queryForCylinderUnloadFakeList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitInfoServiceImpl.java

@@ -4,15 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMessageDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.WechatRelation;
 import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAuthServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.WechatRelationServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.WechatServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
@@ -32,6 +38,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +54,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * 企业信息表服务实现类
@@ -83,6 +91,16 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
     @Autowired
     SourceFileServiceImpl sourceFileService;
 
+    @Autowired
+    WechatRelationServiceImpl wechatRelationServiceImpl;
+
+    @Autowired
+    WechatServiceImpl wechatService;
+
+
+    @Value("${tzs.wechat.tempId.kr}")
+    private String CALLBACK_TEMP;
+
 
 
     @Transactional
@@ -262,7 +280,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
                 companyInfo.setAddress(sourceUnit.getProvince() + sourceUnit.getCity() + sourceUnit.getDistrict() + sourceUnit.getStree() + sourceUnit.getCommunity() + sourceUnit.getAddress());
                 companyInfo.setAgencyCode("tzs");
                 companyInfo.setParentId(sourceUnit.getManagementUnitId());
-                companyInfo.setLevel("headquarter");
+                companyInfo.setLevel("company");
                 companyInfo.setCompanyName(sourceUnit.getOrgName());
                 companyInfo.setContact(sourceUnit.getUnitTel());
                 FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
@@ -322,7 +340,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
                 } catch (InnerInvokException e) {
                     // 删除已经创建的 企业信息
                     Privilege.companyClient.deleteCompany(companyInfo.getSequenceNbr() + "");
-                    throw new BadRequest("注册失败");
+                    throw new BadRequest(e.getMessage());
                 }
 
                 if(userResult == null || userResult.getResult() == null) {
@@ -352,12 +370,48 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
                 content = "驳回";
             }
 
-            if(changeFlag) {   // 如果是变更单 需要把 变更数据覆盖到原单子 预留（确定字段）
+            String tel = "17342333945";
+            String callBackId = UUID.randomUUID().toString().replaceAll("-","");
+
+
+            if(changeFlag) {
+                // 更新变更单状态
                 changeUnit.setUnitStatus(2);
                 // 变更单全覆盖原单
                 unitInfoChangeServiceImpl.updateById(changeUnit);
+            } else {
+                // 生成 驳回uuid 便于编辑
+                sourceUnit.setCallbackId(callBackId);
+            }
+            // 返回短信提醒 及 公众号提醒
+            HashMap<String, String> params = new HashMap<>();
+            // 变更驳回 重新提变更单 新建驳回 原单上修改
+
+            // 短信提醒
+            params.put("code","");
+            params.put("mobile",tel);
+            params.put("smsCode", "SMS_JCS_0009");
+            try {
+                Systemctl.smsClient.sendCommonSms(params).getResult();
+            } catch (Exception e) {
+                throw new BadRequest("发送短信失败：" + e.getMessage());
             }
 
+            // 公众号提醒
+            WechatRelation tempRealtion = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getPhone,tel));
+            if(tempRealtion != null && tempRealtion.getOpenId() != null) {
+
+                WechatMessageDto wechaMessage = new WechatMessageDto();
+                Map<String,String> data = new HashMap<>();
+                wechaMessage.setTemplateId(CALLBACK_TEMP);
+                wechaMessage.setUrl("");
+                data.put("first","电梯困人任务已派遣，请尽快前往救援!");
+                data.put("keyword1","测试测试");
+                data.put("keyword2", DateUtils.date2LongStr(new Date()));
+                data.put("remark", "请在收到任务后30分钟内到达人员被困位置进行救援！");
+                wechaMessage.setData(data);
+                wechatService.sendWechatModelMessage(tempRealtion.getOpenId() ,  wechaMessage);
+            }
             sourceUnit.setUnitStatus(2);
 
         }

amos-boot-system-tzs/src/main/resources/application.properties

-spring.application.name=TZS
+spring.application.name=TZS-kfm
 server.servlet.context-path=/tzs
 server.port=11000
 spring.profiles.active=jd
@@ -63,4 +63,7 @@ Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
 
 
 ## 设备告知流程v1
-inform.work.flow.processDefinitionKey=equipment_inform_process_v1
\ No newline at end of file
+inform.work.flow.processDefinitionKey=equipment_inform_process_v1
+
+## 消防救援保障部ID
+fire-rescue=1432549862557130753
\ No newline at end of file

amos-boot-system-tzs/src/main/resources/db/changelog/tzs-1.0.0.0.xml

@@ -855,5 +855,17 @@
 		</sql>
 	</changeSet>
 
+	<changeSet author="kongfm" id="2022-03-02-01">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="tz_flc_unit_info"/>
+		</preConditions>
+		<comment>modify table tz_flc_unit_info add callback_id columns</comment>
+		<sql>
+			ALTER TABLE `tz_flc_unit_info` add callback_id varchar(50) COMMENT '驳回id';
+		</sql>
+	</changeSet>
+
+
+
 </databaseChangeLog>