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

# Conflicts:
#	application/src/main/data/sql/qg.sql

@@ -103,6 +103,7 @@ CREATE TABLE "public"."qg_inspection_plan"
     "status"      varchar(50) NOT NULL,
     "status"      varchar(50) NOT NULL,
     "start_time"  timestamp(6),
     "start_time"  timestamp(6),
     "end_time"    timestamp(6),
     "end_time"    timestamp(6),
+    "tenant_id"   varchar(36),
     "create_time" timestamp(6),
     "create_time" timestamp(6),
     "creator"     varchar(36),
     "creator"     varchar(36),
     "updater"     varchar(36),
     "updater"     varchar(36),
@@ -117,6 +118,7 @@ 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"."status" IS '计划状态';
 COMMENT ON COLUMN "public"."qg_inspection_plan"."start_time" 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"."end_time" IS '结束日期';
+COMMENT ON COLUMN "public"."qg_inspection_plan"."tenant_id" IS '租户ID';
 COMMENT ON COLUMN "public"."qg_inspection_plan"."remark" IS '计划备注';
 COMMENT ON COLUMN "public"."qg_inspection_plan"."remark" IS '计划备注';
 
 
 CREATE TABLE "public"."qg_check_plan"
 CREATE TABLE "public"."qg_check_plan"
@@ -127,6 +129,7 @@ CREATE TABLE "public"."qg_check_plan"
     "type"         varchar(50),
     "type"         varchar(50),
     "status"       varchar(50),
     "status"       varchar(50),
     "plan_details" varchar(255),
     "plan_details" varchar(255),
+    "tenant_id"    varchar(36),
     "create_time"  timestamp(6),
     "create_time"  timestamp(6),
     "creator"      varchar(36),
     "creator"      varchar(36),
     "updater"      varchar(36),
     "updater"      varchar(36),
@@ -140,6 +143,7 @@ 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"."type" IS '方案类型';
 COMMENT ON COLUMN "public"."qg_check_plan"."status" IS '状态';
 COMMENT ON COLUMN "public"."qg_check_plan"."status" IS '状态';
 COMMENT ON COLUMN "public"."qg_check_plan"."plan_details" IS '方案明细';
 COMMENT ON COLUMN "public"."qg_check_plan"."plan_details" IS '方案明细';
