巡检计划 接口开发

@@ -150,6 +150,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),
@@ -164,6 +165,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"
@@ -196,6 +198,7 @@ CREATE TABLE "public"."qg_inspection_details"
     "check_device_id" varchar(36),
     "plan_details"    varchar(255),
     "record_result"   bool,
+    "show_order"      int4,
     "tenant_id"       varchar(36),
     "create_time"     timestamp(6),
     "creator"         varchar(36),
@@ -208,4 +211,5 @@ 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"."tenant_id" IS '租户ID';
\ No newline at end of file

 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.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+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.i18n.MessageUtils;
+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.sql.Timestamp;
+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 +36,71 @@ 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));
+    }
+
+    protected void checkTimeAndPut(Map<String, Object> queryMap, Long startTime, Long endTime) {
+        if (null != endTime && null != startTime) {
+            if (startTime > endTime) {
+                throw new TkDataValidationException(
+                        MessageUtils.message(ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getI18nCode()));
+            }
+
+            queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
+            queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
+        }
+    }
+
 }

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

@@ -19,4 +19,7 @@ public class TkInspectionDetailsDTO extends TenantDTO {
 
     @ApiModelProperty("巡检结果")
     private boolean recordResult;
+
+    @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;
 }

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

@@ -27,4 +27,9 @@ public class TkInspectionDetailsEntity extends TenantBaseEntity {
      * 巡检结果
      */
     private boolean recordResult;
+
+    /**
+     * 排序
+     */
+    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);
+    }
+
+    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);
+    }
 }

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