增加tenant_id

@@ -100,6 +100,7 @@ CREATE TABLE "public"."qg_inspection_plan"
     "status"      varchar(50) NOT NULL,
     "start_time"  timestamp(6),
     "end_time"    timestamp(6),
+    "tenant_id"   varchar(36),
     "create_time" timestamp(6),
     "creator"     varchar(36),
     "updater"     varchar(36),
@@ -114,6 +115,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"."start_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 '计划备注';
 
 CREATE TABLE "public"."qg_check_plan"
@@ -124,6 +126,7 @@ CREATE TABLE "public"."qg_check_plan"
     "type"         varchar(50),
     "status"       varchar(50),
     "plan_details" varchar(255),
+    "tenant_id"    varchar(36),
     "create_time"  timestamp(6),
     "creator"      varchar(36),
     "updater"      varchar(36),
@@ -137,6 +140,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"."status" 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"
 (
@@ -146,6 +150,7 @@ CREATE TABLE "public"."qg_check_details"
     "check_plan_id"      varchar(36),
     "inspection_plan_id" varchar(36),
     "plan_details"       varchar(255),
+    "tenant_id"          varchar(36),
     "create_time"        timestamp(6),
     "creator"            varchar(36),
     "updater"            varchar(36),
@@ -159,15 +164,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"."inspection_plan_id" 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"
 (
     "id"                 varchar(36) PRIMARY KEY,
     "code"               varchar(50) NOT NULL,
     "inspection_plan_id" varchar(36),
-    "tenant_id"          varchar(36),
+    "inspector_id"       varchar(36),
     "check_date"         timestamp(6),
     "record_result"      bool,
+    "tenant_id"          varchar(36),
     "create_time"        timestamp(6),
     "creator"            varchar(36),
     "updater"            varchar(36),
@@ -178,9 +185,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"."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"."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"."tenant_id" IS '租户ID';
 
 CREATE TABLE "public"."qg_inspection_details"
 (
@@ -188,6 +196,7 @@ CREATE TABLE "public"."qg_inspection_details"
     "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),
@@ -198,4 +207,5 @@ 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
+COMMENT ON COLUMN "public"."qg_inspection_details"."record_result" IS '巡检结果';
+COMMENT ON COLUMN "public"."qg_inspection_details"."tenant_id" IS '租户ID';
\ No newline at end of file

-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.*;
-import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.TkCheckDetailsService;
-import org.thingsboard.server.queue.util.TbCoreComponent;
-
-@RestController
-@TbCoreComponent
-@RequiredArgsConstructor
-@RequestMapping("api/yt/checkDetails")
-@Api(tags = {"巡检/保养方案"})
-@Slf4j
-public class TkCheckDetailsController extends BaseController {
-    private final TkCheckDetailsService tkCheckDetailsService;
-
-}

+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) {
+        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));
+    }
+
+}

@@ -5,11 +5,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 巡检/保养方案
+ * 巡检明细
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class TkCheckDetailsDTO extends BaseDTO {
+public class TkCheckDetailsDTO extends TenantDTO {
 
     @ApiModelProperty("明细编号")
     private String code;

@@ -7,11 +7,11 @@ 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 BaseDTO {
+public class TkCheckPlanDTO extends TenantDTO {
 
     @ApiModelProperty("方案编号")
     private String code;

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class TkInspectionDetailsDTO extends BaseDTO {
+public class TkInspectionDetailsDTO extends TenantDTO {
 
     @ApiModelProperty("巡检设备")
     private String checkDeviceId;

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class TkInspectionPlanDTO extends BaseDTO {
+public class TkInspectionPlanDTO extends TenantDTO {
 
     @ApiModelProperty("计划编号")
     private String code;

@@ -6,7 +6,6 @@ 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;
 
@@ -15,7 +14,7 @@ import java.time.LocalDateTime;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class TkInspectionRecordDTO extends BaseDTO {
+public class TkInspectionRecordDTO extends TenantDTO {
 
     @ApiModelProperty("记录编号")
     private String code;
@@ -23,6 +22,9 @@ public class TkInspectionRecordDTO extends BaseDTO {
     @ApiModelProperty("巡检计划")
     private String inspectionPlanId;
 
+    @ApiModelProperty("巡检人")
+    private String inspectorId;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "巡检日期")
     @JsonSerialize(using = LocalDateTimeSerializer.class)

@@ -26,6 +26,11 @@ public class TkInspectionRecordEntity extends TenantBaseEntity {
     private String inspectionPlanId;
 
     /**
+     * 巡检人
+     */
+    private String inspectorId;
+
+    /**
      * 巡检日期
      */
     private LocalDateTime checkDate;

 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.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("code").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) {
+        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;
+    }
+
+    @Override
+    public boolean delete(String id) {
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
 }

 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);
 }