Merge remote-tracking branch 'origin/test_ymk_from_0102' into test_hhl_0102

@@ -91,4 +91,112 @@ COMMENT ON COLUMN "public"."qg_repair_record"."tenant_id" IS '租户ID';
 COMMENT ON COLUMN "public"."qg_repair_record"."create_time" IS '创建时间';
 COMMENT ON COLUMN "public"."qg_repair_record"."updater" IS '更新用户';
 COMMENT ON COLUMN "public"."qg_repair_record"."update_time" IS '更新时间';
-COMMENT ON COLUMN "public"."qg_repair_record"."creator" IS '创建用户';
\ No newline at end of file
+COMMENT ON COLUMN "public"."qg_repair_record"."creator" IS '创建用户';
+
+CREATE TABLE "public"."qg_inspection_plan"
+(
+    "id"          varchar(36) PRIMARY KEY,
+    "code"        varchar(50) NOT NULL,
+    "name"        varchar(50) NOT NULL,
+    "status"      varchar(50) NOT NULL,
+    "start_time"  timestamp(6),
+    "end_time"    timestamp(6),
+    "create_time" timestamp(6),
+    "creator"     varchar(36),
+    "updater"     varchar(36),
+    "update_time" timestamp(6),
+    "remark"      varchar(255)
+);
+
+COMMENT ON TABLE "public"."qg_inspection_plan" IS '巡检计划';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."code" IS '计划编号';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."name" IS '计划名称';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."status" IS '计划状态';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."start_time" IS '开始日期';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."end_time" IS '结束日期';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."remark" IS '计划备注';
+
+CREATE TABLE "public"."qg_check_plan"
+(
+    "id"           varchar(36) PRIMARY KEY,
+    "code"         varchar(50) NOT NULL,
+    "name"         varchar(50) NOT NULL,
+    "type"         varchar(50),
+    "status"       varchar(50),
+    "plan_details" varchar(255),
+    "create_time"  timestamp(6),
+    "creator"      varchar(36),
+    "updater"      varchar(36),
+    "update_time"  timestamp(6)
+);
+
+COMMENT ON TABLE "public"."qg_check_plan" IS '巡检/保养方案';
+COMMENT ON COLUMN "public"."qg_check_plan"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."qg_check_plan"."code" IS '方案编号';
+COMMENT ON COLUMN "public"."qg_check_plan"."name" IS '方案名称';
+COMMENT ON COLUMN "public"."qg_check_plan"."type" IS '方案类型';
+COMMENT ON COLUMN "public"."qg_check_plan"."status" IS '状态';
+COMMENT ON COLUMN "public"."qg_check_plan"."plan_details" IS '方案明细';
+
+CREATE TABLE "public"."qg_check_details"
+(
+    "id"                 varchar(36) PRIMARY KEY,
+    "code"               varchar(50) NOT NULL,
+    "check_device_id"    varchar(36) NOT NULL,
+    "check_plan_id"      varchar(36),
+    "inspection_plan_id" varchar(36),
+    "plan_details"       varchar(255),
+    "create_time"        timestamp(6),
+    "creator"            varchar(36),
+    "updater"            varchar(36),
+    "update_time"        timestamp(6)
+);
+
+COMMENT ON TABLE "public"."qg_check_details" IS '巡检明细';
+COMMENT ON COLUMN "public"."qg_check_details"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."qg_check_details"."code" IS '明细编号';
+COMMENT ON COLUMN "public"."qg_check_details"."check_device_id" IS '巡检设备';
+COMMENT ON COLUMN "public"."qg_check_details"."check_plan_id" IS '巡检方案';
+COMMENT ON COLUMN "public"."qg_check_details"."inspection_plan_id" IS '巡检计划';
+COMMENT ON COLUMN "public"."qg_check_details"."plan_details" IS '方案明细';
+
+CREATE TABLE "public"."qg_inspection_record"
+(
+    "id"                 varchar(36) PRIMARY KEY,
+    "code"               varchar(50) NOT NULL,
+    "inspection_plan_id" varchar(36),
+    "tenant_id"          varchar(36),
+    "check_date"         timestamp(6),
+    "record_result"      bool,
+    "create_time"        timestamp(6),
+    "creator"            varchar(36),
+    "updater"            varchar(36),
+    "update_time"        timestamp(6)
+);
+
+COMMENT ON TABLE "public"."qg_inspection_record" IS '巡检记录';
+COMMENT ON COLUMN "public"."qg_inspection_record"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."qg_inspection_record"."code" IS '记录编号';
+COMMENT ON COLUMN "public"."qg_inspection_record"."inspection_plan_id" IS '巡检计划';
+COMMENT ON COLUMN "public"."qg_inspection_record"."tenant_id" IS '巡检人';
+COMMENT ON COLUMN "public"."qg_inspection_record"."check_date" IS '巡检结果';
+COMMENT ON COLUMN "public"."qg_inspection_record"."record_result" IS '巡检结果';
+
+CREATE TABLE "public"."qg_inspection_details"
+(
+    "id"              varchar(36) PRIMARY KEY,
+    "check_device_id" varchar(36),
+    "plan_details"    varchar(255),
+    "record_result"   bool,
+    "create_time"     timestamp(6),
+    "creator"         varchar(36),
+    "updater"         varchar(36),
+    "update_time"     timestamp(6)
+);
+
+COMMENT ON TABLE "public"."qg_inspection_details" IS '巡检记录明细';
+COMMENT ON COLUMN "public"."qg_inspection_details"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."qg_inspection_details"."check_device_id" IS '巡检设备';
+COMMENT ON COLUMN "public"."qg_inspection_details"."plan_details" IS '巡检内容';
+COMMENT ON COLUMN "public"."qg_inspection_details"."record_result" IS '巡检结果';
\ No newline at end of file

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/**
+ * 巡检/保养方案状态枚举类
+ */
+public enum TkCheckPlanStatusEnum {
+    ENABLE("启用"),
+    DISABLE("停用");
+
+    TkCheckPlanStatusEnum(String name){
+        this.name = name;
+    }
+
+    String name;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/**
+ * 巡检/保养方案类型枚举类
+ */
+public enum TkCheckPlanTypeEnum {
+    INSPECTION("巡检方案"),
+    MAINTENANCE("保养方案");
+
+    TkCheckPlanTypeEnum(String name){
+        this.name = name;
+    }
+
+    String name;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/**
+ * 巡检计划状态枚举类
+ */
+public enum TkInspectionPlanStatusEnum {
+    NOT_START("未开始"),
+    UNDERWAY("进行中"),
+    FINISH("已完成"),
+    STOP("停用");
+
+    TkInspectionPlanStatusEnum(String name){
+        this.name = name;
+    }
+
+    String name;
+}

@@ -681,6 +681,12 @@ public class ModelConstants {
      */
     public static final String TKREPAIRRECORD_TABLE_NAME = "qg_repair_record";
 
+    public static final String TKINSPECTIONPLAN_TABLE_NAME= "qg_inspection_plan"; // 巡检计划
+    public static final String TKCHECKPLAN_TABLE_NAME= "qg_check_plan"; // 巡检/保养方案
+    public static final String TKCHECKDETAILS_TABLE_NAME= "qg_check_details"; // 巡检明细
+    public static final String TKINSPECTIONRECORD_TABLE_NAME= "qg_inspection_record"; // 巡检记录
+    public static final String TKINSPECTIONDETAILS_TABLE_NAME= "qg_inspection_details"; // 巡检记录明细
+
     protected static final String[] NONE_AGGREGATION_COLUMNS = new String[]{LONG_VALUE_COLUMN, DOUBLE_VALUE_COLUMN, BOOLEAN_VALUE_COLUMN, STRING_VALUE_COLUMN, JSON_VALUE_COLUMN, KEY_COLUMN, TS_COLUMN};
 
     protected static final String[] COUNT_AGGREGATION_COLUMNS = new String[]{count(LONG_VALUE_COLUMN), count(DOUBLE_VALUE_COLUMN), count(BOOLEAN_VALUE_COLUMN), count(STRING_VALUE_COLUMN), count(JSON_VALUE_COLUMN), max(TS_COLUMN)};

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanStatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanTypeEnum;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+/**
+ * 巡检/保养方案
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKCHECKPLAN_TABLE_NAME, autoResultMap = true)
+public class TkCheckPlanEntity extends TenantBaseEntity {
+    private String code;
+    private String name;
+    private TkCheckPlanTypeEnum type;
+    private TkCheckPlanStatusEnum status;
+    private String planDetails;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.time.LocalDateTime;
+
+/**
+ * 巡检计划
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKINSPECTIONPLAN_TABLE_NAME, autoResultMap = true)
+public class TkInspectionPlanEntity extends TenantBaseEntity {
+    private String code;
+    private String name;
+    private TkInspectionPlanStatusEnum status;
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+}