Merge branch 'develop_unit_register' into 'developer'

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -203,6 +203,25 @@ public class DataDictionaryController extends BaseController {
 	}
 
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/dataDictionaryIdFillMenu", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典,id为SequenceNbr", notes = "根据字典类型查询字典,id为SequenceNbr")
+	public ResponseModel<Object> getDictionaryWithTreeFillId(@RequestParam String type) throws Exception {
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type + "_ID")) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type  + "_ID");
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getSequenceNbr", 2, "getName",
+					"getParent", null,"getCode");
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type  + "_ID", JSON.toJSON(menus), time);
+			return ResponseHelper.buildResponse(menus);
+		}
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/dataDictionary", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典2", notes = "根据字典类型查询字典2")
 	public ResponseModel<Object> getDictionary(@RequestParam String type) throws Exception {
@@ -224,6 +243,7 @@ public class DataDictionaryController extends BaseController {
 		}
 	}
 
+
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/BaseUnitLicenceDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -39,12 +40,15 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "证书编号")
     private String certNo;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "有效期至")
     private Date expiryDate;
 
     @ApiModelProperty(value = "发证日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date issueDate;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "变更日期")
     private Date changeDate;
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import java.util.Date;
+import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -254,5 +256,8 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	private String fullAddress;
 
 	private String superviseKey;
+
+	private List<BaseUnitLicenceDto> unitLicences;
 	
+	private RegUnitIcDto regUnitIcDto;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/BaseUnitLicence.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -62,28 +63,48 @@ public class BaseUnitLicence extends BaseEntity {
     /**
      * 有效期至
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("expiry_date")
     private Date expiryDate;
 
     /**
      * 发证日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("issue_date")
     private Date issueDate;
 
     /**
      * 变更日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("change_date")
     private Date changeDate;
 
     /**
-     * 许可评审方式
+     * 许可方式/许可状态
      */
 	@TableField("apply_type")
     private String applyType;
 
     /**
+     * 许可方式/许可状态
+     */
+    @TableField("apply_type_code")
+    private String applyTypeCode;
+
+
+    /**
+     * 许可评审方式
+     */
+    private String appraisalType;
+
+    /**
+     * 许可评审方式code
+     */
+    private String appraisalTypeCode;
+
+    /**
      * 备注
      */
 	@TableField("remark")

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.entity;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -21,49 +21,59 @@ public class CylinderFillingCheckDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "充装后复查ID")
-    private String fillingCheckId;
 
-    @ApiModelProperty(value = "充装企业名称")
-    private String fillingUnitName;
+   @ApiModelProperty(value = "id")
 
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNum;
+   private Long sequenceNbr;
 
-    @ApiModelProperty(value = "气瓶唯一标识码")
-    private String sequenceCode;
+   @ApiModelProperty(value = "充装后复查ID")
+   private String fillingCheckId;
 
-    @ApiModelProperty(value = "充装量在规定范围内")
-    private Integer withinScope;
+   @ApiModelProperty(value = "充装量在规定范围内")
+   private Integer withinScope;
 
-    @ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
-    private Integer sealedState;
+   @ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
+   private Integer sealedState;
 
-    @ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
-    private Integer defective;
+   @ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
+   private Integer defective;
 
-    @ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
-    private Integer abnormalTemperature;
+   @ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
+   private Integer abnormalTemperature;
 
-    @ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
-    private Integer warningSign;
+   @ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
+   private Integer warningSign;
 
-    @ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
-    private String compliance;
+   @ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
+   private String compliance;
 
-    @ApiModelProperty(value = "检查人员姓名")
-    private String inspector;
+   @ApiModelProperty(value = "检查人员姓名")
+   private String inspector;
 
-    @ApiModelProperty(value = "检查时间")
-    private String inspectionDate;
+   @ApiModelProperty(value = "检查时间")
+   private String inspectionDate;
 
-    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
-    private Date syncDate;
+   @ApiModelProperty(value = "创建时间")
+   private Date recDate;
 
-    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
-    private Integer syncState;
+   @ApiModelProperty(value = "操作人员")
+   private String recUserId;
 
-    @ApiModelProperty(value = "对接公司编码")
-    private String appId;
+   @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+   private Date syncDate;
 
+   @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+   private Integer syncState;
+
+   @ApiModelProperty(value = "对接公司编码")
+   private String appId;
+
+   @ApiModelProperty(value = "数据完整度")
+   private Double integrity;
+
+   @ApiModelProperty(value = "检查结果")
+   private String checkResults;
+
+   @ApiModelProperty(value = "不合格项")
+   private String nonconformances;
 }

amos-boot-system-tzs/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 com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -21,52 +22,75 @@ public class CylinderFillingDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "充装前检查Id")
-    private String fillingBeforeId;
+   @ApiModelProperty(value = "id")
 
-    @ApiModelProperty(value = "充装企业名称")
-    private String fillingUnitName;
+   private Long sequenceNbr;
 
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNum;
+   @ApiModelProperty(value = "充装前检查Id")
+   private String fillingBeforeId;
 
-    @ApiModelProperty(value = "气瓶唯一标识码")
-    private String sequenceCode;
+   @ApiModelProperty(value = "充装企业名称")
+   private String fillingUnitName;
 
-    @ApiModelProperty(value = "是否在检验有效期以内")
-    private String isValid;
+   @ApiModelProperty(value = "气瓶唯一标识码")
+   private String sequenceCode;
 
-    @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
-    private Integer same;
+   @ApiModelProperty(value = "是否在检验有效期以内")
+   private String isValid;
 
-    @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
-    private Integer isRegulations;
+   @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
+   private Integer same;
 
-    @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
-    private Integer isComplianceWithgbt;
+   @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
+   private Integer isRegulations;
 
-    @ApiModelProperty(value = "气瓶内有无剩余压力")
-    private Integer haveStillPressure;
+   @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
+   @TableField("is_compliance_withGBT")
+   private Integer isComplianceWithgbt;
 
-    @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
-    private Integer isComplete;
+   @ApiModelProperty(value = "气瓶内有无剩余压力")
+   private Integer haveStillPressure;
 
-    @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
-    private Integer haveSecurityDocuments;
+   @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
+   private Integer isComplete;
 
-    @ApiModelProperty(value = "检查人员姓名")
-    private String inspectorUser;
+   @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
+   private Integer haveSecurityDocuments;
 
-    @ApiModelProperty(value = "检查时间")
-    private String inspectionDate;
+   @ApiModelProperty(value = "检查人员姓名")
+   private String inspectorUser;
 
-    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
-    private Date syncDate;
+   @ApiModelProperty(value = "检查时间")
+   private String inspectionDate;
 
-    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
-    private Integer syncState;
+   @ApiModelProperty(value = "创建时间")
+   private Date recDate;
 
-    @ApiModelProperty(value = "对接公司编码")
-    private String appId;
+   @ApiModelProperty(value = "操作人员")
+   private String recUserId;
+
+   @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+   private Date syncDate;
+
+   @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+   private Integer syncState;
+
+   @ApiModelProperty(value = "对接公司编码")
+   private String appId;
+
+   @ApiModelProperty(value = "数据完整度")
+   private Double integrity;
+
+   @ApiModelProperty(value = "统一社会信用代码")
+   private String creditCode;
+
+   @ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
+   private String fillBeforeItem;
+
+   @ApiModelProperty(value = "检查结果")
+   private String checkResults;
+
+   @ApiModelProperty(value = "不合格项")
+   private String nonconformances;
 
 }

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

@@ -20,29 +20,37 @@ public class CylinderFillingExamineDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
+ @ApiModelProperty(value = "id")
 
-    @ApiModelProperty(value = "充装信息审核ID")
-    private String fillingExamineId;
+ private Long sequenceNbr;
 
-    @ApiModelProperty(value = "充装企业名称")
-    private String fillingUnitName;
+ @ApiModelProperty(value = "充装信息审核ID")
+ private String fillingExamineId;
 
-    @ApiModelProperty(value = "报表生成时间")
-    private String fillingAuditDate;
+ @ApiModelProperty(value = "报表生成时间")
+ private String fillingAuditDate;
 
-    @ApiModelProperty(value = "充装审核报表附件地址")
-    private String fillingAuditUrl;
+ @ApiModelProperty(value = "充装审核报表附件地址")
+ private String fillingAuditUrl;
 
-    @ApiModelProperty(value = "充装审核报表附件名称")
-    private String fillingAuditName;
+ @ApiModelProperty(value = "充装审核报表附件名称")
+ private String fillingAuditName;
 
-    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
-    private Date syncDate;
+ @ApiModelProperty(value = "创建时间")
+ private Date recDate;
 
-    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
-    private Integer syncState;
+ @ApiModelProperty(value = "操作人员")
+ private String recUserId;
 
-    @ApiModelProperty(value = "对接公司编码")
-    private String appId;
+ @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+ private Date syncDate;
 
+ @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+ private Integer syncState;
+
+ @ApiModelProperty(value = "对接公司编码")
+ private String appId;
+
+ @ApiModelProperty(value = "数据完整度")
+ private Double integrity;
 }

amos-boot-system-tzs/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 com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -20,39 +21,19 @@ import java.util.Date;
 public class CylinderFillingRecordDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "id")
 
+    private Long sequenceNbr;
 
     @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 = "充装开始时间")
+    @TableField("filling_startTime")
     private String fillingStarttime;
 
     @ApiModelProperty(value = "充装结束时间")
+    @TableField("filling_endTime")
     private String fillingEndtime;
 
     @ApiModelProperty(value = "充装人员姓名")
@@ -67,27 +48,11 @@ public class CylinderFillingRecordDto extends BaseDto {
     @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 = "创建时间")
+    private Date recDate;
 
+    @ApiModelProperty(value = "操作人员")
+    private String recUserId;
 
     @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
@@ -98,40 +63,20 @@ public class CylinderFillingRecordDto extends BaseDto {
     @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    @ApiModelProperty(value = "是否在检验有效期以内")
-    private String isValid;
-
-    @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
-    private Integer same;
-
-    @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
-    private Integer isRegulations;
+    @ApiModelProperty(value = "数据完整度")
+    private Double integrity;
 
-    @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
-    private Integer isComplianceWithgbt;
+    @ApiModelProperty(value = "不能与充装人员姓名相同")
+    private String inspectorName;
 
-    @ApiModelProperty(value = "气瓶内有无剩余压力")
-    private Integer haveStillPressure;
+    @ApiModelProperty(value = "充装前检查Id")
+    private String fillingBeforeId;
 
-    @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
-    private Integer isComplete;
+    @ApiModelProperty(value = "充装后复查ID")
+    private String fillingCheckId;
 
-    @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
-    private Integer haveSecurityDocuments;
-
-    @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 = "充装信息审核ID")
+    private String fillingExamineId;
 
+    private String sequenceCode;
 }

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

@@ -24,9 +24,9 @@ public class CylinderInfoDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id")
 
-    @ApiModelProperty(value = "气瓶基本信息ID")
-    private String cylinderId;
+    private Long sequenceNbr;
 
     @ApiModelProperty(value = "产权单位名称")
     private String unitName;
