Skip to content

A
amos-boot-biz
Commit c9e8a36d authored by zhangyingbin's avatar zhangyingbin
Browse files
Options

燃气气瓶dto和entity修改，并修改service和controller

parent c761a6f1
Hide whitespace changes
Inline Side-by-side
Showing with 812 additions and 1845 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingCheckDto.java
View file @ c9e8a36d
......@@ -21,49 +21,89 @@ public class CylinderFillingCheckDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
@ApiModelProperty(value = "充装企业名称")
private String fillingUnitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "充装量在规定范围内")
private Integer withinScope;
@ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
private Integer sealedState;
@ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
private Integer defective;
@ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
private Integer abnormalTemperature;
@ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
private Integer warningSign;
@ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
private String compliance;
@ApiModelProperty(value = "检查人员姓名")
private String inspector;
@ApiModelProperty(value = "检查时间")
private String inspectionDate;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "id")
/**
* id
*/
private Long sequenceNbr;
@ApiModelProperty(value = "充装后复查ID")
/**
* 充装后复查ID
*/
private String fillingCheckId;
@ApiModelProperty(value = "充装量在规定范围内")
/**
* 充装量在规定范围内
*/
private Integer withinScope;
@ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
/**
* 瓶阀及其与瓶口连接的密封良好
*/
private Integer sealedState;
@ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
/**
* 瓶体未出现鼓包变形或泄露等严重缺陷
*/
private Integer defective;
@ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
/**
* 瓶体温度没有异常升高的迹象
*/
private Integer abnormalTemperature;
@ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
/**
* 气瓶粘贴警示标签和充装标签
*/
private Integer warningSign;
@ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
/**
* 液化气瓶充装量符合有关规定，充装后逐瓶称重
*/
private String compliance;
@ApiModelProperty(value = "检查结果")
/**
* 检查结果
*/
private String checkResults;
@ApiModelProperty(value = "不合格项")
/**
* 不合格项
*/
private String nonconformances;
@ApiModelProperty(value = "检查人员姓名")
/**
* 检查人员姓名
*/
private String inspector;
@ApiModelProperty(value = "检查时间")
/**
* 检查时间
*/
private String inspectionDate;
@ApiModelProperty(value = "创建时间")
/**
* 创建时间
*/
private Date recDate;
@ApiModelProperty(value = "操作人员")
/**
* 操作人员
*/
private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
/**
* 0-新增 1-更新 2-删除
*/
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
/**
* 对接公司编码
*/
private String appId;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingDto.java
View file @ c9e8a36d
......@@ -20,53 +20,109 @@ public class CylinderFillingDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "充装企业名称")
private String fillingUnitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "是否在检验有效期以内")
private String isValid;
@ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
private Integer same;
@ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
private Integer isRegulations;
@ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
private Integer isComplianceWithgbt;
@ApiModelProperty(value = "气瓶内有无剩余压力")
private Integer haveStillPressure;
@ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
private Integer isComplete;
@ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
private Integer haveSecurityDocuments;
@ApiModelProperty(value = "检查人员姓名")
private String inspectorUser;
@ApiModelProperty(value = "检查时间")
private String inspectionDate;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "id")
/**
* id
*/
private Long sequenceNbr;
@ApiModelProperty(value = "气瓶唯一标识码")
/**
* 气瓶唯一标识码
*/
private String sequenceCode;
@ApiModelProperty(value = "充装企业名称")
/**
* 充装企业名称
*/
private String fillingUnitName;
@ApiModelProperty(value = "检查人员姓名")
/**
* 检查人员姓名
*/
private String inspectorUser;
@ApiModelProperty(value = "检查时间")
/**
* 检查时间
*/
private String inspectionDate;
@ApiModelProperty(value = "统一社会信用代码")
/**
* 统一社会信用代码
*/
private String creditCode;
@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;
@ApiModelProperty(value = "检查结果")
/**
* 检查结果
*/
private String checkResults;
@ApiModelProperty(value = "不合格项")
/**
* 不合格项
*/
private String nonconformances;
@ApiModelProperty(value = "创建时间")
/**
* 创建时间
*/
private Date recDate;
@ApiModelProperty(value = "操作人员")
/**
* 操作人员
*/
private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
/**
* 0-新增 1-更新 2-删除
*/
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
/**
* 对接公司编码
*/
private String appId;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingExamineDto.java
View file @ c9e8a36d
......@@ -20,29 +20,36 @@ 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 = "同步时间 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 String appId;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingRecordDto.java
View file @ c9e8a36d
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,43 +22,36 @@ 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 = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
@ApiModelProperty(value = "产权单位")
private String propertyUnit;
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
@ApiModelProperty(value = "充装开始时间")
@TableField("filling_startTime")
private String fillingStarttime;
@ApiModelProperty(value = "充装结束时间")
@TableField("filling_endTime")
private String fillingEndtime;
@ApiModelProperty(value = "充装人员姓名")
private String fillingUser;
@ApiModelProperty(value = "不能与充装人员姓名相同")
private String inspectorName;
@ApiModelProperty(value = "充装量（Kg）")
private Double fillingQuantity;
......@@ -67,27 +61,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 +76,9 @@ 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 = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
private Integer isComplianceWithgbt;
@ApiModelProperty(value = "气瓶内有无剩余压力")
private Integer haveStillPressure;
@ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
private Integer isComplete;
@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;
/**
* 扩展字段
*/
private String sequenceCode;
private String fillingUnitName;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java
View file @ c9e8a36d
......@@ -24,127 +24,112 @@ 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 creditCode;
@ApiModelProperty(value = "产权单位名称")
private String unitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "气瓶状态str")
private String cylinderStatusStr;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "气瓶品种")
@ApiModelProperty(value = "设备品种")
private Integer cylinderVariety;
@ApiModelProperty(value = "气瓶品种str")
private String cylinderVarietyStr;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
@ApiModelProperty(value = "充装介质")
private String fillingMedia;
@ApiModelProperty(value = "二维码编号")
private String qrCode;
@ApiModelProperty(value = "气瓶制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode;
@ApiModelProperty(value = "制造日期")
private String manufacturingDate;
@ApiModelProperty(value = "充装介质")
private String fillingMedium;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "公称压力(MPa）")
private Double pressure;
@ApiModelProperty(value = "产品编号")
private String factoryNum;
@ApiModelProperty(value = "容积（L）")
private Double volume;
@ApiModelProperty(value = "制造日期")
private Date manufacturingDate;
@ApiModelProperty(value = "产品合格证")
private String productQualified;
@ApiModelProperty(value = "制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "质量证明书")
private String proofQuality;
@ApiModelProperty(value = "气瓶制造许可证")
private String license;
@ApiModelProperty(value = "监督检验证书")
private String supervisionInspec;
@ApiModelProperty(value = "气瓶重量（kg）")
private Double cylinderWeight;
@ApiModelProperty(value = "型式实验证书")
private String typeExperiments;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
@ApiModelProperty(value = "最近一次检验日期")
private Date inspectionDate;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "下次检验日期")
private Date nextInspectionDate;
@ApiModelProperty(value = "阀门制造单位")
private String valveManufacturUnit;
@ApiModelProperty(value = "检验日期开始")
private String inspectionDateStart;
@ApiModelProperty(value = "公称工作压力(MPa）")
private Double nominalWorkPressure;
@ApiModelProperty(value = "检验日期结束")
private String inspectionDateEnd;
@ApiModelProperty(value = "创建时间")
private Date recDate;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@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 = "查询单位appid")
private List<String> appIds;
@ApiModelProperty(value = "检验状态 0 已超期 1 正常 2 即将超期")
private int inspectionStatas;
/**
* 扩展字段 气瓶状态
*/
private String cylinderStatusStr;
@ApiModelProperty(value = "检验状态描述")
private String inspectionStatusDesc;
/**
* 宽展字段 设备品种
*/
private String cylinderVarietyStr;
@ApiModelProperty(value = "预警等级")
private String earlyWarningLevel;
/**
* 宽展字段
*/
private String regionCode;
/**
* 宽展字段
*/
private List<String> appIds;
/**
* 宽展字段
*/
private Date nextInspectionDate;
/**
* 宽展字段
*/
private Integer inspectionStatas;
/**
* 宽展字段
*/
private Map<String, List<AttachmentDto>> attachments;
@ApiModelProperty(value = "预警等级名称")
private String earlyWarningLevelName;
@ApiModelProperty(value = "最近配送地址")
private String address;
@ApiModelProperty(value = "最近预警时间")
private Date earlyWarningLevelCalDate;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "客户名称")
private String customType;
@ApiModelProperty(value = "客户类型")
private String customName;
@ApiModelProperty(value = "联系电话")
private String contactPhone;
@ApiModelProperty(value = "企业负责人手机")
private String personMobilePhone;
@ApiModelProperty(value = "企业负责人")
private String unitPerson;
@ApiModelProperty(value = "附件")
private Map<String, List<AttachmentDto>> attachments;
private String inspectionStatusDesc;
private String earlyWarningLevel;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInspectionDto.java
View file @ c9e8a36d
......@@ -21,37 +21,41 @@ public class CylinderInspectionDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "检验信息ID")
private String inspectionId;
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "检验单位")
private String inspectionUnit;
private Long sequenceNbr;
@ApiModelProperty(value = "产权单位名称")
private String propertyUnitName;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "检验单位")
private String inspectionUnit;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "检验日期")
private String inspectionDate;
@ApiModelProperty(value = "检验日期")
private String inspectionDate;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate;
@ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "不合格报废数量")
private String scrapQuantity;
@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;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderTagsDto.java
View file @ c9e8a36d
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,35 @@ public class CylinderTagsDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "标签ID")
private String tagId;
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "产权单位名称")
private String unitName;
private Long sequenceNbr;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "二维码编号")
@TableField("qrCode")
private String qrCode;
@ApiModelProperty(value = "二维码编号")
private String qrCode;
@ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode;
@ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode;
@ApiModelProperty(value = "气瓶钢印标识")
private String gasCylinderStamp;
@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;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderUnitDto.java
View file @ c9e8a36d
......@@ -22,6 +22,10 @@ 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 +35,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;
......@@ -52,73 +50,27 @@ public class CylinderUnitDto extends BaseDto {
@ApiModelProperty(value = "企业负责人固定电话")
private String personTelephone;
@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 String inspectionScope;
@ApiModelProperty(value = "安全管理员")
private String securityAdm;
@ApiModelProperty(value = "检验许可证有效期")
private Date effectiveDate;
@ApiModelProperty(value = "安全管理员手机")
private String securityAdmPhone;
@ApiModelProperty(value = "制造许可证号")
private String manufacturingLicense;
@ApiModelProperty(value = "制造许可证有效期")
private Date manufacturingDate;
@ApiModelProperty(value = "企业邮编")
private String postalCode;
@ApiModelProperty(value = "制造许可范围")
private String manufacturingScope;
@ApiModelProperty(value = "创建时间")
private Date recDate;
@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 String fillingPermitDateStart;
@ApiModelProperty(value = "充装许可证有效期结束")
private String fillingPermitDateEnd;
@ApiModelProperty(value = "行政许可有效期 0 已超期 1 正常 2 即将超期")
private Integer licenseStatus;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFilling.java
View file @ c9e8a36d
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;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
/**
* 充装前检查Id
*/
@TableField("filling_before_id")
private String fillingBeforeId;
/**
* 充装企业名称
*/
@TableField("filling_unit_name")
@ApiModelProperty(value = "充装企业名称")
private String fillingUnitName;
/**
* 出厂编号
*/
@TableField("factory_num")
private String factoryNum;
@ApiModelProperty(value = "检查人员姓名")
private String inspectorUser;
/**
* 气瓶唯一标识码
*/
@TableField("sequence_code")
private String sequenceCode;
@ApiModelProperty(value = "检查时间")
private String inspectionDate;
/**
* 是否在检验有效期以内
*/
@TableField("is_valid")
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@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")
private String inspectorUser;
@ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
private String fillBeforeItem;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
/**
* 检查时间
*/
@TableField("inspection_date")
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;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingCheck.java
View file @ c9e8a36d
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 checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
@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;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingExamine.java
View file @ c9e8a36d
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;
/**
* 报表生成时间
*/
@TableField("filling_audit_date")
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
@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
View file @ c9e8a36d
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 = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
@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 = "不能与充装人员姓名相同")
private String inspectorName;
@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;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java
View file @ c9e8a36d
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")
private String unitName;
/**
* 出厂编号
*/
@TableField("factory_num")
private String factoryNum;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
/**
* 气瓶状态
*/
@TableField("cylinder_status")
private Integer cylinderStatus;
@ApiModelProperty(value = "产权单位名称")
private String unitName;
/**
* 气瓶品种
*/
@TableField("cylinder_variety")
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@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")
private Double volume;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
/**
* 制造日期
*/
@TableField("manufacturing_date")
private Date manufacturingDate;
@ApiModelProperty(value = "充装介质")
private String fillingMedia;
/**
* 制造单位
*/
@TableField("manufacturing_unit")
@ApiModelProperty(value = "气瓶制造单位")
private String manufacturingUnit;
/**
* 气瓶制造许可证
*/
@TableField("license")
private String license;
/**
* 气瓶重量（kg）
*/
@TableField("cylinder_weight")
private Double cylinderWeight;
/**
* 单位内部编号
*/
@TableField("unit_inner_code")
private String unitInnerCode;
@ApiModelProperty(value = "制造日期")
private String manufacturingDate;
/**
* 最近一次检验日期
*/
@TableField("inspection_date")
private Date inspectionDate;
/**
* 下次检验日期
*/
@TableField("next_inspection_date")
private Date nextInspectionDate;
/**
* 气瓶唯一标识码
*/
@TableField("sequence_code")
private String sequenceCode;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "产品编号")
private String factoryNum;
@ApiModelProperty(value = "容积（L）")
private Double volume;
@ApiModelProperty(value = "产品合格证")
private String productQualified;
@ApiModelProperty(value = "质量证明书")
private String proofQuality;
@ApiModelProperty(value = "监督检验证书")
private String supervisionInspec;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
@TableField("sync_date")
@ApiModelProperty(value = "型式实验证书")
private String typeExperiments;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "阀门制造单位")
private String valveManufacturUnit;
@ApiModelProperty(value = "公称工作压力(MPa）")
private Double nominalWorkPressure;
@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;
/**
* 预警等级 计算日期
*/
private Date earlyWarningLevelCalDate;
/**
* 经度
*/
@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
View file @ c9e8a36d
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")
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 inspectionUnit;
@ApiModelProperty(value = "检验日期")
private String inspectionDate;
/**
* 下次检验日期
*/
@TableField("next_inspection_date")
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate;
/**
* 检验结果
*/
@TableField("inspection_result")
private String inspectionResult;
@ApiModelProperty(value = "不合格报废数量")
private String scrapQuantity;
/**
* 同步时间 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/CylinderTags.java
View file @ c9e8a36d
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 = "气瓶钢印标识")
private String gasCylinderStamp;
@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/CylinderUnit.java
View file @ c9e8a36d
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 securityAdm;
@ApiModelProperty(value = "安全管理员手机")
private String securityAdmPhone;
@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")
private String longitude;
/**
* 纬度
*/
@TableField("latitude")
private String latitude;
/**
* 数据完整度
*/
@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/TzCylinderFilling.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_filling")
@ApiModel(value="TzCylinderFilling对象", description="气瓶充装信息--充装前检查")
public class TzCylinderFilling extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "充装企业名称")
private String fillingUnitName;
@ApiModelProperty(value = "检查人员姓名")
private String inspectorUser;
@ApiModelProperty(value = "检查时间")
private String inspectionDate;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "是否在检验有效期以内")
private String isValid;
@ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
private Integer same;
@ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
private Integer isRegulations;
@ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
@TableField("is_compliance_withGBT")
private Integer isComplianceWithgbt;
@ApiModelProperty(value = "气瓶内有无剩余压力")
private Integer haveStillPressure;
@ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
private Integer isComplete;
@ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
private Integer haveSecurityDocuments;
@ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
private String fillBeforeItem;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
@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/entity/TzCylinderFillingCheck.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
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 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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_filling_check")
@ApiModel(value="TzCylinderFillingCheck对象", description="液化气体气瓶充装信息-充装后复查")
public class TzCylinderFillingCheck extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
@ApiModelProperty(value = "充装量在规定范围内")
private Integer withinScope;
@ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
private Integer sealedState;
@ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
private Integer defective;
@ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
private Integer abnormalTemperature;
@ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
private Integer warningSign;
@ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
private String compliance;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
@ApiModelProperty(value = "检查人员姓名")
private String inspector;
@ApiModelProperty(value = "检查时间")
private String inspectionDate;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
private String appId;
@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/TzCylinderFillingExamine.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
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 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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_filling_examine")
@ApiModel(value="TzCylinderFillingExamine对象", description="液化气体气瓶充装信息审核")
public class TzCylinderFillingExamine extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
@ApiModelProperty(value = "报表生成时间")
private String fillingAuditDate;
@ApiModelProperty(value = "充装审核报表附件地址")
private String fillingAuditUrl;
@ApiModelProperty(value = "充装审核报表附件名称")
private String fillingAuditName;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
private String appId;
@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/TzCylinderFillingRecord.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_filling_record")
@ApiModel(value="TzCylinderFillingRecord对象", description="液化气体气瓶充装信息-充装记录")
public class TzCylinderFillingRecord extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "充装记录Id")
private String fillingRecordId;
@ApiModelProperty(value = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
@ApiModelProperty(value = "充装开始时间")
@TableField("filling_startTime")
private String fillingStarttime;
@ApiModelProperty(value = "充装结束时间")
@TableField("filling_endTime")
private String fillingEndtime;
@ApiModelProperty(value = "充装人员姓名")
private String fillingUser;
@ApiModelProperty(value = "不能与充装人员姓名相同")
private String inspectorName;
@ApiModelProperty(value = "充装量（Kg）")
private Double fillingQuantity;
@ApiModelProperty(value = "室温")
private Double temperature;
@ApiModelProperty(value = "异常情况")
private Integer abnormal;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据")
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/entity/TzCylinderInfo.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
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 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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_info")
@ApiModel(value="TzCylinderInfo对象", description="气瓶基本信息")
public class TzCylinderInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "产权单位名称")
private String unitName;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "设备品种")
private Integer cylinderVariety;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
@ApiModelProperty(value = "充装介质")
private String fillingMedia;
@ApiModelProperty(value = "气瓶制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "制造日期")
private String manufacturingDate;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "产品编号")
private String factoryNum;
@ApiModelProperty(value = "容积（L）")
private Double volume;
@ApiModelProperty(value = "产品合格证")
private String productQualified;
@ApiModelProperty(value = "质量证明书")
private String proofQuality;
@ApiModelProperty(value = "监督检验证书")
private String supervisionInspec;
@ApiModelProperty(value = "型式实验证书")
private String typeExperiments;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "阀门制造单位")
private String valveManufacturUnit;
@ApiModelProperty(value = "公称工作压力(MPa）")
private Double nominalWorkPressure;
@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/entity/TzCylinderInspection.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
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 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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_inspection")
@ApiModel(value="TzCylinderInspection对象", description="气瓶检验信息")
public class TzCylinderInspection extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "检验单位")
private String inspectionUnit;
@ApiModelProperty(value = "检验日期")
private String inspectionDate;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate;
@ApiModelProperty(value = "不合格报废数量")
private String scrapQuantity;
@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/entity/TzCylinderTags.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_tags")
@ApiModel(value="TzCylinderTags对象", description="气瓶标签信息")
public class TzCylinderTags extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "二维码编号")
@TableField("qrCode")
private String qrCode;
@ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode;
@ApiModelProperty(value = "气瓶钢印标识")
private String gasCylinderStamp;
@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/entity/TzCylinderUnit.java deleted 100644 → 0
View file @ c761a6f1
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
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 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 duanwei
* @date 2022-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_cylinder_unit")
@ApiModel(value="TzCylinderUnit对象", description="气瓶企业信息")
public class TzCylinderUnit extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "单位ID")
private String unitId;
@ApiModelProperty(value = "所属区域")
private String regionCode;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "详细地址")
private String address;
@ApiModelProperty(value = "企业负责人")
private String unitPerson;
@ApiModelProperty(value = "企业负责人手机")
private String personMobilePhone;
@ApiModelProperty(value = "企业负责人固定电话")
private String personTelephone;
@ApiModelProperty(value = "安全管理员")
private String securityAdm;
@ApiModelProperty(value = "安全管理员手机")
private String securityAdmPhone;
@ApiModelProperty(value = "企业邮编")
private String postalCode;
@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/mapper/CylinderFillingCheckMapper.java
View file @ c9e8a36d
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
View file @ c9e8a36d
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
View file @ c9e8a36d
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
View file @ c9e8a36d
......@@ -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("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("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
View file @ c9e8a36d
......@@ -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
View file @ c9e8a36d
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
View file @ c9e8a36d
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
View file @ c9e8a36d
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/TzCylinderMapper.java
View file @ c9e8a36d
......@@ -4,7 +4,7 @@ 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.TzCylinderInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
import java.util.List;
......@@ -14,7 +14,7 @@ import java.util.List;
* @author duanwei
* @date 2022-08-11
*/
public interface TzCylinderMapper extends BaseMapper<TzCylinderInfo> {
public interface TzCylinderMapper extends BaseMapper<CylinderInfo> {
IPage<TzCylinderInfoDto> getTzCylinderInfoList(Page<TzCylinderInfoDto> page, TzCylinderInfoDto tzCylinderInfoDto, String superviseOrgCode);
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ITzCylinderService.java
View file @ c9e8a36d
......@@ -5,7 +5,7 @@ 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.TzCylinderInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
/**
* 气瓶基本信息 服务类
......@@ -13,7 +13,7 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.entity.TzCylinderInfo;
* @author duanwei
* @date 2022-08-11
*/
public interface ITzCylinderService extends IService<TzCylinderInfo> {
public interface ITzCylinderService extends IService<CylinderInfo> {
IPage<TzCylinderInfoDto> getCylinderInfoDtoList(PageParam pageParam, TzCylinderInfoDto idxBizCarcylUserCompany, String key);
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESCylinderServiceImpl.java
View file @ c9e8a36d
......@@ -10,7 +10,6 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.EsCylinder;
import com.yeejoin.amos.boot.module.tzs.api.enums.SpecialEquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.tzs.biz.dao.ESCylinderRepository;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EndUser;
import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnitServiceImpl;
import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EndUserServiceImpl;
......@@ -66,31 +65,31 @@ public class ESCylinderServiceImpl {
if (!ValidationUtil.isEmpty(cylinderInfoList)) {
cylinderInfoList.forEach(cylinderInfo -> {
EsCylinder esCylinder = new EsCylinder();
if (StringUtils.isNotEmpty(cylinderInfo.getLongitude())) {
esCylinder.setLongitude(Double.parseDouble(cylinderInfo.getLongitude()));
}
if (StringUtils.isNotEmpty(cylinderInfo.getLatitude())) {
esCylinder.setLatitude(Double.parseDouble(cylinderInfo.getLatitude()));
}
// if (StringUtils.isNotEmpty(cylinderInfo.getLongitude())) {
// esCylinder.setLongitude(Double.parseDouble(cylinderInfo.getLongitude()));
// }
// if (StringUtils.isNotEmpty(cylinderInfo.getLatitude())) {
// esCylinder.setLatitude(Double.parseDouble(cylinderInfo.getLatitude()));
// }
esCylinder.setSequenceNbr(cylinderInfo.getSequenceNbr());
EndUser endUser = endUserService.getOne(new LambdaQueryWrapper<EndUser>().eq(EndUser::getCustomCode,
cylinderInfo.getEndCustomCode()));
if (!ValidationUtil.isEmpty(endUser)) {
esCylinder.setAddress(endUser.getAddress());
}
CylinderUnit cylinderUnit =
cylinderUnitService.getOne(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,
cylinderInfo.getAppId()));
if (!ValidationUtil.isEmpty(cylinderUnit)) {
esCylinder.setRegionCode(cylinderUnit.getRegionCode());
}
// EndUser endUser = endUserService.getOne(new LambdaQueryWrapper<EndUser>().eq(EndUser::getCustomCode,
// cylinderInfo.getEndCustomCode()));
// if (!ValidationUtil.isEmpty(endUser)) {
// esCylinder.setAddress(endUser.getAddress());
// }
// CylinderUnit cylinderUnit =
// cylinderUnitService.getOne(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,
// cylinderInfo.getAppId()));
// if (!ValidationUtil.isEmpty(cylinderUnit)) {
// esCylinder.setRegionCode(cylinderUnit.getRegionCode());
// }
esCylinder.setFactoryNum(cylinderInfo.getFactoryNum());
esCylinder.setUnitName(cylinderInfo.getUnitName());
if (StringUtils.isNotBlank(cylinderInfo.getLatitude()) && StringUtils.isNotBlank(cylinderInfo.getLongitude())) {
double lat = Double.parseDouble(cylinderInfo.getLatitude());
double lon = Double.parseDouble(cylinderInfo.getLongitude());
esCylinder.setLocation(new GeoPoint(lat, lon));
}
// if (StringUtils.isNotBlank(cylinderInfo.getLatitude()) && StringUtils.isNotBlank(cylinderInfo.getLongitude())) {
// double lat = Double.parseDouble(cylinderInfo.getLatitude());
// double lon = Double.parseDouble(cylinderInfo.getLongitude());
// esCylinder.setLocation(new GeoPoint(lat, lon));
// }
esCylinderList.add(esCylinder);
});
}
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java
View file @ c9e8a36d
......@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import com.yeejoin.amos.boot.module.tzs.api.entity.MsgLog;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ESCylinderServiceImpl;
......@@ -23,10 +22,8 @@ import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnitService
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.common.recycler.Recycler;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
......@@ -512,12 +509,12 @@ public class CylinderInfoController extends BaseController {
if (!ValidationUtil.isEmpty(cylinderInfo.getAppId())) {
queryWrapper.eq("app_id", cylinderInfo.getAppId());
}
if (!ValidationUtil.isEmpty(cylinderInfo.getInspectionDateStart())) {
queryWrapper.ge("inspection_date", cylinderInfo.getInspectionDateStart());
}
if (!ValidationUtil.isEmpty(cylinderInfo.getInspectionDateEnd())) {
queryWrapper.le("inspection_date", cylinderInfo.getInspectionDateEnd());
}
// if (!ValidationUtil.isEmpty(cylinderInfo.getInspectionDateStart())) {
// queryWrapper.ge("inspection_date", cylinderInfo.getInspectionDateStart());
// }
// if (!ValidationUtil.isEmpty(cylinderInfo.getInspectionDateEnd())) {
// queryWrapper.le("inspection_date", cylinderInfo.getInspectionDateEnd());
// }
if (!ValidationUtil.isEmpty(cylinderInfo.getUnitName())) { // 产权单位
queryWrapper.like("unit_name", cylinderInfo.getUnitName());
}
......@@ -527,12 +524,12 @@ public class CylinderInfoController extends BaseController {
if (!ValidationUtil.isEmpty(cylinderInfo.getCylinderVariety())) {// 气瓶品种
queryWrapper.eq("cylinder_variety", cylinderInfo.getCylinderVariety());
}
if (!ValidationUtil.isEmpty(cylinderInfo.getQrCode())) {// 二维码编号
queryWrapper.like("qrCode", cylinderInfo.getQrCode());
}
if (!ValidationUtil.isEmpty(cylinderInfo.getElectronicLabelCode())) {// 电子标签编号
queryWrapper.like("electronic_label_code", cylinderInfo.getElectronicLabelCode());
}
// if (!ValidationUtil.isEmpty(cylinderInfo.getQrCode())) {// 二维码编号
// queryWrapper.like("qrCode", cylinderInfo.getQrCode());
// }
// if (!ValidationUtil.isEmpty(cylinderInfo.getElectronicLabelCode())) {// 电子标签编号
// queryWrapper.like("electronic_label_code", cylinderInfo.getElectronicLabelCode());
// }
if (!ValidationUtil.isEmpty(cylinderInfo.getSequenceCode())) {// 气瓶唯一标识码
queryWrapper.like("sequence_code", cylinderInfo.getSequenceCode());
}
......@@ -662,26 +659,26 @@ public class CylinderInfoController extends BaseController {
regionCode += this.regionMap.get(Integer.parseInt(regionCodes[i]));
}
target.setRegionCode(regionCode);
if (1 == cylinderUnit.getUnitType()) {
target.setUnitTypeStr("液化石油气瓶充装单位");
} else if (2 == cylinderUnit.getUnitType()) {
target.setUnitTypeStr("液化石油气瓶检验单位");
} else if (3 == cylinderUnit.getUnitType()) {
target.setUnitTypeStr("液化石油气瓶生产单位");
} else {
target.setUnitTypeStr("");
}
target.setCylinderNumber((long) cylinderInfoServiceImpl.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, target.getAppId())));
target.setCylinderOutOfDate((long) cylinderInfoServiceImpl.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, target.getAppId()).le(CylinderInfo::getNextInspectionDate, new Date())));
Date nextDate = target.getFillingPermitDate();
long dates = nextDate.getTime() - System.currentTimeMillis();
if (dates >= 1000 * 60 * 60 * 24 * 200) {
target.setLicenseStatus(1);
} else if (0 < dates && dates < 1000 * 60 * 60 * 24 * 200) {
target.setLicenseStatus(2);
} else {
target.setLicenseStatus(0);
}
// if (1 == cylinderUnit.getUnitType()) {
// target.setUnitTypeStr("液化石油气瓶充装单位");
// } else if (2 == cylinderUnit.getUnitType()) {
// target.setUnitTypeStr("液化石油气瓶检验单位");
// } else if (3 == cylinderUnit.getUnitType()) {
// target.setUnitTypeStr("液化石油气瓶生产单位");
// } else {
// target.setUnitTypeStr("");
// }
// target.setCylinderNumber((long) cylinderInfoServiceImpl.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, target.getAppId())));
// target.setCylinderOutOfDate((long) cylinderInfoServiceImpl.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, target.getAppId()).le(CylinderInfo::getNextInspectionDate, new Date())));
// Date nextDate = target.getFillingPermitDate();
// long dates = nextDate.getTime() - System.currentTimeMillis();
// if (dates >= 1000 * 60 * 60 * 24 * 200) {
// target.setLicenseStatus(1);
// } else if (0 < dates && dates < 1000 * 60 * 60 * 24 * 200) {
// target.setLicenseStatus(2);
// } else {
// target.setLicenseStatus(0);
// }
return ResponseHelper.buildResponse(target);
}
......@@ -699,21 +696,21 @@ public class CylinderInfoController extends BaseController {
queryWrapper.orderByDesc("sync_date");
}
if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateStart())) { // 许可有效期
queryWrapper.ge("filling_permit_date", cylinderUnitDto.getFillingPermitDateStart());
}
// if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateStart())) { // 许可有效期
// queryWrapper.ge("filling_permit_date", cylinderUnitDto.getFillingPermitDateStart());
// }
if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateEnd())) {
queryWrapper.le("filling_permit_date", cylinderUnitDto.getFillingPermitDateEnd());
}
// if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateEnd())) {
// queryWrapper.le("filling_permit_date", cylinderUnitDto.getFillingPermitDateEnd());
// }
if (!ValidationUtil.isEmpty(cylinderUnitDto.getUnitName())) { // 企业名称
queryWrapper.like("unit_name", cylinderUnitDto.getUnitName());
}
if (!ValidationUtil.isEmpty(cylinderUnitDto.getUnitType())) {// 企业类型
queryWrapper.eq("unit_type", cylinderUnitDto.getUnitType());
}
// if (!ValidationUtil.isEmpty(cylinderUnitDto.getUnitType())) {// 企业类型
// queryWrapper.eq("unit_type", cylinderUnitDto.getUnitType());
// }
if (!ValidationUtil.isEmpty(cylinderUnitDto.getCreditCode())) {// 统一社会信用代码
queryWrapper.like("credit_code", cylinderUnitDto.getCreditCode());
......@@ -727,12 +724,12 @@ public class CylinderInfoController extends BaseController {
if (!ValidationUtil.isEmpty(cylinderUnitDto.getPersonMobilePhone())) {// 负责人手机
queryWrapper.like("person_mobile_phone", cylinderUnitDto.getPersonMobilePhone());
}
if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingLicense())) {// 许可证号
queryWrapper.like("filling_license", cylinderUnitDto.getFillingLicense());
}
if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermScope())) {// 许可范围
queryWrapper.like("filling_perm_scope", cylinderUnitDto.getFillingPermScope());
}
// if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingLicense())) {// 许可证号
// queryWrapper.like("filling_license", cylinderUnitDto.getFillingLicense());
// }
// if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermScope())) {// 许可范围
// queryWrapper.like("filling_perm_scope", cylinderUnitDto.getFillingPermScope());
// }
if (!ValidationUtil.isEmpty(cylinderUnitDto.getRegionCode())) {// 所属区域
queryWrapper.like("region_code", cylinderUnitDto.getRegionCode());
}
......@@ -762,16 +759,16 @@ public class CylinderInfoController extends BaseController {
regionCode += this.regionMap.get(Integer.parseInt(regionCodes[i]));
}
target.setRegionCode(regionCode);
if (1 == item.getUnitType()) {
target.setUnitTypeStr("液化石油气瓶充装单位");
} else if (2 == item.getUnitType()) {
target.setUnitTypeStr("液化石油气瓶检验单位");
} else if (3 == item.getUnitType()) {
target.setUnitTypeStr("液化石油气瓶生产单位");
} else {
target.setUnitTypeStr("");
}
target.setCylinderNumber((long) cylinderInfoServiceImpl.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, target.getAppId())));
// if (1 == item.getUnitType()) {
// target.setUnitTypeStr("液化石油气瓶充装单位");
// } else if (2 == item.getUnitType()) {
// target.setUnitTypeStr("液化石油气瓶检验单位");
// } else if (3 == item.getUnitType()) {
// target.setUnitTypeStr("液化石油气瓶生产单位");
// } else {
// target.setUnitTypeStr("");
// }
// target.setCylinderNumber((long) cylinderInfoServiceImpl.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, target.getAppId())));
return target;
} catch (Exception e) {
return null;
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderUnitController.java
View file @ c9e8a36d
......@@ -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);
......@@ -81,12 +81,12 @@ 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"));
}
if(cylinderInfo.get("outOfDateNum") != null) {
unit.setCylinderOutOfDate(cylinderInfo.get("outOfDateNum"));
}
// if(cylinderInfo.get("cylinderNum") != null) {
// unit.setCylinderNumber(cylinderInfo.get("cylinderNum"));
// }
// if(cylinderInfo.get("outOfDateNum") != null) {
// 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/TzCylinderController.java
View file @ c9e8a36d
......@@ -4,7 +4,6 @@ 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.entity.TzCylinderInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCylinderService;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingCheckServiceImpl.java
View file @ c9e8a36d
......@@ -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
View file @ c9e8a36d
......@@ -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
View file @ c9e8a36d
......@@ -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.getFillingUnitName(),
// cylinderFillingRecordDto.getPropertyUnit(),
// cylinderFillingRecordDto.getFactoryNum(),
// cylinderFillingRecordDto.getCylinderVariety(),
// cylinderFillingRecordDto.getQrCode(),
// cylinderFillingRecordDto.getElectronicLabelCode(),
cylinderFillingRecordDto.getSequenceCode(),
cylinderFillingRecordDto.getUnitInnerCode(),
// 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
View file @ c9e8a36d
......@@ -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
View file @ c9e8a36d
......@@ -641,13 +641,13 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
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()) {
......@@ -681,8 +681,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
*/
public CylinderInfo updateEarlyWarningLevel(String sequenceCode, String level) {
CylinderInfo cylinderInfo = this.getOne(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getSequenceCode, sequenceCode));
cylinderInfo.setEarlyWarningLevel(level);
cylinderInfo.setEarlyWarningLevelCalDate(new Date());
// cylinderInfo.setEarlyWarningLevel(level);
// cylinderInfo.setEarlyWarningLevelCalDate(new Date());
this.updateById(cylinderInfo);
return cylinderInfo;
}
......@@ -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
View file @ c9e8a36d
......@@ -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
View file @ c9e8a36d
......@@ -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
View file @ c9e8a36d
......@@ -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 {
/**
* 分页查询
*/
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/TzCylinderServiceImpl.java
View file @ c9e8a36d
......@@ -5,7 +5,7 @@ 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.TzCylinderInfo;
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;
......@@ -25,7 +25,7 @@ import java.util.Map;
* @date 2022-08-11
*/
@Service
public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, TzCylinderInfo, TzCylinderMapper> implements ITzCylinderService {
public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, CylinderInfo, TzCylinderMapper> implements ITzCylinderService {
@Autowired
private TzCylinderMapper tzCylinderMapper;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment