Skip to content

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

燃气气瓶修改dto和entity，service和controller中注释了涉及到修改字段的代码

parent 19c5257e
Hide whitespace changes
Inline Side-by-side
Showing with 410 additions and 418 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 @ 38d429c6
......@@ -21,89 +21,59 @@ public class CylinderFillingCheckDto extends BaseDto {
private static final long serialVersionUID = 1L;
@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;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingDto.java
View file @ 38d429c6
package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
......@@ -20,109 +21,76 @@ public class CylinderFillingDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
/**
* id
*/
private Long sequenceNbr;
@ApiModelProperty(value = "气瓶唯一标识码")
/**
* 气瓶唯一标识码
*/
private String sequenceCode;
@ApiModelProperty(value = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "充装企业名称")
/**
* 充装企业名称
*/
private String fillingUnitName;
@ApiModelProperty(value = "检查人员姓名")
/**
* 检查人员姓名
*/
private String inspectorUser;
@ApiModelProperty(value = "检查时间")
/**
* 检查时间
*/
private String inspectionDate;
@ApiModelProperty(value = "统一社会信用代码")
/**
* 统一社会信用代码
*/
private String creditCode;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "是否在检验有效期以内")
/**
* 是否在检验有效期以内
*/
private String isValid;
@ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
/**
* 警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致
*/
private Integer same;
@ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
/**
* 气瓶外表面的颜色标志是否符合规定
*/
private Integer isRegulations;
@ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
/**
* 气瓶瓶阀的出气口螺纹型式是否符合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 = "检查人员姓名")
private String inspectorUser;
@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;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
private String fillBeforeItem;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingExamineDto.java
View file @ 38d429c6
......@@ -51,5 +51,6 @@ public class CylinderFillingExamineDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingRecordDto.java
View file @ 38d429c6
......@@ -21,7 +21,6 @@ import java.util.Date;
public class CylinderFillingRecordDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long sequenceNbr;
......@@ -29,15 +28,6 @@ public class CylinderFillingRecordDto extends BaseDto {
@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;
......@@ -49,9 +39,6 @@ public class CylinderFillingRecordDto extends BaseDto {
@ApiModelProperty(value = "充装人员姓名")
private String fillingUser;
@ApiModelProperty(value = "不能与充装人员姓名相同")
private String inspectorName;
@ApiModelProperty(value = "充装量（Kg）")
private Double fillingQuantity;
......@@ -76,9 +63,20 @@ public class CylinderFillingRecordDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码")
private String appId;
/**
* 扩展字段
*/
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "不能与充装人员姓名相同")
private String inspectorName;
@ApiModelProperty(value = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
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 @ 38d429c6
......@@ -28,59 +28,41 @@ public class CylinderInfoDto extends BaseDto {
private Long sequenceNbr;
@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 factoryNum;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "产品编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶品种")
private Integer cylinderVariety;
@ApiModelProperty(value = "容积（L）")
private Double volume;
@ApiModelProperty(value = "产品合格证")
private String productQualified;
@ApiModelProperty(value = "制造日期")
private String manufacturingDate;
@ApiModelProperty(value = "质量证明书")
private String proofQuality;
@ApiModelProperty(value = "制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "监督检验证书")
private String supervisionInspec;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
@ApiModelProperty(value = "型式实验证书")
private String typeExperiments;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "Ԥ???ȼ?")
private String earlyWarningLevel;
@ApiModelProperty(value = "阀门制造单位")
private String valveManufacturUnit;
@ApiModelProperty(value = "????Ԥ??ʱ?")
private Date earlyWarningLevelCalDate;
@ApiModelProperty(value = "公称工作压力(MPa）")
private Double nominalWorkPressure;
@ApiModelProperty(value = "????վ??ʹ???û????")
private String endCustomCode;
@ApiModelProperty(value = "创建时间")
private Date recDate;
......@@ -97,39 +79,50 @@ public class CylinderInfoDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
/**
* 扩展字段 气瓶状态
*/
private String cylinderStatusStr;
@ApiModelProperty(value = "???")
private String longitude;
@ApiModelProperty(value = "γ?")
private String latitude;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "充装介质")
private String fillingMedia;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "产品合格证")
private String productQualified;
@ApiModelProperty(value = "质量证明书")
private String proofQuality;
@ApiModelProperty(value = "监督检验证书")
private String supervisionInspec;
@ApiModelProperty(value = "型式实验证书")
private String typeExperiments;
@ApiModelProperty(value = "阀门制造单位")
private Double valveManufacturUnit;
@ApiModelProperty(value = "公称工作压力(MPa）")
private String nominalWorkPressure;
@ApiModelProperty(value = "设备品种名称")
private String cylinderVarietyName;
@ApiModelProperty(value = "充装介质名称")
private String fillingMediaName;
/**
* 宽展字段 设备品种
*/
private String cylinderVarietyStr;
/**
* 宽展字段
*/
private String regionCode;
/**
* 宽展字段
*/
private List<String> appIds;
/**
* 宽展字段
*/
private Date nextInspectionDate;
/**
* 宽展字段
*/
private Integer inspectionStatas;
/**
* 宽展字段
*/
private Map<String, List<AttachmentDto>> attachments;
private String earlyWarningLevelName;
private String inspectionStatusDesc;
private String earlyWarningLevel;
private String regionCode;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInspectionDto.java
View file @ 38d429c6
......@@ -21,27 +21,26 @@ public class CylinderInspectionDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long sequenceNbr;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "检验单位")
private String inspectionUnit;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "检验日期")
private String inspectionDate;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate;
@ApiModelProperty(value = "不合格报废数量")
private String scrapQuantity;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "创建时间")
private Date recDate;
......@@ -58,4 +57,10 @@ public class CylinderInspectionDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "不合格报废数量")
private String scrapQuantity;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderTagsDto.java
View file @ 38d429c6
......@@ -22,6 +22,7 @@ public class CylinderTagsDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long sequenceNbr;
......@@ -36,9 +37,6 @@ public class CylinderTagsDto extends BaseDto {
@ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode;
@ApiModelProperty(value = "气瓶钢印标识")
private String gasCylinderStamp;
@ApiModelProperty(value = "创建时间")
private Date recDate;
......@@ -53,4 +51,10 @@ public class CylinderTagsDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "气瓶钢印标识")
private String gasCylinderStamp;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderUnitDto.java
View file @ 38d429c6
......@@ -22,6 +22,7 @@ public class CylinderUnitDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long sequenceNbr;
......@@ -50,12 +51,6 @@ public class CylinderUnitDto extends BaseDto {
@ApiModelProperty(value = "企业负责人固定电话")
private String personTelephone;
@ApiModelProperty(value = "安全管理员")
private String securityAdm;
@ApiModelProperty(value = "安全管理员手机")
private String securityAdmPhone;
@ApiModelProperty(value = "企业邮编")
private String postalCode;
......@@ -73,4 +68,22 @@ public class CylinderUnitDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "安全管理员")
private String securityAdm;
@ApiModelProperty(value = "安全管理员手机")
private String securityAdmPhone;
@ApiModelProperty(value = "所属区域")
private String regionName;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFilling.java
View file @ 38d429c6
......@@ -32,20 +32,14 @@ public class CylinderFilling extends BaseEntity {
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "充装企业名称")
private String fillingUnitName;
@ApiModelProperty(value = "检查人员姓名")
private String inspectorUser;
@ApiModelProperty(value = "检查时间")
private String inspectionDate;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "是否在检验有效期以内")
private String isValid;
......@@ -69,14 +63,11 @@ public class CylinderFilling extends BaseEntity {
@ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
private Integer haveSecurityDocuments;
@ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
private String fillBeforeItem;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "检查人员姓名")
private String inspectorUser;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
@ApiModelProperty(value = "检查时间")
private String inspectionDate;
......@@ -91,4 +82,17 @@ public class CylinderFilling extends BaseEntity {
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
private String fillBeforeItem;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingCheck.java
View file @ 38d429c6
......@@ -30,6 +30,7 @@ public class CylinderFillingCheck extends BaseEntity {
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
......@@ -51,12 +52,6 @@ public class CylinderFillingCheck extends BaseEntity {
@ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
private String compliance;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
@ApiModelProperty(value = "检查人员姓名")
private String inspector;
......@@ -76,4 +71,10 @@ public class CylinderFillingCheck extends BaseEntity {
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "检查结果")
private String checkResults;
@ApiModelProperty(value = "不合格项")
private String nonconformances;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingExamine.java
View file @ 38d429c6
......@@ -29,7 +29,6 @@ public class CylinderFillingExamine extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingRecord.java
View file @ 38d429c6
......@@ -32,18 +32,10 @@ public class CylinderFillingRecord extends BaseEntity {
@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;
......@@ -55,9 +47,6 @@ public class CylinderFillingRecord extends BaseEntity {
@ApiModelProperty(value = "充装人员姓名")
private String fillingUser;
@ApiModelProperty(value = "不能与充装人员姓名相同")
private String inspectorName;
@ApiModelProperty(value = "充装量（Kg）")
private Double fillingQuantity;
......@@ -80,4 +69,17 @@ public class CylinderFillingRecord extends BaseEntity {
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "不能与充装人员姓名相同")
private String inspectorName;
@ApiModelProperty(value = "充装前检查Id")
private String fillingBeforeId;
@ApiModelProperty(value = "充装后复查ID")
private String fillingCheckId;
@ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java
View file @ 38d429c6
......@@ -31,38 +31,70 @@ public class CylinderInfo extends BaseEntity {
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "产权单位名称")
private String unitName;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "设备品种")
@ApiModelProperty(value = "气瓶品种")
private Integer cylinderVariety;
@ApiModelProperty(value = "容积（L）")
private Double volume;
@ApiModelProperty(value = "制造日期")
private String manufacturingDate;
@ApiModelProperty(value = "制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
@ApiModelProperty(value = "充装介质")
private String fillingMedia;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "气瓶制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "Ԥ???ȼ?")
private String earlyWarningLevel;
@ApiModelProperty(value = "制造日期")
private String manufacturingDate;
@ApiModelProperty(value = "????Ԥ??ʱ?")
private Date earlyWarningLevelCalDate;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "????վ??ʹ???û????")
private String endCustomCode;
@ApiModelProperty(value = "产品编号")
private String factoryNum;
@ApiModelProperty(value = "容积（L）")
private Double volume;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "???")
private String longitude;
@ApiModelProperty(value = "γ?")
private String latitude;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "充装介质")
private String fillingMedia;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "产品合格证")
private String productQualified;
......@@ -76,26 +108,16 @@ public class CylinderInfo extends BaseEntity {
@ApiModelProperty(value = "型式实验证书")
private String typeExperiments;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "阀门制造单位")
private String valveManufacturUnit;
private Double valveManufacturUnit;
@ApiModelProperty(value = "公称工作压力(MPa）")
private Double nominalWorkPressure;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
private String nominalWorkPressure;
@ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Integer syncState;
@ApiModelProperty(value = "设备品种名称")
private String cylinderVarietyName;
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "充装介质名称")
private String fillingMediaName;
@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/CylinderInspection.java
View file @ 38d429c6
......@@ -31,23 +31,20 @@ public class CylinderInspection extends BaseEntity {
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "检验单位")
private String inspectionUnit;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "检验日期")
private String inspectionDate;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate;
@ApiModelProperty(value = "不合格报废数量")
private String scrapQuantity;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
......@@ -62,4 +59,7 @@ public class CylinderInspection extends BaseEntity {
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "不合格报废数量")
private String scrapQuantity;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderTags.java
View file @ 38d429c6
......@@ -32,6 +32,7 @@ public class CylinderTags extends BaseEntity {
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
......@@ -42,9 +43,6 @@ public class CylinderTags extends BaseEntity {
@ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode;
@ApiModelProperty(value = "气瓶钢印标识")
private String gasCylinderStamp;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
......@@ -58,4 +56,7 @@ public class CylinderTags extends BaseEntity {
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "气瓶钢印标识")
private String gasCylinderStamp;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnit.java
View file @ 38d429c6
......@@ -31,6 +31,7 @@ public class CylinderUnit extends BaseEntity {
@ApiModelProperty(value = "单位ID")
private String unitId;
......@@ -55,12 +56,6 @@ public class CylinderUnit extends BaseEntity {
@ApiModelProperty(value = "企业负责人固定电话")
private String personTelephone;
@ApiModelProperty(value = "安全管理员")
private String securityAdm;
@ApiModelProperty(value = "安全管理员手机")
private String securityAdmPhone;
@ApiModelProperty(value = "企业邮编")
private String postalCode;
......@@ -75,6 +70,21 @@ public class CylinderUnit extends BaseEntity {
@ApiModelProperty(value = "对接公司编码")
private String appId;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "数据完整度")
private Double integrity;
@ApiModelProperty(value = "安全管理员")
private String securityAdm;
@ApiModelProperty(value = "安全管理员手机")
private String securityAdmPhone;
@ApiModelProperty(value = "所属区域")
private String regionName;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingRecordMapper.java
View file @ 38d429c6
......@@ -36,7 +36,7 @@ public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingR
// @Param("cylinderVariety") String cylinderVariety,
// @Param("qrCode") String qrCode,
// @Param("electronicLabelCode") String electronicLabelCode,
@Param("sequenceCode") String sequenceCode,
// @Param("sequenceCode") String sequenceCode,
// @Param("unitInnerCode") String unitInnerCode,
@Param("fillingStartTime") String fillingStartTime,
@Param("fillingEndTime") String fillingEndTime,
......
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 @ 38d429c6
......@@ -10,6 +10,7 @@ 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;
......@@ -65,31 +66,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/biz/utils/BeanDtoVoUtils.java
View file @ 38d429c6
......@@ -323,31 +323,31 @@ public class BeanDtoVoUtils {
CylinderInfoDto target = new CylinderInfoDto();
// 把原对象数据拷贝到新对象
BeanUtils.copyProperties(item, target);
if(0 == item.getCylinderStatus()) {
target.setCylinderStatusStr("在用");
} else if(1 == item.getCylinderStatus()) {
target.setCylinderStatusStr("停用");
} else if(2 == item.getCylinderStatus()) {
target.setCylinderStatusStr("注销");
} else if(3 == item.getCylinderStatus()) {
target.setCylinderStatusStr("报废");
} else {
target.setCylinderStatusStr("");
}
if(1 == item.getCylinderVariety()) {
target.setCylinderVarietyStr("无缝气瓶");
} else if(2 == item.getCylinderVariety()) {
target.setCylinderVarietyStr("焊接气瓶");
} else if(3 == item.getCylinderVariety()) {
target.setCylinderVarietyStr("缠绕气瓶");
} else if(4 == item.getCylinderVariety()) {
target.setCylinderVarietyStr("绝热气瓶");
} else if(5 ==item.getCylinderVariety()) {
target.setCylinderVarietyStr("内装填料气瓶");
} else {
target.setCylinderVarietyStr("");
}
// if(0 == item.getCylinderStatus()) {
// target.setCylinderStatusStr("在用");
// } else if(1 == item.getCylinderStatus()) {
// target.setCylinderStatusStr("停用");
// } else if(2 == item.getCylinderStatus()) {
// target.setCylinderStatusStr("注销");
// } else if(3 == item.getCylinderStatus()) {
// target.setCylinderStatusStr("报废");
// } else {
// target.setCylinderStatusStr("");
// }
// if(1 == item.getCylinderVariety()) {
// target.setCylinderVarietyStr("无缝气瓶");
// } else if(2 == item.getCylinderVariety()) {
// target.setCylinderVarietyStr("焊接气瓶");
// } else if(3 == item.getCylinderVariety()) {
// target.setCylinderVarietyStr("缠绕气瓶");
// } else if(4 == item.getCylinderVariety()) {
// target.setCylinderVarietyStr("绝热气瓶");
// } else if(5 ==item.getCylinderVariety()) {
// target.setCylinderVarietyStr("内装填料气瓶");
// } else {
// target.setCylinderVarietyStr("");
// }
return target;
} catch (Exception e) {
return null;
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java
View file @ 38d429c6
......@@ -562,41 +562,41 @@ public class CylinderInfoController extends BaseController {
CylinderInfoDto target = new CylinderInfoDto();
// 把原对象数据拷贝到新对象
BeanUtils.copyProperties(cylinderInfo, target);
if (0 == cylinderInfo.getCylinderStatus()) {
target.setCylinderStatusStr("在用");
} else if (1 == cylinderInfo.getCylinderStatus()) {
target.setCylinderStatusStr("停用");
} else if (2 == cylinderInfo.getCylinderStatus()) {
target.setCylinderStatusStr("注销");
} else if (3 == cylinderInfo.getCylinderStatus()) {
target.setCylinderStatusStr("报废");
} else {
target.setCylinderStatusStr("");
}
// if (0 == cylinderInfo.getCylinderStatus()) {
// target.setCylinderStatusStr("在用");
// } else if (1 == cylinderInfo.getCylinderStatus()) {
// target.setCylinderStatusStr("停用");
// } else if (2 == cylinderInfo.getCylinderStatus()) {
// target.setCylinderStatusStr("注销");
// } else if (3 == cylinderInfo.getCylinderStatus()) {
// target.setCylinderStatusStr("报废");
// } else {
// target.setCylinderStatusStr("");
// }
if (1 == cylinderInfo.getCylinderVariety()) {
target.setCylinderVarietyStr("无缝气瓶");
} else if (2 == cylinderInfo.getCylinderVariety()) {
target.setCylinderVarietyStr("焊接气瓶");
} else if (3 == cylinderInfo.getCylinderVariety()) {
target.setCylinderVarietyStr("缠绕气瓶");
} else if (4 == cylinderInfo.getCylinderVariety()) {
target.setCylinderVarietyStr("绝热气瓶");
} else if (5 == cylinderInfo.getCylinderVariety()) {
target.setCylinderVarietyStr("内装填料气瓶");
} else {
target.setCylinderVarietyStr("");
}
Date nextDate = target.getNextInspectionDate();
long dates = nextDate.getTime() - System.currentTimeMillis();
if (dates >= 1000 * 60 * 60 * 24 * 30) {
target.setInspectionStatas(1);
} else if (0 < dates && dates < 1000 * 60 * 60 * 24 * 30) {
target.setInspectionStatas(2);
} else {
target.setInspectionStatas(0);
}
target.setAttachments(imgMap);
// if (1 == cylinderInfo.getCylinderVariety()) {
// target.setCylinderVarietyStr("无缝气瓶");
// } else if (2 == cylinderInfo.getCylinderVariety()) {
// target.setCylinderVarietyStr("焊接气瓶");
// } else if (3 == cylinderInfo.getCylinderVariety()) {
// target.setCylinderVarietyStr("缠绕气瓶");
// } else if (4 == cylinderInfo.getCylinderVariety()) {
// target.setCylinderVarietyStr("绝热气瓶");
// } else if (5 == cylinderInfo.getCylinderVariety()) {
// target.setCylinderVarietyStr("内装填料气瓶");
// } else {
// target.setCylinderVarietyStr("");
// }
// Date nextDate = target.getNextInspectionDate();
// long dates = nextDate.getTime() - System.currentTimeMillis();
// if (dates >= 1000 * 60 * 60 * 24 * 30) {
// target.setInspectionStatas(1);
// } else if (0 < dates && dates < 1000 * 60 * 60 * 24 * 30) {
// target.setInspectionStatas(2);
// } else {
// target.setInspectionStatas(0);
// }
// target.setAttachments(imgMap);
return ResponseHelper.buildResponse(target);
}
......@@ -699,7 +699,7 @@ public class CylinderInfoController extends BaseController {
// if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateStart())) { // 许可有效期
// queryWrapper.ge("filling_permit_date", cylinderUnitDto.getFillingPermitDateStart());
// }
//
// if (!ValidationUtil.isEmpty(cylinderUnitDto.getFillingPermitDateEnd())) {
// queryWrapper.le("filling_permit_date", cylinderUnitDto.getFillingPermitDateEnd());
// }
......
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 @ 38d429c6
......@@ -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) {
if(cylinderInfo.get("cylinderNum") != null) {
// unit.setCylinderNumber(cylinderInfo.get("cylinderNum"));
// }
// if(cylinderInfo.get("outOfDateNum") != null) {
}
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/service/impl/CylinderFillingRecordServiceImpl.java
View file @ 38d429c6
......@@ -51,7 +51,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
// cylinderFillingRecordDto.getCylinderVariety(),
// cylinderFillingRecordDto.getQrCode(),
// cylinderFillingRecordDto.getElectronicLabelCode(),
cylinderFillingRecordDto.getSequenceCode(),
// cylinderFillingRecordDto.getSequenceCode(),
// cylinderFillingRecordDto.getUnitInnerCode(),
cylinderFillingRecordDto.getFillingStarttime(),
cylinderFillingRecordDto.getFillingEndtime(),
......
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 @ 38d429c6
......@@ -591,8 +591,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
public Page<CylinderInfoDto> earlyWarningLevelPageList(Page<CylinderInfoDto> page, String earlyWarningLevel) {
Page<CylinderInfoDto> result = this.baseMapper.queryPageListByEarlyWarningLevel(page, earlyWarningLevel);
result.getRecords().forEach(r -> {
r.setEarlyWarningLevelName(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getName());
r.setInspectionStatusDesc(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getStatus());
// r.setEarlyWarningLevelName(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getName());
// r.setInspectionStatusDesc(EarlyWarningLevelEnum.getEumByLevel(earlyWarningLevel).getStatus());
});
return result;
......@@ -638,8 +638,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
CylinderInfoDto cylinderInfoDto = this.getDetail(r.getSequenceCode());
try {
CylWarningMsgDto cylWarningMsgDto = new CylWarningMsgDto();
int interval = DateUtils.dateBetweenIncludeToday(now, cylinderInfoDto.getNextInspectionDate()) - 1;
cylWarningMsgDto.setNum(String.valueOf(interval));
// int interval = DateUtils.dateBetweenIncludeToday(now, cylinderInfoDto.getNextInspectionDate()) - 1;
// cylWarningMsgDto.setNum(String.valueOf(interval));
cylWarningMsgDto.setFactoryNum(cylinderInfoDto.getFactoryNum());
// cylWarningMsgDto.setUserType(cylinderInfoDto.getCustomType());
// cylWarningMsgDto.setUserPeople(cylinderInfoDto.getCustomName());
......@@ -661,7 +661,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
public CylinderInfoDto getDetail(String sequenceCode) {
CylinderInfoDto dto = this.baseMapper.getDetail(sequenceCode);
dto.setInspectionStatusDesc(StringUtils.isNotEmpty(dto.getEarlyWarningLevel()) ? EarlyWarningLevelEnum.getEumByLevel(dto.getEarlyWarningLevel()).getStatus() : "");
// dto.setInspectionStatusDesc(StringUtils.isNotEmpty(dto.getEarlyWarningLevel()) ? EarlyWarningLevelEnum.getEumByLevel(dto.getEarlyWarningLevel()).getStatus() : "");
return dto;
}
......@@ -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;
}
......
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