气瓶充装企业查询列表接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingCheckDataUnitDto.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingCheckDataUnitDto", description="气瓶充装检查情况统计表-企业")
+public class CylinderFillingCheckDataUnitDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "充装次数")
+    private Long totalSum;
+
+    @ApiModelProperty(value = "充装前检查率")
+    private Double fillingPercent;
+
+    @ApiModelProperty(value = "充装后检查率")
+    private Double fillingCheckPercent;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "充装年份")
+    private String fillingYear;
+
+    @ApiModelProperty(value = "充装月份")
+    private String fillingMonth;
+
+    @ApiModelProperty(value = "充装检查合格率")
+    private Double fillingPassedPercent;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingUnloadDataUnitDto.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingUnloadDataUnitDto", description="气瓶充卸统计表-企业")
+public class CylinderFillingUnloadDataUnitDto  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 appId;
+
+    @ApiModelProperty(value = "充卸年份")
+    private String statisYear;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "充卸月份")
+    private String statisMonth;
+
+    @ApiModelProperty(value = "充卸日期字符串")
+    private String statisDateStr;
+
+}

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 气瓶基本信息
@@ -33,9 +34,15 @@ public class CylinderInfoDto  extends BaseDto {
     @ApiModelProperty(value = "气瓶状态")
     private Integer cylinderStatus;
 
+    @ApiModelProperty(value = "气瓶状态str")
+    private String cylinderStatusStr;
+
     @ApiModelProperty(value = "气瓶品种")
     private Integer cylinderVariety;
 
+    @ApiModelProperty(value = "气瓶品种str")
+    private String cylinderVarietyStr;
+
     @ApiModelProperty(value = "二维码编号")
     private String qrCode;
 
@@ -72,6 +79,12 @@ public class CylinderInfoDto  extends BaseDto {
     @ApiModelProperty(value = "下次检验日期")
     private Date nextInspectionDate;
 
+    @ApiModelProperty(value = "检验日期开始")
+    private String inspectionDateStart;
+
+    @ApiModelProperty(value = "检验日期结束")
+    private String inspectionDateEnd;
+
     @ApiModelProperty(value = "气瓶唯一标识码")
     private String sequenceCode;
 
@@ -84,4 +97,10 @@ public class CylinderInfoDto  extends BaseDto {
     @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
+    @ApiModelProperty(value = "所属区域代码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "查询单位appid")
+    private List<String> appIds;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderIntegrityDataUnitDto.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderIntegrityDataUnitDto", description="气瓶数据完整度表-企业")
+public class CylinderIntegrityDataUnitDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "数据类型")
+    private String dataType;
+
+    @ApiModelProperty(value = "数据完整度")
+    private Double integrity;
+
+    @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/CylinderTagsDataUnitDto.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderTagsDataUnitDto", description="气瓶及标签数量比表-企业")
+public class CylinderTagsDataUnitDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "气瓶标签比")
+    private Double percent;
+
+    @ApiModelProperty(value = "气瓶数量")
+    private Long cylinderSum;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "标签数量")
+    private Long tagsSum;
+
+}

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

