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

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

@@ -153,6 +153,7 @@ CREATE TABLE "public"."qg_check_details"
     "check_plan_id"      varchar(36),
     "inspection_plan_id" varchar(36),
     "plan_details"       varchar(255),
+    "show_order"         int4,
     "tenant_id"          varchar(36),
     "create_time"        timestamp(6),
     "creator"            varchar(36),
@@ -167,6 +168,7 @@ 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 '方案明细';
+COMMENT ON COLUMN "public"."qg_check_details"."show_order" IS '排序';
 COMMENT ON COLUMN "public"."qg_check_details"."tenant_id" IS '租户ID';
 
 CREATE TABLE "public"."qg_inspection_record"
@@ -195,15 +197,17 @@ COMMENT ON COLUMN "public"."qg_inspection_record"."tenant_id" IS '租户ID';
 
 CREATE TABLE "public"."qg_inspection_details"
 (
-    "id"              varchar(36) PRIMARY KEY,
-    "check_device_id" varchar(36),
-    "plan_details"    varchar(255),
-    "record_result"   bool,
-    "tenant_id"       varchar(36),
-    "create_time"     timestamp(6),
-    "creator"         varchar(36),
-    "updater"         varchar(36),
-    "update_time"     timestamp(6)
+    "id"                   varchar(36) PRIMARY KEY,
+    "check_device_id"      varchar(36),
+    "plan_details"         varchar(255),
+    "record_result"        bool,
+    "show_order"           int4,
+    "inspection_record_id" varchar(36),
+    "tenant_id"            varchar(36),
+    "create_time"          timestamp(6),
+    "creator"              varchar(36),
+    "updater"              varchar(36),
+    "update_time"          timestamp(6)
 );
 
 COMMENT ON TABLE "public"."qg_inspection_details" IS '巡检记录明细';
@@ -211,6 +215,9 @@ 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 '巡检结果';
+COMMENT ON COLUMN "public"."qg_inspection_details"."show_order" IS '排序';
+COMMENT ON COLUMN "public"."qg_inspection_details"."inspection_record_id" IS '巡检记录';
+COMMENT ON COLUMN "public"."qg_inspection_details"."tenant_id" IS '租户ID';
 
 CREATE TABLE "public"."qg_preserve_detail" (
    "id" varchar(36)  NOT NULL,

@@ -39,7 +39,8 @@ public class TkCheckPlanController extends BaseController {
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "type", required = false) TkCheckPlanTypeEnum type
+            @RequestParam(value = "type", required = false) TkCheckPlanTypeEnum type,
+            @RequestParam(value = "status", required = false) TkCheckPlanStatusEnum status
     ) throws ThingsboardException {
         Map<String, Object> queryMap = new HashMap<>();
         queryMap.put(PAGE_SIZE, pageSize);
@@ -52,6 +53,10 @@ public class TkCheckPlanController extends BaseController {
             queryMap.put("type", type);
         }
 
+        if (status != null) {
+            queryMap.put("status", status);
+        }
+
         return tkCheckPlanService.page(queryMap, getCurrentUser().isTenantAdmin());
     }
 

 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.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.commons.collections4.CollectionUtils;
+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.TkInspectionPlanDTO;
+import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkInspectionPlanService;
 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
@@ -18,4 +32,58 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 public class TkInspectionPlanController extends BaseController {
     private final TkInspectionPlanService tkInspectionPlanService;
 
+    @GetMapping(params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页查询")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public TkPageData<TkInspectionPlanDTO> page(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "type", required = false) TkInspectionPlanStatusEnum status,
+            @RequestParam(value = "startTime", required = false) Long startTime,
+            @RequestParam(value = "endTime", required = false) Long endTime
+    ) 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 (status != null) {
+            queryMap.put("status", status);
+        }
+
+        checkTimeAndPut(queryMap, startTime, endTime);
+        return tkInspectionPlanService.page(queryMap, getCurrentUser().isTenantAdmin());
+    }
+
+    @PostMapping("/save")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkInspectionPlanDTO> save(@RequestBody TkInspectionPlanDTO tkInspectionPlanDTO) throws ThingsboardException {
+        tkInspectionPlanDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        if (tkInspectionPlanDTO.getStatus() == null) {
+            tkInspectionPlanDTO.setStatus(TkInspectionPlanStatusEnum.NOT_START);
+        }
+
+        if (CollectionUtils.isNotEmpty(tkInspectionPlanDTO.getTkCheckDetailsDTOList())) {
+            tkInspectionPlanDTO.getTkCheckDetailsDTOList()
+                    .forEach(tkCheckDetailsDTO -> tkCheckDetailsDTO.setTenantId(tkCheckDetailsDTO.getTenantId()));
+        }
+
+        TkInspectionPlanDTO dto = tkInspectionPlanService.save(tkInspectionPlanDTO);
+        return ResponseEntity.ok(dto);
+    }
+
+    @GetMapping("/detail")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkInspectionPlanDTO> detail(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkInspectionPlanService.get(id));
+    }
+
+    @GetMapping("/delete")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkInspectionPlanService.delete(id));
+    }
 }

 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.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.commons.collections4.CollectionUtils;
+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.TkInspectionRecordDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkInspectionRecordService;
 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
@@ -18,4 +31,60 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 public class TkInspectionRecordController extends BaseController {
     private final TkInspectionRecordService tkInspectionRecordService;
 
+    @GetMapping(params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页查询")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public TkPageData<TkInspectionRecordDTO> page(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "inspectionPlanId", required = false) String inspectionPlanId,
+            @RequestParam(value = "inspectorId", required = false) String inspectorId,
+            @RequestParam(value = "startTime", required = false) Long startTime,
+            @RequestParam(value = "endTime", required = false) Long endTime,
+            @RequestParam(value = "recordResult", required = false) Boolean recordResult
+    ) throws ThingsboardException {
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(PAGE, page);
+        if (StringUtils.isNotBlank(inspectionPlanId)) {
+            queryMap.put("inspectionPlanId", inspectionPlanId);
+        }
+
+        if (StringUtils.isNotBlank(inspectorId)) {
+            queryMap.put("inspectorId", inspectorId);
+        }
+
+        if (recordResult != null) {
+            queryMap.put("recordResult", recordResult);
+        }
+
+        checkTimeAndPut(queryMap, startTime, endTime);
+        return tkInspectionRecordService.page(queryMap, getCurrentUser().isTenantAdmin());
+    }
+
+    @PostMapping("/save")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkInspectionRecordDTO> save(@RequestBody TkInspectionRecordDTO tkInspectionRecordDTO) throws ThingsboardException {
+        tkInspectionRecordDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        if (CollectionUtils.isNotEmpty(tkInspectionRecordDTO.getTkInspectionDetailsDTOList())) {
+            tkInspectionRecordDTO.getTkInspectionDetailsDTOList()
+                    .forEach(tkInspectionDetailsDTO -> tkInspectionDetailsDTO.setTenantId(tkInspectionRecordDTO.getTenantId()));
+        }
+
+        TkInspectionRecordDTO dto = tkInspectionRecordService.save(tkInspectionRecordDTO);
+        return ResponseEntity.ok(dto);
+    }
+
+    @GetMapping("/detail")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkInspectionRecordDTO> detail(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkInspectionRecordService.get(id));
+    }
+
+    @GetMapping("/delete")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkInspectionRecordService.delete(id));
+    }
+
 }

@@ -25,4 +25,7 @@ public class TkCheckDetailsDTO extends TenantDTO {
 
     @ApiModelProperty("方案明细")
     private String planDetails;
+
+    @ApiModelProperty("排序")
+    private int showOrder;
 }

@@ -19,4 +19,10 @@ public class TkInspectionDetailsDTO extends TenantDTO {
 
     @ApiModelProperty("巡检结果")
     private boolean recordResult;
+
+    @ApiModelProperty("巡检记录")
+    private String inspectionRecordId;
+
+    @ApiModelProperty("排序")
+    private int showOrder;
 }

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.enums.TkInspectionPlanStatusEnum;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 巡检计划
@@ -38,4 +39,7 @@ public class TkInspectionPlanDTO extends TenantDTO {
 
     @ApiModelProperty("计划备注")
     private String remark;
+
+    @ApiModelProperty("巡检明细")
+    private List<TkCheckDetailsDTO> tkCheckDetailsDTOList;
 }

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 巡检记录
@@ -32,4 +33,17 @@ public class TkInspectionRecordDTO extends TenantDTO {
 
     @ApiModelProperty("巡检结果")
     private boolean recordResult;
+
+    @ApiModelProperty("巡检记录明细")
+    private List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "巡检日期-筛选开始日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "巡检日期-筛选结束日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime endTime;
 }