@@ -37,114 +37,92 @@ 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;
-
-    @ApiModelProperty(value = "电子标签编号")
-    private String electronicLabelCode;
-
-    @ApiModelProperty(value = "充装介质")
-    private String fillingMedium;
-
-    @ApiModelProperty(value = "公称压力(MPa）")
-    private Double pressure;
-
     @ApiModelProperty(value = "容积（L）")
     private Double volume;
 
     @ApiModelProperty(value = "制造日期")
-    private Date manufacturingDate;
+    private String manufacturingDate;
 
     @ApiModelProperty(value = "制造单位")
     private String manufacturingUnit;
 
-    @ApiModelProperty(value = "气瓶制造许可证")
-    private String license;
-
-    @ApiModelProperty(value = "气瓶重量（kg）")
-    private Double cylinderWeight;
-
     @ApiModelProperty(value = "单位内部编号")
     private String unitInnerCode;
 
-    @ApiModelProperty(value = "最近一次检验日期")
-    private Date inspectionDate;
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    private String sequenceCode;
 
-    @ApiModelProperty(value = "下次检验日期")
-    private Date nextInspectionDate;
+    @ApiModelProperty(value = "Ԥ???ȼ?")
+    private String earlyWarningLevel;
 
-    @ApiModelProperty(value = "检验日期开始")
-    private String inspectionDateStart;
+    @ApiModelProperty(value = "????Ԥ??ʱ?")
+    private Date earlyWarningLevelCalDate;
 
-    @ApiModelProperty(value = "检验日期结束")
-    private String inspectionDateEnd;
+    @ApiModelProperty(value = "????վ??ʹ???û????")
+    private String endCustomCode;
 
-    @ApiModelProperty(value = "气瓶唯一标识码")
-    private String sequenceCode;
+    @ApiModelProperty(value = "创建时间")
+    private Date recDate;
+
+    @ApiModelProperty(value = "操作人员")
+    private String recUserId;
 
     @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    @ApiModelProperty(value = "1初次同步数据   2上层系统已同步数据   0已删除数据")
-    private Boolean syncState;
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
 
     @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    @ApiModelProperty(value = "所属区域代码")
-    private String regionCode;
+    @ApiModelProperty(value = "数据完整度")
+    private Double integrity;
 
-    @ApiModelProperty(value = "查询单位appid")
-    private List<String> appIds;
+    @ApiModelProperty(value = "???")
+    private String longitude;
 
-    @ApiModelProperty(value = "检验状态 0 已超期 1 正常 2 即将超期")
-    private int inspectionStatas;
+    @ApiModelProperty(value = "γ?")
+    private String latitude;
 
-    @ApiModelProperty(value = "检验状态描述")
-    private String inspectionStatusDesc;
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String creditCode;
 
-    @ApiModelProperty(value = "预警等级")
-    private String earlyWarningLevel;
+    @ApiModelProperty(value = "充装介质")
+    private String fillingMedia;
 
-    @ApiModelProperty(value = "预警等级名称")
-    private String earlyWarningLevelName;
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
 
-    @ApiModelProperty(value = "最近配送地址")
-    private String address;
+    @ApiModelProperty(value = "产品合格证")
+    private String productQualified;
 
-    @ApiModelProperty(value = "最近预警时间")
-    private Date earlyWarningLevelCalDate;
+    @ApiModelProperty(value = "质量证明书")
+    private String proofQuality;
 
-    @ApiModelProperty(value = "经度")
-    private String longitude;
+    @ApiModelProperty(value = "监督检验证书")
+    private String supervisionInspec;
 
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
+    @ApiModelProperty(value = "型式实验证书")
+    private String typeExperiments;
 
-    @ApiModelProperty(value = "客户名称")
-    private  String customType;
+    @ApiModelProperty(value = "阀门制造单位")
+    private Double valveManufacturUnit;
 
-    @ApiModelProperty(value = "客户类型")
-    private String customName;
+    @ApiModelProperty(value = "公称工作压力(MPa）")
+    private String nominalWorkPressure;
 
-    @ApiModelProperty(value = "联系电话")
-    private String contactPhone;
+    @ApiModelProperty(value = "设备品种名称")
+    private String cylinderVarietyName;
 
-    @ApiModelProperty(value = "企业负责人手机")
-    private String personMobilePhone;
+    @ApiModelProperty(value = "充装介质名称")
+    private String fillingMediaName;
 
-    @ApiModelProperty(value = "企业负责人")
-    private String unitPerson;
 
-    @ApiModelProperty(value = "附件")
-    private Map<String, List<AttachmentDto>> attachments;
+    private List<String> appIds;
+    private String regionCode;
+
 }

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

@@ -21,37 +21,46 @@ 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 = "id")
 
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNum;
+ private Long sequenceNbr;
 
-    @ApiModelProperty(value = "气瓶唯一标识码")
-    private String sequenceCode;
+ @ApiModelProperty(value = "检验单位")
+ private String inspectionUnit;
 
-    @ApiModelProperty(value = "检验日期")
-    private String inspectionDate;
+ @ApiModelProperty(value = "气瓶唯一标识码")
+ private String sequenceCode;
 
-    @ApiModelProperty(value = "下次检验日期")
-    private String nextInspectionDate;
+ @ApiModelProperty(value = "检验日期")
+ private String inspectionDate;
 
-    @ApiModelProperty(value = "检验结果")
-    private String inspectionResult;
+ @ApiModelProperty(value = "下次检验日期")
+ private String nextInspectionDate;
 
-    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
-    private Date syncDate;
+ @ApiModelProperty(value = "检验结果")
+ private String inspectionResult;
 
-    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
-    private Integer syncState;
+ @ApiModelProperty(value = "创建时间")
+ private Date recDate;
 
-    @ApiModelProperty(value = "对接公司编码")
-    private String appId;
+ @ApiModelProperty(value = "操作人员")
+ private String recUserId;
+
+ @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+ private Date syncDate;
+
+ @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+ private Integer syncState;
+
+ @ApiModelProperty(value = "对接公司编码")
+ private String appId;
+
+ @ApiModelProperty(value = "数据完整度")
+ private Double integrity;
+
+ @ApiModelProperty(value = "不合格报废数量")
+ private String scrapQuantity;
 
 }

amos-boot-system-tzs/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 com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -21,31 +22,39 @@ public class CylinderTagsDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "标签ID")
-    private String tagId;
 
-    @ApiModelProperty(value = "产权单位名称")
-    private String unitName;
+ @ApiModelProperty(value = "id")
 
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNum;
+ private Long sequenceNbr;
 
-    @ApiModelProperty(value = "气瓶唯一标识码")
-    private String sequenceCode;
+ @ApiModelProperty(value = "气瓶唯一标识码")
+ private String sequenceCode;
 
-    @ApiModelProperty(value = "二维码编号")
-    private String qrCode;
+ @ApiModelProperty(value = "二维码编号")
+ @TableField("qrCode")
+ private String qrCode;
 
-    @ApiModelProperty(value = "电子标签编号")
-    private String electronicLabelCode;
+ @ApiModelProperty(value = "电子标签编号")
+ private String electronicLabelCode;
 
-    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
-    private Date syncDate;
+ @ApiModelProperty(value = "创建时间")
+ private Date recDate;
 
-    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
-    private Integer syncState;
+ @ApiModelProperty(value = "操作人员")
+ private String recUserId;
 
-    @ApiModelProperty(value = "对接公司编码")
-    private String appId;
+ @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+ private Date syncDate;
 
+ @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+ private Integer syncState;
+
+ @ApiModelProperty(value = "对接公司编码")
+ private String appId;
+
+ @ApiModelProperty(value = "数据完整度")
+ private Double integrity;
+
+ @ApiModelProperty(value = "气瓶钢印标识")
+ private String gasCylinderStamp;
 }

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

@@ -22,6 +22,11 @@ public class CylinderUnitDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 
+
+    @ApiModelProperty(value = "id")
+
+    private Long sequenceNbr;
+
     @ApiModelProperty(value = "单位ID")
     private String unitId;
 