@@ -33,6 +33,9 @@ public class CylinderUnitDto  extends BaseDto {
     @ApiModelProperty(value = "企业类型")
     private Integer unitType;
 
+    @ApiModelProperty(value = "企业类型str")
+    private String unitTypeStr;
+
     @ApiModelProperty(value = "统一社会信用代码")
     private String creditCode;
 
@@ -109,4 +112,9 @@ public class CylinderUnitDto  extends BaseDto {
  @ApiModelProperty(value = "是否过期")
  private Boolean outOfDate;
 
+   @ApiModelProperty(value = "充装许可证有效期开始")
+   private String fillingPermitDateStart;
+   @ApiModelProperty(value = "充装许可证有效期结束")
+   private String fillingPermitDateEnd;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingCheckDataUnit.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling_check_data_unit")
+public class CylinderFillingCheckDataUnit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 充装次数
+     */
+	@TableField("total_sum")
+    private Long totalSum;
+
+    /**
+     * 充装前检查率
+     */
+	@TableField("filling_percent")
+    private Double fillingPercent;
+
+    /**
+     * 充装后检查率
+     */
+	@TableField("filling_check_percent")
+    private Double fillingCheckPercent;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 充装年份
+     */
+	@TableField("filling_year")
+    private String fillingYear;
+
+    /**
+     * 充装月份
+     */
+	@TableField("filling_month")
+    private String fillingMonth;
+
+    /**
+     * 充装检查合格率
+     */
+	@TableField("filling_passed_percent")
+    private Double fillingPassedPercent;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingUnloadDataUnit.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling_unload_data_unit")
+public class CylinderFillingUnloadDataUnit 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("app_id")
+    private String appId;
+
+    /**
+     * 充卸年份
+     */
+	@TableField("statis_year")
+    private String statisYear;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 充卸月份
+     */
+	@TableField("statis_month")
+    private String statisMonth;
+
+    /**
+     * 充卸日期字符串
+     */
+	@TableField("statis_date_str")
+    private String statisDateStr;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderIntegrityDataUnit.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_integrity_data_unit")
+public class CylinderIntegrityDataUnit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据类型
+     */
+	@TableField("data_type")
+    private String dataType;
+
+    /**
+     * 数据完整度
+     */
+	@TableField("integrity")
+    private Double integrity;
+
+    /**
+     * 企业编码
+     */
+	@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/CylinderTagsDataUnit.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-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_tags_data_unit")
+public class CylinderTagsDataUnit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 气瓶标签比
+     */
+	@TableField("percent")
+    private Double percent;
+
+    /**
+     * 气瓶数量
+     */
+	@TableField("cylinder_sum")
+    private Long cylinderSum;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 标签数量
+     */
+	@TableField("tags_sum")
+    private Long tagsSum;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingCheckDataUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶充装检查情况统计表-企业 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+public interface CylinderFillingCheckDataUnitMapper extends BaseMapper<CylinderFillingCheckDataUnit> {
+
+}

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

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

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

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

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderTagsDataUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶及标签数量比表-企业 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+public interface CylinderTagsDataUnitMapper extends BaseMapper<CylinderTagsDataUnit> {
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶充装检查情况统计表-企业接口类
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+public interface ICylinderFillingCheckDataUnitService {
+
+}

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

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

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

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

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶及标签数量比表-企业接口类
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+public interface ICylinderTagsDataUnitService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingCheckDataUnitMapper.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.CylinderFillingCheckDataUnitMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingUnloadDataUnitMapper.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.CylinderFillingUnloadDataUnitMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderIntegrityDataUnitMapper.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.CylinderIntegrityDataUnitMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderTagsDataUnitMapper.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.CylinderTagsDataUnitMapper">
+
+</mapper>

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

@@ -6,9 +6,12 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.MaintenanceUnitDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentInform;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
@@ -44,6 +47,7 @@ public class BeanDtoVoUtils {
     private static List<DictionarieValueModel> elevatorDragMode;
     private static List<DictionarieValueModel> qualificationLevel;
 
+
     @PostConstruct
     public void init() {
         beanDtoVoUtils = this;
@@ -312,6 +316,47 @@ public class BeanDtoVoUtils {
         });
     }
 
+    public static IPage<CylinderInfoDto> cyinderInfoIPageDto(IPage<CylinderInfo> page) {
+
+        return page.convert(item -> {
+            try {
+                CylinderInfoDto target = new CylinderInfoDto();
+                // 把原对象数据拷贝到新对象
+                BeanUtils.copyProperties(item, target);
+                if(0 == item.getCylinderStatus()) {
+                    target.setCylinderStatusStr("在用");
+                } else if(1 == item.getCylinderStatus()) {
+                    target.setCylinderStatusStr("停用");
+                } else if(2 == item.getCylinderStatus()) {
+                    target.setCylinderStatusStr("注销");
+                } else if(3 == item.getCylinderStatus()) {
+                    target.setCylinderStatusStr("报废");
+                } else {
+                    target.setCylinderStatusStr("");
+                }
+
+                if(1 == item.getCylinderVariety()) {
+                    target.setCylinderVarietyStr("无缝气瓶");
+                } else if(2 == item.getCylinderVariety()) {
+                    target.setCylinderVarietyStr("焊接气瓶");
+                } else if(3 == item.getCylinderVariety()) {
+                    target.setCylinderVarietyStr("缠绕气瓶");
+                } else if(4 == item.getCylinderVariety()) {
+                    target.setCylinderVarietyStr("绝热气瓶");
+                } else if(5 ==item.getCylinderVariety()) {
+                    target.setCylinderVarietyStr("内装填料气瓶");
+                } else {
+                    target.setCylinderVarietyStr("");
+                }
+                return target;
+            } catch (Exception e) {
+                return null;
+            }
+        });
+    }
+
+
+
 
 
 }
\ 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/controller/CylinderFillingCheckDataUnitController.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.CylinderFillingCheckDataUnitServiceImpl;
+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.CylinderFillingCheckDataUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶充装检查情况统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+@RestController
+@Api(tags = "气瓶充装检查情况统计表-企业Api")
+@RequestMapping(value = "/cylinder-filling-check-data-unit")
+public class CylinderFillingCheckDataUnitController extends BaseController {
+
+    @Autowired
+    CylinderFillingCheckDataUnitServiceImpl cylinderFillingCheckDataUnitServiceImpl;
+
+    /**
+     * 新增气瓶充装检查情况统计表-企业
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶充装检查情况统计表-企业", notes = "新增气瓶充装检查情况统计表-企业")
+	public ResponseModel<CylinderFillingCheckDataUnitDto> save(@RequestBody CylinderFillingCheckDataUnitDto model) {
+	    model = cylinderFillingCheckDataUnitServiceImpl.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<CylinderFillingCheckDataUnitDto> updateBySequenceNbrCylinderFillingCheckDataUnit(@RequestBody CylinderFillingCheckDataUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderFillingCheckDataUnitServiceImpl.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(cylinderFillingCheckDataUnitServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶充装检查情况统计表-企业",  notes = "根据sequenceNbr查询单个气瓶充装检查情况统计表-企业")
+	public ResponseModel<CylinderFillingCheckDataUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderFillingCheckDataUnitServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶充装检查情况统计表-企业分页查询",  notes = "气瓶充装检查情况统计表-企业分页查询")
+	public ResponseModel<Page<CylinderFillingCheckDataUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderFillingCheckDataUnitDto> page = new Page<CylinderFillingCheckDataUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderFillingCheckDataUnitServiceImpl.queryForCylinderFillingCheckDataUnitPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶充装检查情况统计表-企业列表全部数据查询",   notes = "气瓶充装检查情况统计表-企业列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderFillingCheckDataUnitDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderFillingCheckDataUnitServiceImpl.queryForCylinderFillingCheckDataUnitList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderFillingUnloadDataUnitController.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.CylinderFillingUnloadDataUnitServiceImpl;
+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.CylinderFillingUnloadDataUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶充卸统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+@RestController
+@Api(tags = "气瓶充卸统计表-企业Api")
+@RequestMapping(value = "/cylinder-filling-unload-data-unit")
+public class CylinderFillingUnloadDataUnitController extends BaseController {
+
+    @Autowired
+    CylinderFillingUnloadDataUnitServiceImpl cylinderFillingUnloadDataUnitServiceImpl;
+
+    /**
+     * 新增气瓶充卸统计表-企业
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶充卸统计表-企业", notes = "新增气瓶充卸统计表-企业")
+	public ResponseModel<CylinderFillingUnloadDataUnitDto> save(@RequestBody CylinderFillingUnloadDataUnitDto model) {
+	    model = cylinderFillingUnloadDataUnitServiceImpl.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<CylinderFillingUnloadDataUnitDto> updateBySequenceNbrCylinderFillingUnloadDataUnit(@RequestBody CylinderFillingUnloadDataUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataUnitServiceImpl.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(cylinderFillingUnloadDataUnitServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶充卸统计表-企业",  notes = "根据sequenceNbr查询单个气瓶充卸统计表-企业")
+	public ResponseModel<CylinderFillingUnloadDataUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataUnitServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶充卸统计表-企业分页查询",  notes = "气瓶充卸统计表-企业分页查询")
+	public ResponseModel<Page<CylinderFillingUnloadDataUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderFillingUnloadDataUnitDto> page = new Page<CylinderFillingUnloadDataUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataUnitServiceImpl.queryForCylinderFillingUnloadDataUnitPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶充卸统计表-企业列表全部数据查询",   notes = "气瓶充卸统计表-企业列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderFillingUnloadDataUnitDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderFillingUnloadDataUnitServiceImpl.queryForCylinderFillingUnloadDataUnitList());
+	}
+}

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

 package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,19 +8,23 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 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.CylinderFillingRecordDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDto;
-import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderFillingRecordServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderInfoServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnitServiceImpl;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,8 +42,12 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 气瓶基本信息
@@ -55,9 +64,12 @@ public class CylinderInfoController extends BaseController {
 	CylinderInfoServiceImpl cylinderInfoServiceImpl;
 
 	@Autowired
-	CylinderFillingRecordServiceImpl cylinderFillingRecordServiceImpl;
+	CylinderUnitServiceImpl cylinderUnitServiceImpl;
 
+	@Autowired
+	CylinderFillingRecordServiceImpl cylinderFillingRecordServiceImpl;
 
+	private Map<Integer, String> regionMap;
 
 
     /**
@@ -440,5 +452,229 @@ public class CylinderInfoController extends BaseController {
 	}
 
 
+	/**
+	 * 列表分页查询
+	 *
+	 * @param pageNum  当前页
+	 * @param pageSize 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/cyinderInfoList")
+	@ApiOperation(httpMethod = "GET", value = "获取登陆人所在气瓶基本信息", notes = "获取登陆人所在气瓶基本信息")
+	public ResponseModel<IPage<CylinderInfoDto>> cyinderInfoList(@RequestParam(value = "pageNum") String pageNum, @RequestParam(value = "pageSize") String pageSize, String sort, CylinderInfoDto cylinderInfoDto) {
+		Page<CylinderInfo> pageBean;
+		IPage<CylinderInfo> page;
+		QueryWrapper<CylinderInfo> cylinderInfoQueryWrapper = new QueryWrapper<>();
+
+
+		if(StringUtils.isNotEmpty(cylinderInfoDto.getRegionCode())) {
+			List<String> appids = new ArrayList<>();
+
+			List<CylinderUnit> unitList = cylinderUnitServiceImpl.list(new LambdaQueryWrapper<CylinderUnit>().like(CylinderUnit::getRegionCode,cylinderInfoDto.getRegionCode()));
+			unitList.stream().forEach(u -> {
+				appids.add(u.getAppId());
+			});
+			cylinderInfoDto.setAppIds(appids);
+		}
+		setQueryWrapper(cylinderInfoQueryWrapper, cylinderInfoDto, sort);
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		page = cylinderInfoServiceImpl.page(pageBean, cylinderInfoQueryWrapper);
+		int num= cylinderInfoServiceImpl.count(cylinderInfoQueryWrapper);
+		pageBean.setTotal(num);
+		IPage<CylinderInfoDto> result = BeanDtoVoUtils.cyinderInfoIPageDto(page);
+		return ResponseHelper.buildResponse(result);
+	}
+
+	private QueryWrapper<CylinderInfo> setQueryWrapper(QueryWrapper<CylinderInfo> queryWrapper, CylinderInfoDto cylinderInfo, String sort) {
+		if(cylinderInfo.getAppIds() != null && cylinderInfo.getAppIds().size() >0) {
+			queryWrapper.in("app_id", cylinderInfo.getAppIds());
+		} else {
+		}
+		if(sort!=null) {  // 排序失效
+			String[] date=  sort.split(",");
+			if(date[1].equals("ascend")) {
+				queryWrapper.orderByAsc(RedisKey.humpToLine(date[0]));
+			}else {
+				queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
+			}
+		}else {
+			queryWrapper.orderByDesc("sync_date");
+		}
+
+		if(!ValidationUtil.isEmpty(cylinderInfo.getInspectionDateStart())) {
+			queryWrapper.ge("inspection_date",cylinderInfo.getInspectionDateStart());
+		}
+
+		if(!ValidationUtil.isEmpty(cylinderInfo.getInspectionDateEnd())) {
+			queryWrapper.le("inspection_date",cylinderInfo.getInspectionDateEnd());
+		}
+
+		if (!ValidationUtil.isEmpty(cylinderInfo.getUnitName())) { // 产权单位
+			queryWrapper.like("unit_name",cylinderInfo.getUnitName());
+		}
+
+		if (!ValidationUtil.isEmpty(cylinderInfo.getFactoryNum())) {// 出厂编号
+			queryWrapper.eq("factory_num", cylinderInfo.getFactoryNum());
+		}
+
+		if (!ValidationUtil.isEmpty(cylinderInfo.getCylinderVariety())) {// 气瓶品种
+			queryWrapper.eq("cylinder_variety", cylinderInfo.getCylinderVariety());
+		}
+
+		if (!ValidationUtil.isEmpty(cylinderInfo.getQrCode())) {// 二维码编号
+			queryWrapper.like("qrCode",cylinderInfo.getQrCode());
+		}
+		if (!ValidationUtil.isEmpty(cylinderInfo.getElectronicLabelCode())) {// 电子标签编号
+			queryWrapper.like("electronic_label_code",cylinderInfo.getElectronicLabelCode());
+		}
+		if (!ValidationUtil.isEmpty(cylinderInfo.getSequenceCode())) {// 气瓶唯一标识码
+			queryWrapper.like("sequence_code",cylinderInfo.getSequenceCode());
+		}
+		if (!ValidationUtil.isEmpty(cylinderInfo.getUnitInnerCode())) {// 单位内部编号
+			queryWrapper.like("unit_inner_code",cylinderInfo.getUnitInnerCode());
+		}
+		if (!ValidationUtil.isEmpty(cylinderInfo.getCylinderStatus())) {// 气瓶状态
+			queryWrapper.eq("cylinder_status",cylinderInfo.getCylinderStatus());
+		}
+		if (!ValidationUtil.isEmpty(cylinderInfo.getManufacturingUnit())) {// 制造单位
+			queryWrapper.like("manufacturing_unit",cylinderInfo.getManufacturingUnit());
+		}
+		return queryWrapper;
+	}
+
+	/**
+	 * 列表分页查询
+	 *
+	 * @param pageNum  当前页
+	 * @param pageSize 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/cyinderUnitList")
+	@ApiOperation(httpMethod = "GET", value = "获取登陆人所在气瓶充装单位信息", notes = "获取登陆人所在气瓶充装单位信息")
+	public ResponseModel<IPage<CylinderUnitDto>> cyinderUnitList(@RequestParam(value = "pageNum") String pageNum, @RequestParam(value = "pageSize") String pageSize, String sort, CylinderUnitDto cylinderUnitDto) {
+		Page<CylinderUnit> pageBean;
+		IPage<CylinderUnit> page;
+		QueryWrapper<CylinderUnit> cylinderUnitQueryWrapper = new QueryWrapper<>();
+
+		setQueryWrapper(cylinderUnitQueryWrapper, cylinderUnitDto, sort);
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		page = cylinderUnitServiceImpl.page(pageBean, cylinderUnitQueryWrapper);
+		int num= cylinderUnitServiceImpl.count(cylinderUnitQueryWrapper);
+		pageBean.setTotal(num);
+		IPage<CylinderUnitDto> result = this.cyinderInfoIPageDto(page);
+		return ResponseHelper.buildResponse(result);
+	}
+
+	private QueryWrapper<CylinderUnit> setQueryWrapper(QueryWrapper<CylinderUnit> queryWrapper, CylinderUnitDto cylinderUnitDto, String sort) {
+		if(sort!=null) {  // 排序失效
+			String[] date=  sort.split(",");
+			if(date[1].equals("ascend")) {
+				queryWrapper.orderByAsc(RedisKey.humpToLine(date[0]));
+			}else {
+				queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
+			}
+		}else {
+			queryWrapper.orderByDesc("sync_date");
+		}
+
+		if(!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateStart())) { // 许可有效期
+			queryWrapper.ge("filling_permit_date",cylinderUnitDto.getFillingPermitDateStart());
+		}
+
+		if(!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateEnd())) {
+			queryWrapper.le("filling_permit_date",cylinderUnitDto.getFillingPermitDateEnd());
+		}
+
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getUnitName())) { // 企业名称
+			queryWrapper.like("unit_name",cylinderUnitDto.getUnitName());
+		}
+
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getUnitType())) {// 企业类型
+			queryWrapper.eq("unit_type", cylinderUnitDto.getUnitType());
+		}
+
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getCreditCode())) {// 统一社会信用代码
+			queryWrapper.like("credit_code",cylinderUnitDto.getCreditCode());
+		}
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getAddress())) {// 详细地址
+			queryWrapper.like("address",cylinderUnitDto.getAddress());
+		}
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getUnitPerson())) {// 企业负责人
+			queryWrapper.like("unit_person",cylinderUnitDto.getUnitPerson());
+		}
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getPersonMobilePhone())) {// 负责人手机
+			queryWrapper.like("person_mobile_phone",cylinderUnitDto.getPersonMobilePhone());
+		}
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingLicense())) {// 许可证号
+			queryWrapper.like("filling_license",cylinderUnitDto.getFillingLicense());
+		}
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermScope())) {// 许可范围
+			queryWrapper.like("filling_perm_scope",cylinderUnitDto.getFillingPermScope());
+		}
+		if (!ValidationUtil.isEmpty(cylinderUnitDto.getRegionCode())) {// 所属区域
+			queryWrapper.like("region_code",cylinderUnitDto.getRegionCode());
+		}
+		return queryWrapper;
+	}
+
+	private IPage<CylinderUnitDto> cyinderInfoIPageDto(IPage<CylinderUnit> page) {
+
+		if(this.regionMap == null) {
+			this.regionMap = new HashMap<>();
+			Collection<RegionModel> regions = Systemctl.regionClient.queryForTree(null).getResult();
+			regions.stream().forEach(t -> {
+				this.addRegionsMap(regionMap,t);
+			});
+		}
+
+
+		return page.convert(item -> {
+			try {
+				CylinderUnitDto target = new CylinderUnitDto();
+				// 把原对象数据拷贝到新对象
+				BeanUtils.copyProperties(item, target);
+				String regionCode = item.getRegionCode();
+				String[] regionCodes = regionCode.split("#");
+				regionCode = "";
+				for(int i =0 ; i < regionCodes.length ; i ++) {
+					regionCode += this.regionMap.get(Integer.parseInt(regionCodes[i]));
+				}
+				target.setRegionCode(regionCode);
+				if(1 == item.getUnitType()) {
+					target.setUnitTypeStr("液化石油气瓶充装单位");
+				} else if(2 == item.getUnitType()) {
+					target.setUnitTypeStr("液化石油气瓶检验单位");
+				} else if(3 == item.getUnitType()) {
+					target.setUnitTypeStr("液化石油气瓶生产单位");
+				} else {
+					target.setUnitTypeStr("");
+				}
+				target.setCylinderNumber((long) cylinderInfoServiceImpl.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,target.getAppId())));
+				return target;
+			} catch (Exception e) {
+				return null;
+			}
+		});
+	}
+
+	private void addRegionsMap(Map<Integer,String> regionMap, RegionModel region) {
+		regionMap.put(region.getRegionCode(),region.getRegionName());
+		if (region.getChildren() != null) {
+			region.getChildren().stream().forEach(c -> {
+				addRegionsMap(regionMap, c);
+			});
+		}
+	}
+
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderIntegrityDataUnitController.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.CylinderIntegrityDataUnitServiceImpl;
+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.CylinderIntegrityDataUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶数据完整度表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+@RestController
+@Api(tags = "气瓶数据完整度表-企业Api")
+@RequestMapping(value = "/cylinder-integrity-data-unit")
+public class CylinderIntegrityDataUnitController extends BaseController {
+
+    @Autowired
+    CylinderIntegrityDataUnitServiceImpl cylinderIntegrityDataUnitServiceImpl;
+
+    /**
+     * 新增气瓶数据完整度表-企业
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶数据完整度表-企业", notes = "新增气瓶数据完整度表-企业")
+	public ResponseModel<CylinderIntegrityDataUnitDto> save(@RequestBody CylinderIntegrityDataUnitDto model) {
+	    model = cylinderIntegrityDataUnitServiceImpl.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<CylinderIntegrityDataUnitDto> updateBySequenceNbrCylinderIntegrityDataUnit(@RequestBody CylinderIntegrityDataUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataUnitServiceImpl.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(cylinderIntegrityDataUnitServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶数据完整度表-企业",  notes = "根据sequenceNbr查询单个气瓶数据完整度表-企业")
+	public ResponseModel<CylinderIntegrityDataUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataUnitServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶数据完整度表-企业分页查询",  notes = "气瓶数据完整度表-企业分页查询")
+	public ResponseModel<Page<CylinderIntegrityDataUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderIntegrityDataUnitDto> page = new Page<CylinderIntegrityDataUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataUnitServiceImpl.queryForCylinderIntegrityDataUnitPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶数据完整度表-企业列表全部数据查询",   notes = "气瓶数据完整度表-企业列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderIntegrityDataUnitDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderIntegrityDataUnitServiceImpl.queryForCylinderIntegrityDataUnitList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderTagsDataUnitController.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.CylinderTagsDataUnitServiceImpl;
+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.CylinderTagsDataUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶及标签数量比表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-11
+ */
+@RestController
+@Api(tags = "气瓶及标签数量比表-企业Api")
+@RequestMapping(value = "/cylinder-tags-data-unit")
+public class CylinderTagsDataUnitController extends BaseController {
+
+    @Autowired
+    CylinderTagsDataUnitServiceImpl cylinderTagsDataUnitServiceImpl;
+
+    /**
+     * 新增气瓶及标签数量比表-企业
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶及标签数量比表-企业", notes = "新增气瓶及标签数量比表-企业")
+	public ResponseModel<CylinderTagsDataUnitDto> save(@RequestBody CylinderTagsDataUnitDto model) {
+	    model = cylinderTagsDataUnitServiceImpl.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<CylinderTagsDataUnitDto> updateBySequenceNbrCylinderTagsDataUnit(@RequestBody CylinderTagsDataUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderTagsDataUnitServiceImpl.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(cylinderTagsDataUnitServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶及标签数量比表-企业",  notes = "根据sequenceNbr查询单个气瓶及标签数量比表-企业")
+	public ResponseModel<CylinderTagsDataUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderTagsDataUnitServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶及标签数量比表-企业分页查询",  notes = "气瓶及标签数量比表-企业分页查询")
+	public ResponseModel<Page<CylinderTagsDataUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderTagsDataUnitDto> page = new Page<CylinderTagsDataUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderTagsDataUnitServiceImpl.queryForCylinderTagsDataUnitPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶及标签数量比表-企业列表全部数据查询",   notes = "气瓶及标签数量比表-企业列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderTagsDataUnitDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderTagsDataUnitServiceImpl.queryForCylinderTagsDataUnitList());
+	}
+}

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/CylinderFillingCheckDataUnitServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingCheckDataUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingCheckDataUnitMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingCheckDataUnitService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingCheckDataUnitDto;
+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-11
+ */
+@Service
+public class CylinderFillingCheckDataUnitServiceImpl extends BaseService<CylinderFillingCheckDataUnitDto,CylinderFillingCheckDataUnit,CylinderFillingCheckDataUnitMapper> implements ICylinderFillingCheckDataUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingCheckDataUnitDto> queryForCylinderFillingCheckDataUnitPage(Page<CylinderFillingCheckDataUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingCheckDataUnitDto> queryForCylinderFillingCheckDataUnitList()   {
+        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/CylinderFillingUnloadDataUnitServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingUnloadDataUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingUnloadDataUnitMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingUnloadDataUnitService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingUnloadDataUnitDto;
+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-11
+ */
+@Service
+public class CylinderFillingUnloadDataUnitServiceImpl extends BaseService<CylinderFillingUnloadDataUnitDto,CylinderFillingUnloadDataUnit,CylinderFillingUnloadDataUnitMapper> implements ICylinderFillingUnloadDataUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingUnloadDataUnitDto> queryForCylinderFillingUnloadDataUnitPage(Page<CylinderFillingUnloadDataUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingUnloadDataUnitDto> queryForCylinderFillingUnloadDataUnitList()   {
+        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/CylinderInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingUnloadDataDto
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDataDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderIntegrityDataDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDataDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderAreaData;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingUnloadData;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfoData;
@@ -172,6 +173,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto,Cylinde
 
     @Scheduled(cron = "0 0 2 * * ?") //每天凌晨两点执行
     public Boolean synAreaData() {
+        cylinderAreaDataServiceImpl.remove(new LambdaQueryWrapper<CylinderAreaData>());
         Collection<RegionModel> regions = Systemctl.regionClient.queryForTree(null).getResult();
         List<RegionModel> regionCodes = new ArrayList<RegionModel>();
         regions.stream().forEach(t -> {

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/CylinderIntegrityDataUnitServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderIntegrityDataUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderIntegrityDataUnitMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderIntegrityDataUnitService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderIntegrityDataUnitDto;
+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-11
+ */
+@Service
+public class CylinderIntegrityDataUnitServiceImpl extends BaseService<CylinderIntegrityDataUnitDto,CylinderIntegrityDataUnit,CylinderIntegrityDataUnitMapper> implements ICylinderIntegrityDataUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderIntegrityDataUnitDto> queryForCylinderIntegrityDataUnitPage(Page<CylinderIntegrityDataUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderIntegrityDataUnitDto> queryForCylinderIntegrityDataUnitList()   {
+        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/CylinderTagsDataUnitServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderTagsDataUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderTagsDataUnitMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderTagsDataUnitService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderTagsDataUnitDto;
+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-11
+ */
+@Service
+public class CylinderTagsDataUnitServiceImpl extends BaseService<CylinderTagsDataUnitDto,CylinderTagsDataUnit,CylinderTagsDataUnitMapper> implements ICylinderTagsDataUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderTagsDataUnitDto> queryForCylinderTagsDataUnitPage(Page<CylinderTagsDataUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderTagsDataUnitDto> queryForCylinderTagsDataUnitList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file