Showing
6 changed files
with
160 additions
and
1 deletions
@@ -179,7 +179,7 @@ COMMENT ON COLUMN "public"."qg_inspection_record"."id" IS '主键ID'; | @@ -179,7 +179,7 @@ COMMENT ON COLUMN "public"."qg_inspection_record"."id" IS '主键ID'; | ||
179 | COMMENT ON COLUMN "public"."qg_inspection_record"."code" IS '记录编号'; | 179 | COMMENT ON COLUMN "public"."qg_inspection_record"."code" IS '记录编号'; |
180 | COMMENT ON COLUMN "public"."qg_inspection_record"."inspection_plan_id" IS '巡检计划'; | 180 | COMMENT ON COLUMN "public"."qg_inspection_record"."inspection_plan_id" IS '巡检计划'; |
181 | COMMENT ON COLUMN "public"."qg_inspection_record"."tenant_id" IS '巡检人'; | 181 | COMMENT ON COLUMN "public"."qg_inspection_record"."tenant_id" IS '巡检人'; |
182 | -COMMENT ON COLUMN "public"."qg_inspection_record"."check_date" IS '巡检结果'; | 182 | +COMMENT ON COLUMN "public"."qg_inspection_record"."check_date" IS '巡检日期'; |
183 | COMMENT ON COLUMN "public"."qg_inspection_record"."record_result" IS '巡检结果'; | 183 | COMMENT ON COLUMN "public"."qg_inspection_record"."record_result" IS '巡检结果'; |
184 | 184 | ||
185 | CREATE TABLE "public"."qg_inspection_details" | 185 | CREATE TABLE "public"."qg_inspection_details" |
1 | +package org.thingsboard.server.dao.yunteng.entities; | ||
2 | + | ||
3 | +import com.baomidou.mybatisplus.annotation.TableName; | ||
4 | +import lombok.Data; | ||
5 | +import lombok.EqualsAndHashCode; | ||
6 | +import org.thingsboard.server.dao.model.ModelConstants; | ||
7 | + | ||
8 | +/** | ||
9 | + * 巡检明细 | ||
10 | + */ | ||
11 | +@Data | ||
12 | +@EqualsAndHashCode(callSuper = true) | ||
13 | +@TableName(value = ModelConstants.TKCHECKDETAILS_TABLE_NAME, autoResultMap = true) | ||
14 | +public class TkCheckDetailsEntity extends TenantBaseEntity { | ||
15 | + | ||
16 | + /** | ||
17 | + * 明细编号 | ||
18 | + */ | ||
19 | + private String code; | ||
20 | + | ||
21 | + /** | ||
22 | + * 巡检设备 | ||
23 | + */ | ||
24 | + private String checkDeviceId; | ||
25 | + | ||
26 | + /** | ||
27 | + * 巡检方案 | ||
28 | + */ | ||
29 | + private String checkPlanId; | ||
30 | + | ||
31 | + /** | ||
32 | + * 巡检计划 | ||
33 | + */ | ||
34 | + private String inspectionPlanId; | ||
35 | + | ||
36 | + /** | ||
37 | + * 方案明细 | ||
38 | + */ | ||
39 | + private String planDetails; | ||
40 | +} |
1 | package org.thingsboard.server.dao.yunteng.entities; | 1 | package org.thingsboard.server.dao.yunteng.entities; |
2 | 2 | ||
3 | +import com.baomidou.mybatisplus.annotation.TableField; | ||
3 | import com.baomidou.mybatisplus.annotation.TableName; | 4 | import com.baomidou.mybatisplus.annotation.TableName; |
4 | import lombok.Data; | 5 | import lombok.Data; |
5 | import lombok.EqualsAndHashCode; | 6 | import lombok.EqualsAndHashCode; |
7 | +import org.apache.ibatis.type.EnumTypeHandler; | ||
6 | import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanStatusEnum; | 8 | import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanStatusEnum; |
7 | import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanTypeEnum; | 9 | import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanTypeEnum; |
8 | import org.thingsboard.server.dao.model.ModelConstants; | 10 | import org.thingsboard.server.dao.model.ModelConstants; |
@@ -14,9 +16,31 @@ import org.thingsboard.server.dao.model.ModelConstants; | @@ -14,9 +16,31 @@ import org.thingsboard.server.dao.model.ModelConstants; | ||
14 | @EqualsAndHashCode(callSuper = true) | 16 | @EqualsAndHashCode(callSuper = true) |
15 | @TableName(value = ModelConstants.TKCHECKPLAN_TABLE_NAME, autoResultMap = true) | 17 | @TableName(value = ModelConstants.TKCHECKPLAN_TABLE_NAME, autoResultMap = true) |
16 | public class TkCheckPlanEntity extends TenantBaseEntity { | 18 | public class TkCheckPlanEntity extends TenantBaseEntity { |
19 | + | ||
20 | + /** | ||
21 | + * 方案编号 | ||
22 | + */ | ||
17 | private String code; | 23 | private String code; |
24 | + | ||
25 | + /** | ||
26 | + * 方案名称 | ||
27 | + */ | ||
18 | private String name; | 28 | private String name; |
29 | + | ||
30 | + /** | ||
31 | + * 方案类型 | ||
32 | + */ | ||
33 | + @TableField(typeHandler = EnumTypeHandler.class) | ||
19 | private TkCheckPlanTypeEnum type; | 34 | private TkCheckPlanTypeEnum type; |
35 | + | ||
36 | + /** | ||
37 | + * 状态 | ||
38 | + */ | ||
39 | + @TableField(typeHandler = EnumTypeHandler.class) | ||
20 | private TkCheckPlanStatusEnum status; | 40 | private TkCheckPlanStatusEnum status; |
41 | + | ||
42 | + /** | ||
43 | + * 方案明细 | ||
44 | + */ | ||
21 | private String planDetails; | 45 | private String planDetails; |
22 | } | 46 | } |
dao/src/main/java/org/thingsboard/server/dao/yunteng/entities/TkInspectionDetailsEntity.java
0 → 100644
1 | +package org.thingsboard.server.dao.yunteng.entities; | ||
2 | + | ||
3 | +import com.baomidou.mybatisplus.annotation.TableName; | ||
4 | +import lombok.Data; | ||
5 | +import lombok.EqualsAndHashCode; | ||
6 | +import org.thingsboard.server.dao.model.ModelConstants; | ||
7 | + | ||
8 | +/** | ||
9 | + * 巡检记录明细 | ||
10 | + */ | ||
11 | +@Data | ||
12 | +@EqualsAndHashCode(callSuper = true) | ||
13 | +@TableName(value = ModelConstants.TKINSPECTIONDETAILS_TABLE_NAME, autoResultMap = true) | ||
14 | +public class TkInspectionDetailsEntity extends TenantBaseEntity { | ||
15 | + | ||
16 | + /** | ||
17 | + * 巡检设备 | ||
18 | + */ | ||
19 | + private String checkDeviceId; | ||
20 | + | ||
21 | + /** | ||
22 | + * 巡检内容 | ||
23 | + */ | ||
24 | + private String planDetails; | ||
25 | + | ||
26 | + /** | ||
27 | + * 巡检结果 | ||
28 | + */ | ||
29 | + private boolean recordResult; | ||
30 | +} |
1 | package org.thingsboard.server.dao.yunteng.entities; | 1 | package org.thingsboard.server.dao.yunteng.entities; |
2 | 2 | ||
3 | +import com.baomidou.mybatisplus.annotation.TableField; | ||
3 | import com.baomidou.mybatisplus.annotation.TableName; | 4 | import com.baomidou.mybatisplus.annotation.TableName; |
4 | import lombok.Data; | 5 | import lombok.Data; |
5 | import lombok.EqualsAndHashCode; | 6 | import lombok.EqualsAndHashCode; |
7 | +import org.apache.ibatis.type.EnumTypeHandler; | ||
6 | import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum; | 8 | import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum; |
7 | import org.thingsboard.server.dao.model.ModelConstants; | 9 | import org.thingsboard.server.dao.model.ModelConstants; |
8 | 10 | ||
@@ -15,9 +17,35 @@ import java.time.LocalDateTime; | @@ -15,9 +17,35 @@ import java.time.LocalDateTime; | ||
15 | @EqualsAndHashCode(callSuper = true) | 17 | @EqualsAndHashCode(callSuper = true) |
16 | @TableName(value = ModelConstants.TKINSPECTIONPLAN_TABLE_NAME, autoResultMap = true) | 18 | @TableName(value = ModelConstants.TKINSPECTIONPLAN_TABLE_NAME, autoResultMap = true) |
17 | public class TkInspectionPlanEntity extends TenantBaseEntity { | 19 | public class TkInspectionPlanEntity extends TenantBaseEntity { |
20 | + | ||
21 | + /** | ||
22 | + * 计划编号 | ||
23 | + */ | ||
18 | private String code; | 24 | private String code; |
25 | + | ||
26 | + /** | ||
27 | + * 计划名称 | ||
28 | + */ | ||
19 | private String name; | 29 | private String name; |
30 | + | ||
31 | + /** | ||
32 | + * 计划状态 | ||
33 | + */ | ||
34 | + @TableField(typeHandler = EnumTypeHandler.class) | ||
20 | private TkInspectionPlanStatusEnum status; | 35 | private TkInspectionPlanStatusEnum status; |
36 | + | ||
37 | + /** | ||
38 | + * 开始日期 | ||
39 | + */ | ||
21 | private LocalDateTime startTime; | 40 | private LocalDateTime startTime; |
41 | + | ||
42 | + /** | ||
43 | + * 结束日期 | ||
44 | + */ | ||
22 | private LocalDateTime endTime; | 45 | private LocalDateTime endTime; |
46 | + | ||
47 | + /** | ||
48 | + * 计划备注 | ||
49 | + */ | ||
50 | + private String remark; | ||
23 | } | 51 | } |
dao/src/main/java/org/thingsboard/server/dao/yunteng/entities/TkInspectionRecordEntity.java
0 → 100644
1 | +package org.thingsboard.server.dao.yunteng.entities; | ||
2 | + | ||
3 | +import com.baomidou.mybatisplus.annotation.TableName; | ||
4 | +import lombok.Data; | ||
5 | +import lombok.EqualsAndHashCode; | ||
6 | +import org.thingsboard.server.dao.model.ModelConstants; | ||
7 | + | ||
8 | +import java.time.LocalDateTime; | ||
9 | + | ||
10 | +/** | ||
11 | + * 巡检记录 | ||
12 | + */ | ||
13 | +@Data | ||
14 | +@EqualsAndHashCode(callSuper = true) | ||
15 | +@TableName(value = ModelConstants.TKINSPECTIONRECORD_TABLE_NAME, autoResultMap = true) | ||
16 | +public class TkInspectionRecordEntity extends TenantBaseEntity { | ||
17 | + | ||
18 | + /** | ||
19 | + * 记录编号 | ||
20 | + */ | ||
21 | + private String code; | ||
22 | + | ||
23 | + /** | ||
24 | + * 巡检计划 | ||
25 | + */ | ||
26 | + private String inspectionPlanId; | ||
27 | + | ||
28 | + /** | ||
29 | + * 巡检日期 | ||
30 | + */ | ||
31 | + private LocalDateTime checkDate; | ||
32 | + | ||
33 | + /** | ||
34 | + * 巡检结果 | ||
35 | + */ | ||
36 | + private boolean recordResult; | ||
37 | +} |