@@ -37,4 +37,9 @@ public class TkCheckDetailsEntity extends TenantBaseEntity {
      * 方案明细
      */
     private String planDetails;
+
+    /**
+     * 排序
+     */
+    private int showOrder;
 }

@@ -27,4 +27,14 @@ public class TkInspectionDetailsEntity extends TenantBaseEntity {
      * 巡检结果
      */
     private boolean recordResult;
+
+    /**
+     * 巡检记录
+     */
+    private String inspectionRecordId;
+
+    /**
+     * 排序
+     */
+    private int showOrder;
 }

 package org.thingsboard.server.dao.yunteng.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.TkCheckDetailsDTO;
 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;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetailsMapper, TkCheckDetailsEntity>
         implements TkCheckDetailsService {
+    @Override
+    public List<TkCheckDetailsDTO> batchSave(List<TkCheckDetailsDTO> checkDetailsDTOList, String inspectionPlanId) {
+        List<TkCheckDetailsDTO> oldTkCheckDetailsDTOList = listByInspectionPlanId(inspectionPlanId);
+        if (CollectionUtils.isEmpty(checkDetailsDTOList) && CollectionUtils.isNotEmpty(oldTkCheckDetailsDTOList)) {
+            List<String> checkDetailsIdList = oldTkCheckDetailsDTOList.stream()
+                    .map(TkCheckDetailsDTO::getId)
+                    .collect(Collectors.toList());
+            baseMapper.deleteBatchIds(checkDetailsIdList);
+            return new ArrayList<>(0);
+        }
+
+        if (CollectionUtils.isEmpty(oldTkCheckDetailsDTOList) && CollectionUtils.isNotEmpty(checkDetailsDTOList)) {
+            List<TkCheckDetailsEntity> tkCheckDetailsEntityList = checkDetailsDTOList.stream().map(checkDetailsDTO -> {
+                TkCheckDetailsEntity entity = new TkCheckDetailsEntity();
+                checkDetailsDTO.copyToEntity(entity);
+                return entity;
+            }).collect(Collectors.toList());
+
+            insertBatch(tkCheckDetailsEntityList, TkCheckDetailsEntity.class);
+            return listByInspectionPlanId(inspectionPlanId);
+        }
+
+        List<TkCheckDetailsEntity> addEntityList = new ArrayList<>(checkDetailsDTOList.size());
+        List<TkCheckDetailsEntity> updateEntityList = new ArrayList<>(checkDetailsDTOList.size());
+        List<String> needDeleteIdList = new ArrayList<>(checkDetailsDTOList.size());
+        List<String> checkDetailsIdList = CollectionUtils.emptyIfNull(oldTkCheckDetailsDTOList).stream()
+                .map(TkCheckDetailsDTO::getId)
+                .collect(Collectors.toList());
+        for (TkCheckDetailsDTO tkCheckDetailsDTO : checkDetailsDTOList) {
+            TkCheckDetailsEntity entity = new TkCheckDetailsEntity();
+            tkCheckDetailsDTO.copyToEntity(entity);
+            if (StringUtils.isBlank(entity.getId())) {
+                addEntityList.add(entity);
+                continue;
+            }
+
+            if (checkDetailsIdList.contains(entity.getId())) {
+                updateEntityList.add(entity);
+            }
+        }
+
+
+        if (CollectionUtils.isNotEmpty(addEntityList)) {
+            insertBatch(addEntityList, TkCheckDetailsEntity.class);
+        }
+
+        if (CollectionUtils.isNotEmpty(updateEntityList)) {
+            updateEntityList.forEach(tkCheckDetailsEntity -> baseMapper.updateById(tkCheckDetailsEntity));
+            List<String> updateIdList = updateEntityList.stream().map(TkCheckDetailsEntity::getId).collect(Collectors.toList());
+            checkDetailsIdList.removeAll(updateIdList);
+            needDeleteIdList.addAll(checkDetailsIdList);
+        } else {
+            needDeleteIdList = checkDetailsIdList;
+        }
+
+        if (CollectionUtils.isNotEmpty(needDeleteIdList)) {
+            baseMapper.deleteBatchIds(needDeleteIdList);
+        }
+
+        return listByInspectionPlanId(inspectionPlanId);
+    }
+
+    @Override
+    public List<TkCheckDetailsDTO> listByInspectionPlanId(String inspectionPlanId) {
+        if (StringUtils.isBlank(inspectionPlanId)) {
+            return new ArrayList<>(0);
+        }
+
+        QueryWrapper<TkCheckDetailsEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkCheckDetailsEntity> lambda = wrapper.lambda();
+        lambda.eq(TkCheckDetailsEntity::getInspectionPlanId, inspectionPlanId);
+        lambda.orderByAsc(TkCheckDetailsEntity::getShowOrder);
+        List<TkCheckDetailsEntity> tkCheckDetailsEntitieList = baseMapper.selectList(wrapper);
+        return CollectionUtils.emptyIfNull(tkCheckDetailsEntitieList).stream().map(entity -> {
+            TkCheckDetailsDTO tkCheckDetailsDTO = new TkCheckDetailsDTO();
+            entity.copyToDTO(tkCheckDetailsDTO);
+            return tkCheckDetailsDTO;
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public void deleteByInspectionPlanId(String inspectionPlanId) {
+        if (StringUtils.isBlank(inspectionPlanId)) {
+            return;
+        }
+
+        QueryWrapper<TkCheckDetailsEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkCheckDetailsEntity> lambda = wrapper.lambda();
+        lambda.eq(TkCheckDetailsEntity::getInspectionPlanId, inspectionPlanId);
+        baseMapper.delete(wrapper);
+    }
 }

@@ -34,6 +34,10 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe
             lambda.eq(TkCheckPlanEntity::getType, queryMap.get("type").toString());
         }
 
+        if (queryMap != null && queryMap.get("status") != null) {
+            lambda.eq(TkCheckPlanEntity::getStatus, queryMap.get("status").toString());
+        }
+
         IPage<TkCheckPlanEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
                 wrapper);
 

 package org.thingsboard.server.dao.yunteng.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.TkInspectionDetailsDTO;
 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;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspectionDetailsMapper, TkInspectionDetailsEntity>
         implements TkInspectionDetailsService {
+    @Override
+    public List<TkInspectionDetailsDTO> batchSave(List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList, String inspectionRecordId) {
+        List<TkInspectionDetailsDTO> oldTkInspectionDetailsDTOList = listByInspectionRecordId(inspectionRecordId);
+        if (CollectionUtils.isEmpty(tkInspectionDetailsDTOList) && CollectionUtils.isNotEmpty(oldTkInspectionDetailsDTOList)) {
+            List<String> inspectionDetailsIdList = oldTkInspectionDetailsDTOList.stream()
+                    .map(TkInspectionDetailsDTO::getId)
+                    .collect(Collectors.toList());
+            baseMapper.deleteBatchIds(inspectionDetailsIdList);
+            return new ArrayList<>(0);
+        }
+
+        if (CollectionUtils.isEmpty(oldTkInspectionDetailsDTOList) && CollectionUtils.isNotEmpty(tkInspectionDetailsDTOList)) {
+            List<TkInspectionDetailsEntity> tkInspectionDetailsEntityList = tkInspectionDetailsDTOList.stream().map(tkInspectionDetailsDTO -> {
+                TkInspectionDetailsEntity entity = new TkInspectionDetailsEntity();
+                tkInspectionDetailsDTO.copyToEntity(entity);
+                return entity;
+            }).collect(Collectors.toList());
+
+            insertBatch(tkInspectionDetailsEntityList, TkInspectionDetailsEntity.class);
+            return listByInspectionRecordId(inspectionRecordId);
+        }
+
+        List<TkInspectionDetailsEntity> addEntityList = new ArrayList<>(tkInspectionDetailsDTOList.size());
+        List<TkInspectionDetailsEntity> updateEntityList = new ArrayList<>(tkInspectionDetailsDTOList.size());
+        List<String> needDeleteIdList = new ArrayList<>(tkInspectionDetailsDTOList.size());
+        List<String> inspectionDetailsIdList = CollectionUtils.emptyIfNull(oldTkInspectionDetailsDTOList).stream()
+                .map(TkInspectionDetailsDTO::getId)
+                .collect(Collectors.toList());
+        for (TkInspectionDetailsDTO tkInspectionDetailsDTO : tkInspectionDetailsDTOList) {
+            TkInspectionDetailsEntity entity = new TkInspectionDetailsEntity();
+            tkInspectionDetailsDTO.copyToEntity(entity);
+            if (StringUtils.isBlank(entity.getId())) {
+                addEntityList.add(entity);
+                continue;
+            }
+
+            if (inspectionDetailsIdList.contains(entity.getId())) {
+                updateEntityList.add(entity);
+            }
+        }
+
+        if (CollectionUtils.isNotEmpty(addEntityList)) {
+            insertBatch(addEntityList, TkInspectionDetailsEntity.class);
+        }
+
+        if (CollectionUtils.isNotEmpty(updateEntityList)) {
+            updateEntityList.forEach(tkInspectionDetailsEntity -> baseMapper.updateById(tkInspectionDetailsEntity));
+            List<String> updateIdList = updateEntityList.stream().map(TkInspectionDetailsEntity::getId).collect(Collectors.toList());
+            inspectionDetailsIdList.retainAll(updateIdList);
+            needDeleteIdList.addAll(inspectionDetailsIdList);
+        } else {
+            needDeleteIdList = inspectionDetailsIdList;
+        }
+
+        if (CollectionUtils.isNotEmpty(needDeleteIdList)) {
+            baseMapper.deleteBatchIds(needDeleteIdList);
+        }
+
+        return listByInspectionRecordId(inspectionRecordId);
+    }
+
+    @Override
+    public List<TkInspectionDetailsDTO> listByInspectionRecordId(String inspectionRecordId) {
+        if (StringUtils.isBlank(inspectionRecordId)) {
+            return new ArrayList<>(0);
+        }
+
+        QueryWrapper<TkInspectionDetailsEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkInspectionDetailsEntity> lambda = wrapper.lambda();
+        lambda.eq(TkInspectionDetailsEntity::getInspectionRecordId, inspectionRecordId);
+        lambda.orderByAsc(TkInspectionDetailsEntity::getShowOrder);
+        List<TkInspectionDetailsEntity> tkInspectionDetailsEntityList = baseMapper.selectList(wrapper);
+        return CollectionUtils.emptyIfNull(tkInspectionDetailsEntityList).stream().map(entity -> {
+            TkInspectionDetailsDTO tkInspectionDetailsDTO = new TkInspectionDetailsDTO();
+            entity.copyToDTO(tkInspectionDetailsDTO);
+            return tkInspectionDetailsDTO;
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public void deleteByInspectionRecordId(String inspectionRecordId) {
+        if (StringUtils.isBlank(inspectionRecordId)) {
+            return;
+        }
+
+        QueryWrapper<TkInspectionDetailsEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkInspectionDetailsEntity> lambda = wrapper.lambda();
+        lambda.eq(TkInspectionDetailsEntity::getInspectionRecordId, inspectionRecordId);
+        baseMapper.delete(wrapper);
+    }
 }

 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.collections4.CollectionUtils;
+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.TkCheckDetailsDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkInspectionPlanDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 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.TkCheckDetailsService;
 import org.thingsboard.server.dao.yunteng.service.TkInspectionPlanService;
+import org.thingsboard.server.dao.yunteng.service.TkInspectionRecordService;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectionPlanMapper, TkInspectionPlanEntity>
         implements TkInspectionPlanService {
+    private final TkCheckDetailsService tkCheckDetailsService;
+    private final TkInspectionRecordService tkInspectionRecordService;
+
+    @Override
+    public TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+        QueryWrapper<TkInspectionPlanEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkInspectionPlanEntity> lambda = wrapper.lambda();
+        if (queryMap != null && queryMap.get("name") != null) {
+            lambda.eq(TkInspectionPlanEntity::getName, queryMap.get("name").toString());
+        }
+
+        if (queryMap != null && queryMap.get("status") != null) {
+            lambda.eq(TkInspectionPlanEntity::getStatus, queryMap.get("status").toString());
+        }
+
+        if (queryMap != null && queryMap.get("startTime") != null && queryMap.get("endTime") != null) {
+            LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");
+            LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");
+            lambda.ge(TkInspectionPlanEntity::getStartTime, startTime);
+            lambda.le(TkInspectionPlanEntity::getEndTime, endTime);
+        }
+
+        IPage<TkInspectionPlanEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
+                wrapper);
+
+        return getPageData(page, TkInspectionPlanDTO.class);
+    }
+
+    @Override
+    public TkInspectionPlanDTO save(TkInspectionPlanDTO tkInspectionPlanDTO) {
+        List<TkCheckDetailsDTO> checkDetailsDTOList = new ArrayList<>(tkInspectionPlanDTO.getTkCheckDetailsDTOList());
+        checkDto(tkInspectionPlanDTO);
+        TkInspectionPlanEntity entity = new TkInspectionPlanEntity();
+        if (StringUtils.isBlank(tkInspectionPlanDTO.getId())) {
+            tkInspectionPlanDTO.copyToEntity(entity);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<TkInspectionPlanEntity> filter = new QueryWrapper<TkInspectionPlanEntity>().lambda()
+                    .eq(TkInspectionPlanEntity::getId, tkInspectionPlanDTO.getId());
+            entity = tkInspectionPlanDTO.getEntity(TkInspectionPlanEntity.class);
+            baseMapper.update(entity, filter);
+        }
+
+        entity.copyToDTO(tkInspectionPlanDTO);
+        String id = tkInspectionPlanDTO.getId();
+        for (int index = 0; index < checkDetailsDTOList.size(); index++) {
+            if (CollectionUtils.isEmpty(checkDetailsDTOList)) {
+                continue;
+            }
+
+            TkCheckDetailsDTO checkDetailsDTO = checkDetailsDTOList.get(index);
+            checkDetailsDTO.setInspectionPlanId(id);
+            checkDetailsDTO.setShowOrder(index);
+        }
+
+        List<TkCheckDetailsDTO> tkCheckDetailsDTOList = tkCheckDetailsService.batchSave(checkDetailsDTOList, id);
+        tkInspectionPlanDTO.setTkCheckDetailsDTOList(tkCheckDetailsDTOList);
+        return tkInspectionPlanDTO;
+    }
+
+    @Override
+    public TkInspectionPlanDTO get(String id) {
+        if (StringUtils.isBlank(id)) {
+            return new TkInspectionPlanDTO();
+        }
+
+        TkInspectionPlanEntity entity = baseMapper.selectById(id);
+        TkInspectionPlanDTO tkInspectionPlanDTO = new TkInspectionPlanDTO();
+        entity.copyToDTO(tkInspectionPlanDTO);
+        List<TkCheckDetailsDTO> checkDetailsDTOList = tkCheckDetailsService.listByInspectionPlanId(id);
+        tkInspectionPlanDTO.setTkCheckDetailsDTOList(checkDetailsDTOList);
+        return tkInspectionPlanDTO;
+    }
+
+    @Override
+    public boolean delete(String id) {
+        tkCheckDetailsService.deleteByInspectionPlanId(id);
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
+
+    private void checkDto(TkInspectionPlanDTO dto) {
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            throw new TkDataValidationException("租户id为空！");
+        }
+    }
 }

 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.collections4.CollectionUtils;
+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.TkInspectionDetailsDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkInspectionRecordDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 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.TkInspectionDetailsService;
 import org.thingsboard.server.dao.yunteng.service.TkInspectionRecordService;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspectionRecordMapper, TkInspectionRecordEntity>
         implements TkInspectionRecordService {
+    private final TkInspectionDetailsService tkInspectionDetailsService;
+
+    @Override
+    public TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+        QueryWrapper<TkInspectionRecordEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkInspectionRecordEntity> lambda = wrapper.lambda();
+        if (queryMap != null && queryMap.get("inspectionPlanId") != null) {
+            lambda.eq(TkInspectionRecordEntity::getInspectionPlanId, queryMap.get("inspectionPlanId").toString());
+        }
+
+        if (queryMap != null && queryMap.get("inspectorId") != null) {
+            lambda.eq(TkInspectionRecordEntity::getInspectorId, queryMap.get("inspectorId").toString());
+        }
+
+        if (queryMap != null && queryMap.get("recordResult") != null) {
+            lambda.eq(TkInspectionRecordEntity::isRecordResult, queryMap.get("recordResult").toString());
+        }
+
+        if (queryMap != null && queryMap.get("startTime") != null && queryMap.get("endTime") != null) {
+            LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");
+            LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");
+            lambda.ge(TkInspectionRecordEntity::getCheckDate, startTime);
+            lambda.le(TkInspectionRecordEntity::getCheckDate, endTime);
+        }
+
+        IPage<TkInspectionRecordEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
+                wrapper);
+
+        return getPageData(page, TkInspectionRecordDTO.class);
+    }
+
+    @Override
+    public TkInspectionRecordDTO save(TkInspectionRecordDTO tkInspectionRecordDTO) {
+        List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList = new ArrayList<>(tkInspectionRecordDTO.getTkInspectionDetailsDTOList());
+        checkDto(tkInspectionRecordDTO);
+        TkInspectionRecordEntity entity = new TkInspectionRecordEntity();
+        if (StringUtils.isBlank(tkInspectionRecordDTO.getId())) {
+            tkInspectionRecordDTO.copyToEntity(entity);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<TkInspectionRecordEntity> filter = new QueryWrapper<TkInspectionRecordEntity>().lambda()
+                    .eq(TkInspectionRecordEntity::getId, tkInspectionRecordDTO.getId());
+            entity = tkInspectionRecordDTO.getEntity(TkInspectionRecordEntity.class);
+            baseMapper.update(entity, filter);
+        }
+
+        entity.copyToDTO(tkInspectionRecordDTO);
+        String id = tkInspectionRecordDTO.getId();
+        for (int index = 0; index < tkInspectionDetailsDTOList.size(); index++) {
+            if (CollectionUtils.isEmpty(tkInspectionDetailsDTOList)) {
+                continue;
+            }
+
+            TkInspectionDetailsDTO tkInspectionDetailsDTO = tkInspectionDetailsDTOList.get(index);
+            tkInspectionDetailsDTO.setInspectionRecordId(id);
+            tkInspectionDetailsDTO.setShowOrder(index);
+        }
+
+        List<TkInspectionDetailsDTO> detailsDTOList = tkInspectionDetailsService.batchSave(tkInspectionDetailsDTOList, id);
+        tkInspectionRecordDTO.setTkInspectionDetailsDTOList(detailsDTOList);
+        return tkInspectionRecordDTO;
+    }
+
+    @Override
+    public TkInspectionRecordDTO get(String id) {
+        if (StringUtils.isBlank(id)) {
+            return new TkInspectionRecordDTO();
+        }
+
+        TkInspectionRecordEntity entity = baseMapper.selectById(id);
+        TkInspectionRecordDTO tkInspectionRecordDTO = new TkInspectionRecordDTO();
+        entity.copyToDTO(tkInspectionRecordDTO);
+        List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList = tkInspectionDetailsService.listByInspectionRecordId(id);
+        tkInspectionRecordDTO.setTkInspectionDetailsDTOList(tkInspectionDetailsDTOList);
+        return tkInspectionRecordDTO;
+    }
+
+    @Override
+    public boolean delete(String id) {
+        tkInspectionDetailsService.deleteByInspectionRecordId(id);
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
+
+    private void checkDto(TkInspectionRecordDTO dto) {
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            throw new TkDataValidationException("租户id为空！");
+        }
+    }
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.yunteng.dto.TkCheckDetailsDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkCheckDetailsEntity;
 
+import java.util.List;
+
 public interface TkCheckDetailsService extends BaseService<TkCheckDetailsEntity> {
+
+    List<TkCheckDetailsDTO> batchSave(List<TkCheckDetailsDTO> checkDetailsDTOList, String inspectionPlanId);
+
+    List<TkCheckDetailsDTO> listByInspectionPlanId(String inspectionPlanId);
+
+    void deleteByInspectionPlanId(String inspectionPlanId);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.yunteng.dto.TkInspectionDetailsDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkInspectionDetailsEntity;
 
+import java.util.List;
+
 public interface TkInspectionDetailsService extends BaseService<TkInspectionDetailsEntity> {
+
+    List<TkInspectionDetailsDTO> batchSave(List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList, String inspectionRecordId);
+
+    List<TkInspectionDetailsDTO> listByInspectionRecordId(String inspectionRecordId);
+
+    void deleteByInspectionRecordId(String inspectionRecordId);
 }

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

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