+COMMENT ON COLUMN "public"."qg_check_plan"."tenant_id" IS '租户ID';
 
 
 CREATE TABLE "public"."qg_check_details"
 CREATE TABLE "public"."qg_check_details"
 (
 (
@@ -149,6 +153,7 @@ CREATE TABLE "public"."qg_check_details"
     "check_plan_id"      varchar(36),
     "check_plan_id"      varchar(36),
     "inspection_plan_id" varchar(36),
     "inspection_plan_id" varchar(36),
     "plan_details"       varchar(255),
     "plan_details"       varchar(255),
+    "tenant_id"          varchar(36),
     "create_time"        timestamp(6),
     "create_time"        timestamp(6),
     "creator"            varchar(36),
     "creator"            varchar(36),
     "updater"            varchar(36),
     "updater"            varchar(36),
@@ -162,15 +167,17 @@ 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"."check_plan_id" IS '巡检方案';
 COMMENT ON COLUMN "public"."qg_check_details"."inspection_plan_id" IS '巡检计划';
 COMMENT ON COLUMN "public"."qg_check_details"."inspection_plan_id" IS '巡检计划';
 COMMENT ON COLUMN "public"."qg_check_details"."plan_details" IS '方案明细';
 COMMENT ON COLUMN "public"."qg_check_details"."plan_details" IS '方案明细';
+COMMENT ON COLUMN "public"."qg_check_details"."tenant_id" IS '租户ID';
 
 
 CREATE TABLE "public"."qg_inspection_record"
 CREATE TABLE "public"."qg_inspection_record"
 (
 (
     "id"                 varchar(36) PRIMARY KEY,
     "id"                 varchar(36) PRIMARY KEY,
     "code"               varchar(50) NOT NULL,
     "code"               varchar(50) NOT NULL,
     "inspection_plan_id" varchar(36),
     "inspection_plan_id" varchar(36),
-    "tenant_id"          varchar(36),
+    "inspector_id"       varchar(36),
     "check_date"         timestamp(6),
     "check_date"         timestamp(6),
     "record_result"      bool,
     "record_result"      bool,
+    "tenant_id"          varchar(36),
     "create_time"        timestamp(6),
     "create_time"        timestamp(6),
     "creator"            varchar(36),
     "creator"            varchar(36),
     "updater"            varchar(36),
     "updater"            varchar(36),
@@ -181,9 +188,10 @@ 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"."id" IS '主键ID';
 COMMENT ON COLUMN "public"."qg_inspection_record"."code" IS '记录编号';
 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"."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"."inspector_id" IS '巡检人';
+COMMENT ON COLUMN "public"."qg_inspection_record"."check_date" IS '巡检日期';
 COMMENT ON COLUMN "public"."qg_inspection_record"."record_result" IS '巡检结果';
 COMMENT ON COLUMN "public"."qg_inspection_record"."record_result" IS '巡检结果';
+COMMENT ON COLUMN "public"."qg_inspection_record"."tenant_id" IS '租户ID';
 
 
 CREATE TABLE "public"."qg_inspection_details"
 CREATE TABLE "public"."qg_inspection_details"
 (
 (
@@ -191,6 +199,7 @@ CREATE TABLE "public"."qg_inspection_details"
     "check_device_id" varchar(36),
     "check_device_id" varchar(36),
     "plan_details"    varchar(255),
     "plan_details"    varchar(255),
     "record_result"   bool,
     "record_result"   bool,
+    "tenant_id"       varchar(36),
     "create_time"     timestamp(6),
     "create_time"     timestamp(6),
     "creator"         varchar(36),
     "creator"         varchar(36),
     "updater"         varchar(36),
     "updater"         varchar(36),

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.TkCheckPlanDTO;
+import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanStatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkCheckPlanService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
+
+@RestController
+@TbCoreComponent
+@RequiredArgsConstructor
+@RequestMapping("api/yt/checkPlan")
+@Api(tags = {"巡检/保养方案"})
+@Slf4j
+public class TkCheckPlanController extends BaseController {
+    private final TkCheckPlanService tkCheckPlanService;
+
+    @GetMapping(params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页查询")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public TkPageData<TkCheckPlanDTO> page(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "type", required = false) TkCheckPlanTypeEnum type
+    ) throws ThingsboardException {
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(PAGE, page);
+        if (StringUtils.isNotBlank(name)) {
+            queryMap.put("name", name);
+        }
+
+        if (type != null) {
+            queryMap.put("type", type);
+        }
+
+        return tkCheckPlanService.page(queryMap, getCurrentUser().isTenantAdmin());
+    }
+
+    @PostMapping("/save")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkCheckPlanDTO> save(@RequestBody TkCheckPlanDTO tkCheckPlanDTO) throws ThingsboardException {
+        tkCheckPlanDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        if (tkCheckPlanDTO.getStatus() == null) {
+            tkCheckPlanDTO.setStatus(TkCheckPlanStatusEnum.ENABLE);
+        }
+
+        TkCheckPlanDTO dto = tkCheckPlanService.save(tkCheckPlanDTO);
+        return ResponseEntity.ok(dto);
+    }
+
+    @GetMapping("/delete")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkCheckPlanService.delete(id));
+    }
+
+    @GetMapping("/get")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkCheckPlanDTO> get(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkCheckPlanService.get(id));
+    }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkInspectionPlanService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+@RestController
+@TbCoreComponent
+@RequiredArgsConstructor
+@RequestMapping("api/yt/inspectionPlan")
+@Api(tags = {"巡检计划"})
+@Slf4j
+public class TkInspectionPlanController extends BaseController {
+    private final TkInspectionPlanService tkInspectionPlanService;
+
+}

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkInspectionRecordService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+@RestController
+@TbCoreComponent
+@RequiredArgsConstructor
+@RequestMapping("api/yt/inspectionRecord")
+@Api(tags = {"巡检记录"})
+@Slf4j
+public class TkInspectionRecordController extends BaseController {
+    private final TkInspectionRecordService tkInspectionRecordService;
+
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 巡检明细
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkCheckDetailsDTO extends TenantDTO {
+
+    @ApiModelProperty("明细编号")
+    private String code;
+
+    @ApiModelProperty("巡检设备")
+    private String checkDeviceId;
+
+    @ApiModelProperty("巡检方案")
+    private String checkPlanId;
+
+    @ApiModelProperty("巡检计划")
+    private String inspectionPlanId;
+
+    @ApiModelProperty("方案明细")
+    private String planDetails;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanStatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanTypeEnum;
+
+/**
+ * 巡检/保养方案
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkCheckPlanDTO extends TenantDTO {
+
+    @ApiModelProperty("方案编号")
+    private String code;
+
+    @ApiModelProperty("方案名称")
+    private String name;
+
+    @ApiModelProperty("方案类型")
+    private TkCheckPlanTypeEnum type;
+
+    @ApiModelProperty("状态")
+    private TkCheckPlanStatusEnum status;
+
+    @ApiModelProperty("方案明细")
+    private String planDetails;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 巡检记录明细
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkInspectionDetailsDTO extends TenantDTO {
+
+    @ApiModelProperty("巡检设备")
+    private String checkDeviceId;
+
+    @ApiModelProperty("巡检内容")
+    private String planDetails;
+
+    @ApiModelProperty("巡检结果")
+    private boolean recordResult;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum;
+
+import java.time.LocalDateTime;
+
+/**
+ * 巡检计划
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkInspectionPlanDTO extends TenantDTO {
+
+    @ApiModelProperty("计划编号")
+    private String code;
+
+    @ApiModelProperty("计划名称")
+    private String name;
+
+    @ApiModelProperty("计划状态")
+    private TkInspectionPlanStatusEnum status;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("开始日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("结束日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime endTime;
+
+    @ApiModelProperty("计划备注")
+    private String remark;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 巡检记录
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkInspectionRecordDTO extends TenantDTO {
+
+    @ApiModelProperty("记录编号")
+    private String code;
+
+    @ApiModelProperty("巡检计划")
+    private String inspectionPlanId;
+
+    @ApiModelProperty("巡检人")
+    private String inspectorId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "巡检日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime checkDate;
+
+    @ApiModelProperty("巡检结果")
+    private boolean recordResult;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+/**
+ * 巡检明细
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKCHECKDETAILS_TABLE_NAME, autoResultMap = true)
+public class TkCheckDetailsEntity extends TenantBaseEntity {
+
+    /**
+     * 明细编号
+     */
+    private String code;
+
+    /**
+     * 巡检设备
+     */
+    private String checkDeviceId;
+
+    /**
+     * 巡检方案
+     */
+    private String checkPlanId;
+
+    /**
+     * 巡检计划
+     */
+    private String inspectionPlanId;
+
+    /**
+     * 方案明细
+     */
+    private String planDetails;
+}

 package org.thingsboard.server.dao.yunteng.entities;
 package org.thingsboard.server.dao.yunteng.entities;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanStatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanStatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkCheckPlanTypeEnum;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -14,9 +16,31 @@ import org.thingsboard.server.dao.model.ModelConstants;
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.TKCHECKPLAN_TABLE_NAME, autoResultMap = true)
 @TableName(value = ModelConstants.TKCHECKPLAN_TABLE_NAME, autoResultMap = true)
 public class TkCheckPlanEntity extends TenantBaseEntity {
 public class TkCheckPlanEntity extends TenantBaseEntity {
+
+    /**
+     * 方案编号
+     */
     private String code;
     private String code;
+
+    /**
+     * 方案名称
+     */
     private String name;
     private String name;
+
+    /**
+     * 方案类型
+     */
+    @TableField(typeHandler = EnumTypeHandler.class)
     private TkCheckPlanTypeEnum type;
     private TkCheckPlanTypeEnum type;
+
+    /**
+     * 状态
+     */
+    @TableField(typeHandler = EnumTypeHandler.class)
     private TkCheckPlanStatusEnum status;
     private TkCheckPlanStatusEnum status;
+
+    /**
+     * 方案明细
+     */
     private String planDetails;
     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.dao.model.ModelConstants;
+
+/**
+ * 巡检记录明细
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKINSPECTIONDETAILS_TABLE_NAME, autoResultMap = true)
+public class TkInspectionDetailsEntity extends TenantBaseEntity {
+
+    /**
+     * 巡检设备
+     */
+    private String checkDeviceId;
+
+    /**
+     * 巡检内容
+     */
+    private String planDetails;
+
+    /**
+     * 巡检结果
+     */
+    private boolean recordResult;
+}

 package org.thingsboard.server.dao.yunteng.entities;
 package org.thingsboard.server.dao.yunteng.entities;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.ModelConstants;
 
 
@@ -15,9 +17,35 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.TKINSPECTIONPLAN_TABLE_NAME, autoResultMap = true)
 @TableName(value = ModelConstants.TKINSPECTIONPLAN_TABLE_NAME, autoResultMap = true)
 public class TkInspectionPlanEntity extends TenantBaseEntity {
 public class TkInspectionPlanEntity extends TenantBaseEntity {
+
+    /**
+     * 计划编号
+     */
     private String code;
     private String code;
+
+    /**
+     * 计划名称
+     */
     private String name;
     private String name;
+
+    /**
+     * 计划状态
+     */
+    @TableField(typeHandler = EnumTypeHandler.class)
     private TkInspectionPlanStatusEnum status;
     private TkInspectionPlanStatusEnum status;
+
+    /**
+     * 开始日期
+     */
     private LocalDateTime startTime;
     private LocalDateTime startTime;
+
+    /**
+     * 结束日期
+     */
     private LocalDateTime endTime;
     private LocalDateTime endTime;
+
+    /**
+     * 计划备注
+     */
+    private String remark;
 }
 }

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.time.LocalDateTime;
+
+/**
+ * 巡检记录
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKINSPECTIONRECORD_TABLE_NAME, autoResultMap = true)
+public class TkInspectionRecordEntity extends TenantBaseEntity {
+
+    /**
+     * 记录编号
+     */
+    private String code;
+
+    /**
+     * 巡检计划
+     */
+    private String inspectionPlanId;
+
+    /**
+     * 巡检人
+     */
+    private String inspectorId;
+
+    /**
+     * 巡检日期
+     */
+    private LocalDateTime checkDate;
+
+    /**
+     * 巡检结果
+     */
+    private boolean recordResult;
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.TkCheckDetailsEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkCheckDetailsMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkCheckDetailsService;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetailsMapper, TkCheckDetailsEntity>
+        implements TkCheckDetailsService {
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.TkCheckPlanDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkCheckPlanEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkCheckPlanMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkCheckPlanService;
+
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMapper, TkCheckPlanEntity>
+        implements TkCheckPlanService {
+    @Override
+    public TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+        QueryWrapper<TkCheckPlanEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda();
+        if (queryMap != null && queryMap.get("name") != null) {
+            lambda.eq(TkCheckPlanEntity::getName, queryMap.get("name").toString());
+        }
+
+        if (queryMap != null && queryMap.get("type") != null) {
+            lambda.eq(TkCheckPlanEntity::getType, queryMap.get("type").toString());
+        }
+
+        IPage<TkCheckPlanEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
+                wrapper);
+
+        return getPageData(page, TkCheckPlanDTO.class);
+    }
+
+    @Override
+    public TkCheckPlanDTO save(TkCheckPlanDTO tkCheckPlanDTO) {
+        checkDto(tkCheckPlanDTO);
+        TkCheckPlanEntity entity = new TkCheckPlanEntity();
+        if (StringUtils.isBlank(tkCheckPlanDTO.getId())) {
+            tkCheckPlanDTO.copyToEntity(entity);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<TkCheckPlanEntity> filter = new QueryWrapper<TkCheckPlanEntity>().lambda()
+                    .eq(TkCheckPlanEntity::getId, tkCheckPlanDTO.getId());
+            entity = tkCheckPlanDTO.getEntity(TkCheckPlanEntity.class);
+            baseMapper.update(entity, filter);
+        }
+
+        entity.copyToDTO(tkCheckPlanDTO);
+        return tkCheckPlanDTO;
+    }
+
+    private void checkDto(TkCheckPlanDTO dto) {
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            throw new TkDataValidationException("租户id为空！");
+        }
+    }
+
+    @Override
+    public boolean delete(String id) {
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
+
+    @Override
+    public TkCheckPlanDTO get(String id) {
+        if (StringUtils.isBlank(id)) {
+            return new TkCheckPlanDTO();
+        }
+
+        TkCheckPlanEntity entity = baseMapper.selectById(id);
+        TkCheckPlanDTO tkCheckPlanDTO = new TkCheckPlanDTO();
+        entity.copyToDTO(tkCheckPlanDTO);
+        return tkCheckPlanDTO;
+    }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionDetailsEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkInspectionDetailsMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkInspectionDetailsService;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspectionDetailsMapper, TkInspectionDetailsEntity>
+        implements TkInspectionDetailsService {
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionPlanEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkInspectionPlanMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkInspectionPlanService;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectionPlanMapper, TkInspectionPlanEntity>
+        implements TkInspectionPlanService {
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionRecordEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkInspectionRecordMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkInspectionRecordService;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspectionRecordMapper, TkInspectionRecordEntity>
+        implements TkInspectionRecordService {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.TkCheckDetailsEntity;
+
+@Mapper
+public interface TkCheckDetailsMapper extends BaseMapper<TkCheckDetailsEntity> {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.TkCheckPlanEntity;
+
+@Mapper
+public interface TkCheckPlanMapper extends BaseMapper<TkCheckPlanEntity> {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionDetailsEntity;
+
+@Mapper
+public interface TkInspectionDetailsMapper extends BaseMapper<TkInspectionDetailsEntity> {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionPlanEntity;
+
+@Mapper
+public interface TkInspectionPlanMapper extends BaseMapper<TkInspectionPlanEntity> {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionRecordEntity;
+
+@Mapper
+public interface TkInspectionRecordMapper extends BaseMapper<TkInspectionRecordEntity> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.dao.yunteng.entities.TkCheckDetailsEntity;
+
+public interface TkCheckDetailsService extends BaseService<TkCheckDetailsEntity> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.TkCheckPlanDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkCheckPlanEntity;
+
+import java.util.Map;
+
+public interface TkCheckPlanService extends BaseService<TkCheckPlanEntity> {
+    TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
+
+    TkCheckPlanDTO save(TkCheckPlanDTO tkCheckPlanDTO);
+
+    boolean delete(String id);
+
+    TkCheckPlanDTO get(String id);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionDetailsEntity;
+
+public interface TkInspectionDetailsService extends BaseService<TkInspectionDetailsEntity> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionPlanEntity;
+
+public interface TkInspectionPlanService extends BaseService<TkInspectionPlanEntity> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.dao.yunteng.entities.TkInspectionRecordEntity;
+
+public interface TkInspectionRecordService extends BaseService<TkInspectionRecordEntity> {
+}