@@ -31,12 +36,6 @@ public class CylinderUnitDto extends BaseDto {
     @ApiModelProperty(value = "单位名称")
     private String unitName;
 
-    @ApiModelProperty(value = "企业类型")
-    private Integer unitType;
-
-    @ApiModelProperty(value = "企业类型str")
-    private String unitTypeStr;
-
     @ApiModelProperty(value = "统一社会信用代码")
     private String creditCode;
 
@@ -55,70 +54,36 @@ public class CylinderUnitDto extends BaseDto {
     @ApiModelProperty(value = "企业邮编")
     private String postalCode;
 
-    @ApiModelProperty(value = "企业简称")
-    private String unitAbbreviation;
-
-    @ApiModelProperty(value = "充装许可证号")
-    private String fillingLicense;
-
-    @ApiModelProperty(value = "充装许可证有效期")
-    private Date fillingPermitDate;
-
-    @ApiModelProperty(value = "充装许可范围")
-    private String fillingPermScope;
-
-    @ApiModelProperty(value = "检验许可证号")
-    private String inspectionLicense;
+    @ApiModelProperty(value = "创建时间")
+    private Date recDate;
 
-    @ApiModelProperty(value = "检验范围")
-    private String inspectionScope;
-
-    @ApiModelProperty(value = "检验许可证有效期")
-    private Date effectiveDate;
-
-    @ApiModelProperty(value = "制造许可证号")
-    private String manufacturingLicense;
-
-    @ApiModelProperty(value = "制造许可证有效期")
-    private Date manufacturingDate;
-
-    @ApiModelProperty(value = "制造许可范围")
-    private String manufacturingScope;
-
-    @ApiModelProperty(value = "制造单位代码")
-    private String manufacturingUnitCode;
+    @ApiModelProperty(value = "操作人员")
+    private String recUserId;
 
     @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    @ApiModelProperty(value = "1初次同步数据   2上层系统已同步数据   0已删除数据")
-    private Boolean syncState;
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
 
     @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    @ApiModelProperty(value = "气瓶数量")
-    private Long cylinderNumber;
-
-    @ApiModelProperty(value = "检验过期气瓶数量")
-    private Long cylinderOutOfDate;
-
-
     @ApiModelProperty(value = "经度")
     private String longitude;
 
     @ApiModelProperty(value = "纬度")
     private String latitude;
 
-    @ApiModelProperty(value = "是否过期")
-    private Boolean outOfDate;
+    @ApiModelProperty(value = "数据完整度")
+    private Double integrity;
 
-    @ApiModelProperty(value = "充装许可证有效期开始")
-    private String fillingPermitDateStart;
-    @ApiModelProperty(value = "充装许可证有效期结束")
-    private String fillingPermitDateEnd;
+    @ApiModelProperty(value = "安全管理员")
+    private String securityAdm;
 
-    @ApiModelProperty(value = "行政许可有效期 0 已超期 1 正常 2 即将超期")
-    private Integer licenseStatus;
+    @ApiModelProperty(value = "安全管理员手机")
+    private String securityAdmPhone;
 
+    @ApiModelProperty(value = "所属区域")
+    private String regionName;
 }

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -37,6 +38,7 @@ public class RegUnitIcDto  extends BaseDto {
     private String registeredOrganCode;
 
     @ApiModelProperty(value = "核准时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date approvedDate;
 
     @ApiModelProperty(value = "经营状态：在业、吊销、注销、迁入、迁出、停业、清算")

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

@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -33,6 +35,9 @@ public class RegUnitInfoDto  extends BaseDto {
     @ApiModelProperty(value = "证件类型")
     private String unitCodeType;
 
+    @ApiModelProperty(value = "证件类型名称")
+    private String unitCodeTypeName;
+
     @ApiModelProperty(value = "单位类型")
     private String unitType;
 
@@ -110,7 +115,7 @@ public class RegUnitInfoDto  extends BaseDto {
     private RegUnitIcDto regUnitIc;
 
     @ApiModelProperty(value = "行政许可")
-    private List<BaseUnitLicenceDto> unitLicences;
+    private List<BaseUnitLicenceDto> unitLicences = new ArrayList<>();
 
     @ApiModelProperty(value = "平台公司id,平台创建公司后更新")
     private String amosCompanySeq;

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TzCylinderAfterCheckDto {
+
+    @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;
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 充装前检查结果DTO
+ */
+@Data
+public class TzCylinderBeforeCheckDto {
+
+    @ApiModelProperty(value = "是否在检验有效期以内")
+    /**
+     * 是否在检验有效期以内
+     */
+    private String isValid;
+    @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
+    /**
+     * 警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致
+     */
+    private Integer same;
+    @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
+    /**
+     * 气瓶外表面的颜色标志是否符合规定
+     */
+    private Integer isRegulations;
+    @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
+    /**
+     * 气瓶瓶阀的出气口螺纹型式是否符合GB/T15383
+     */
+    private Integer isComplianceWithgbt;
+    @ApiModelProperty(value = "气瓶内有无剩余压力")
+    /**
+     * 气瓶内有无剩余压力
+     */
+    private Integer haveStillPressure;
+    @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
+    /**
+     * 气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷
+     */
+    private Integer isComplete;
+    @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
+    /**
+     * 气瓶的安全附件齐全并符合安全要求
+     */
+    private Integer haveSecurityDocuments;
+    @ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
+    /**
+     * 新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气
+     */
+    private String fillBeforeItem;
+
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+
+/**
+ * 充装检查前检查内容
+ */
+public class TzCylinderCheckDto {
+
+    /**
+     * 检查项英文名称
+     */
+    private String item;
+
+    /**
+     * 检查项中文名称
+     */
+    private String explain;
+
+    /**
+     * 检查结果
+     */
+    private String result;
+
+    public TzCylinderCheckDto(String item, String explain, String result) {
+        this.item = item;
+        this.explain = explain;
+        this.result = result;
+    }
+
+    public String getItem() {
+        return item;
+    }
+
+    public void setItem(String item) {
+        this.item = item;
+    }
+
+    public String getExplain() {
+        return explain;
+    }
+
+    public void setExplain(String explain) {
+        this.explain = explain;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+* 液化气体气瓶充装信息-充装记录Dto
+*
+* @author duanwei
+* @date 2022-08-11
+*/
+@Data
+public class TzCylinderFillingDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    /**
+     * id
+     */
+    private String sequenceNbr;
+
+    /**
+     * 充装量
+     */
+    private String fillingQuantity;
+
+    /**
+     * 气瓶唯一标识编码
+     */
+    private String sequenceCode;
+
+    /**
+     * 气瓶充装前检查id
+     */
+    private String fillingBeforeId;
+
+    /**
+     * 气瓶充装后检查id
+     */
+    private String fillingCheckId;
+
+    @ApiModelProperty(value = "充装记录Id")
+    /**
+     * 充装记录Id
+     */
+    private String fillingRecordId;
+    @ApiModelProperty(value = "充装开始时间")
+    /**
+     * 充装开始时间
+     */
+    private String fillingStarttime;
+    @ApiModelProperty(value = "充装结束时间")
+    /**
+     * 充装结束时间
+     */
+    private String fillingEndtime;
+    @ApiModelProperty(value = "充装人员姓名")
+    /**
+     * 充装人员姓名
+     */
+    private String fillingUser;
+    @ApiModelProperty(value = "不能与充装人员姓名相同")
+    /**
+     * 不能与充装人员姓名相同
+     */
+    private String inspectorName;
+    @ApiModelProperty(value = "室温")
+    /**
+     * 室温
+     */
+    private Double temperature;
+    @ApiModelProperty(value = "异常情况")
+    /**
+     * 异常情况
+     */
+    private Integer abnormal;
+
+    /**
+     * 充装前检查结果
+     */
+    private String checkResultsBefore;
+
+    /**
+     * 充装后检查结果
+     */
+    private String checkResultsAfter;
+
+    /**
+     * 充装前检查项内容及结果
+     */
+    private List<TzCylinderCheckDto> tzCylinderCheckDtoList;
+
+    /**
+     * 充装后检查项内容及结果
+     */
+    private List<TzCylinderCheckDto> tzCylinderAfterCheckDtoList;
+
+    /**
+     * 充装前检查人员
+     */
+    private String inspectorBeforeUser;
+
+    /**
+     * 充装前检查时间
+     */
+    private String inspectionBeforeDate;
+
+    /**
+     * 充装后检查时间
+     */
+    private String inspectionAfterDate;
+
+    /**
+     * 充装后检查人员
+     */
+    private String inspectorAfter;
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import java.util.Date;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+* 气瓶基本信息列表Dto
+*
+* @author duanwei
+* @date 2022-08-11
+*/
+@Data
+public class TzCylinderInfoDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    /**
+    * id
+    */
+    private String sequenceNbr;
+
+    @ApiModelProperty(value = "产权单位名称")
+    /**
+     * 产权单位名称
+     */
+    private String unitName;
+
+    @ApiModelProperty(value = "设备品种")
+    /**
+     * 设备品种
+     */
+    private Integer cylinderVariety;
+
+    @ApiModelProperty(value = "产品名称")
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    @ApiModelProperty(value = "产品编号")
+    /**
+     * 产品编号
+     */
+    private String factoryNum;
+
+    @ApiModelProperty(value = "单位内部编号")
+    /**
+     * 单位内部编号
+     */
+    private String unitInnerCode;
+
+    @ApiModelProperty(value = "充装介质")
+    /**
+     * 充装介质
+     */
+    private String fillingMedia;
+
+    @ApiModelProperty(value = "气瓶制造单位")
+    /**
+     * 气瓶制造单位
+     */
+    private String manufacturingUnit;
+
+    @ApiModelProperty(value = "制造日期")
+    /**
+     * 制造日期
+     */
+    private String manufacturingDate;
+
+    @ApiModelProperty(value = "气瓶状态")
+    /**
+     * 气瓶状态
+     */
+    private Integer cylinderStatus;
+
+    @ApiModelProperty(value = "阀门制造单位")
+    /**
+     * 阀门制造单位
+     */
+    private String valveManufacturUnit;
+
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import java.util.Date;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+* 气瓶检验信息Dto
+*
+* @author duanwei
+* @date 2022-08-11
+*/
+@Data
+public class TzCylinderInspectionDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    /**
+     * id
+     */
+    private String sequenceNbr;
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    /**
+     * 气瓶唯一标识码
+     */
+    private String sequenceCode;
+    @ApiModelProperty(value = "检验单位")
+    /**
+     * 检验单位
+     */
+    private String inspectionUnit;
+    @ApiModelProperty(value = "检验日期")
+    /**
+     * 检验日期
+     */
+    private String inspectionDate;
+    @ApiModelProperty(value = "检验结果")
+    /**
+     * 检验结果
+     */
+    private String inspectionResult;
+    @ApiModelProperty(value = "不合格报废数量")
+    /**
+     * 不合格报废数量
+     */
+    private String scrapQuantity;
+    @ApiModelProperty(value = "下次检验日期")
+    /**
+     * 下次检验日期
+     */
+    private String nextInspectionDate;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 燃气气瓶追溯生产制造Dto
+ * @author duanwei
+ */
+@Data
+public class TzCylinderProduceDto {
+
+
+    /**
+     * id
+     */
+    private String sequenceNbr;
+
+    /**
+     * 气瓶制造单位
+     */
+    private String manufacturingUnit;
+
+    /**
+     * 制造日期
+     */
+    private String manufacturingDate;
+
+    /**
+     *阀门制造单位
+     */
+    private String valveManufacturUnit;
+
+    /**
+     *公称工作压力(MPa）
+     */
+    private String nominalWorkPressure;
+
+    /**
+     *容积（L）
+     */
+    private String volume;
+
+    /**
+     *产品合格证
+     */
+    private String productQualified;
+
+    /**
+     *质量证明书
+     */
+    private String proofQuality;
+
+    /**
+     *监督检验证书
+     */
+    private String supervisionInspec;
+
+    /**
+     *型式实验证书
+     */
+    private String typeExperiments;
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import java.util.Date;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+* 气瓶标签信息Dto
+*
+* @author duanwei
+* @date 2022-08-11
+*/
+@Data
+public class TzCylinderTagsDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    /**
+     * 气瓶唯一标识码
+     */
+    private String sequenceCode;
+
+    @ApiModelProperty(value = "二维码编号")
+    /**
+     * 二维码编号
+     */
+    private String qrCode;
+
+    @ApiModelProperty(value = "电子标签编号")
+    /**
+     * 电子标签编号
+     */
+    private String electronicLabelCode;
+
+    @ApiModelProperty(value = "气瓶钢印标识")
+    /**
+     * 气瓶钢印标识
+     */
+    private String gasCylinderStamp;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 燃气气瓶追溯详情合计
+ * @author duanwei
+ */
+@Data
+public class TzCylinderTraceDto {
+    TzCylinderProduceDto tzCylinderProduceDto;
+    TzCylinderInfoDto tzCylinderInfoDto;
+    TzCylinderTagsDto tzCylinderTagsDto;
+    List<TzCylinderInspectionDto> tzCylinderInspectionDto;
+    List<TzCylinderFillingDto> tzCylinderFillingDto;
+
+    public TzCylinderTraceDto(TzCylinderProduceDto tzCylinderProduceDto, TzCylinderInfoDto tzCylinderInfoDto, TzCylinderTagsDto tzCylinderTagsDto, List<TzCylinderInspectionDto> tzCylinderInspectionDto, List<TzCylinderFillingDto> tzCylinderFillingDto) {
+        this.tzCylinderProduceDto = tzCylinderProduceDto;
+        this.tzCylinderInfoDto = tzCylinderInfoDto;
+        this.tzCylinderTagsDto = tzCylinderTagsDto;
+        this.tzCylinderInspectionDto = tzCylinderInspectionDto;
+        this.tzCylinderFillingDto = tzCylinderFillingDto;
+    }
+}

amos-boot-system-tzs/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 java.util.Date;
 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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 气瓶充装信息--充装前检查
  *
- * @author system_generator
- * @date 2022-03-04
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_filling")
-public class CylinderFilling  {
+@ApiModel(value="TzCylinderFilling对象", description="气瓶充装信息--充装前检查")
+public class CylinderFilling extends BaseEntity {
 
     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")
+    @ApiModelProperty(value = "充装前检查Id")
     private String fillingBeforeId;
 
-    /**
-     * 充装企业名称
-     */
-	@TableField("filling_unit_name")
+    @ApiModelProperty(value = "充装企业名称")
     private String fillingUnitName;
 
-    /**
-     * 出厂编号
-     */
-	@TableField("factory_num")
-    private String factoryNum;
-
-    /**
-     * 气瓶唯一标识码
-     */
-	@TableField("sequence_code")
+    @ApiModelProperty(value = "气瓶唯一标识码")
     private String sequenceCode;
 
-    /**
-     * 是否在检验有效期以内
-     */
-	@TableField("is_valid")
+    @ApiModelProperty(value = "是否在检验有效期以内")
     private String isValid;
 
-    /**
-     * 警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致
-     */
-	@TableField("same")
+    @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
     private Integer same;
 
-    /**
-     * 气瓶外表面的颜色标志是否符合规定
-     */
-	@TableField("is_regulations")
+    @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
     private Integer isRegulations;
 
-    /**
-     * 气瓶瓶阀的出气口螺纹型式是否符合GB/T15383
-     */
-	@TableField("is_compliance_withGBT")
+    @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
+    @TableField("is_compliance_withGBT")
     private Integer isComplianceWithgbt;
 
-    /**
-     * 气瓶内有无剩余压力
-     */
-	@TableField("have_still_pressure")
+    @ApiModelProperty(value = "气瓶内有无剩余压力")
     private Integer haveStillPressure;
 
-    /**
-     * 气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷
-     */
-	@TableField("is_complete")
+    @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
     private Integer isComplete;
 
-    /**
-     * 气瓶的安全附件齐全并符合安全要求
-     */
-	@TableField("have_security_documents")
+    @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
     private Integer haveSecurityDocuments;
 
-    /**
-     * 检查人员姓名
-     */
-	@TableField("inspector_user")
+    @ApiModelProperty(value = "检查人员姓名")
     private String inspectorUser;
 
-    /**
-     * 检查时间
-     */
-	@TableField("inspection_date")
+    @ApiModelProperty(value = "检查时间")
     private String inspectionDate;
 
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 0-新增   1-更新  2-删除
-     */
-	@TableField("sync_state")
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
     private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-	@TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
 
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String creditCode;
+
+    @ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
+    private String fillBeforeItem;
+
+    @ApiModelProperty(value = "检查结果")
+    private String checkResults;
+
+    @ApiModelProperty(value = "不合格项")
+    private String nonconformances;
+
 }

amos-boot-system-tzs/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 java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 液化气体气瓶充装信息-充装后复查
  *
- * @author system_generator
- * @date 2022-03-04
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_filling_check")
+@ApiModel(value="TzCylinderFillingCheck对象", description="液化气体气瓶充装信息-充装后复查")
 public class CylinderFillingCheck extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 充装后复查ID
-     */
-	@TableField("filling_check_id")
+
+
+
+    @ApiModelProperty(value = "充装后复查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")
+    @ApiModelProperty(value = "充装量在规定范围内")
     private Integer withinScope;
 
-    /**
-     * 瓶阀及其与瓶口连接的密封良好
-     */
-	@TableField("sealed_state")
+    @ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
     private Integer sealedState;
 
-    /**
-     * 瓶体未出现鼓包变形或泄露等严重缺陷
-     */
-	@TableField("defective")
+    @ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
     private Integer defective;
 
-    /**
-     * 瓶体温度没有异常升高的迹象
-     */
-	@TableField("abnormal_temperature")
+    @ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
     private Integer abnormalTemperature;
 
-    /**
-     * 气瓶粘贴警示标签和充装标签
-     */
-	@TableField("warning_sign")
+    @ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
     private Integer warningSign;
 
-    /**
-     * 液化气瓶充装量符合有关规定，充装后逐瓶称重
-     */
-	@TableField("compliance")
+    @ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
     private String compliance;
 
-    /**
-     * 检查人员姓名
-     */
-	@TableField("inspector")
+    @ApiModelProperty(value = "检查人员姓名")
     private String inspector;
 
-    /**
-     * 检查时间
-     */
-	@TableField("inspection_date")
+    @ApiModelProperty(value = "检查时间")
     private String inspectionDate;
 
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 0-新增   1-更新  2-删除
-     */
-	@TableField("sync_state")
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
     private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-	@TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
 
+    @ApiModelProperty(value = "检查结果")
+    private String checkResults;
+
+    @ApiModelProperty(value = "不合格项")
+    private String nonconformances;
 }

amos-boot-system-tzs/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 java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 液化气体气瓶充装信息审核
  *
- * @author system_generator
- * @date 2022-03-04
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_filling_examine")
+@ApiModel(value="TzCylinderFillingExamine对象", description="液化气体气瓶充装信息审核")
 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;
+    @ApiModelProperty(value = "充装信息审核ID")
+    private String fillingExamineId;
 
-    /**
-     * 报表生成时间
-     */
-	@TableField("filling_audit_date")
+    @ApiModelProperty(value = "报表生成时间")
     private String fillingAuditDate;
 
-    /**
-     * 充装审核报表附件地址
-     */
-	@TableField("filling_audit_url")
+    @ApiModelProperty(value = "充装审核报表附件地址")
     private String fillingAuditUrl;
 
-    /**
-     * 充装审核报表附件名称
-     */
-	@TableField("filling_audit_name")
+    @ApiModelProperty(value = "充装审核报表附件名称")
     private String fillingAuditName;
 
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 0-新增   1-更新  2-删除
-     */
-	@TableField("sync_state")
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
     private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-	@TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
-
 }

amos-boot-system-tzs/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 java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 液化气体气瓶充装信息-充装记录
  *
- * @author system_generator
- * @date 2022-03-04
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_filling_record")
+@ApiModel(value="TzCylinderFillingRecord对象", description="液化气体气瓶充装信息-充装记录")
 public class CylinderFillingRecord extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 充装记录Id
-     */
-	@TableField("filling_record_id")
+
+
+
+
+    @ApiModelProperty(value = "充装记录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")
+    @ApiModelProperty(value = "充装开始时间")
+    @TableField("filling_startTime")
     private String fillingStarttime;
 
-    /**
-     * 充装结束时间
-     */
-	@TableField("filling_endTime")
+    @ApiModelProperty(value = "充装结束时间")
+    @TableField("filling_endTime")
     private String fillingEndtime;
 
-    /**
-     * 充装人员姓名
-     */
-	@TableField("filling_user")
+    @ApiModelProperty(value = "充装人员姓名")
     private String fillingUser;
 
-    /**
-     * 充装量（Kg）
-     */
-	@TableField("filling_quantity")
+    @ApiModelProperty(value = "充装量（Kg）")
     private Double fillingQuantity;
 
-    /**
-     * 室温
-     */
-	@TableField("temperature")
+    @ApiModelProperty(value = "室温")
     private Double temperature;
 
-    /**
-     * 异常情况
-     */
-	@TableField("abnormal")
+    @ApiModelProperty(value = "异常情况")
     private Integer abnormal;
 
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 1初次同步数据   2上层系统已同步数据   0已删除数据
-     */
-	@TableField("sync_state")
+    @ApiModelProperty(value = "1初次同步数据   2上层系统已同步数据   0已删除数据")
     private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-	@TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
 
+    @ApiModelProperty(value = "不能与充装人员姓名相同")
+    private String inspectorName;
+
+    @ApiModelProperty(value = "充装前检查Id")
+    private String fillingBeforeId;
+
+    @ApiModelProperty(value = "充装后复查ID")
+    private String fillingCheckId;
+
+    @ApiModelProperty(value = "充装信息审核ID")
+    private String fillingExamineId;
+
 }

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
 
-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 java.util.Date;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 气瓶基本信息
  *
- * @author system_generator
- * @date 2021-12-14
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
-
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_info")
-public class CylinderInfo  {
+@ApiModel(value="TzCylinderInfo对象", description="气瓶基本信息")
+public class CylinderInfo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
-    protected Long sequenceNbr;
 
-    /**
-     * 气瓶基本信息ID
-     */
-	@TableField("cylinder_id")
-    private String cylinderId;
 
-    /**
-     * 产权单位名称
-     */
-	@TableField("unit_name")
+
+    @ApiModelProperty(value = "产权单位名称")
     private String unitName;
 
-    /**
-     * 出厂编号
-     */
-	@TableField("factory_num")
+    @ApiModelProperty(value = "出厂编号")
     private String factoryNum;
 
-    /**
-     * 气瓶状态
-     */
-	@TableField("cylinder_status")
+    @ApiModelProperty(value = "气瓶状态")
     private Integer cylinderStatus;
 
-    /**
-     * 气瓶品种
-     */
-	@TableField("cylinder_variety")
+    @ApiModelProperty(value = "气瓶品种")
     private Integer cylinderVariety;
 
-    /**
-     * 二维码编号
-     */
-	@TableField("qrCode")
-    private String qrCode;
-
-    /**
-     * 电子标签编号
-     */
-	@TableField("electronic_label_code")
-    private String electronicLabelCode;
-
-    /**
-     * 充装介质
-     */
-	@TableField("filling_medium")
-    private String fillingMedium;
-
-    /**
-     * 公称压力(MPa）
-     */
-	@TableField("pressure")
-    private Double pressure;
-
-    /**
-     * 容积（L）
-     */
-	@TableField("volume")
+    @ApiModelProperty(value = "容积（L）")
     private Double volume;
 
-    /**
-     * 制造日期
-     */
-	@TableField("manufacturing_date")
-    private Date manufacturingDate;
+    @ApiModelProperty(value = "制造日期")
+    private String manufacturingDate;
 
-    /**
-     * 制造单位
-     */
-	@TableField("manufacturing_unit")
+    @ApiModelProperty(value = "制造单位")
     private String manufacturingUnit;
 
-    /**
-     * 气瓶制造许可证
-     */
-	@TableField("license")
-    private String license;
-
-    /**
-     * 气瓶重量（kg）
-     */
-	@TableField("cylinder_weight")
-    private Double cylinderWeight;
-
-    /**
-     * 单位内部编号
-     */
-	@TableField("unit_inner_code")
+    @ApiModelProperty(value = "单位内部编号")
     private String unitInnerCode;
 
-    /**
-     * 最近一次检验日期
-     */
-	@TableField("inspection_date")
-    private Date inspectionDate;
-
-    /**
-     * 下次检验日期
-     */
-	@TableField("next_inspection_date")
-    private Date nextInspectionDate;
-
-    /**
-     * 气瓶唯一标识码
-     */
-	@TableField("sequence_code")
+    @ApiModelProperty(value = "气瓶唯一标识码")
     private String sequenceCode;
 
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+    @ApiModelProperty(value = "Ԥ???ȼ?")
+    private String earlyWarningLevel;
+
+    @ApiModelProperty(value = "????Ԥ??ʱ?")
+    private Date earlyWarningLevelCalDate;
+
+    @ApiModelProperty(value = "????վ??ʹ???û????")
+    private String endCustomCode;
+
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 1初次同步数据   2上层系统已同步数据   0已删除数据
-     */
-	@TableField("sync_state")
-    private Boolean syncState;
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-    @TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
 
-    /**
-     * 预警等级
-     */
-    private String earlyWarningLevel;
+    @ApiModelProperty(value = "???")
+    private String longitude;
 
-    /**
-     * 预警等级 计算日期
-     */
-    private Date earlyWarningLevelCalDate;
+    @ApiModelProperty(value = "γ?")
+    private String latitude;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String creditCode;
+
+    @ApiModelProperty(value = "充装介质")
+    private String fillingMedia;
+
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "产品合格证")
+    private String productQualified;
+
+    @ApiModelProperty(value = "质量证明书")
+    private String proofQuality;
+
+    @ApiModelProperty(value = "监督检验证书")
+    private String supervisionInspec;
+
+    @ApiModelProperty(value = "型式实验证书")
+    private String typeExperiments;
+
+    @ApiModelProperty(value = "阀门制造单位")
+    private Double valveManufacturUnit;
+
+    @ApiModelProperty(value = "公称工作压力(MPa）")
+    private String nominalWorkPressure;
+
+    @ApiModelProperty(value = "设备品种名称")
+    private String cylinderVarietyName;
+
+    @ApiModelProperty(value = "充装介质名称")
+    private String fillingMediaName;
 
-	/**
-	 * 经度
-	 */
-	@TableField("longitude")
-	private String longitude;
-
-	/**
-	 * 纬度
-	 */
-	@TableField("latitude")
-	private String latitude;
-
-	/**
-	 * 最近气瓶使用客户编号
-	 */
-	@TableField("end_custom_code")
-	private String endCustomCode;
 }

amos-boot-system-tzs/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 java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 气瓶检验信息
  *
- * @author system_generator
- * @date 2022-03-04
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_inspection")
+@ApiModel(value="TzCylinderInspection对象", description="气瓶检验信息")
 public class CylinderInspection extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 检验信息ID
-     */
-	@TableField("inspection_id")
-    private String inspectionId;
 
-    /**
-     * 检验单位
-     */
-	@TableField("inspection_unit")
+
+
+    @ApiModelProperty(value = "检验单位")
     private String inspectionUnit;
 
-    /**
-     * 产权单位名称
-     */
-	@TableField("property_unit_name")
-    private String propertyUnitName;
-
-    /**
-     * 出厂编号
-     */
-	@TableField("factory_num")
-    private String factoryNum;
-
-    /**
-     * 气瓶唯一标识码
-     */
-	@TableField("sequence_code")
+    @ApiModelProperty(value = "气瓶唯一标识码")
     private String sequenceCode;
 
-    /**
-     * 检验日期
-     */
-	@TableField("inspection_date")
+    @ApiModelProperty(value = "检验日期")
     private String inspectionDate;
 
-    /**
-     * 下次检验日期
-     */
-	@TableField("next_inspection_date")
+    @ApiModelProperty(value = "下次检验日期")
     private String nextInspectionDate;
 
-    /**
-     * 检验结果
-     */
-	@TableField("inspection_result")
+    @ApiModelProperty(value = "检验结果")
     private String inspectionResult;
 
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 0-新增   1-更新  2-删除
-     */
-	@TableField("sync_state")
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
     private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-	@TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
 
+    @ApiModelProperty(value = "不合格报废数量")
+    private String scrapQuantity;
 }

amos-boot-system-tzs/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 java.util.Date;
 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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 气瓶标签信息
  *
- * @author system_generator
- * @date 2022-03-04
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_tags")
-public class CylinderTags {
+@ApiModel(value="TzCylinderTags对象", description="气瓶标签信息")
+public class CylinderTags extends BaseEntity {
 
     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")
+
+
+
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
     private String sequenceCode;
 
-    /**
-     * 二维码编号
-     */
-	@TableField("qrCode")
+    @ApiModelProperty(value = "二维码编号")
+    @TableField("qrCode")
     private String qrCode;
 
-    /**
-     * 电子标签编号
-     */
-	@TableField("electronic_label_code")
+    @ApiModelProperty(value = "电子标签编号")
     private String electronicLabelCode;
 
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 0-新增   1-更新  2-删除
-     */
-	@TableField("sync_state")
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
     private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-	@TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
 
+    @ApiModelProperty(value = "气瓶钢印标识")
+    private String gasCylinderStamp;
 }

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
 
-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 java.util.Date;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * 气瓶企业信息
  *
- * @author system_generator
- * @date 2021-12-14
+ * @author duanwei
+ * @date 2022-08-11
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_cylinder_unit")
-public class CylinderUnit  {
+@ApiModel(value="TzCylinderUnit对象", description="气瓶企业信息")
+public class CylinderUnit extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
-    protected Long sequenceNbr;
 
-    /**
-     * 单位ID
-     */
-	@TableField("unit_id")
+
+
+
+    @ApiModelProperty(value = "单位ID")
     private String unitId;
 
-    /**
-     * 所属区域
-     */
-	@TableField("region_code")
+    @ApiModelProperty(value = "所属区域")
     private String regionCode;
 
-    /**
-     * 单位名称
-     */
-	@TableField("unit_name")
+    @ApiModelProperty(value = "单位名称")
     private String unitName;
 
-    /**
-     * 企业类型
-     */
-	@TableField("unit_type")
-    private Integer unitType;
-
-    /**
-     * 统一社会信用代码
-     */
-	@TableField("credit_code")
+    @ApiModelProperty(value = "统一社会信用代码")
     private String creditCode;
 
-    /**
-     * 详细地址
-     */
-	@TableField("address")
+    @ApiModelProperty(value = "详细地址")
     private String address;
 
-    /**
-     * 企业负责人
-     */
-	@TableField("unit_person")
+    @ApiModelProperty(value = "企业负责人")
     private String unitPerson;
 
-    /**
-     * 企业负责人手机
-     */
-	@TableField("person_mobile_phone")
+    @ApiModelProperty(value = "企业负责人手机")
     private String personMobilePhone;
 
-    /**
-     * 企业负责人固定电话
-     */
-	@TableField("person_telephone")
+    @ApiModelProperty(value = "企业负责人固定电话")
     private String personTelephone;
 
-    /**
-     * 企业邮编
-     */
-	@TableField("postal_code")
+    @ApiModelProperty(value = "企业邮编")
     private String postalCode;
 
-    /**
-     * 企业简称
-     */
-	@TableField("unit_abbreviation")
-    private String unitAbbreviation;
-
-    /**
-     * 充装许可证号
-     */
-	@TableField("filling_license")
-    private String fillingLicense;
-
-    /**
-     * 充装许可证有效期
-     */
-	@TableField("filling_permit_date")
-    private Date fillingPermitDate;
-
-    /**
-     * 充装许可范围
-     */
-	@TableField("filling_perm_scope")
-    private String fillingPermScope;
-
-    /**
-     * 检验许可证号
-     */
-	@TableField("inspection_license")
-    private String inspectionLicense;
-
-    /**
-     * 检验范围
-     */
-	@TableField("inspection_scope")
-    private String inspectionScope;
-
-    /**
-     * 检验许可证有效期
-     */
-	@TableField("effective_date")
-    private Date effectiveDate;
-
-    /**
-     * 制造许可证号
-     */
-	@TableField("manufacturing_license")
-    private String manufacturingLicense;
-
-    /**
-     * 制造许可证有效期
-     */
-	@TableField("manufacturing_date")
-    private Date manufacturingDate;
-
-    /**
-     * 制造许可范围
-     */
-	@TableField("manufacturing_scope")
-    private String manufacturingScope;
-
-    /**
-     * 制造单位代码
-     */
-	@TableField("manufacturing_unit_code")
-    private String manufacturingUnitCode;
-
-    /**
-     * 同步时间  yyyy-MM-dd HH24:mi:ss
-     */
-	@TableField("sync_date")
+
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
-    /**
-     * 1初次同步数据   2上层系统已同步数据   0已删除数据
-     */
-	@TableField("sync_state")
-    private Boolean syncState;
+    @ApiModelProperty(value = "0-新增   1-更新  2-删除")
+    private Integer syncState;
 
-    /**
-     * 对接公司编码
-     */
-    @TableField("app_id")
+    @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-    /**
-     * 经度
-     */
-    @TableField("longitude")
+    @ApiModelProperty(value = "经度")
     private String longitude;
 
-    /**
-     * 纬度
-     */
-    @TableField("latitude")
+    @ApiModelProperty(value = "纬度")
     private String latitude;
 
-    /**
-     * 数据完整度
-     */
-    @TableField("integrity")
+    @ApiModelProperty(value = "数据完整度")
     private Double integrity;
+
+    @ApiModelProperty(value = "安全管理员")
+    private String securityAdm;
+
+    @ApiModelProperty(value = "安全管理员手机")
+    private String securityAdmPhone;
+
+    @ApiModelProperty(value = "所属区域")
+    private String regionName;
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -56,6 +57,7 @@ public class RegUnitIc extends BaseEntity {
     /**
      * 核准时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField("approved_date")
     private Date approvedDate;
 

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

-package com.yeejoin.amos.boot.module.tzs.api.entity;
+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -40,6 +40,11 @@ public class RegUnitInfo extends BaseEntity {
     private String unitCodeType;
 
     /**
+     * 证件类型名称
+     */
+    private String unitCodeTypeName;
+
+    /**
      * 单位类型
      */
     @TableField("unit_type")

amos-boot-system-tzs/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;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingCheck;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

amos-boot-system-tzs/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;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingExamine;
 
 /**
  * 液化气体气瓶充装信息审核 Mapper 接口

amos-boot-system-tzs/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;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFilling;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

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

@@ -3,8 +3,8 @@ 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 com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -30,14 +30,14 @@ public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingR
      * @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("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,

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

@@ -2,8 +2,8 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDto;
-import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

amos-boot-system-tzs/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;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInspection;
 
 /**
  * 气瓶检验信息 Mapper 接口

amos-boot-system-tzs/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 com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderTags;
 import org.apache.ibatis.annotations.Param;
 
 /**

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

 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 com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
 import org.apache.ibatis.annotations.Param;
 
 /**

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.RegUnitInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
 
 /**
  * 单位注册信息表 Mapper 接口

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.*;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
+
+import java.util.List;
+
+/**
+ * 气瓶基本信息 Mapper 接口
+ *
+ * @author duanwei
+ * @date 2022-08-11
+ */
+public interface TzCylinderMapper extends BaseMapper<CylinderInfo> {
+
+    IPage<TzCylinderInfoDto> getTzCylinderInfoList(Page<TzCylinderInfoDto> page, TzCylinderInfoDto tzCylinderInfoDto, String superviseOrgCode);
+
+    TzCylinderInfoDto getTzCylinderInfoDto(String sequenceNbr);
+
+    String getSequencCode(String sequenceNbr);
+
+    TzCylinderProduceDto getTzCylinderProduceDto(String SequenceCode);
+
+    TzCylinderTagsDto getTzCylinderTagsDto(String sequenceCode);
+
+    List<TzCylinderInspectionDto> getTzCylinderInspectionDto(String sequenceCode);
+
+    List<TzCylinderFillingDto> getTzCylinderFillingDto(String sequenceCode);
+
+    TzCylinderBeforeCheckDto getTzCylinderBeforeCheck(String fillingBeforeId);
+
+    List<TzCylinderCheckDto> getTzCylinderCheckItem();
+
+    TzCylinderAfterCheckDto getTzCylinderAfterCheck(String fillingCheckId);
+
+    List<TzCylinderCheckDto> getTzCylinderAfterCheckItem();
+
+
+
+}

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

-package com.yeejoin.amos.boot.module.tzs.api.service;
+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
 /**

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

-package com.yeejoin.amos.boot.module.tzs.api.service;
+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderTraceDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
+
+/**
+ * 气瓶基本信息 服务类
+ *
+ * @author duanwei
+ * @date 2022-08-11
+ */
+public interface ITzCylinderService extends IService<CylinderInfo> {
+
+    IPage<TzCylinderInfoDto> getCylinderInfoDtoList(PageParam pageParam, TzCylinderInfoDto idxBizCarcylUserCompany, String key);
+
+    TzCylinderTraceDto getCylinderTraceDto(String sequenceNbr);
+}

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

@@ -14,7 +14,7 @@
         select
         IFNULL(
         sum(
-        case f.is_valid+f.same+f.is_regulations+f.is_complete+f.have_still_pressure+f.is_complete+f.have_security_documents
+        case f.is_valid+f.same+f.is_regulations+f.is_compliance_withGBT+f.have_still_pressure+f.is_complete+f.have_security_documents
         when 7 then 1
          else
         0 end ),0) from tz_cylinder_filling f where date_format(f.inspection_date,'%Y-%m') = date_format(#{time},'%Y-%m') and app_id = #{appId}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzCylinderMapper.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.TzCylinderMapper">
+
+    <select id="getTzCylinderInfoList" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInfoDto">
+        SELECT
+        CI.sequence_nbr,
+        CI.unit_name,
+        CI.cylinder_variety,
+        CI.product_name,
+        CI.factory_num,
+        CI.unit_inner_code,
+        CI.filling_media,
+        CI.manufacturing_unit,
+        CI.manufacturing_date,
+        CI.valve_manufactur_unit,
+        CI.cylinder_status
+        FROM
+        tz_cylinder_info AS CI
+        LEFT JOIN
+        tz_base_enterprise_info AS EI ON CI.credit_code=EI.use_code
+        <where>
+            <if
+                    test="superviseOrgCode!=null and superviseOrgCode!='' ">
+                AND EI.supervise_org_code LIKE
+                CONCAT('%',#{superviseOrgCode},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.unitName!=null and tzCylinderInfoDto.unitName!='' ">
+                AND CI.unit_name LIKE
+                CONCAT('%',#{tzCylinderInfoDto.unitName},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.cylinderVariety!=null and tzCylinderInfoDto.cylinderVariety!='' ">
+                AND CI.cylinder_variety LIKE
+                CONCAT('%',#{tzCylinderInfoDto.cylinderVariety},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.productName!=null and tzCylinderInfoDto.productName!='' ">
+                AND CI.product_name LIKE
+                CONCAT('%',#{tzCylinderInfoDto.productName},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.factoryNum!=null and tzCylinderInfoDto.factoryNum!='' ">
+                AND CI.factory_num LIKE
+                CONCAT('%',#{tzCylinderInfoDto.factoryNum},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.unitInnerCode!=null and tzCylinderInfoDto.unitInnerCode!='' ">
+                AND CI.unit_inner_code LIKE
+                CONCAT('%',#{tzCylinderInfoDto.unitInnerCode},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.fillingMedia!=null and tzCylinderInfoDto.fillingMedia!='' ">
+                AND CI.filling_media LIKE
+                CONCAT('%',#{tzCylinderInfoDto.fillingMedia},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.manufacturingUnit!=null and tzCylinderInfoDto.manufacturingUnit!='' ">
+                AND CI.manufacturing_unit LIKE
+                CONCAT('%',#{tzCylinderInfoDto.manufacturingUnit},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.manufacturingDate!=null and tzCylinderInfoDto.manufacturingDate!='' ">
+                AND CI.manufacturing_date LIKE
+                CONCAT('%',#{tzCylinderInfoDto.manufacturingDate},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.valveManufacturUnit!=null and tzCylinderInfoDto.valveManufacturUnit!='' ">
+                AND CI.valve_manufactur_unit LIKE
+                CONCAT('%',#{tzCylinderInfoDto.valveManufacturUnit},'%')
+            </if>
+            <if
+                    test="tzCylinderInfoDto.cylinderStatus!=null and tzCylinderInfoDto.cylinderStatus!='' ">
+                AND CI.cylinder_status LIKE
+                CONCAT('%',#{tzCylinderInfoDto.cylinderStatus},'%')
+            </if>
+        </where>
+    </select>
+
+    <select id="getTzCylinderInfoDto" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInfoDto">
+        SELECT
+            CI.sequence_nbr,
+            CI.unit_name,
+            CI.cylinder_variety,
+            CI.product_name,
+            CI.factory_num,
+            CI.unit_inner_code,
+            CI.filling_media,
+            CI.manufacturing_unit,
+            CI.manufacturing_date,
+            CI.valve_manufactur_unit,
+            CI.cylinder_status
+        FROM
+            tz_cylinder_info AS CI
+        WHERE CI.sequence_nbr = #{sequenceNbr}
+    </select>
+
+    <select id="getSequencCode" resultType="java.lang.String">
+        SELECT sequence_code FROM tz_cylinder_info WHERE sequence_nbr=#{sequenceNbr}
+    </select>
+
+    <select id="getTzCylinderProduceDto" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderProduceDto">
+        SELECT
+            CI.sequence_nbr,
+            CI.manufacturing_unit,
+            CI.manufacturing_date,
+            CI.valve_manufactur_unit,
+            CI.nominal_work_pressure,
+            CI.volume,
+            CI.product_qualified,
+            CI.proof_quality,
+            CI.supervision_inspec,
+            CI.type_experiments
+        FROM
+            tz_cylinder_info CI
+        WHERE CI.sequence_code =#{SequenceCode}
+    </select>
+
+    <select id="getTzCylinderTagsDto" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderTagsDto">
+        SELECT
+            CT.sequence_nbr,
+            CT.sequence_code,
+            CT.qrCode,
+            CT.electronic_label_code,
+            CT.gas_cylinder_stamp
+        FROM tz_cylinder_tags CT
+        WHERE CT.sequence_code = #{SequenceCode}
+    </select>
+
+    <select id="getTzCylinderInspectionDto" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInspectionDto">
+        SELECT
+            CI.sequence_nbr,
+            CI.sequence_code,
+            CI.inspection_unit,
+            CI.inspection_date,
+            CI.inspection_result,
+            CI.scrap_quantity,
+            CI.next_inspection_date
+        FROM tz_cylinder_inspection CI
+        WHERE CI.sequence_code = #{SequenceCode}
+        ORDER BY CI.inspection_date DESC
+    </select>
+
+    <select id="getTzCylinderFillingDto" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderFillingDto">
+        SELECT
+            CF.inspector_user AS inspector_before_user,
+            CF.inspection_date AS inspection_before_date,
+            FC.inspection_date AS inspection_after_date,
+            FC.inspector AS inspector_after,
+            FR.sequence_nbr,
+            FC.filling_check_id,
+            FR.filling_quantity,
+            CF.sequence_code,
+            FR.filling_before_id,
+            FR.filling_startTime,
+            FR.filling_endTime,
+            FR.filling_user,
+            FR.inspector_name,
+            FR.temperature,
+            FR.abnormal,
+            CF.check_results AS check_results_before,
+            FC.check_results AS check_results_after
+        FROM
+            tz_cylinder_filling_record AS FR
+                LEFT JOIN tz_cylinder_filling AS CF ON CF.filling_before_id = FR.filling_before_id
+                LEFT JOIN tz_cylinder_filling_check AS FC ON FC.filling_check_id = FR.filling_check_id
+        WHERE
+            CF.sequence_code = #{sequence_code}
+        ORDER BY FR.filling_startTime DESC
+    </select>
+
+    <select id="getTzCylinderBeforeCheck" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderBeforeCheckDto">
+        SELECT
+            CF.is_valid,
+            CF.same,
+            CF.is_regulations,
+            CF.is_compliance_withGBT,
+            CF.have_still_pressure,
+            CF.is_complete,
+            CF.have_security_documents,
+            CF.fill_before_item
+        FROM tz_cylinder_filling AS CF
+        WHERE CF.filling_before_id=#{fillingBeforeId}
+    </select>
+
+    <select id="getTzCylinderCheckItem" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderCheckDto">
+        SELECT
+            item,
+            `explain`,
+            `result`
+        FROM
+            tz_cylinder_check_item
+        WHERE item!=''
+    </select>
+
+    <select id="getTzCylinderAfterCheck" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderAfterCheckDto">
+        SELECT
+            FC.within_scope,
+            FC.sealed_state,
+            FC.defective,
+            FC.abnormal_temperature,
+            FC.warning_sign
+        FROM tz_cylinder_filling_check AS FC
+        WHERE FC.filling_check_id=#{fillingCheckId}
+    </select>
+
+    <select id="getTzCylinderAfterCheckItem" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderCheckDto">
+        SELECT
+            after_item AS item,
+            after_explain AS `explain`,
+            after_result AS `result`
+        FROM
+            tz_cylinder_check_item
+        WHERE after_item!=''
+    </select>
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -90,8 +90,8 @@ public class TzBaseEnterpriseInfoController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-	public ResponseModel<TzBaseEnterpriseInfo> selectById(HttpServletRequest request, @PathVariable Long id) {
-		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getById(id));
+	public ResponseModel<TzBaseEnterpriseInfoDto> selectById(HttpServletRequest request, @PathVariable Long id) {
+		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.detail(id));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/BaseEnterpriseMqTtlListener.java

 package com.yeejoin.amos.boot.module.tzs.biz.listener;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,45 +63,67 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
 				.map(i -> i.getAppCode()).collect(Collectors.toList());
 		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(object.getLong("sequence_nbr"));
+		// FeignClientResult<Collection<CompanyModel>> cResult =
+		// Privilege.companyClient.queryAgencyTree(null);
+		String useCode = object.getString("use_code");
+		// if (useCode == null || !isUse(useCode, cResult.getResult())) {
 		if (cResult.getResult() == null) {
 			CompanyModel companyModel = new CompanyModel();
 			companyModel.setCompanyName(object.getString("use_unit"));
 			companyModel.setParentId(0L);
 			companyModel.setLevel("company");
-			companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
-			companyModel.setCompanyCode(object.getString("use_code"));
-			FeignClientResult<HashMap<String,Object>>  result= Privilege.companyClient.queryByOrgcode(object.getString("supervise_org_code"));
-			//JSONObject parent = JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
-			if(result.getResult().get("sequenceNbr")!=null) 
-			{
-				companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
+			// companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
+			companyModel.setCompanyCode(useCode);
+			if (object.getString("supervise_org_code") != null) {
+				FeignClientResult<HashMap<String, Object>> result = Privilege.companyClient
+						.queryByOrgcode(object.getString("supervise_org_code"));
+				// JSONObject parent =
+				// JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
+				if (result.getResult().get("sequenceNbr") != null) {
+					companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
+				}
 			}
-			Privilege.companyClient.create(companyModel);
-		}
+			FeignClientResult<CompanyModel> createResult = Privilege.companyClient.create(companyModel);
 
-		String unitCode = object.getString("use_code");
-		if (unitCode == null || unitCode.length() < 6) {
-			log.error("公司统一信用代码长度不够6位");
-			throw new Exception("公司统一信用代码长度不够6位");
+			String unitCode = object.getString("use_code");
+			if (unitCode == null || unitCode.length() < 6) {
+				log.error("公司统一信用代码长度不够6位");
+				throw new Exception("公司统一信用代码长度不够6位");
+			}
+			String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
+			FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
+			if (uResult.getResult() == null) {
+				AgencyUserModel userModel = new AgencyUserModel();
+				userModel.setUserName(userName);
+				userModel.setRealName(userName);
+				userModel.setPassword(DesUtil.encode(userName, secretKey));
+				userModel.setRePassword(DesUtil.encode(userName, secretKey));
+				// userModel.setMobile(vo.getPhoneNo());
+				userModel.setLockStatus("UNLOCK");
+				FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("使用单位", "admin");
+				Map<Long, List<Long>> orgRoles = new HashMap<>();
+				List<Long> roleIds = new ArrayList<>();
+				roleIds.add(list.getResult().get(0).getSequenceNbr());
+				// orgRoles.put(object.getLong("sequence_nbr"), roleIds);
+				orgRoles.put(createResult.getResult().getSequenceNbr(), roleIds);
+				userModel.setAppCodes(appCodes);
+				userModel.setOrgRoleSeqs(orgRoles);
+				Privilege.agencyUserClient.create(userModel);
+			}
 		}
-		String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
-		FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
-		if (uResult.getResult() == null) {
-			AgencyUserModel userModel = new AgencyUserModel();
-			userModel.setUserName(userName);
-			userModel.setRealName(userName);
-			userModel.setPassword(DesUtil.encode(userName, secretKey));
-			userModel.setRePassword(DesUtil.encode(userName, secretKey));
-			// userModel.setMobile(vo.getPhoneNo());
-			userModel.setLockStatus("UNLOCK");
-			FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("使用单位", "admin");
-			Map<Long, List<Long>> orgRoles = new HashMap<>();
-			List<Long> roleIds = new ArrayList<>();
-			roleIds.add(list.getResult().get(0).getSequenceNbr());
-			orgRoles.put(object.getLong("sequence_nbr"), roleIds);
-			userModel.setAppCodes(appCodes);
-			userModel.setOrgRoleSeqs(orgRoles);
-			Privilege.agencyUserClient.create(userModel);
+
+	}
+
+	private boolean isUse(String useCode, Collection<CompanyModel> companys) {
+		for (Object obj : companys) {
+			String json = JSONObject.toJSONString(obj);
+			CompanyModel companyMode = JSONObject.toJavaObject(JSONObject.parseObject(json), CompanyModel.class);
+			if (useCode.equals(companyMode.getCompanyCode())) {
+				return true;
+			} else if (companyMode.getChildren() != null) {
+				return isUse(useCode, companyMode.getChildren());
+			}
 		}
+		return false;
 	}
 }

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IBaseUnitLicenceService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.L;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitIcServiceImpl;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 /**
  * 企业数据信息 服务实现类
@@ -24,25 +34,65 @@ import java.util.List;
  * @date 2022-08-10
  */
 @Service
-public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> implements ITzBaseEnterpriseInfoService {
+public class TzBaseEnterpriseInfoServiceImpl
+		extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
+		implements ITzBaseEnterpriseInfoService {
 
-    @Autowired
-    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+	@Autowired
+	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
-    @Override
-    public List<EquEnterDto> getInfo(String sequenceNbr) {
-        return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
-    }
+	@Autowired
+	BaseUnitLicenceServiceImpl baseUnitLicenceService;
+
+	@Autowired
+	RegUnitIcServiceImpl regUnitIcService;
+
+	@Autowired
+	private IBaseUnitLicenceService iBaseUnitLicenceService;
+
+	@Override
+	public List<EquEnterDto> getInfo(String sequenceNbr) {
+		return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
+	}
 
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+		if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
+			FeignClientResult<CompanyModel> result = Privilege.companyClient
+					.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
+			if (result.getResult() != null) {
+				tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+			}
+		}
 		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
 		return this.baseMapper.page(page, tzBaseEnterpriseInfoDto);
 	}
 
 	@Override
 	public TzBaseEnterpriseInfoDto detail(Long id) {
-		// TODO Auto-generated method stub
-		return null;
+		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
+		if (tzBaseEnterpriseInfo != null) {
+			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+		}
+		// 许可信息
+		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+		for (BaseUnitLicence baseUnitLicence : unitLicences) {
+			BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+			BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+			unitLicenceDtos.add(baseUnitLicenceDto);
+		}
+		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+		// 工商信息
+		RegUnitIc regUnitIc = regUnitIcService.getOne(
+				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+		if (regUnitIc != null) {
+			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+		}
+		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+		return tzBaseEnterpriseInfoDto;
 	}
 }

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

@@ -323,31 +323,31 @@ public class BeanDtoVoUtils {
                 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("");
-                }
+//                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;

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

@@ -57,11 +57,11 @@ public class CylinderUnitController extends BaseController {
 		unitList.stream().forEach(t -> {
 			CylinderUnitDto temp = new CylinderUnitDto();
 			BeanUtils.copyProperties(t,temp);
-			if(t.getFillingPermitDate() != null && t.getFillingPermitDate().getTime() < System.currentTimeMillis()) {
-				temp.setOutOfDate(true);
-			} else {
-				temp.setOutOfDate(false);
-			}
+//			if(t.getFillingPermitDate() != null && t.getFillingPermitDate().getTime() < System.currentTimeMillis()) {
+//				temp.setOutOfDate(true);
+//			} else {
+//				temp.setOutOfDate(false);
+//			}
 			result.add(temp);
 		});
 		return ResponseHelper.buildResponse(result);
@@ -82,10 +82,10 @@ public class CylinderUnitController extends BaseController {
 		Map<String, Long> cylinderInfo = iCylinderInfoService.queryNumAndOutOfDateNum(unit.getSequenceNbr());
 		if(cylinderInfo != null) {
 			if(cylinderInfo.get("cylinderNum") != null) {
-				unit.setCylinderNumber(cylinderInfo.get("cylinderNum"));
+//				unit.setCylinderNumber(cylinderInfo.get("cylinderNum"));
 			}
 			if(cylinderInfo.get("outOfDateNum") != null) {
-				unit.setCylinderOutOfDate(cylinderInfo.get("outOfDateNum"));
+//				unit.setCylinderOutOfDate(cylinderInfo.get("outOfDateNum"));
 			}
 		}
 	    return ResponseHelper.buildResponse(unit);

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

 package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.tzs.api.service.IRegUnitInfoService;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IRegUnitInfoService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,7 +21,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.ws.rs.DELETE;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -67,7 +63,7 @@ public class RegUnitInfoController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "单位注册校验", notes = "单位注册校验")
     public ResponseModel<RegUnitInfoDto> unitCheck(@PathVariable String unitCode,
                                                    @RequestParam String unitType) {
-        if(ValidationUtil.isEmpty(unitCode)){
+        if (ValidationUtil.isEmpty(unitCode)) {
             throw new BadRequest("单位编码不能为空");
         }
         RegUnitInfoDto regUnitInfoDto = iRegUnitInfoService.unitCheck(unitCode, unitType);
@@ -95,13 +91,12 @@ public class RegUnitInfoController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{tel}/sendTelCode")
     @ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
-    public ResponseModel<Boolean> sendTelCode(@PathVariable(value = "tel") String tel) {
+    public ResponseModel<Boolean> sendTelCode(@PathVariable(value = "tel") String tel) throws Exception {
         if (ValidationUtil.isEmpty(tel)) {
             throw new BadRequest("手机号不能为空");
         }
-        try {
-            Privilege.authClient.mobileVerify(tel);
-        } catch (Exception e) {
+        Boolean isReg = (Boolean) Privilege.authClient.mobileVerify(tel).getResult();
+        if(isReg){
             throw new RuntimeException("该手机号已注册!");
         }
         Boolean flag;
@@ -136,9 +131,9 @@ public class RegUnitInfoController extends BaseController {
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{tel}/{code}/verifyTelCode")
-    @ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
+    @ApiOperation(httpMethod = "GET", value = "手机号验证码校验", notes = "手机号验证码校验")
     public ResponseModel<Boolean> verifyTelCode(@PathVariable(value = "tel") String tel, @PathVariable(value = "code") String code) {
-        Boolean flag = false;
+        boolean flag = false;
         if (ValidationUtil.isEmpty(tel) || ValidationUtil.isEmpty(code)) {
             throw new BadRequest("参数校验失败.");
         }
@@ -158,17 +153,17 @@ public class RegUnitInfoController extends BaseController {
     public ResponseModel<Boolean> hasExistUser(@PathVariable(value = "userName") String userName) {
         boolean flag = false;
         AgencyUserModel user = Privilege.agencyUserClient.queryByUserName(userName).getResult();
-            if (user != null) {
+        if (user != null) {
             flag = true;
         }
         return ResponseHelper.buildResponse(flag);
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @DeleteMapping(value = "/{unitCode}/logOut")
     @ApiOperation(httpMethod = "DELETE", value = "企业注销", notes = "企业注销")
-    public ResponseModel unitLogOut(@PathVariable String unitCode){
+    public ResponseModel unitLogOut(@PathVariable String unitCode) {
         return ResponseHelper.buildResponse(iRegUnitInfoService.unitLogOut(unitCode));
     }
 

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderTraceDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCylinderService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+@RestController
+@Api(tags = "燃气气瓶Api")
+@RequestMapping(value = "/cylinder")
+public class TzCylinderController {
+
+    @Autowired
+    ITzCylinderService iTzCylinderService;
+
+    /**
+     * 气瓶基本信息列表分页查询
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "气瓶基本信息列表分页查询", notes = "气瓶基本信息列表分页查询")
+    public ResponseModel<IPage<TzCylinderInfoDto>> listPage(PageParam pageParam, TzCylinderInfoDto tzCylinderInfoDto, String key){
+        return ResponseHelper.buildResponse(iTzCylinderService.getCylinderInfoDtoList(pageParam,tzCylinderInfoDto,key));
+    }
+
+    /**
+     * 根据id查询追溯详情
+     * @param sequenceNbr 气瓶基本信息的sequenceNbr
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/trace/{sequenceNbr}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询追溯详情", notes = "根据sequenceNbr查询追溯详情")
+    public ResponseModel<TzCylinderTraceDto> selectById(HttpServletRequest request, @PathVariable String sequenceNbr){
+        return ResponseHelper.buildResponse(iTzCylinderService.getCylinderTraceDto(sequenceNbr));
+    }
+
+
+}

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

@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-public class CylinderFillingCheckServiceImpl extends BaseService<CylinderFillingCheckDto,CylinderFillingCheck,CylinderFillingCheckMapper> implements ICylinderFillingCheckService {
+public class CylinderFillingCheckServiceImpl extends BaseService<CylinderFillingCheckDto, CylinderFillingCheck,CylinderFillingCheckMapper> implements ICylinderFillingCheckService {
     /**
      * 分页查询
      */

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-public class CylinderFillingExamineServiceImpl extends BaseService<CylinderFillingExamineDto,CylinderFillingExamine,CylinderFillingExamineMapper> implements ICylinderFillingExamineService {
+public class CylinderFillingExamineServiceImpl extends BaseService<CylinderFillingExamineDto, CylinderFillingExamine,CylinderFillingExamineMapper> implements ICylinderFillingExamineService {
     /**
      * 分页查询
      */

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

@@ -45,14 +45,14 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
     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.getFillingUnitName(),
+//                cylinderFillingRecordDto.getPropertyUnit(),
+//                cylinderFillingRecordDto.getFactoryNum(),
+//                cylinderFillingRecordDto.getCylinderVariety(),
+//                cylinderFillingRecordDto.getQrCode(),
+//                cylinderFillingRecordDto.getElectronicLabelCode(),
+//                cylinderFillingRecordDto.getSequenceCode(),
+//                cylinderFillingRecordDto.getUnitInnerCode(),
                 cylinderFillingRecordDto.getFillingStarttime(),
                 cylinderFillingRecordDto.getFillingEndtime(),
                 sortParam, sortRule, cylinderFillingRecordDto.getAppId()

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

@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-public class CylinderFillingServiceImpl extends BaseService<CylinderFillingDto,CylinderFilling,CylinderFillingMapper> implements ICylinderFillingService {
+public class CylinderFillingServiceImpl extends BaseService<CylinderFillingDto, CylinderFilling,CylinderFillingMapper> implements ICylinderFillingService {
     /**
      * 分页查询
      */

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

@@ -591,8 +591,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
     public Page<CylinderInfoDto> earlyWarningLevelPageList(Page<CylinderInfoDto> page, String earlyWarningLevel) {
         Page<CylinderInfoDto> result = this.baseMapper.queryPageListByEarlyWarningLevel(page, earlyWarningLevel);
         result.getRecords().forEach(r -> {
-            r.setEarlyWarningLevelName(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getName());
-            r.setInspectionStatusDesc(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getStatus());
+//            r.setEarlyWarningLevelName(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getName());
+//            r.setInspectionStatusDesc(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getStatus());
         });
 
         return result;
@@ -638,16 +638,16 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
         CylinderInfoDto cylinderInfoDto = this.getDetail(r.getSequenceCode());
         try {
             CylWarningMsgDto cylWarningMsgDto = new CylWarningMsgDto();
-            int interval = DateUtils.dateBetweenIncludeToday(now, cylinderInfoDto.getNextInspectionDate()) - 1;
-            cylWarningMsgDto.setNum(String.valueOf(interval));
+//            int interval = DateUtils.dateBetweenIncludeToday(now, cylinderInfoDto.getNextInspectionDate()) - 1;
+//            cylWarningMsgDto.setNum(String.valueOf(interval));
             cylWarningMsgDto.setFactoryNum(cylinderInfoDto.getFactoryNum());
-            cylWarningMsgDto.setUserType(cylinderInfoDto.getCustomType());
-            cylWarningMsgDto.setUserPeople(cylinderInfoDto.getCustomName());
-            cylWarningMsgDto.setUserPeoplePhone(cylinderInfoDto.getContactPhone());
+//            cylWarningMsgDto.setUserType(cylinderInfoDto.getCustomType());
+//            cylWarningMsgDto.setUserPeople(cylinderInfoDto.getCustomName());
+//            cylWarningMsgDto.setUserPeoplePhone(cylinderInfoDto.getContactPhone());
             cylWarningMsgDto.setCylSeq(cylinderInfoDto.getSequenceCode());
             cylWarningMsgDto.setCompanyName(cylinderInfoDto.getUnitName());
-            cylWarningMsgDto.setPhone(cylinderInfoDto.getPersonMobilePhone());
-            cylWarningMsgDto.setPeople(cylinderInfoDto.getUnitPerson());
+//            cylWarningMsgDto.setPhone(cylinderInfoDto.getPersonMobilePhone());
+//            cylWarningMsgDto.setPeople(cylinderInfoDto.getUnitPerson());
             cylWarningMsgDto.setCurrentTime(dateStr);
             // 2.循环调用规则 触发计算等级及发送消息
             if (log.isInfoEnabled()) {
@@ -661,7 +661,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 
     public CylinderInfoDto getDetail(String sequenceCode) {
         CylinderInfoDto dto = this.baseMapper.getDetail(sequenceCode);
-        dto.setInspectionStatusDesc(StringUtils.isNotEmpty(dto.getEarlyWarningLevel()) ? EarlyWarningLevelEnum.getEumByLevel(dto.getEarlyWarningLevel()).getStatus() : "");
+//        dto.setInspectionStatusDesc(StringUtils.isNotEmpty(dto.getEarlyWarningLevel()) ? EarlyWarningLevelEnum.getEumByLevel(dto.getEarlyWarningLevel()).getStatus() : "");
         return dto;
     }
 
@@ -692,7 +692,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
         List<CylinderInfo> cylinderInfos = new ArrayList<>();
         cylinderInfoDtos.forEach(c -> {
             CylinderInfo cylinderInfo = this.getOne(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getSequenceCode, c.getSequenceCode()));
-            cylinderInfo.setNextInspectionDate(c.getNextInspectionDate());
+//            cylinderInfo.setNextInspectionDate(c.getNextInspectionDate());
             cylinderInfos.add(cylinderInfo);
         });
         if (!cylinderInfos.isEmpty()) {

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-public class CylinderInspectionServiceImpl extends BaseService<CylinderInspectionDto,CylinderInspection,CylinderInspectionMapper> implements ICylinderInspectionService {
+public class CylinderInspectionServiceImpl extends BaseService<CylinderInspectionDto, CylinderInspection,CylinderInspectionMapper> implements ICylinderInspectionService {
     /**
      * 分页查询
      */

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-public class CylinderTagsServiceImpl extends BaseService<CylinderTagsDto,CylinderTags,CylinderTagsMapper> implements ICylinderTagsService {
+public class CylinderTagsServiceImpl extends BaseService<CylinderTagsDto, CylinderTags,CylinderTagsMapper> implements ICylinderTagsService {
     /**
      * 分页查询
      */

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2021-12-14
  */
 @Service
-public class CylinderUnitServiceImpl extends BaseService<CylinderUnitDto,CylinderUnit,CylinderUnitMapper> implements ICylinderUnitService {
+public class CylinderUnitServiceImpl extends BaseService<CylinderUnitDto, CylinderUnit,CylinderUnitMapper> implements ICylinderUnitService {
     /**
      * 分页查询
      */
@@ -52,7 +52,13 @@ public class CylinderUnitServiceImpl extends BaseService<CylinderUnitDto,Cylinde
     }
 
 
+    /**
+     * 后边对接需要更改，目前没值默认0
+     * @param code
+     * @return
+     */
     public Integer getWarnNum(String code) {
-        return baseMapper.getWarnNum(code);
+//        return baseMapper.getWarnNum(code);
+        return 0;
     }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.tzs.api.service.IRegUnitIcService;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.RegUnitIcMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IRegUnitIcService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.*;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.TzCylinderMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCylinderService;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 气瓶基本信息 服务实现类
+ *
+ * @author duanwei
+ * @date 2022-08-11
+ */
+@Service
+public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, CylinderInfo, TzCylinderMapper> implements ITzCylinderService {
+
+    @Autowired
+    private TzCylinderMapper tzCylinderMapper;
+
+    @Override
+    public IPage<TzCylinderInfoDto> getCylinderInfoDtoList(PageParam pageParam, TzCylinderInfoDto tzCylinderInfoDto, String key) {
+        Page<TzCylinderInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        System.out.println("key有值："+key);
+        String superviseOrgCode = Privilege.companyClient.seleteOne(Long.valueOf(key)).getResult().getOrgCode();
+        return tzCylinderMapper.getTzCylinderInfoList(page, tzCylinderInfoDto, superviseOrgCode);
+
+    }
+
+    @Override
+    public TzCylinderTraceDto getCylinderTraceDto(String sequenceNbr) {
+        String orgCode = tzCylinderMapper.getSequencCode(sequenceNbr);
+        TzCylinderProduceDto tzCylinderProduceDto = tzCylinderMapper.getTzCylinderProduceDto(orgCode);
+        TzCylinderInfoDto tzCylinderInfoDto = tzCylinderMapper.getTzCylinderInfoDto(sequenceNbr);
+        TzCylinderTagsDto tzCylinderTagsDto = tzCylinderMapper.getTzCylinderTagsDto(orgCode);
+        List<TzCylinderInspectionDto> tzCylinderInspectionDtoList = tzCylinderMapper.getTzCylinderInspectionDto(orgCode);
+        List<TzCylinderFillingDto> tzCylinderFillingDtoList = tzCylinderMapper.getTzCylinderFillingDto(orgCode);
+
+
+        /**
+         * 取气瓶追溯详情 充装前检查项 名称和结果列表
+         */
+        List<TzCylinderCheckDto> tzCylinderCheckDtoList = tzCylinderMapper.getTzCylinderCheckItem();
+        Map<String,String> map = new HashMap<>();
+        for(TzCylinderCheckDto tzCylinderCheckDto : tzCylinderCheckDtoList){
+            map.put(tzCylinderCheckDto.getItem(), tzCylinderCheckDto.getExplain());
+        }
+        for(TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList){
+            List<TzCylinderCheckDto> tzCylinderCheckDtoListResult = new ArrayList<>();
+            TzCylinderBeforeCheckDto tzcylinderBeforeCheckDto = tzCylinderMapper.getTzCylinderBeforeCheck(tzCylinderFillingDto.getFillingBeforeId());
+            JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderBeforeCheckDto));
+            for( String str : obj.keySet())
+            {
+                String explain = map.get(str);
+                String value = String.valueOf(obj.get(str)) ;
+                TzCylinderCheckDto tzcylinderCheckDto = new TzCylinderCheckDto(str,explain,value);
+                tzCylinderCheckDtoListResult.add(tzcylinderCheckDto);
+            }
+            tzCylinderFillingDto.setTzCylinderCheckDtoList(tzCylinderCheckDtoListResult);
+        }
+
+        /**
+         * 取气瓶追溯详情 充装后检查项 名称和结果列表
+         */
+        List<TzCylinderCheckDto> tzCylinderAfterCheckDtoList = tzCylinderMapper.getTzCylinderAfterCheckItem();
+        Map<String,String> afterMap = new HashMap<>();
+        for(TzCylinderCheckDto tzCylinderCheckDto : tzCylinderAfterCheckDtoList){
+            afterMap.put(tzCylinderCheckDto.getItem(), tzCylinderCheckDto.getExplain());
+        }
+        for(TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList){
+            List<TzCylinderCheckDto> tzCylinderAfterCheckDtoListResult = new ArrayList<>();
+            TzCylinderAfterCheckDto tzcylinderAfterCheckDto = tzCylinderMapper.getTzCylinderAfterCheck(tzCylinderFillingDto.getFillingCheckId());
+            JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderAfterCheckDto));
+            for( String str : obj.keySet())
+            {
+                String explain = afterMap.get(str);
+                String value = String.valueOf(obj.get(str)) ;
+                TzCylinderCheckDto tzcylinderCheckDto = new TzCylinderCheckDto(str,explain,value);
+                tzCylinderAfterCheckDtoListResult.add(tzcylinderCheckDto);
+            }
+            tzCylinderFillingDto.setTzCylinderAfterCheckDtoList(tzCylinderAfterCheckDtoListResult);
+        }
+
+
+        return new TzCylinderTraceDto(tzCylinderProduceDto,tzCylinderInfoDto,tzCylinderTagsDto,tzCylinderInspectionDtoList,tzCylinderFillingDtoList);
+    }
+}