Skip to content

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

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

parent c761a6f1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 710 additions and 1743 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 { ...@@ -21,49 +21,89 @@ public class CylinderFillingCheckDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
/**
* id
*/
private Long sequenceNbr;
@ApiModelProperty(value = "充装后复查ID") @ApiModelProperty(value = "充装后复查ID")
/**
* 充装后复查ID
*/
private String fillingCheckId; private String fillingCheckId;
@ApiModelProperty(value = "充装企业名称")
private String fillingUnitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "充装量在规定范围内") @ApiModelProperty(value = "充装量在规定范围内")
/**
* 充装量在规定范围内
*/
private Integer withinScope; private Integer withinScope;
@ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好") @ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
/**
* 瓶阀及其与瓶口连接的密封良好
*/
private Integer sealedState; private Integer sealedState;
@ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷") @ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
/**
* 瓶体未出现鼓包变形或泄露等严重缺陷
*/
private Integer defective; private Integer defective;
@ApiModelProperty(value = "瓶体温度没有异常升高的迹象") @ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
/**
* 瓶体温度没有异常升高的迹象
*/
private Integer abnormalTemperature; private Integer abnormalTemperature;
@ApiModelProperty(value = "气瓶粘贴警示标签和充装标签") @ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
/**
* 气瓶粘贴警示标签和充装标签
*/
private Integer warningSign; private Integer warningSign;
@ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重") @ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
/**
* 液化气瓶充装量符合有关规定，充装后逐瓶称重
*/
private String compliance; private String compliance;
@ApiModelProperty(value = "检查结果")
/**
* 检查结果
*/
private String checkResults;
@ApiModelProperty(value = "不合格项")
/**
* 不合格项
*/
private String nonconformances;
@ApiModelProperty(value = "检查人员姓名") @ApiModelProperty(value = "检查人员姓名")
/**
* 检查人员姓名
*/
private String inspector; private String inspector;
@ApiModelProperty(value = "检查时间") @ApiModelProperty(value = "检查时间")
/**
* 检查时间
*/
private String inspectionDate; private String inspectionDate;
@ApiModelProperty(value = "创建时间")
/**
* 创建时间
*/
private Date recDate;
@ApiModelProperty(value = "操作人员")
/**
* 操作人员
*/
private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
private Date syncDate; private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除") @ApiModelProperty(value = "0-新增 1-更新 2-删除")
/**
* 0-新增 1-更新 2-删除
*/
private Integer syncState; private Integer syncState;
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
/**
* 对接公司编码
*/
private String appId; 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 { ...@@ -20,53 +20,109 @@ public class CylinderFillingDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "充装前检查Id") /**
private String fillingBeforeId; * id
*/
@ApiModelProperty(value = "充装企业名称") private Long sequenceNbr;
private String fillingUnitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶唯一标识码") @ApiModelProperty(value = "气瓶唯一标识码")
/**
* 气瓶唯一标识码
*/
private String sequenceCode; 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 = "是否在检验有效期以内") @ApiModelProperty(value = "是否在检验有效期以内")
/**
* 是否在检验有效期以内
*/
private String isValid; private String isValid;
@ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致") @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
/**
* 警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致
*/
private Integer same; private Integer same;
@ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定") @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
/**
* 气瓶外表面的颜色标志是否符合规定
*/
private Integer isRegulations; private Integer isRegulations;
@ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383") @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
/**
* 气瓶瓶阀的出气口螺纹型式是否符合GB/T15383
*/
private Integer isComplianceWithgbt; private Integer isComplianceWithgbt;
@ApiModelProperty(value = "气瓶内有无剩余压力") @ApiModelProperty(value = "气瓶内有无剩余压力")
/**
* 气瓶内有无剩余压力
*/
private Integer haveStillPressure; private Integer haveStillPressure;
@ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷") @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
/**
* 气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷
*/
private Integer isComplete; private Integer isComplete;
@ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求") @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
/**
* 气瓶的安全附件齐全并符合安全要求
*/
private Integer haveSecurityDocuments; private Integer haveSecurityDocuments;
@ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
@ApiModelProperty(value = "检查人员姓名") /**
private String inspectorUser; * 新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气
*/
@ApiModelProperty(value = "检查时间") private String fillBeforeItem;
private String inspectionDate; @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") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
private Date syncDate; private Date syncDate;
@ApiModelProperty(value = "0-新增 1-更新 2-删除") @ApiModelProperty(value = "0-新增 1-更新 2-删除")
/**
* 0-新增 1-更新 2-删除
*/
private Integer syncState; private Integer syncState;
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
/**
* 对接公司编码
*/
private String appId; 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,13 +20,13 @@ public class CylinderFillingExamineDto extends BaseDto { ...@@ -20,13 +20,13 @@ public class CylinderFillingExamineDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long sequenceNbr;
@ApiModelProperty(value = "充装信息审核ID") @ApiModelProperty(value = "充装信息审核ID")
private String fillingExamineId; private String fillingExamineId;
@ApiModelProperty(value = "充装企业名称")
private String fillingUnitName;
@ApiModelProperty(value = "报表生成时间") @ApiModelProperty(value = "报表生成时间")
private String fillingAuditDate; private String fillingAuditDate;
...@@ -36,6 +36,12 @@ public class CylinderFillingExamineDto extends BaseDto { ...@@ -36,6 +36,12 @@ public class CylinderFillingExamineDto extends BaseDto {
@ApiModelProperty(value = "充装审核报表附件名称") @ApiModelProperty(value = "充装审核报表附件名称")
private String fillingAuditName; private String fillingAuditName;
@ApiModelProperty(value = "创建时间")
private Date recDate;
@ApiModelProperty(value = "操作人员")
private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
...@@ -45,4 +51,5 @@ public class CylinderFillingExamineDto extends BaseDto { ...@@ -45,4 +51,5 @@ public class CylinderFillingExamineDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
private String appId; 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; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
...@@ -21,43 +22,36 @@ public class CylinderFillingRecordDto extends BaseDto { ...@@ -21,43 +22,36 @@ public class CylinderFillingRecordDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long sequenceNbr;
@ApiModelProperty(value = "充装记录Id") @ApiModelProperty(value = "充装记录Id")
private String fillingRecordId; private String fillingRecordId;
@ApiModelProperty(value = "充装企业名称") @ApiModelProperty(value = "充装前检查Id")
private String fillingUnitName; private String fillingBeforeId;
@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 = "单位内部编号") @ApiModelProperty(value = "充装后复查ID")
private String unitInnerCode; private String fillingCheckId;
@ApiModelProperty(value = "产权单位") @ApiModelProperty(value = "充装信息审核ID")
private String propertyUnit; private String fillingExamineId;
@ApiModelProperty(value = "充装开始时间") @ApiModelProperty(value = "充装开始时间")
@TableField("filling_startTime")
private String fillingStarttime; private String fillingStarttime;
@ApiModelProperty(value = "充装结束时间") @ApiModelProperty(value = "充装结束时间")
@TableField("filling_endTime")
private String fillingEndtime; private String fillingEndtime;
@ApiModelProperty(value = "充装人员姓名") @ApiModelProperty(value = "充装人员姓名")
private String fillingUser; private String fillingUser;
@ApiModelProperty(value = "不能与充装人员姓名相同")
private String inspectorName;
@ApiModelProperty(value = "充装量（Kg）") @ApiModelProperty(value = "充装量（Kg）")
private Double fillingQuantity; private Double fillingQuantity;
...@@ -67,27 +61,11 @@ public class CylinderFillingRecordDto extends BaseDto { ...@@ -67,27 +61,11 @@ public class CylinderFillingRecordDto extends BaseDto {
@ApiModelProperty(value = "异常情况") @ApiModelProperty(value = "异常情况")
private Integer abnormal; private Integer abnormal;
@ApiModelProperty(value = "异常情况") @ApiModelProperty(value = "创建时间")
private String abnormalStr; private Date recDate;
@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 String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
...@@ -98,40 +76,9 @@ public class CylinderFillingRecordDto extends BaseDto { ...@@ -98,40 +76,9 @@ public class CylinderFillingRecordDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
private String appId; private String appId;
@ApiModelProperty(value = "是否在检验有效期以内") /**
private String isValid; * 扩展字段
*/
@ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致") private String sequenceCode;
private Integer same; private String fillingUnitName;
@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;
} }
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 { ...@@ -24,127 +24,112 @@ public class CylinderInfoDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "气瓶基本信息ID") private Long sequenceNbr;
private String cylinderId;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "产权单位名称") @ApiModelProperty(value = "产权单位名称")
private String unitName; private String unitName;
@ApiModelProperty(value = "出厂编号") @ApiModelProperty(value = "气瓶唯一标识码")
private String factoryNum; private String sequenceCode;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "气瓶状态str")
private String cylinderStatusStr;
@ApiModelProperty(value = "气瓶品种") @ApiModelProperty(value = "设备品种")
private Integer cylinderVariety; private Integer cylinderVariety;
@ApiModelProperty(value = "气瓶品种str") @ApiModelProperty(value = "单位内部编号")
private String cylinderVarietyStr; private String unitInnerCode;
@ApiModelProperty(value = "二维码编号") @ApiModelProperty(value = "充装介质")
private String qrCode; private String fillingMedia;
@ApiModelProperty(value = "电子标签编号") @ApiModelProperty(value = "气瓶制造单位")
private String electronicLabelCode; private String manufacturingUnit;
@ApiModelProperty(value = "充装介质") @ApiModelProperty(value = "制造日期")
private String fillingMedium; private String manufacturingDate;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "公称压力(MPa）") @ApiModelProperty(value = "产品编号")
private Double pressure; private String factoryNum;
@ApiModelProperty(value = "容积（L）") @ApiModelProperty(value = "容积（L）")
private Double volume; private Double volume;
@ApiModelProperty(value = "制造日期") @ApiModelProperty(value = "产品合格证")
private Date manufacturingDate; private String productQualified;
@ApiModelProperty(value = "制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "气瓶制造许可证") @ApiModelProperty(value = "质量证明书")
private String license; private String proofQuality;
@ApiModelProperty(value = "气瓶重量（kg）") @ApiModelProperty(value = "监督检验证书")
private Double cylinderWeight; private String supervisionInspec;
@ApiModelProperty(value = "单位内部编号") @ApiModelProperty(value = "型式实验证书")
private String unitInnerCode; private String typeExperiments;
@ApiModelProperty(value = "最近一次检验日期") @ApiModelProperty(value = "气瓶状态")
private Date inspectionDate; private Integer cylinderStatus;
@ApiModelProperty(value = "下次检验日期") @ApiModelProperty(value = "阀门制造单位")
private Date nextInspectionDate; private String valveManufacturUnit;
@ApiModelProperty(value = "检验日期开始") @ApiModelProperty(value = "公称工作压力(MPa）")
private String inspectionDateStart; private Double nominalWorkPressure;
@ApiModelProperty(value = "检验日期结束") @ApiModelProperty(value = "创建时间")
private String inspectionDateEnd; private Date recDate;
@ApiModelProperty(value = "气瓶唯一标识码") @ApiModelProperty(value = "操作人员")
private String sequenceCode; private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
@ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据") @ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Boolean syncState; private Integer syncState;
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
private String appId; private String appId;
@ApiModelProperty(value = "所属区域代码")
private String regionCode;
@ApiModelProperty(value = "查询单位appid") /**
private List<String> appIds; * 扩展字段 气瓶状态
*/
@ApiModelProperty(value = "检验状态 0 已超期 1 正常 2 即将超期") private String cylinderStatusStr;
private int inspectionStatas;
@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; private String earlyWarningLevelName;
private String inspectionStatusDesc;
@ApiModelProperty(value = "最近配送地址") private String earlyWarningLevel;
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;
} }
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,29 +21,33 @@ public class CylinderInspectionDto extends BaseDto { ...@@ -21,29 +21,33 @@ public class CylinderInspectionDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "检验信息ID") @ApiModelProperty(value = "id")
private String inspectionId;
@ApiModelProperty(value = "检验单位") private Long sequenceNbr;
private String inspectionUnit;
@ApiModelProperty(value = "产权单位名称")
private String propertyUnitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶唯一标识码") @ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode; private String sequenceCode;
@ApiModelProperty(value = "检验单位")
private String inspectionUnit;
@ApiModelProperty(value = "检验日期") @ApiModelProperty(value = "检验日期")
private String inspectionDate; private String inspectionDate;
@ApiModelProperty(value = "检验结果")
private String inspectionResult;
@ApiModelProperty(value = "下次检验日期") @ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate; private String nextInspectionDate;
@ApiModelProperty(value = "检验结果") @ApiModelProperty(value = "不合格报废数量")
private String inspectionResult; private String scrapQuantity;
@ApiModelProperty(value = "创建时间")
private Date recDate;
@ApiModelProperty(value = "操作人员")
private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
......
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; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
...@@ -21,24 +22,29 @@ public class CylinderTagsDto extends BaseDto { ...@@ -21,24 +22,29 @@ public class CylinderTagsDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "标签ID") @ApiModelProperty(value = "id")
private String tagId;
@ApiModelProperty(value = "产权单位名称") private Long sequenceNbr;
private String unitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶唯一标识码") @ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode; private String sequenceCode;
@ApiModelProperty(value = "二维码编号") @ApiModelProperty(value = "二维码编号")
@TableField("qrCode")
private String qrCode; private String qrCode;
@ApiModelProperty(value = "电子标签编号") @ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode; private String electronicLabelCode;
@ApiModelProperty(value = "气瓶钢印标识")
private String gasCylinderStamp;
@ApiModelProperty(value = "创建时间")
private Date recDate;
@ApiModelProperty(value = "操作人员")
private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
...@@ -47,5 +53,4 @@ public class CylinderTagsDto extends BaseDto { ...@@ -47,5 +53,4 @@ public class CylinderTagsDto extends BaseDto {
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
private String appId; 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 { ...@@ -22,6 +22,10 @@ public class CylinderUnitDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long sequenceNbr;
@ApiModelProperty(value = "单位ID") @ApiModelProperty(value = "单位ID")
private String unitId; private String unitId;
...@@ -31,12 +35,6 @@ public class CylinderUnitDto extends BaseDto { ...@@ -31,12 +35,6 @@ public class CylinderUnitDto extends BaseDto {
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "单位名称")
private String unitName; private String unitName;
@ApiModelProperty(value = "企业类型")
private Integer unitType;
@ApiModelProperty(value = "企业类型str")
private String unitTypeStr;
@ApiModelProperty(value = "统一社会信用代码") @ApiModelProperty(value = "统一社会信用代码")
private String creditCode; private String creditCode;
...@@ -52,73 +50,27 @@ public class CylinderUnitDto extends BaseDto { ...@@ -52,73 +50,27 @@ public class CylinderUnitDto extends BaseDto {
@ApiModelProperty(value = "企业负责人固定电话") @ApiModelProperty(value = "企业负责人固定电话")
private String personTelephone; private String personTelephone;
@ApiModelProperty(value = "企业邮编") @ApiModelProperty(value = "安全管理员")
private String postalCode; private String securityAdm;
@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 = "检验许可证有效期") @ApiModelProperty(value = "安全管理员手机")
private Date effectiveDate; private String securityAdmPhone;
@ApiModelProperty(value = "制造许可证号") @ApiModelProperty(value = "企业邮编")
private String manufacturingLicense; private String postalCode;
@ApiModelProperty(value = "制造许可证有效期")
private Date manufacturingDate;
@ApiModelProperty(value = "制造许可范围") @ApiModelProperty(value = "创建时间")
private String manufacturingScope; private Date recDate;
@ApiModelProperty(value = "制造单位代码") @ApiModelProperty(value = "操作人员")
private String manufacturingUnitCode; private String recUserId;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss") @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
@ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据") @ApiModelProperty(value = "0-新增 1-更新 2-删除")
private Boolean syncState; private Integer syncState;
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
private String appId; 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; package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel;
import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2022-03-04 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode() @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_filling") @TableName("tz_cylinder_filling")
public class CylinderFilling { @ApiModel(value="TzCylinderFilling对象", description="气瓶充装信息--充装前检查")
public class CylinderFilling extends BaseEntity {
private static final long serialVersionUID = 1L; 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;
/** @ApiModelProperty(value = "充装企业名称")
* 充装前检查Id
*/
@TableField("filling_before_id")
private String fillingBeforeId;
/**
* 充装企业名称
*/
@TableField("filling_unit_name")
private String fillingUnitName; private String fillingUnitName;
/** @ApiModelProperty(value = "检查人员姓名")
* 出厂编号 private String inspectorUser;
*/
@TableField("factory_num")
private String factoryNum;
/** @ApiModelProperty(value = "检查时间")
* 气瓶唯一标识码 private String inspectionDate;
*/
@TableField("sequence_code")
private String sequenceCode;
/** @ApiModelProperty(value = "统一社会信用代码")
* 是否在检验有效期以内 private String creditCode;
*/
@TableField("is_valid") @ApiModelProperty(value = "是否在检验有效期以内")
private String isValid; private String isValid;
/** @ApiModelProperty(value = "警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致")
* 警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致
*/
@TableField("same")
private Integer same; private Integer same;
/** @ApiModelProperty(value = "气瓶外表面的颜色标志是否符合规定")
* 气瓶外表面的颜色标志是否符合规定
*/
@TableField("is_regulations")
private Integer isRegulations; private Integer isRegulations;
/** @ApiModelProperty(value = "气瓶瓶阀的出气口螺纹型式是否符合GB/T15383")
* 气瓶瓶阀的出气口螺纹型式是否符合GB/T15383
*/
@TableField("is_compliance_withGBT") @TableField("is_compliance_withGBT")
private Integer isComplianceWithgbt; private Integer isComplianceWithgbt;
/** @ApiModelProperty(value = "气瓶内有无剩余压力")
* 气瓶内有无剩余压力
*/
@TableField("have_still_pressure")
private Integer haveStillPressure; private Integer haveStillPressure;
/** @ApiModelProperty(value = "气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷")
* 气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷
*/
@TableField("is_complete")
private Integer isComplete; private Integer isComplete;
/** @ApiModelProperty(value = "气瓶的安全附件齐全并符合安全要求")
* 气瓶的安全附件齐全并符合安全要求
*/
@TableField("have_security_documents")
private Integer haveSecurityDocuments; private Integer haveSecurityDocuments;
/** @ApiModelProperty(value = "新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气")
* 检查人员姓名 private String fillBeforeItem;
*/
@TableField("inspector_user")
private String inspectorUser;
/** @ApiModelProperty(value = "检查结果")
* 检查时间 private String checkResults;
*/
@TableField("inspection_date")
private String inspectionDate;
/** @ApiModelProperty(value = "不合格项")
* 同步时间 yyyy-MM-dd HH24:mi:ss private String nonconformances;
*/
@TableField("sync_date")
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "0-新增 1-更新 2-删除")
* 0-新增 1-更新 2-删除
*/
@TableField("sync_state")
private Integer syncState; private Integer syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2022-03-04 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_filling_check") @TableName("tz_cylinder_filling_check")
@ApiModel(value="TzCylinderFillingCheck对象", description="液化气体气瓶充装信息-充装后复查")
public class CylinderFillingCheck extends BaseEntity { public class CylinderFillingCheck extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 充装后复查ID
*/
@TableField("filling_check_id")
private String fillingCheckId;
/**
* 充装企业名称
*/
@TableField("filling_unit_name")
private String fillingUnitName;
/**
* 出厂编号
*/
@TableField("factory_num")
private String factoryNum;
/** @ApiModelProperty(value = "充装后复查ID")
* 气瓶唯一标识码 private String fillingCheckId;
*/
@TableField("sequence_code")
private String sequenceCode;
/** @ApiModelProperty(value = "充装量在规定范围内")
* 充装量在规定范围内
*/
@TableField("within_scope")
private Integer withinScope; private Integer withinScope;
/** @ApiModelProperty(value = "瓶阀及其与瓶口连接的密封良好")
* 瓶阀及其与瓶口连接的密封良好
*/
@TableField("sealed_state")
private Integer sealedState; private Integer sealedState;
/** @ApiModelProperty(value = "瓶体未出现鼓包变形或泄露等严重缺陷")
* 瓶体未出现鼓包变形或泄露等严重缺陷
*/
@TableField("defective")
private Integer defective; private Integer defective;
/** @ApiModelProperty(value = "瓶体温度没有异常升高的迹象")
* 瓶体温度没有异常升高的迹象
*/
@TableField("abnormal_temperature")
private Integer abnormalTemperature; private Integer abnormalTemperature;
/** @ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
* 气瓶粘贴警示标签和充装标签
*/
@TableField("warning_sign")
private Integer warningSign; private Integer warningSign;
/** @ApiModelProperty(value = "液化气瓶充装量符合有关规定，充装后逐瓶称重")
* 液化气瓶充装量符合有关规定，充装后逐瓶称重
*/
@TableField("compliance")
private String compliance; private String compliance;
/** @ApiModelProperty(value = "检查结果")
* 检查人员姓名 private String checkResults;
*/
@TableField("inspector") @ApiModelProperty(value = "不合格项")
private String nonconformances;
@ApiModelProperty(value = "检查人员姓名")
private String inspector; private String inspector;
/** @ApiModelProperty(value = "检查时间")
* 检查时间
*/
@TableField("inspection_date")
private String inspectionDate; private String inspectionDate;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/ @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
@TableField("sync_date")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "0-新增 1-更新 2-删除")
* 0-新增 1-更新 2-删除
*/
@TableField("sync_state")
private Integer syncState; private Integer syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2022-03-04 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_filling_examine") @TableName("tz_cylinder_filling_examine")
@ApiModel(value="TzCylinderFillingExamine对象", description="液化气体气瓶充装信息审核")
public class CylinderFillingExamine extends BaseEntity { public class CylinderFillingExamine extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 充装信息审核ID
*/
@TableField("filling_examine_id")
private String fillingExamineId;
/**
* 充装企业名称
*/
@TableField("filling_unit_name")
private String fillingUnitName;
/** @ApiModelProperty(value = "充装信息审核ID")
* 报表生成时间 private String fillingExamineId;
*/
@TableField("filling_audit_date") @ApiModelProperty(value = "报表生成时间")
private String fillingAuditDate; private String fillingAuditDate;
/** @ApiModelProperty(value = "充装审核报表附件地址")
* 充装审核报表附件地址
*/
@TableField("filling_audit_url")
private String fillingAuditUrl; private String fillingAuditUrl;
/** @ApiModelProperty(value = "充装审核报表附件名称")
* 充装审核报表附件名称
*/
@TableField("filling_audit_name")
private String fillingAuditName; private String fillingAuditName;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/ @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
@TableField("sync_date")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "0-新增 1-更新 2-删除")
* 0-新增 1-更新 2-删除
*/
@TableField("sync_state")
private Integer syncState; private Integer syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2022-03-04 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_filling_record") @TableName("tz_cylinder_filling_record")
@ApiModel(value="TzCylinderFillingRecord对象", description="液化气体气瓶充装信息-充装记录")
public class CylinderFillingRecord extends BaseEntity { public class CylinderFillingRecord extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 充装记录Id
*/
@TableField("filling_record_id") @ApiModelProperty(value = "充装记录Id")
private String fillingRecordId; private String fillingRecordId;
/** @ApiModelProperty(value = "充装前检查Id")
* 充装企业名称 private String fillingBeforeId;
*/
@TableField("filling_unit_name")
private String fillingUnitName;
/** @ApiModelProperty(value = "充装后复查ID")
* 出厂编号 private String fillingCheckId;
*/
@TableField("factory_num")
private String factoryNum;
/** @ApiModelProperty(value = "充装信息审核ID")
* 气瓶唯一标识码 private String fillingExamineId;
*/
@TableField("sequence_code")
private String sequenceCode;
/** @ApiModelProperty(value = "充装开始时间")
* 充装开始时间
*/
@TableField("filling_startTime") @TableField("filling_startTime")
private String fillingStarttime; private String fillingStarttime;
/** @ApiModelProperty(value = "充装结束时间")
* 充装结束时间
*/
@TableField("filling_endTime") @TableField("filling_endTime")
private String fillingEndtime; private String fillingEndtime;
/** @ApiModelProperty(value = "充装人员姓名")
* 充装人员姓名
*/
@TableField("filling_user")
private String fillingUser; private String fillingUser;
/** @ApiModelProperty(value = "不能与充装人员姓名相同")
* 充装量（Kg） private String inspectorName;
*/
@TableField("filling_quantity") @ApiModelProperty(value = "充装量（Kg）")
private Double fillingQuantity; private Double fillingQuantity;
/** @ApiModelProperty(value = "室温")
* 室温
*/
@TableField("temperature")
private Double temperature; private Double temperature;
/** @ApiModelProperty(value = "异常情况")
* 异常情况
*/
@TableField("abnormal")
private Integer abnormal; private Integer abnormal;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/ @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
@TableField("sync_date")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据")
* 1初次同步数据 2上层系统已同步数据 0已删除数据
*/
@TableField("sync_state")
private Integer syncState; private Integer syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.IdType; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel;
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.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2021-12-14 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_info") @TableName("tz_cylinder_info")
public class CylinderInfo { @ApiModel(value="TzCylinderInfo对象", description="气瓶基本信息")
public class CylinderInfo extends BaseEntity {
private static final long serialVersionUID = 1L; 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;
/** @ApiModelProperty(value = "统一社会信用代码")
* 出厂编号 private String creditCode;
*/
@TableField("factory_num")
private String factoryNum;
/** @ApiModelProperty(value = "产权单位名称")
* 气瓶状态 private String unitName;
*/
@TableField("cylinder_status")
private Integer cylinderStatus;
/** @ApiModelProperty(value = "气瓶唯一标识码")
* 气瓶品种 private String sequenceCode;
*/
@TableField("cylinder_variety") @ApiModelProperty(value = "设备品种")
private Integer cylinderVariety; private Integer cylinderVariety;
/** @ApiModelProperty(value = "单位内部编号")
* 二维码编号 private String unitInnerCode;
*/
@TableField("qrCode")
private String qrCode;
/** @ApiModelProperty(value = "充装介质")
* 电子标签编号 private String fillingMedia;
*/
@TableField("electronic_label_code")
private String electronicLabelCode;
/** @ApiModelProperty(value = "气瓶制造单位")
* 充装介质 private String manufacturingUnit;
*/
@TableField("filling_medium")
private String fillingMedium;
/** @ApiModelProperty(value = "制造日期")
* 公称压力(MPa） private String manufacturingDate;
*/
@TableField("pressure")
private Double pressure;
/** @ApiModelProperty(value = "产品名称")
* 容积（L） private String productName;
*/
@TableField("volume") @ApiModelProperty(value = "产品编号")
private String factoryNum;
@ApiModelProperty(value = "容积（L）")
private Double volume; private Double volume;
/** @ApiModelProperty(value = "产品合格证")
* 制造日期 private String productQualified;
*/
@TableField("manufacturing_date")
private Date manufacturingDate;
/** @ApiModelProperty(value = "质量证明书")
* 制造单位 private String proofQuality;
*/
@TableField("manufacturing_unit")
private String manufacturingUnit;
/** @ApiModelProperty(value = "监督检验证书")
* 气瓶制造许可证 private String supervisionInspec;
*/
@TableField("license")
private String license;
/** @ApiModelProperty(value = "型式实验证书")
* 气瓶重量（kg） private String typeExperiments;
*/
@TableField("cylinder_weight")
private Double cylinderWeight;
/** @ApiModelProperty(value = "气瓶状态")
* 单位内部编号 private Integer cylinderStatus;
*/
@TableField("unit_inner_code")
private String unitInnerCode;
/** @ApiModelProperty(value = "阀门制造单位")
* 最近一次检验日期 private String valveManufacturUnit;
*/
@TableField("inspection_date")
private Date inspectionDate;
/** @ApiModelProperty(value = "公称工作压力(MPa）")
* 下次检验日期 private Double nominalWorkPressure;
*/
@TableField("next_inspection_date")
private Date nextInspectionDate;
/**
* 气瓶唯一标识码
*/
@TableField("sequence_code")
private String sequenceCode;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
*/
@TableField("sync_date")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "0-新增 1-更新 2-删除")
* 1初次同步数据 2上层系统已同步数据 0已删除数据 private Integer syncState;
*/
@TableField("sync_state")
private Boolean syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2022-03-04 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_inspection") @TableName("tz_cylinder_inspection")
@ApiModel(value="TzCylinderInspection对象", description="气瓶检验信息")
public class CylinderInspection extends BaseEntity { public class CylinderInspection extends BaseEntity {
private static final long serialVersionUID = 1L; 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;
/** @ApiModelProperty(value = "气瓶唯一标识码")
* 气瓶唯一标识码
*/
@TableField("sequence_code")
private String sequenceCode; private String sequenceCode;
/** @ApiModelProperty(value = "检验单位")
* 检验日期 private String inspectionUnit;
*/
@TableField("inspection_date") @ApiModelProperty(value = "检验日期")
private String inspectionDate; private String inspectionDate;
/** @ApiModelProperty(value = "检验结果")
* 下次检验日期 private String inspectionResult;
*/
@TableField("next_inspection_date") @ApiModelProperty(value = "下次检验日期")
private String nextInspectionDate; private String nextInspectionDate;
/** @ApiModelProperty(value = "不合格报废数量")
* 检验结果 private String scrapQuantity;
*/
@TableField("inspection_result")
private String inspectionResult;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/ @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
@TableField("sync_date")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "0-新增 1-更新 2-删除")
* 0-新增 1-更新 2-删除
*/
@TableField("sync_state")
private Integer syncState; private Integer syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel;
import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2022-03-04 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode() @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_tags") @TableName("tz_cylinder_tags")
public class CylinderTags { @ApiModel(value="TzCylinderTags对象", description="气瓶标签信息")
public class CylinderTags extends BaseEntity {
private static final long serialVersionUID = 1L; 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;
/** @ApiModelProperty(value = "气瓶唯一标识码")
* 出厂编号
*/
@TableField("factory_num")
private String factoryNum;
/**
* 气瓶唯一标识码
*/
@TableField("sequence_code")
private String sequenceCode; private String sequenceCode;
/** @ApiModelProperty(value = "二维码编号")
* 二维码编号
*/
@TableField("qrCode") @TableField("qrCode")
private String qrCode; private String qrCode;
/** @ApiModelProperty(value = "电子标签编号")
* 电子标签编号
*/
@TableField("electronic_label_code")
private String electronicLabelCode; private String electronicLabelCode;
/** @ApiModelProperty(value = "气瓶钢印标识")
* 同步时间 yyyy-MM-dd HH24:mi:ss private String gasCylinderStamp;
*/
@TableField("sync_date")
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "0-新增 1-更新 2-删除")
* 0-新增 1-更新 2-删除
*/
@TableField("sync_state")
private Integer syncState; private Integer syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.IdType; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel;
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.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 * @author duanwei
* @date 2021-12-14 * @date 2022-08-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tz_cylinder_unit") @TableName("tz_cylinder_unit")
public class CylinderUnit { @ApiModel(value="TzCylinderUnit对象", description="气瓶企业信息")
public class CylinderUnit extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
/**
* 单位ID
*/ @ApiModelProperty(value = "单位ID")
@TableField("unit_id")
private String unitId; private String unitId;
/** @ApiModelProperty(value = "所属区域")
* 所属区域
*/
@TableField("region_code")
private String regionCode; private String regionCode;
/** @ApiModelProperty(value = "单位名称")
* 单位名称
*/
@TableField("unit_name")
private String unitName; private String unitName;
/** @ApiModelProperty(value = "统一社会信用代码")
* 企业类型
*/
@TableField("unit_type")
private Integer unitType;
/**
* 统一社会信用代码
*/
@TableField("credit_code")
private String creditCode; private String creditCode;
/** @ApiModelProperty(value = "详细地址")
* 详细地址
*/
@TableField("address")
private String address; private String address;
/** @ApiModelProperty(value = "企业负责人")
* 企业负责人
*/
@TableField("unit_person")
private String unitPerson; private String unitPerson;
/** @ApiModelProperty(value = "企业负责人手机")
* 企业负责人手机
*/
@TableField("person_mobile_phone")
private String personMobilePhone; private String personMobilePhone;
/** @ApiModelProperty(value = "企业负责人固定电话")
* 企业负责人固定电话
*/
@TableField("person_telephone")
private String personTelephone; private String personTelephone;
/** @ApiModelProperty(value = "安全管理员")
* 企业邮编 private String securityAdm;
*/
@TableField("postal_code")
private String postalCode;
/**
* 企业简称
*/
@TableField("unit_abbreviation")
private String unitAbbreviation;
/** @ApiModelProperty(value = "安全管理员手机")
* 充装许可证号 private String securityAdmPhone;
*/
@TableField("filling_license")
private String fillingLicense;
/** @ApiModelProperty(value = "企业邮编")
* 充装许可证有效期 private String postalCode;
*/
@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;
/** @ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
@TableField("sync_date")
private Date syncDate; private Date syncDate;
/** @ApiModelProperty(value = "0-新增 1-更新 2-删除")
* 1初次同步数据 2上层系统已同步数据 0已删除数据 private Integer syncState;
*/
@TableField("sync_state")
private Boolean syncState;
/** @ApiModelProperty(value = "对接公司编码")
* 对接公司编码
*/
@TableField("app_id")
private String appId; private String appId;
/** @ApiModelProperty(value = "数据完整度")
* 经度
*/
@TableField("longitude")
private String longitude;
/**
* 纬度
*/
@TableField("latitude")
private String latitude;
/**
* 数据完整度
*/
@TableField("integrity")
private Double integrity; 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; 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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingCheck;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; 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; 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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingExamine;
/** /**
* 液化气体气瓶充装信息审核 Mapper 接口 * 液化气体气瓶充装信息审核 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; 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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFilling;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; 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; ...@@ -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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.dto.CylinderFillingRecordDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
...@@ -30,14 +30,14 @@ public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingR ...@@ -30,14 +30,14 @@ public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingR
* @return * @return
*/ */
Page<List<CylinderFillingRecordDto>> queryListByQueryDto(IPage<CylinderFillingRecordDto> page, Page<List<CylinderFillingRecordDto>> queryListByQueryDto(IPage<CylinderFillingRecordDto> page,
@Param("fillingUnitName") String fillingUnitName, // @Param("fillingUnitName") String fillingUnitName,
@Param("propertyUnit") String propertyUnit, // @Param("propertyUnit") String propertyUnit,
@Param("factoryNum") String factoryNum, // @Param("factoryNum") String factoryNum,
@Param("cylinderVariety") String cylinderVariety, // @Param("cylinderVariety") String cylinderVariety,
@Param("qrCode") String qrCode, // @Param("qrCode") String qrCode,
@Param("electronicLabelCode") String electronicLabelCode, // @Param("electronicLabelCode") String electronicLabelCode,
@Param("sequenceCode") String sequenceCode, @Param("sequenceCode") String sequenceCode,
@Param("unitInnerCode") String unitInnerCode, // @Param("unitInnerCode") String unitInnerCode,
@Param("fillingStartTime") String fillingStartTime, @Param("fillingStartTime") String fillingStartTime,
@Param("fillingEndTime") String fillingEndTime, @Param("fillingEndTime") String fillingEndTime,
@Param("sortParam") String sortParam, @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; ...@@ -2,8 +2,8 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.dto.CylinderInfoDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 org.apache.ibatis.annotations.Param;
import java.util.List; 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; 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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInspection;
/** /**
* 气瓶检验信息 Mapper 接口 * 气瓶检验信息 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; 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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderTags;
import org.apache.ibatis.annotations.Param; 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; 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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
import org.apache.ibatis.annotations.Param; 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; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.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; import java.util.List;
...@@ -14,7 +14,7 @@ import java.util.List; ...@@ -14,7 +14,7 @@ import java.util.List;
* @author duanwei * @author duanwei
* @date 2022-08-11 * @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); 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; ...@@ -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.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInfoDto; 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.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; ...@@ -13,7 +13,7 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.entity.TzCylinderInfo;
* @author duanwei * @author duanwei
* @date 2022-08-11 * @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); 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; ...@@ -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.api.enums.SpecialEquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.tzs.biz.dao.ESCylinderRepository; 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.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.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.CylinderUnitServiceImpl;
import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EndUserServiceImpl; import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EndUserServiceImpl;
...@@ -66,31 +65,31 @@ public class ESCylinderServiceImpl { ...@@ -66,31 +65,31 @@ public class ESCylinderServiceImpl {
if (!ValidationUtil.isEmpty(cylinderInfoList)) { if (!ValidationUtil.isEmpty(cylinderInfoList)) {
cylinderInfoList.forEach(cylinderInfo -> { cylinderInfoList.forEach(cylinderInfo -> {
EsCylinder esCylinder = new EsCylinder(); EsCylinder esCylinder = new EsCylinder();
if (StringUtils.isNotEmpty(cylinderInfo.getLongitude())) { // if (StringUtils.isNotEmpty(cylinderInfo.getLongitude())) {
esCylinder.setLongitude(Double.parseDouble(cylinderInfo.getLongitude())); // esCylinder.setLongitude(Double.parseDouble(cylinderInfo.getLongitude()));
} // }
if (StringUtils.isNotEmpty(cylinderInfo.getLatitude())) { // if (StringUtils.isNotEmpty(cylinderInfo.getLatitude())) {
esCylinder.setLatitude(Double.parseDouble(cylinderInfo.getLatitude())); // esCylinder.setLatitude(Double.parseDouble(cylinderInfo.getLatitude()));
} // }
esCylinder.setSequenceNbr(cylinderInfo.getSequenceNbr()); esCylinder.setSequenceNbr(cylinderInfo.getSequenceNbr());
EndUser endUser = endUserService.getOne(new LambdaQueryWrapper<EndUser>().eq(EndUser::getCustomCode, // EndUser endUser = endUserService.getOne(new LambdaQueryWrapper<EndUser>().eq(EndUser::getCustomCode,
cylinderInfo.getEndCustomCode())); // cylinderInfo.getEndCustomCode()));
if (!ValidationUtil.isEmpty(endUser)) { // if (!ValidationUtil.isEmpty(endUser)) {
esCylinder.setAddress(endUser.getAddress()); // esCylinder.setAddress(endUser.getAddress());
} // }
CylinderUnit cylinderUnit = // CylinderUnit cylinderUnit =
cylinderUnitService.getOne(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId, // cylinderUnitService.getOne(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,
cylinderInfo.getAppId())); // cylinderInfo.getAppId()));
if (!ValidationUtil.isEmpty(cylinderUnit)) { // if (!ValidationUtil.isEmpty(cylinderUnit)) {
esCylinder.setRegionCode(cylinderUnit.getRegionCode()); // esCylinder.setRegionCode(cylinderUnit.getRegionCode());
} // }
esCylinder.setFactoryNum(cylinderInfo.getFactoryNum()); esCylinder.setFactoryNum(cylinderInfo.getFactoryNum());
esCylinder.setUnitName(cylinderInfo.getUnitName()); esCylinder.setUnitName(cylinderInfo.getUnitName());
if (StringUtils.isNotBlank(cylinderInfo.getLatitude()) && StringUtils.isNotBlank(cylinderInfo.getLongitude())) { // if (StringUtils.isNotBlank(cylinderInfo.getLatitude()) && StringUtils.isNotBlank(cylinderInfo.getLongitude())) {
double lat = Double.parseDouble(cylinderInfo.getLatitude()); // double lat = Double.parseDouble(cylinderInfo.getLatitude());
double lon = Double.parseDouble(cylinderInfo.getLongitude()); // double lon = Double.parseDouble(cylinderInfo.getLongitude());
esCylinder.setLocation(new GeoPoint(lat, lon)); // esCylinder.setLocation(new GeoPoint(lat, lon));
} // }
esCylinderList.add(esCylinder); esCylinderList.add(esCylinder);
}); });
} }
......
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 { ...@@ -57,11 +57,11 @@ public class CylinderUnitController extends BaseController {
unitList.stream().forEach(t -> { unitList.stream().forEach(t -> {
CylinderUnitDto temp = new CylinderUnitDto(); CylinderUnitDto temp = new CylinderUnitDto();
BeanUtils.copyProperties(t,temp); BeanUtils.copyProperties(t,temp);
if(t.getFillingPermitDate() != null && t.getFillingPermitDate().getTime() < System.currentTimeMillis()) { // if(t.getFillingPermitDate() != null && t.getFillingPermitDate().getTime() < System.currentTimeMillis()) {
temp.setOutOfDate(true); // temp.setOutOfDate(true);
} else { // } else {
temp.setOutOfDate(false); // temp.setOutOfDate(false);
} // }
result.add(temp); result.add(temp);
}); });
return ResponseHelper.buildResponse(result); return ResponseHelper.buildResponse(result);
...@@ -81,12 +81,12 @@ public class CylinderUnitController extends BaseController { ...@@ -81,12 +81,12 @@ public class CylinderUnitController extends BaseController {
// 查询气瓶数量以及过期数量 // 查询气瓶数量以及过期数量
Map<String, Long> cylinderInfo = iCylinderInfoService.queryNumAndOutOfDateNum(unit.getSequenceNbr()); Map<String, Long> cylinderInfo = iCylinderInfoService.queryNumAndOutOfDateNum(unit.getSequenceNbr());
if(cylinderInfo != null) { if(cylinderInfo != null) {
if(cylinderInfo.get("cylinderNum") != null) { // if(cylinderInfo.get("cylinderNum") != null) {
unit.setCylinderNumber(cylinderInfo.get("cylinderNum")); // unit.setCylinderNumber(cylinderInfo.get("cylinderNum"));
} // }
if(cylinderInfo.get("outOfDateNum") != null) { // if(cylinderInfo.get("outOfDateNum") != null) {
unit.setCylinderOutOfDate(cylinderInfo.get("outOfDateNum")); // unit.setCylinderOutOfDate(cylinderInfo.get("outOfDateNum"));
} // }
} }
return ResponseHelper.buildResponse(unit); 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; ...@@ -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.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInfoDto; 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.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 com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCylinderService;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation; 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; ...@@ -18,7 +18,7 @@ import java.util.List;
* @date 2022-03-04 * @date 2022-03-04
*/ */
@Service @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; ...@@ -16,7 +16,7 @@ import java.util.List;
* @date 2022-03-04 * @date 2022-03-04
*/ */
@Service @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 ...@@ -45,14 +45,14 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
public Page<CylinderFillingRecordDto> queryListByQueryDto(Page<CylinderFillingRecordDto> page, CylinderFillingRecordDto cylinderFillingRecordDto, String sortParam, String sortRule) { public Page<CylinderFillingRecordDto> queryListByQueryDto(Page<CylinderFillingRecordDto> page, CylinderFillingRecordDto cylinderFillingRecordDto, String sortParam, String sortRule) {
Page<List<CylinderFillingRecordDto>> list = this.baseMapper.queryListByQueryDto( Page<List<CylinderFillingRecordDto>> list = this.baseMapper.queryListByQueryDto(
page, page,
cylinderFillingRecordDto.getFillingUnitName(), // cylinderFillingRecordDto.getFillingUnitName(),
cylinderFillingRecordDto.getPropertyUnit(), // cylinderFillingRecordDto.getPropertyUnit(),
cylinderFillingRecordDto.getFactoryNum(), // cylinderFillingRecordDto.getFactoryNum(),
cylinderFillingRecordDto.getCylinderVariety(), // cylinderFillingRecordDto.getCylinderVariety(),
cylinderFillingRecordDto.getQrCode(), // cylinderFillingRecordDto.getQrCode(),
cylinderFillingRecordDto.getElectronicLabelCode(), // cylinderFillingRecordDto.getElectronicLabelCode(),
cylinderFillingRecordDto.getSequenceCode(), cylinderFillingRecordDto.getSequenceCode(),
cylinderFillingRecordDto.getUnitInnerCode(), // cylinderFillingRecordDto.getUnitInnerCode(),
cylinderFillingRecordDto.getFillingStarttime(), cylinderFillingRecordDto.getFillingStarttime(),
cylinderFillingRecordDto.getFillingEndtime(), cylinderFillingRecordDto.getFillingEndtime(),
sortParam, sortRule, cylinderFillingRecordDto.getAppId() 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; ...@@ -18,7 +18,7 @@ import java.util.List;
* @date 2022-03-04 * @date 2022-03-04
*/ */
@Service @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 ...@@ -641,13 +641,13 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
int interval = DateUtils.dateBetweenIncludeToday(now, cylinderInfoDto.getNextInspectionDate()) - 1; int interval = DateUtils.dateBetweenIncludeToday(now, cylinderInfoDto.getNextInspectionDate()) - 1;
cylWarningMsgDto.setNum(String.valueOf(interval)); cylWarningMsgDto.setNum(String.valueOf(interval));
cylWarningMsgDto.setFactoryNum(cylinderInfoDto.getFactoryNum()); cylWarningMsgDto.setFactoryNum(cylinderInfoDto.getFactoryNum());
cylWarningMsgDto.setUserType(cylinderInfoDto.getCustomType()); // cylWarningMsgDto.setUserType(cylinderInfoDto.getCustomType());
cylWarningMsgDto.setUserPeople(cylinderInfoDto.getCustomName()); // cylWarningMsgDto.setUserPeople(cylinderInfoDto.getCustomName());
cylWarningMsgDto.setUserPeoplePhone(cylinderInfoDto.getContactPhone()); // cylWarningMsgDto.setUserPeoplePhone(cylinderInfoDto.getContactPhone());
cylWarningMsgDto.setCylSeq(cylinderInfoDto.getSequenceCode()); cylWarningMsgDto.setCylSeq(cylinderInfoDto.getSequenceCode());
cylWarningMsgDto.setCompanyName(cylinderInfoDto.getUnitName()); cylWarningMsgDto.setCompanyName(cylinderInfoDto.getUnitName());
cylWarningMsgDto.setPhone(cylinderInfoDto.getPersonMobilePhone()); // cylWarningMsgDto.setPhone(cylinderInfoDto.getPersonMobilePhone());
cylWarningMsgDto.setPeople(cylinderInfoDto.getUnitPerson()); // cylWarningMsgDto.setPeople(cylinderInfoDto.getUnitPerson());
cylWarningMsgDto.setCurrentTime(dateStr); cylWarningMsgDto.setCurrentTime(dateStr);
// 2.循环调用规则 触发计算等级及发送消息 // 2.循环调用规则 触发计算等级及发送消息
if (log.isInfoEnabled()) { if (log.isInfoEnabled()) {
...@@ -681,8 +681,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -681,8 +681,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
*/ */
public CylinderInfo updateEarlyWarningLevel(String sequenceCode, String level) { public CylinderInfo updateEarlyWarningLevel(String sequenceCode, String level) {
CylinderInfo cylinderInfo = this.getOne(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getSequenceCode, sequenceCode)); CylinderInfo cylinderInfo = this.getOne(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getSequenceCode, sequenceCode));
cylinderInfo.setEarlyWarningLevel(level); // cylinderInfo.setEarlyWarningLevel(level);
cylinderInfo.setEarlyWarningLevelCalDate(new Date()); // cylinderInfo.setEarlyWarningLevelCalDate(new Date());
this.updateById(cylinderInfo); this.updateById(cylinderInfo);
return cylinderInfo; return cylinderInfo;
} }
...@@ -692,7 +692,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -692,7 +692,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
List<CylinderInfo> cylinderInfos = new ArrayList<>(); List<CylinderInfo> cylinderInfos = new ArrayList<>();
cylinderInfoDtos.forEach(c -> { cylinderInfoDtos.forEach(c -> {
CylinderInfo cylinderInfo = this.getOne(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getSequenceCode, c.getSequenceCode())); CylinderInfo cylinderInfo = this.getOne(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getSequenceCode, c.getSequenceCode()));
cylinderInfo.setNextInspectionDate(c.getNextInspectionDate()); // cylinderInfo.setNextInspectionDate(c.getNextInspectionDate());
cylinderInfos.add(cylinderInfo); cylinderInfos.add(cylinderInfo);
}); });
if (!cylinderInfos.isEmpty()) { 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; ...@@ -16,7 +16,7 @@ import java.util.List;
* @date 2022-03-04 * @date 2022-03-04
*/ */
@Service @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; ...@@ -16,7 +16,7 @@ import java.util.List;
* @date 2022-03-04 * @date 2022-03-04
*/ */
@Service @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; ...@@ -16,7 +16,7 @@ import java.util.List;
* @date 2021-12-14 * @date 2021-12-14
*/ */
@Service @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; ...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.*; 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.mapper.TzCylinderMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCylinderService; import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCylinderService;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
...@@ -25,7 +25,7 @@ import java.util.Map; ...@@ -25,7 +25,7 @@ import java.util.Map;
* @date 2022-08-11 * @date 2022-08-11
*/ */
@Service @Service
public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, TzCylinderInfo, TzCylinderMapper> implements ITzCylinderService { public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, CylinderInfo, TzCylinderMapper> implements ITzCylinderService {
@Autowired @Autowired
private TzCylinderMapper tzCylinderMapper; 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