docking
/
docking
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

格式调整

liujun-yunwei
zhaokai 2025-06-26 17:03:15 +08:00
parent 3f00f4dafe
commit 595e7b7bc3
123 changed files with 472 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsCheckCycleUnitEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjCheckCycleUnitEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 DangerCheckTask 字段：巡检周期单位。 checkCycleUnit
*/
@Getter
public enum TsCheckCycleUnitEnum {
public enum DjCheckCycleUnitEnum {
HOUR("1", "小时"),
DAY("2", "天"),
@ -16,7 +16,7 @@ public enum TsCheckCycleUnitEnum {
;
private final String code;
private final String desc;
TsCheckCycleUnitEnum(String code, String desc) {
DjCheckCycleUnitEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsCheckLevelEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjCheckLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 DangerCheckTask 字段：巡检级别。 checkLevel
*/
@Getter
public enum TsCheckLevelEnum {
public enum DjCheckLevelEnum {
ENTERPRISE("1", "企业级"),
DEPARTMENT("2", "部门级"),
@ -18,7 +18,7 @@ public enum TsCheckLevelEnum {
;
private final String code;
private final String desc;
TsCheckLevelEnum(String code, String desc) {
DjCheckLevelEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsCheckRiskLevelEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjCheckRiskLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口:隐患排查记录, DangerCheckRecord 字段：排查风险等级。 checkRiskLevel
*/
@Getter
public enum TsCheckRiskLevelEnum {
public enum DjCheckRiskLevelEnum {
MAJOR_RISK("1", "重大风险"),
SIGNIFICANT_RISK("2", "较大风险"),
@ -16,7 +16,7 @@ public enum TsCheckRiskLevelEnum {
;
private final String code;
private final String desc;
TsCheckRiskLevelEnum(String code, String desc) {
DjCheckRiskLevelEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsCheckStatusEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjCheckStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口:隐患排查记录, DangerCheckRecord 字段：排查风险名称。 checkStatus
*/
@Getter
public enum TsCheckStatusEnum {
public enum DjCheckStatusEnum {
NORMAL("1", "正常"),
HIDDEN_DANGERS("2", "存在隐患"),
@ -16,7 +16,7 @@ public enum TsCheckStatusEnum {
;
private final String code;
private final String desc;
TsCheckStatusEnum(String code, String desc) {
DjCheckStatusEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsCheckTaskTypeEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjCheckTaskTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 DangerCheckTask 字段：巡检任务类型。 checkTaskType
*/
@Getter
public enum TsCheckTaskTypeEnum {
public enum DjCheckTaskTypeEnum {
PERSONAL("1", "个人任务"),
DEPARTMENT("2", "部门任务"),
@ -17,7 +17,7 @@ public enum TsCheckTaskTypeEnum {
;
private final String code;
private final String desc;
TsCheckTaskTypeEnum(String code, String desc) {
DjCheckTaskTypeEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsClassify1Enum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjClassify1Enum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 SafeRiskControlMeasure 字段：管控措施分类1。 classify1
*/
@Getter
public enum TsClassify1Enum {
public enum DjClassify1Enum {
ENGINEERING("1", "工程技术"),
MAINTENANCE("2", "维护保养"),
@ -16,7 +16,7 @@ public enum TsClassify1Enum {
;
private final String code;
private final String desc;
TsClassify1Enum(String code, String desc) {
DjClassify1Enum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsClassify2Enum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjClassify2Enum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 SafeRiskControlMeasure 字段：管控措施分类2 c1assify2
*/
@Getter
public enum TsClassify2Enum {
public enum DjClassify2Enum {
CLASSIFY2ONE("101", "工艺控制"),
CLASSIFY2TWO("102", "关键设备/部件"),
CLASSIFY2THREE("103", "安全附件"),
@ -29,7 +29,7 @@ public enum TsClassify2Enum {
private final String code;
private final String desc;
TsClassify2Enum(String code, String desc) {
DjClassify2Enum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsDangerLevelEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjDangerLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,14 +7,14 @@ import lombok.Getter;
* 接口:隐患信息, DangerInfo 字段：隐患等级。 dangerLevel
*/
@Getter
public enum TsDangerLevelEnum {
public enum DjDangerLevelEnum {
GENERAL_DANGER("1", "一般隐患"),
MAJOR_DANGER("2", "重大隐患"),
;
private final String code;
private final String desc;
TsDangerLevelEnum(String code, String desc) {
DjDangerLevelEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsDangerManageTypeEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjDangerManageTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,14 +7,14 @@ import lombok.Getter;
* 接口:隐患信息, DangerInfo 字段：治理类型。 dangerManageType
*/
@Getter
public enum TsDangerManageTypeEnum {
public enum DjDangerManageTypeEnum {
TYPE1("1", "即查即改"),
TYPE2("2", "期限整改"),
;
private final String code;
private final String desc;
TsDangerManageTypeEnum(String code, String desc) {
DjDangerManageTypeEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsDangerSrcEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjDangerSrcEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口:隐患信息, DangerInfo 字段：隐患来源。 dangerSrc
*/
@Getter
public enum TsDangerSrcEnum {
public enum DjDangerSrcEnum {
SRC1("1", "日常排查"),
SRC2("2", "综合性排查"),
@ -23,7 +23,7 @@ public enum TsDangerSrcEnum {
;
private final String code;
private final String desc;
TsDangerSrcEnum(String code, String desc) {
DjDangerSrcEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsDangerStateEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjDangerStateEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口:隐患信息, DangerInfo 字段：隐患状态。 dangerState
*/
@Getter
public enum TsDangerStateEnum {
public enum DjDangerStateEnum {
UNDER_RECTIFICATION("1", "整改中"),
PENDING("2", "待验收"),
@ -15,7 +15,7 @@ public enum TsDangerStateEnum {
;
private final String code;
private final String desc;
TsDangerStateEnum(String code, String desc) {
DjDangerStateEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsDataSrcEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjDataSrcEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,14 +7,14 @@ import lombok.Getter;
* 接口 SafeRiskControlMeasure 字段：管控方式。 dataSrc
*/
@Getter
public enum TsDataSrcEnum {
public enum DjDataSrcEnum {
AUTOMATED("1", "自动化监控"),
HAZARD_INVESTIGATION("2", "隐患排查"),
;
private final String code;
private final String desc;
TsDataSrcEnum(String code, String desc) {
DjDataSrcEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsHazardCategoryEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjHazardCategoryEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口:隐患信息, DangerInfo 字段：隐患类别。 hazardCategory
*/
@Getter
public enum TsHazardCategoryEnum {
public enum DjHazardCategoryEnum {
TYPE1("1", "其他隐患"),
TYPE2("2", "主要负责人登记隐患"),
@ -16,7 +16,7 @@ public enum TsHazardCategoryEnum {
;
private final String code;
private final String desc;
TsHazardCategoryEnum(String code, String desc) {
DjHazardCategoryEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsHazardDangerTypeEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjHazardDangerTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口:隐患信息, DangerInfo 字段：隐患类型。 hazardDangerType
*/
@Getter
public enum TsHazardDangerTypeEnum {
public enum DjHazardDangerTypeEnum {
TYPE1("1", "安全"),
TYPE2("2", "工艺"),
@ -20,7 +20,7 @@ public enum TsHazardDangerTypeEnum {
;
private final String code;
private final String desc;
TsHazardDangerTypeEnum(String code, String desc) {
DjHazardDangerTypeEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsHazardRankEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjHazardRankEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 SafeRiskAnalysisUnit 字段：风险分析单元等级。 hazardRank
*/
@Getter
public enum TsHazardRankEnum {
public enum DjHazardRankEnum {
ONE("1", "Ⅰ级最高"),
TWO("2", "Ⅱ级"),
@ -16,7 +16,7 @@ public enum TsHazardRankEnum {
;
private final String code;
private final String desc;
TsHazardRankEnum(String code, String desc) {
DjHazardRankEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsHazardTypeEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjHazardTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 SafeRiskAnalysisUnit 字段：风险分析单元分类。 hazardType
*/
@Getter
public enum TsHazardTypeEnum {
public enum DjHazardTypeEnum {
ACTIVITIES("1", "作业活动"),
WORKPLACE("2", "作业场所"),
@ -16,7 +16,7 @@ public enum TsHazardTypeEnum {
;
private final String code;
private final String desc;
TsHazardTypeEnum(String code, String desc) {
DjHazardTypeEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsHeightWorkLevelEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjHeightWorkLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -8,7 +8,7 @@ import lombok.Getter;
*/
@Getter
public enum TsHeightWorkLevelEnum {
public enum DjHeightWorkLevelEnum {
ONE("1", "Ⅰ级"),
TWO("2", "Ⅱ级"),
THREE("3", "Ⅲ级"),
@ -17,7 +17,7 @@ public enum TsHeightWorkLevelEnum {
private final String code;
private final String desc;
TsHeightWorkLevelEnum(String code, String desc) {
DjHeightWorkLevelEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsHoistWorkLevelEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjHoistWorkLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* * 接口 SpecialWorkTicket_HoistWork 字段：巡检级别。 workLevel
*/
@Getter
public enum TsHoistWorkLevelEnum {
public enum DjHoistWorkLevelEnum {
ONE("1", "一级吊装作业"),
TWO("2", "二级吊装作业"),
@ -16,7 +16,7 @@ public enum TsHoistWorkLevelEnum {
;
private final String code;
private final String desc;
TsHoistWorkLevelEnum(String code, String desc) {
DjHoistWorkLevelEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsHotWorkLevelEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjHotWorkLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,14 +7,14 @@ import lombok.Getter;
* 接口:动火作业, SpecialWorkTicket_HotWork 字段：动火级别。 hotWorkLevel
*/
@Getter
public enum TsHotWorkLevelEnum {
public enum DjHotWorkLevelEnum {
HOTWORKSUPER("1", "特级"),
HOTWORKONE("2", "一级"),
HOTWORKTWO("3", "二级"),
;
private final String code;
private final String desc;
TsHotWorkLevelEnum(String code, String desc) {
DjHotWorkLevelEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsIsCommonStatusEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjIsCommonStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -9,13 +9,13 @@ import lombok.Getter;
*/
@Getter
public enum TsIsCommonStatusEnum {
public enum DjIsCommonStatusEnum {
NO("0", "否"),
YES("1", "是");
private final String code;
private final String desc;
TsIsCommonStatusEnum(String code, String desc) {
DjIsCommonStatusEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsIsDefendEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjIsDefendEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,14 +7,14 @@ import lombok.Getter;
* 接口:隐患排查记录, DangerCheckRecord 字段：是否包保责任人任务。 isDefend
*/
@Getter
public enum TsIsDefendEnum {
public enum DjIsDefendEnum {
NO("0", "否"),
YES("1", "是"),
;
private final String code;
private final String desc;
TsIsDefendEnum(String code, String desc) {
DjIsDefendEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsIsHazardEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjIsHazardEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,14 +7,14 @@ import lombok.Getter;
* 接口 SafeRiskAnalysisUnit 字段：是否为风险分析对象。 IsHazard
*/
@Getter
public enum TsIsHazardEnum {
public enum DjIsHazardEnum {
NO("0", "否"),
YES("1", "是");
;
private final String code;
private final String desc;
TsIsHazardEnum(String code, String desc) {
DjIsHazardEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsIsInvolveEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjIsInvolveEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -8,13 +8,13 @@ import lombok.Getter;
*/
@Getter
public enum TsIsInvolveEnum {
public enum DjIsInvolveEnum {
NO("0", "不涉及"),
YES("1", "涉及");
private final String code;
private final String desc;
TsIsInvolveEnum(String code, String desc) {
DjIsInvolveEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsRecordDeletedEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjRecordDeletedEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,14 +7,14 @@ import lombok.Getter;
* 删除标志。
*/
@Getter
public enum TsRecordDeletedEnum {
public enum DjRecordDeletedEnum {
NORMAL("0", "正常"),
DELETED("1", "已删除"),
;
private final String code;
private final String desc;
TsRecordDeletedEnum(String code, String desc) {
DjRecordDeletedEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsRiskMeasureLevelEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjRiskMeasureLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 SafeRiskControlMeasure 字段：管控级别。 riskMeasureLevel
*/
@Getter
public enum TsRiskMeasureLevelEnum {
public enum DjRiskMeasureLevelEnum {
ENTERPRISE("1", "企业级"),
DEPARTMENT("2", "部门级"),
@ -20,7 +20,7 @@ public enum TsRiskMeasureLevelEnum {
;
private final String code;
private final String desc;
TsRiskMeasureLevelEnum(String code, String desc) {
DjRiskMeasureLevelEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsTaskNumEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjTaskNumEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口:隐患排查任务 DangerCheckTask 字段：包保任务对应项。 taskNum
*/
@Getter
public enum TsTaskNumEnum {
public enum DjTaskNumEnum {
ONE("1", "2","主要负责人任务","1","核查技术负责人、操作负责人是否按规定时间、规定内容履行职责"),
TWO("2", "2","主要负责人任务","2","确认重大危险源安全管理制度、操作规程是否实用有效，操作员是否按制度和操作规程执行"),
THREE("3", "2","主要负责人任务","3","核查是否存在重大安全隐患，确认各类安全隐患是否及时整改"),
@ -44,7 +44,7 @@ public enum TsTaskNumEnum {
private final String taskNum;
private final String taskNumName;
TsTaskNumEnum(String index, String workTypeCode, String workTypedesc, String taskNum, String taskNumName) {
DjTaskNumEnum(String index, String workTypeCode, String workTypedesc, String taskNum, String taskNumName) {
this.index = index;
this.workTypeCode = workTypeCode;
this.workTypedesc = workTypedesc;

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsWorkCategoryEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjWorkCategoryEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -8,13 +8,13 @@ import lombok.Getter;
*/
@Getter
public enum TsWorkCategoryEnum {
public enum DjWorkCategoryEnum {
BLIND_PLATE_DRAWING("1", "抽盲板"),
BLOCK_BLIND("2", "堵盲板");
private final String code;
private final String desc;
TsWorkCategoryEnum(String code, String desc) {
DjWorkCategoryEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsWorkDayTypeEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjWorkDayTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 DangerCheckTask 字段：工作日类型。 workDayType
*/
@Getter
public enum TsWorkDayTypeEnum {
public enum DjWorkDayTypeEnum {
EVERYDAY("0", "每天"),
WORKDAY("1", "法定工作日"),
@ -16,7 +16,7 @@ public enum TsWorkDayTypeEnum {
;
private final String code;
private final String desc;
TsWorkDayTypeEnum(String code, String desc) {
DjWorkDayTypeEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/ts/TsWorkTypeEnum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/enums/DjWorkTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.ts;
package com.zcloud.modules.data.base.heBei.dj.enums;
import lombok.Getter;
@ -7,7 +7,7 @@ import lombok.Getter;
* 接口 DangerCheckTask 字段：任务类型。 workType
*/
@Getter
public enum TsWorkTypeEnum {
public enum DjWorkTypeEnum {
WORKTYPEZERO("1", "日常任务"),
WORKTYPEONE("2", "主要负责人任务"),
WORKTYPETWO("3", "技术负责人任务"),
@ -16,7 +16,7 @@ public enum TsWorkTypeEnum {
;
private final String code;
private final String desc;
TsWorkTypeEnum(String code, String desc) {
DjWorkTypeEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}

6
src/main/java/com/zcloud/modules/data/base/heBei/url/TsReportV2Enum.java → src/main/java/com/zcloud/modules/data/base/heBei/dj/url/DjReportV2Enum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.heBei.url;
package com.zcloud.modules.data.base.heBei.dj.url;
import lombok.Getter;
@ -9,7 +9,7 @@ import lombok.Getter;
* 版本：2.0
*/
@Getter
public enum TsReportV2Enum {
public enum DjReportV2Enum {
SAFERISKANALYSISUNIT("1", "安全风险分析单元", "SafeRiskAnalysisUnit", "", "POST"),
SAFERISKEVENT("2", "安全风险事件", "SafeRiskEvent", "", "POST"),
SAFERISKCONTROLMEASURE("3", "安全风险管控措施", "SafeRiskControlMeasure", "", "POST"),
@ -33,7 +33,7 @@ public enum TsReportV2Enum {
private final String remark;
private final String requestType;
TsReportV2Enum(String code, String desc, String url, String remark, String requestType) {
DjReportV2Enum(String code, String desc, String url, String remark, String requestType) {
this.code = code;
this.desc = desc;
this.url = url;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyCheckStatusEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyCheckStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyCheckTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyCheckTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyClassify1Enum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyClassify1Enum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyClassify2Enum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyClassify2Enum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyDangerLevelEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyDangerLevelEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;
/**

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyDangerManageTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyDangerManageTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyDangerSrcEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyDangerSrcEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyDangerStatusEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyDangerStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyDataSrcEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyDataSrcEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyDeleteStatusEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyDeleteStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyGasTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyGasTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyHarmTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyHarmTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyHazardCategoryEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyHazardCategoryEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyHazardDangerTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyHazardDangerTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyIsCancelledEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyIsCancelledEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyIsChangedEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyIsChangedEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyIsCommonStatusEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyIsCommonStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyIsContractorWorkEnumDto.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyIsContractorWorkEnumDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyIsDefendEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyIsDefendEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyIsInvolveEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyIsInvolveEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyPassDirectionEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyPassDirectionEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyResultStatusEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyResultStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyResultsUnitEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyResultsUnitEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyRiskGradEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyRiskGradEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyRiskLeveEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyRiskLeveEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyRunStatusEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyRunStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TySexEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TySexEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyTicketBigTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyTicketBigTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyTicketStatusEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyTicketStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyTicketTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyTicketTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyWorkDayTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyWorkDayTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;
/**

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/TyWorkTypeEnum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/enums/TyWorkTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.ty;
package com.zcloud.modules.data.base.neiMengGu.ty.enums;
import lombok.Getter;
/**

2
src/main/java/com/zcloud/modules/data/base/neiMengGu/url/TyReportV16Enum.java → src/main/java/com/zcloud/modules/data/base/neiMengGu/ty/url/TyReportV16Enum.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.base.neiMengGu.url;
package com.zcloud.modules.data.base.neiMengGu.ty.url;
import lombok.Getter;

50
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsBlindPlateWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjBlindPlateWorkReqDto.java
View File

@ -1,12 +1,10 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHotWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.base.heBei.ts.TsWorkCategoryEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import io.swagger.annotations.ApiModel;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjWorkCategoryEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -21,13 +19,13 @@ import java.util.List;
@NoArgsConstructor
@Data
public class TsBlindPlateWorkReqDto {
public class DjBlindPlateWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -72,14 +70,14 @@ public class TsBlindPlateWorkReqDto {
@JsonProperty("workPlace")
private String workPlace;
/**
* 关联枚举：{@link TsWorkCategoryEnum}
* 关联枚举：{@link DjWorkCategoryEnum}
*/
@ApiModelProperty(value = "作业类别,参考枚举TsWorkCategoryEnum", required = true)
@ApiModelProperty(value = "作业类别,参考枚举DjWorkCategoryEnum", required = true)
@JsonProperty("workCategory")
private String workCategory;
@ApiModelProperty(value = "设备管道具体参数", required = true)
@JsonProperty("pipelineParam")
private TsPipelineParamDto pipelineParam;
private DjPipelineParamDto pipelineParam;
@ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
@JsonProperty("relatedWorkId")
private List<String> relatedWorkId;
@ -95,40 +93,40 @@ public class TsBlindPlateWorkReqDto {
private String locationMap;
@ApiModelProperty(value = "盲板位置图及编号的编制人", required = true)
@JsonProperty("preparedUser")
private TsPreparedUserDto preparedUser;
private DjPreparedUserDto preparedUser;
@ApiModelProperty(value = "风险识别", required = true)
@JsonProperty("riskIdentification")
private String riskIdentification;
@ApiModelProperty(value = "作业人员列表", required = true)
@JsonProperty("workUser")
private List<TsWorkUserDto> workUser;
private List<DjWorkUserDto> workUser;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
@JsonProperty("contractorWork")
private String contractorWork;
@ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "安全措施列表",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
private List<String> otherMeasure;
@ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
@ -136,23 +134,23 @@ public class TsBlindPlateWorkReqDto {
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业负责人",required = true)
@JsonProperty("workHeadUser")
private TsWorkHeadUserDto workHeadUser;
private DjWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "单位审批人",required = true)
@JsonProperty("unitApprovalUser")
private TsApprovalUserDto unitApprovalUser;
private DjApprovalUserDto unitApprovalUser;
@ApiModelProperty(value = "监护人", required = true)
@JsonProperty("guardianUser")
private TsGuardianUserDto guardianUser;
private DjGuardianUserDto guardianUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

11
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsCheckAcceptReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjCheckAcceptReqDto.java
View File

@ -1,15 +1,12 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.TsDetectInfoDto;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* [唐山-园区对接-特殊作业.pdf]:<a href="http://47.92.113.182:3000/docking/doc/src/branch/main/%E5%9B%AD%E5%8C%BA%E7%BA%A7%E5%AF%B9%E6%8E%A5%E6%96%87%E4%BB%B6/%E5%94%90%E5%B1%B1-%E5%9B%AD%E5%8C%BA%E5%AF%B9%E6%8E%A5-%E7%89%B9%E6%AE%8A%E4%BD%9C%E4%B8%9A.pdf">git地址</a>
* 特殊作业验收信息
@ -18,12 +15,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("特殊作业验收信息请求实体")
public class TsCheckAcceptReqDto {
public class DjCheckAcceptReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)

46
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsConfinedSpaceWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjConfinedSpaceWorkReqDto.java
View File

@ -1,9 +1,9 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -19,12 +19,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("受限空间作业请求实体")
public class TsConfinedSpaceWorkReqDto {
public class DjConfinedSpaceWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -101,9 +101,9 @@ public class TsConfinedSpaceWorkReqDto {
@ApiModelProperty(value = "作业人员列表", required = true)
@JsonProperty("workUser")
private List<TsWorkUserDto> workUser;
private List<DjWorkUserDto> workUser;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业",required = true)
@JsonProperty("contractorWork")
@ -111,31 +111,31 @@ public class TsConfinedSpaceWorkReqDto {
@ApiModelProperty(value = "地图位置-中心点，WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界，WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "气体分析-有毒气体",required = false)
@JsonProperty("hazarAnalysis")
private List<TsHazarAnalysisDto> hazarAnalysis;
private List<DjHazarAnalysisDto> hazarAnalysis;
@ApiModelProperty(value = "气体分析-可燃气体")
@JsonProperty("combustibleAnalysis")
private List<TsCombustibleAnalysisDto> combustibleAnalysis;
private List<DjCombustibleAnalysisDto> combustibleAnalysis;
@ApiModelProperty(value = "气体分析-氧气")
@JsonProperty("oxygenAnalysis")
private TsOxygenAnalysisDto oxygenAnalysis;
private DjOxygenAnalysisDto oxygenAnalysis;
@ApiModelProperty(value = "分析人员",required = true)
@JsonProperty("analysisUser")
private TsAnalysisUserDto analysisUser;
private DjAnalysisUserDto analysisUser;
@ApiModelProperty(value = "安全措施列表",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
@ -143,11 +143,11 @@ public class TsConfinedSpaceWorkReqDto {
@ApiModelProperty(value = "其他措施编制人，当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
@ -155,28 +155,28 @@ public class TsConfinedSpaceWorkReqDto {
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业负责人",required = true)
@JsonProperty("workHeadUser")
private TsWorkHeadUserDto workHeadUser;
private DjWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "单位审批人",required = true)
@JsonProperty("unitApprovalUser")
private TsApprovalUserDto unitApprovalUser;
private DjApprovalUserDto unitApprovalUser;
@ApiModelProperty(value = "监护人", required = true)
@JsonProperty("guardianUser")
private TsGuardianUserDto guardianUser;
private DjGuardianUserDto guardianUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

23
src/main/java/com/zcloud/modules/data/dto/hebei/ts/req/TsDangerCheckRecordReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjDangerCheckRecordReqDto.java
View File

@ -1,7 +1,10 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjCheckRiskLevelEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjCheckStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsDefendEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,13 +18,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("隐患排查任务请求实体")
public class TsDangerCheckRecordReqDto {
public class DjDangerCheckRecordReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -65,26 +68,26 @@ public class TsDangerCheckRecordReqDto {
@ApiModelProperty(value = "IMEI码,国际移动设备识别码 IMEI,当设备存在多个IMEI 码时,只上传第一个", required = true)
private String mobileMe;
/**
* 关联枚举：{@link TsIsDefendEnum}
* 关联枚举：{@link DjIsDefendEnum}
*/
@JsonProperty("isDefend")
@ApiModelProperty(value = "是否包保责任人任务, 当排查任务中任务类型为主要负责人任务、技术 负责人任务、操作负责人任务时,此项为 1,参考枚举TsIsDefendEnum", required = true)
@ApiModelProperty(value = "是否包保责任人任务, 当排查任务中任务类型为主要负责人任务、技术 负责人任务、操作负责人任务时,此项为 1,参考枚举DjIsDefendEnum", required = true)
private String isDefend;
/**
* 关联枚举：{@link TsCheckStatusEnum}
* 关联枚举：{@link DjCheckStatusEnum}
*/
@JsonProperty("checkStatus")
@ApiModelProperty(value = "排查风险名称,参考枚举TsCheckStatusEnum", required = true)
@ApiModelProperty(value = "排查风险名称,参考枚举DjCheckStatusEnum", required = true)
private String checkStatus;
@JsonProperty("checkRiskName")
@ApiModelProperty(value = "排查风险名称", required = false)
private String checkRiskName;
/**
* 关联枚举：{@link TsCheckRiskLevelEnum}
* 关联枚举：{@link DjCheckRiskLevelEnum}
*/
@JsonProperty("checkRiskLevel")
@ApiModelProperty(value = "排查风险等级,参考枚举TsCheckRiskLevelEnum", required = true)
@ApiModelProperty(value = "排查风险等级,参考枚举DjCheckRiskLevelEnum", required = true)
private String checkRiskLevel;
@JsonProperty("checkDep")

26
src/main/java/com/zcloud/modules/data/dto/hebei/ts/req/TsDangerCheckTaskReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjDangerCheckTaskReqDto.java
View File

@ -1,7 +1,7 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.*;
import com.zcloud.modules.data.base.heBei.dj.enums.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,14 +15,14 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("隐患排查任务请求实体")
public class TsDangerCheckTaskReqDto {
public class DjDangerCheckTaskReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -60,7 +60,7 @@ public class TsDangerCheckTaskReqDto {
@ApiModelProperty(value = "巡检周期,本次生成排查任务到下次生成排查任务的时间跨度,填写数字值", required = true)
private String checkCycle;
/**
* 关联枚举：{@link TsCheckCycleUnitEnum}
* 关联枚举：{@link DjCheckCycleUnitEnum}
*/
@JsonProperty("checkCycleUnit")
@ApiModelProperty(value = "巡检周期单位,本次生成排查任务到下次生成排查任务的时间跨度的单位,参照枚举TsCheckCycleUnitEnum", required = true)
@ -74,32 +74,32 @@ public class TsDangerCheckTaskReqDto {
@ApiModelProperty(value = "工作结束时间,当排查周期是小时的时候必传,字符串,格式:HH:mm:ss", required = false)
private String workEndTime;
/**
* 关联枚举：{@link TsWorkDayTypeEnum}
* 关联枚举：{@link DjWorkDayTypeEnum}
*/
@JsonProperty("workDayType")
@ApiModelProperty(value = "工作日类型,参照枚举TsWorkDayTypeEnum", required = false)
private String workDayType;
/**
* 关联枚举：{@link TsWorkTypeEnum}
* 关联枚举：{@link DjWorkTypeEnum}
*/
@JsonProperty("workType")
@ApiModelProperty(value = "任务类型,参照枚举TsWorkTypeEnum", required = true)
private String workType;
/**
* 关联枚举：{@link TsTaskNumEnum}
* 关联枚举：{@link DjTaskNumEnum}
*/
@JsonProperty("taskNum")
@ApiModelProperty(value = "包保任务对应项, 当任务类型为 2(主要负责人任务)、3(技术负责人任 务)、4(操作负责人任务)、时此项必填。数字应与《危险化学品企业重大 危险源安全包保责任人隐患排查任务清单》各项标号对应。\n" +
"字符串,填写数字枚举值,参考枚举TsTaskNumEnum中taskNUm", required = true)
"字符串,填写数字枚举值,参考枚举DjTaskNumEnum", required = true)
private String taskNum;
/**
* 关联枚举：{@link TsCheckLevelEnum}
* 关联枚举：{@link DjCheckLevelEnum}
*/
@JsonProperty("checkLevel")
@ApiModelProperty(value = "巡检级别,参考枚举TsCheckLevelEnum", required = true)
@ApiModelProperty(value = "巡检级别,参考枚举DjCheckLevelEnum", required = true)
private String checkLevel;
@JsonProperty("checkTimesDay")
@ -110,10 +110,10 @@ public class TsDangerCheckTaskReqDto {
@ApiModelProperty(value = "巡检频次(次数),非必传,填写数字值", required = false)
private String checkTimesNum;
/**
* 关联枚举：{@link TsCheckTaskTypeEnum}
* 关联枚举：{@link DjCheckTaskTypeEnum}
*/
@JsonProperty("checkTaskType")
@ApiModelProperty(value = "巡检任务类型,参考枚举TsCheckTaskTypeEnum,非必填", required = false)
@ApiModelProperty(value = "巡检任务类型,参考枚举DjCheckTaskTypeEnum,非必填", required = false)
private String checkTaskType;
@JsonProperty("checkStartDate")

32
src/main/java/com/zcloud/modules/data/dto/hebei/ts/req/TsDangerInfoReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjDangerInfoReqDto.java
View File

@ -1,7 +1,7 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.*;
import com.zcloud.modules.data.base.heBei.dj.enums.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,13 +15,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("隐患信息请求实体")
public class TsDangerInfoReqDto {
public class DjDangerInfoReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -63,10 +63,10 @@ public class TsDangerInfoReqDto {
@ApiModelProperty(value = "隐患名称", required = true)
private String dangerName;
/**
* 关联枚举：{@link TsDangerLevelEnum}
* 关联枚举：{@link DjDangerLevelEnum}
*/
@JsonProperty("dangerLevel")
@ApiModelProperty(value = "隐患等级,参考枚举TsDangerLevelEnum", required = true)
@ApiModelProperty(value = "隐患等级,参考枚举DjDangerLevelEnum", required = true)
private String dangerLevel;
@JsonProperty("registerTime")
@ -77,31 +77,31 @@ public class TsDangerInfoReqDto {
@ApiModelProperty(value = "登记人姓名", required = true)
private String registrant;
/**
* 关联枚举：{@link TsDangerSrcEnum}
* 关联枚举：{@link DjDangerSrcEnum}
*/
@JsonProperty("dangerSrc")
@ApiModelProperty(value = "隐患来源,参考枚举TsDangerSrcEnum", required = true)
@ApiModelProperty(value = "隐患来源,参考枚举DjDangerSrcEnum", required = true)
private String dangerSrc;
@JsonProperty("enforcementId")
@ApiModelProperty(value = "执法编号,当隐患来源类型为 11(执法检查)时此项必填", required = false)
private String enforcementId;
/**
* 关联枚举：{@link TsDangerManageTypeEnum}
* 关联枚举：{@link DjDangerManageTypeEnum}
*/
@JsonProperty("dangerManageType")
@ApiModelProperty(value = "隐患治理类型,参考枚举TsDangerManageTypeEnum", required = true)
@ApiModelProperty(value = "隐患治理类型,参考枚举DjDangerManageTypeEnum", required = true)
private String dangerManageType;
/**
* 关联枚举：{@link TsHazardDangerTypeEnum}
* 关联枚举：{@link DjHazardDangerTypeEnum}
*/
@JsonProperty("hazardDangerType")
@ApiModelProperty(value = "隐患类型,参考枚举TsHazardDangerTypeEnum", required = true)
@ApiModelProperty(value = "隐患类型,参考枚举DjHazardDangerTypeEnum", required = true)
private String hazardDangerType;
/**
* 关联枚举：{@link TsHazardCategoryEnum}
* 关联枚举：{@link DjHazardCategoryEnum}
*/
@JsonProperty("hazardCategory")
@ApiModelProperty(value = "隐患类别,参考枚举TsHazardCategoryEnum", required = true)
@ApiModelProperty(value = "隐患类别,参考枚举DjHazardCategoryEnum", required = true)
private String hazardCategory;
@JsonProperty("dangerDesc")
@ -140,10 +140,10 @@ public class TsDangerInfoReqDto {
private String checkAcceptComment;
/**
* 关联枚举：{@link TsDangerStateEnum}
* 关联枚举：{@link DjDangerStateEnum}
*/
@JsonProperty("dangerState")
@ApiModelProperty(value = "隐患状态,参考枚举TsDangerStateEnum", required = true)
@ApiModelProperty(value = "隐患状态,参考枚举DjDangerStateEnum", required = true)
private String dangerState;

49
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsElectricityWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjElectricityWorkReqDto.java
View File

@ -1,10 +1,9 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHeightWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,13 +19,13 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("临时用电作业请求实体")
public class TsElectricityWorkReqDto {
public class DjElectricityWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -110,10 +109,10 @@ public class TsElectricityWorkReqDto {
@ApiModelProperty(value = "作业人员列表", required = true)
@JsonProperty("workUser")
private List<TsWorkUserInfoDto> workUser;
private List<DjWorkUserInfoDto> workUser;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
@JsonProperty("contractorWork")
@ -121,31 +120,31 @@ public class TsElectricityWorkReqDto {
@ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "气体分析-有毒气体",required = false)
@JsonProperty("hazarAnalysis")
private List<TsHazarAnalysisDto> hazarAnalysis;
private List<DjHazarAnalysisDto> hazarAnalysis;
@ApiModelProperty(value = "气体分析-可燃气体")
@JsonProperty("combustibleAnalysis")
private List<TsCombustibleAnalysisDto> combustibleAnalysis;
private List<DjCombustibleAnalysisDto> combustibleAnalysis;
@ApiModelProperty(value = "气体分析-氧气")
@JsonProperty("oxygenAnalysis")
private TsOxygenAnalysisDto oxygenAnalysis;
private DjOxygenAnalysisDto oxygenAnalysis;
@ApiModelProperty(value = "分析人员",required = true)
@JsonProperty("analysisUser")
private TsAnalysisUserDto analysisUser;
private DjAnalysisUserDto analysisUser;
@ApiModelProperty(value = "安全措施",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
@ -153,11 +152,11 @@ public class TsElectricityWorkReqDto {
@ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
@ -165,31 +164,31 @@ public class TsElectricityWorkReqDto {
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业负责人",required = true)
@JsonProperty("workHeadUser")
private TsElecWorkHeadUserDto workHeadUser;
private DjElecWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "用电单位审批人",required = true)
@JsonProperty("electricityApprovalUser")
private TsApprovalUserDto electricityApprovalUser;
private DjApprovalUserDto electricityApprovalUser;
@ApiModelProperty(value = "配送电单位审批人",required = true)
@JsonProperty("deliveryApprovalUser")
private TsApprovalUserDto deliveryApprovalUser;
private DjApprovalUserDto deliveryApprovalUser;
@ApiModelProperty(value = "监护人", required = true)
@JsonProperty("guardianUser")
private TsGuardianUserDto guardianUser;
private DjGuardianUserDto guardianUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

14
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsGasAnalysisDataReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjGasAnalysisDataReqDto.java
View File

@ -1,10 +1,8 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHoistWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.DjDetectInfoDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,12 +18,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("特殊作业气体分析数据请求实体")
public class TsGasAnalysisDataReqDto {
public class DjGasAnalysisDataReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -65,7 +63,7 @@ public class TsGasAnalysisDataReqDto {
@ApiModelProperty(value = "气体检测信息", required = true)
@JsonProperty("detectInfo")
private List<TsDetectInfoDto> detectInfo;
private List<DjDetectInfoDto> detectInfo;
@ApiModelProperty(value = "确认人签字图片.字符串，必传，格式：data:image/png;base64,.", required = true)
@JsonProperty("confirmSign")

42
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsGroundBreakWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjGroundBreakWorkReqDto.java
View File

@ -1,9 +1,9 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -19,12 +19,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("动土作业请求实体")
public class TsGroundBreakWorkReqDto {
public class DjGroundBreakWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -107,10 +107,10 @@ public class TsGroundBreakWorkReqDto {
@ApiModelProperty(value = "作业人员列表", required = true)
@JsonProperty("workUser")
private List<TsWorkUserDto> workUser;
private List<DjWorkUserDto> workUser;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
@JsonProperty("contractorWork")
@ -118,15 +118,15 @@ public class TsGroundBreakWorkReqDto {
@ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "安全措施",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
@ -134,11 +134,11 @@ public class TsGroundBreakWorkReqDto {
@ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
@ -146,35 +146,35 @@ public class TsGroundBreakWorkReqDto {
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业负责人",required = true)
@JsonProperty("workHeadUser")
private TsWorkHeadUserDto workHeadUser;
private DjWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "单位审批人",required = true)
@JsonProperty("unitApprovalUser")
private TsApprovalUserDto unitApprovalUser;
private DjApprovalUserDto unitApprovalUser;
@ApiModelProperty(value = "相关部门负责人", required = true)
@JsonProperty("relatedHeadUser")
private TsApprovalUserDto relatedHeadUser;
private DjApprovalUserDto relatedHeadUser;
@ApiModelProperty(value = "审批部门负责人", required = true)
@JsonProperty("approvalUser")
private TsApprovalUserDto approvalUser;
private DjApprovalUserDto approvalUser;
@ApiModelProperty(value = "监护人", required = true)
@JsonProperty("guardianUser")
private TsGuardianUserDto guardianUser;
private DjGuardianUserDto guardianUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

48
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsHighWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjHighWorkReqDto.java
View File

@ -1,10 +1,10 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHeightWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjHeightWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,12 +20,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("高处作业请求实体")
public class TsHighWorkReqDto {
public class DjHighWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -75,9 +75,9 @@ public class TsHighWorkReqDto {
private String workHeight;
/**
* 关联枚举：{@link TsHeightWorkLevelEnum}
* 关联枚举：{@link DjHeightWorkLevelEnum}
*/
@ApiModelProperty(value = "高处作业等级,参考枚举TsHeightWorkLevelEnum", required = true)
@ApiModelProperty(value = "高处作业等级,参考枚举DjHeightWorkLevelEnum", required = true)
@JsonProperty("heightWorkLevel")
private String heightWorkLevel;
@ -103,10 +103,10 @@ public class TsHighWorkReqDto {
@ApiModelProperty(value = "作业人员列表", required = true)
@JsonProperty("workUser")
private List<TsWorkUserDto> workUser;
private List<DjWorkUserDto> workUser;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
@JsonProperty("contractorWork")
@ -114,15 +114,15 @@ public class TsHighWorkReqDto {
@ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "安全措施",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
@ -130,11 +130,11 @@ public class TsHighWorkReqDto {
@ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
@ -142,35 +142,35 @@ public class TsHighWorkReqDto {
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业负责人",required = true)
@JsonProperty("workHeadUser")
private TsWorkHeadUserDto workHeadUser;
private DjWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "单位审批人",required = true)
@JsonProperty("unitApprovalUser")
private TsApprovalUserDto unitApprovalUser;
private DjApprovalUserDto unitApprovalUser;
@ApiModelProperty(value = "审核部门负责人",required = true)
@JsonProperty("auditUser")
private TsApprovalUserDto auditUser;
private DjApprovalUserDto auditUser;
@ApiModelProperty(value = "审批部门负责人", required = true)
@JsonProperty("approvalUser")
private TsApprovalUserDto approvalUser;
private DjApprovalUserDto approvalUser;
@ApiModelProperty(value = "监护人", required = true)
@JsonProperty("guardianUser")
private TsGuardianUserDto guardianUser;
private DjGuardianUserDto guardianUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

49
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsHoistWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjHoistWorkReqDto.java
View File

@ -1,11 +1,10 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHeightWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.ts.TsHoistWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjHoistWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -21,12 +20,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("吊装作业请求实体")
public class TsHoistWorkReqDto {
public class DjHoistWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -80,9 +79,9 @@ public class TsHoistWorkReqDto {
private String spreaderWeight;
/**
* 关联枚举：{@link TsHoistWorkLevelEnum}
* 关联枚举：{@link DjHoistWorkLevelEnum}
*/
@ApiModelProperty(value = "作业级别,参考枚举TsHoistWorkLevelEnum", required = true)
@ApiModelProperty(value = "作业级别,参考枚举DjHoistWorkLevelEnum", required = true)
@JsonProperty("workLevel")
private String workLevel;
@ -112,10 +111,10 @@ public class TsHoistWorkReqDto {
@ApiModelProperty(value = "作业人员列表", required = true)
@JsonProperty("workUser")
private List<TsWorkUserInfoDto> workUser;
private List<DjWorkUserInfoDto> workUser;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
@JsonProperty("contractorWork")
@ -123,15 +122,15 @@ public class TsHoistWorkReqDto {
@ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "安全措施",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
@ -139,11 +138,11 @@ public class TsHoistWorkReqDto {
@ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
@ -151,35 +150,35 @@ public class TsHoistWorkReqDto {
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业指挥人",required = true)
@JsonProperty("workHeadUser")
private TsWorkHeadUserDto workHeadUser;
private DjWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "单位审批人",required = true)
@JsonProperty("unitApprovalUser")
private TsApprovalUserDto unitApprovalUser;
private DjApprovalUserDto unitApprovalUser;
@ApiModelProperty(value = "审核部门负责人",required = true)
@JsonProperty("auditUser")
private TsApprovalUserDto auditUser;
private DjApprovalUserDto auditUser;
@ApiModelProperty(value = "审批部门负责人", required = true)
@JsonProperty("approvalUser")
private TsApprovalUserDto approvalUser;
private DjApprovalUserDto approvalUser;
@ApiModelProperty(value = "监护人", required = true)
@JsonProperty("guardianUser")
private TsGuardianUserDto guardianUser;
private DjGuardianUserDto guardianUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

56
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsHotWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjHotWorkReqDto.java
View File

@ -1,10 +1,10 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHotWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjHotWorkLevelEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,12 +20,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("动火作业请求实体")
public class TsHotWorkReqDto {
public class DjHotWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -74,7 +74,7 @@ public class TsHotWorkReqDto {
@JsonProperty("hotWorkMethod")
private String hotWorkMethod;
/**
* 关联枚举：{@link TsHotWorkLevelEnum}
* 关联枚举：{@link DjHotWorkLevelEnum}
*/
@ApiModelProperty(value = "动火等级,参照枚举TsHotWorkLevelEnum", required = true)
@JsonProperty("hotWorkLevel")
@ -102,9 +102,9 @@ public class TsHotWorkReqDto {
@ApiModelProperty(value = "作业人员列表", required = true)
@JsonProperty("workUser")
private List<TsWorkUserInfoDto> workUser;
private List<DjWorkUserInfoDto> workUser;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业",required = true)
@JsonProperty("contractorWork")
@ -112,31 +112,31 @@ public class TsHotWorkReqDto {
@ApiModelProperty(value = "地图位置-中心点，WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界，WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "气体分析-有毒气体",required = false)
@JsonProperty("hazarAnalysis")
private List<TsHazarAnalysisDto> hazarAnalysis;
private List<DjHazarAnalysisDto> hazarAnalysis;
@ApiModelProperty(value = "气体分析-可燃气体")
@JsonProperty("combustibleAnalysis")
private List<TsCombustibleAnalysisDto> combustibleAnalysis;
private List<DjCombustibleAnalysisDto> combustibleAnalysis;
@ApiModelProperty(value = "气体分析-氧气")
@JsonProperty("oxygenAnalysis")
private TsOxygenAnalysisDto oxygenAnalysis;
private DjOxygenAnalysisDto oxygenAnalysis;
@ApiModelProperty(value = "分析人员",required = true)
@JsonProperty("analysisUser")
private TsAnalysisUserDto analysisUser;
private DjAnalysisUserDto analysisUser;
@ApiModelProperty(value = "安全措施列表",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
@ -144,11 +144,11 @@ public class TsHotWorkReqDto {
@ApiModelProperty(value = "其他措施编制人，当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
@ -156,39 +156,39 @@ public class TsHotWorkReqDto {
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业负责人",required = true)
@JsonProperty("workHeadUser")
private TsWorkHeadUserDto workHeadUser;
private DjWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "单位审批人",required = true)
@JsonProperty("unitApprovalUser")
private TsApprovalUserDto unitApprovalUser;
private DjApprovalUserDto unitApprovalUser;
@ApiModelProperty(value = "安全部门审批人",required = true)
@JsonProperty("securityApprovalUser")
private TsApprovalUserDto securityApprovalUser;
private DjApprovalUserDto securityApprovalUser;
@ApiModelProperty(value = "动火审批人",required = true)
@JsonProperty("workApprovalUser")
private TsApprovalUserDto workApprovalUser;
private DjApprovalUserDto workApprovalUser;
@ApiModelProperty(value = "监护人",required = true)
@JsonProperty("guardianUser")
private TsApprovalUserDto guardianUser;
private DjApprovalUserDto guardianUser;
@ApiModelProperty(value = "作业前验票人",required = true)
@JsonProperty("inspectUser")
private TsApprovalUserDto inspectUser;
private DjApprovalUserDto inspectUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

41
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/TsOpenCircuitWorkReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjOpenCircuitWorkReqDto.java
View File

@ -1,10 +1,9 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.base.heBei.ts.TsWorkCategoryEnum;
import com.zcloud.modules.data.dto.hebei.ts.req.info.*;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import com.zcloud.modules.data.dto.hebei.dj.req.info.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,12 +19,12 @@ import java.util.List;
@NoArgsConstructor
@Data
@ApiModel("断路作业作业请求实体")
public class TsOpenCircuitWorkReqDto {
public class DjOpenCircuitWorkReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -106,63 +105,63 @@ public class TsOpenCircuitWorkReqDto {
@JsonProperty("riskIdentification")
private String riskIdentification;
/**
* 关联枚举：{@link TsIsCommonStatusEnum}
* 关联枚举：{@link DjIsCommonStatusEnum}
*/
@ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
@JsonProperty("contractorWork")
private String contractorWork;
@ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
@JsonProperty("mapCenter")
private TsMapCenterDto mapCenter;
private DjMapCenterDto mapCenter;
@ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
@JsonProperty("mapBorder")
private List<TsMapBorderDto> mapBorder;
private List<DjMapBorderDto> mapBorder;
@ApiModelProperty(value = "安全措施列表",required = true)
@JsonProperty("securityMeasure")
private List<TsSecurityMeasureDto> securityMeasure;
private List<DjSecurityMeasureDto> securityMeasure;
@ApiModelProperty(value = "其他措施")
@JsonProperty("otherMeasure")
private List<String> otherMeasure;
@ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
@JsonProperty("otherMeasureUser")
private TsOtherMeasureUserDto otherMeasureUser;
private DjOtherMeasureUserDto otherMeasureUser;
@ApiModelProperty(value = "措施确认人", required = true)
@JsonProperty("measureUser")
private TsMeasureUserDto measureUser;
private DjMeasureUserDto measureUser;
@ApiModelProperty(value = "交底内容",required = true)
@JsonProperty("discloseContent")
private String discloseContent;
@ApiModelProperty(value = "安全交底人",required = true)
@JsonProperty("discloseUser")
private TsDiscloseUserDto discloseUser;
private DjDiscloseUserDto discloseUser;
@ApiModelProperty(value = "接受交底人",required = true)
@JsonProperty("acceptUser")
private TsAcceptUserDto acceptUser;
private DjAcceptUserDto acceptUser;
@ApiModelProperty(value = "作业负责人",required = true)
@JsonProperty("workHeadUser")
private TsWorkHeadUserDto workHeadUser;
private DjWorkHeadUserDto workHeadUser;
@ApiModelProperty(value = "单位审批人",required = true)
@JsonProperty("unitApprovalUser")
private TsApprovalUserDto unitApprovalUser;
private DjApprovalUserDto unitApprovalUser;
@ApiModelProperty(value = "相关部门负责人", required = true)
@JsonProperty("relatedHeadUser")
private TsApprovalUserDto relatedHeadUser;
private DjApprovalUserDto relatedHeadUser;
@ApiModelProperty(value = "审批部门负责人", required = true)
@JsonProperty("approvalUser")
private TsApprovalUserDto approvalUser;
private DjApprovalUserDto approvalUser;
@ApiModelProperty(value = "监护人", required = true)
@JsonProperty("guardianUser")
private TsGuardianUserDto guardianUser;
private DjGuardianUserDto guardianUser;
@ApiModelProperty(value = "完工验收人",required = true)
@JsonProperty("finishedUser")
private TsFinishedUserDto finishedUser;
private DjFinishedUserDto finishedUser;
@ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@JsonProperty("issueTime")

20
src/main/java/com/zcloud/modules/data/dto/hebei/ts/req/TsSafeRiskAnalysisUnitReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjSafeRiskAnalysisUnitReqDto.java
View File

@ -1,10 +1,10 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHazardRankEnum;
import com.zcloud.modules.data.base.heBei.ts.TsHazardTypeEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsHazardEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjHazardRankEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjHazardTypeEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsHazardEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -18,13 +18,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("安全风险分析单元请求实体")
public class TsSafeRiskAnalysisUnitReqDto {
public class DjSafeRiskAnalysisUnitReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -67,7 +67,7 @@ public class TsSafeRiskAnalysisUnitReqDto {
private String hazardLiablePerson;
/**
* 关联枚举：{@link TsIsHazardEnum}
* 关联枚举：{@link DjIsHazardEnum}
*/
@JsonProperty("isHazard")
@ApiModelProperty(value = "是否为风险分析对象,参照枚举TsIsHazardEnum", required = true)
@ -78,7 +78,7 @@ public class TsSafeRiskAnalysisUnitReqDto {
private String hazardName;
/**
* 关联枚举：{@link TsHazardTypeEnum}
* 关联枚举：{@link DjHazardTypeEnum}
*/
@JsonProperty("hazardType")
@ApiModelProperty(value = "风险分析单元分类,参照枚举TsHazardTypeEnum", required = true)
@ -93,7 +93,7 @@ public class TsSafeRiskAnalysisUnitReqDto {
private String establishDate;
/**
* 关联枚举：{@link TsHazardRankEnum}
* 关联枚举：{@link DjHazardRankEnum}
*/
@JsonProperty("hazardRank")
@ApiModelProperty(value = "风险分析单元等级,参照枚举TsHazardRankEnum", required = false)

16
src/main/java/com/zcloud/modules/data/dto/hebei/ts/req/TsSafeRiskControlMeasureReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjSafeRiskControlMeasureReqDto.java
View File

@ -1,7 +1,7 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.*;
import com.zcloud.modules.data.base.heBei.dj.enums.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,14 +15,14 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("安全风险事件请求实体")
public class TsSafeRiskControlMeasureReqDto {
public class DjSafeRiskControlMeasureReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
@ -53,7 +53,7 @@ public class TsSafeRiskControlMeasureReqDto {
private String riskEventId;
/**
* 关联枚举：{@link TsDataSrcEnum}
* 关联枚举：{@link DjDataSrcEnum}
*/
@JsonProperty("dataSrc")
@ApiModelProperty(value = "管控方式,参照枚举TsDataSrcEnum", required = true)
@ -64,13 +64,13 @@ public class TsSafeRiskControlMeasureReqDto {
private String riskMeasureDesc;
/**
* 关联枚举：{@link TsClassify1Enum}
* 关联枚举：{@link DjClassify1Enum}
*/
@JsonProperty("classify1")
@ApiModelProperty(value = "管控措施分类 1,参照枚举TsClassify1Enum", required = true)
private String classify1;
/**
* 关联枚举：{@link TsClassify2Enum}
* 关联枚举：{@link DjClassify2Enum}
*/
@JsonProperty("classify2")
@ApiModelProperty(value = "管控措施分类 2,参照枚举TsClassify2Enum", required = true)
@ -85,7 +85,7 @@ public class TsSafeRiskControlMeasureReqDto {
private String troubleshootContent;
/**
* 关联枚举：{@link TsRiskMeasureLevelEnum}
* 关联枚举：{@link DjRiskMeasureLevelEnum}
*/
@JsonProperty("riskMeasureLevel")
@ApiModelProperty(value = "管控级别,参照枚举TsRiskMeasureLevelEnum", required = false)

11
src/main/java/com/zcloud/modules/data/dto/hebei/ts/req/TsSafeRiskEventReqDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/DjSafeRiskEventReqDto.java
View File

@ -1,10 +1,7 @@
package com.zcloud.modules.data.dto.hebei.ts.req;
package com.zcloud.modules.data.dto.hebei.dj.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsHazardRankEnum;
import com.zcloud.modules.data.base.heBei.ts.TsHazardTypeEnum;
import com.zcloud.modules.data.base.heBei.ts.TsIsHazardEnum;
import com.zcloud.modules.data.base.heBei.ts.TsRecordDeletedEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -18,14 +15,14 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("安全风险事件请求实体")
public class TsSafeRiskEventReqDto {
public class DjSafeRiskEventReqDto {
@JsonProperty("recordId")
@ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
private String recordId;
/**
* 关联枚举：{@link TsRecordDeletedEnum}
* 关联枚举：{@link DjRecordDeletedEnum}
*/
@JsonProperty("recordDeleted")
@ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsAcceptUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjAcceptUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("接受交底人")
public class TsAcceptUserDto {
public class DjAcceptUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsAnalysisUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjAnalysisUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("气体分析人")
public class TsAnalysisUserDto {
public class DjAnalysisUserDto {
@ApiModelProperty(value = "姓名", required = true)
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsApprovalUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjApprovalUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("审批人")
public class TsApprovalUserDto {
public class DjApprovalUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsCombustibleAnalysisDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjCombustibleAnalysisDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("气体分析-可燃气体")
public class TsCombustibleAnalysisDto {
public class DjCombustibleAnalysisDto {
@ApiModelProperty(value = "气体名称", required = true)
@JsonProperty("gasName")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsDetectInfoDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjDetectInfoDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("气体检测信息")
public class TsDetectInfoDto {
public class DjDetectInfoDto {
@ApiModelProperty(value = "气体名称", required = true)
@JsonProperty("gasName")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsDiscloseUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjDiscloseUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("安全交底人")
public class TsDiscloseUserDto {
public class DjDiscloseUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsElecWorkHeadUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjElecWorkHeadUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("电工作业负责人")
public class TsElecWorkHeadUserDto {
public class DjElecWorkHeadUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsFinishedUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjFinishedUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("完工验收人")
public class TsFinishedUserDto {
public class DjFinishedUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsGuardianUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjGuardianUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("审批人")
public class TsGuardianUserDto {
public class DjGuardianUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsHazarAnalysisDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjHazarAnalysisDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("气体分析-有毒气体")
public class TsHazarAnalysisDto {
public class DjHazarAnalysisDto {
@ApiModelProperty(value = "气体名称", required = true)
@JsonProperty("gasName")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsMapBorderDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjMapBorderDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("地图位置-边界，WGS-84 坐标系")
public class TsMapBorderDto {
public class DjMapBorderDto {
@ApiModelProperty(value = "经度", required = true)
@JsonProperty("lng")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsMapCenterDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjMapCenterDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("地图位置-中心点，WGS-84 坐标系。")
public class TsMapCenterDto {
public class DjMapCenterDto {
@ApiModelProperty(value = "经度", required = true)
@JsonProperty("lng")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsMeasureUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjMeasureUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("措施确认人")
public class TsMeasureUserDto {
public class DjMeasureUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsOtherMeasureUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjOtherMeasureUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("其他措施编制人，当其他措施不为空时此项必填")
public class TsOtherMeasureUserDto {
public class DjOtherMeasureUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsOxygenAnalysisDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjOxygenAnalysisDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("气体分析-氧气")
public class TsOxygenAnalysisDto {
public class DjOxygenAnalysisDto {
@ApiModelProperty(value = "气体名称", required = true)
@JsonProperty("gasName")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsPipelineParamDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjPipelineParamDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("设备管道具体参数")
public class TsPipelineParamDto {
public class DjPipelineParamDto {
@ApiModelProperty(value = "管道介质", required = true)
@JsonProperty("pipelineMedium")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsPreparedUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjPreparedUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("盲板位置图及编号的编制人")
public class TsPreparedUserDto {
public class DjPreparedUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

8
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsSecurityMeasureDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjSecurityMeasureDto.java
View File

@ -1,7 +1,7 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.zcloud.modules.data.base.heBei.ts.TsIsInvolveEnum;
import com.zcloud.modules.data.base.heBei.dj.enums.DjIsInvolveEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -10,14 +10,14 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("安全措施")
public class TsSecurityMeasureDto {
public class DjSecurityMeasureDto {
@ApiModelProperty(value = "安全措施内容", required = true)
@JsonProperty("content")
private String content;
/**
* 关联枚举：{@link TsIsInvolveEnum}
* 关联枚举：{@link DjIsInvolveEnum}
*/
@ApiModelProperty(value = "是否涉及(1:是)", required = true)
@JsonProperty("isInvolve")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsWorkHeadUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjWorkHeadUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("作业负责人")
public class TsWorkHeadUserDto {
public class DjWorkHeadUserDto {
@ApiModelProperty(value = "姓名")
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsWorkUserDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjWorkUserDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("作业人员信息")
public class TsWorkUserDto {
public class DjWorkUserDto {
@ApiModelProperty(value = "姓名", required = true)
@JsonProperty("name")

4
src/main/java/com/zcloud/modules/data/dto/HeBei/ts/req/info/TsWorkUserInfoDto.java → src/main/java/com/zcloud/modules/data/dto/HeBei/dj/req/info/DjWorkUserInfoDto.java
View File

@ -1,4 +1,4 @@
package com.zcloud.modules.data.dto.hebei.ts.req.info;
package com.zcloud.modules.data.dto.hebei.dj.req.info;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
@ApiModel("作业人员信息")
public class TsWorkUserInfoDto {
public class DjWorkUserInfoDto {
@ApiModelProperty(value = "姓名", required = true)
@JsonProperty("name")

Some files were not shown because too many files have changed in this diff Show More