保养记录关联设备台账

@@ -17,6 +17,8 @@ import org.thingsboard.server.dao.yunteng.service.TkPreserveDetailService;
 import org.thingsboard.server.dao.yunteng.service.TkPreservePlanService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+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;
 
@@ -87,10 +89,23 @@ public class TkPreservePlanController extends BaseController {
     public TkPageData<TkPreserveDetailDTO> pageDetail(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
-            @RequestBody TkPreserveDetailDTO dto)
+            @RequestBody Map<String, Object> params)
             throws ThingsboardException {
-        dto.setPage(page);
-        dto.setPageSize(pageSize);
-        return tkPreserveDetailService.page(dto);
+        params.put(PAGE, page);
+        params.put(PAGE_SIZE, pageSize);
+        return tkPreserveDetailService.page(params);
+    }
+
+    @PostMapping("/updateDetailStatus")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    @ApiOperation("更新保养计划状态")
+    public ResponseEntity<TkPreserveDetailDTO> updateDetailStatus(@RequestBody TkPreserveDetailDTO dto) throws ThingsboardException {
+        TkPreserveDetailDTO detailDTO = tkPreserveDetailService.load(dto.getId());
+        if (detailDTO == null) {
+            throw new TkDataValidationException("保养明细不存在！");
+        }
+
+        tkPreserveDetailService.updateStatus(dto.getId(), dto.getDetailStatus().name());
+        return ResponseEntity.ok(detailDTO);
     }
 }

@@ -3,6 +3,7 @@ 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.PreserveDetailStatusEnum;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -20,13 +21,16 @@ public class TkPreserveDetailDTO extends TenantDTO {
     private String deviceId;
 
     @ApiModelProperty(value = "设备信息")
-    private DeviceDTO deviceInfo;
+    private TkDeviceAccountDTO deviceInfo;
 
     @ApiModelProperty(value = "方案id")
     private String checkPlanId;
 
+    @ApiModelProperty(value = "方案id")
+    private String checkPlanName;
+
     @ApiModelProperty(value = "执行状态(UNEXECUTED未执行，EXECUTED已执行)")
-    private String detailStatus;
+    private PreserveDetailStatusEnum detailStatus;
 
     @ApiModelProperty(value = "页号")
     private Integer page;

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.entities;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.PreserveDetailStatusEnum;
 import org.thingsboard.server.dao.model.ModelConstants;
 
 /**
@@ -17,5 +18,5 @@ public class TkPreserveDetailEntity extends TenantBaseEntity {
     private String preservePlanId;
     private String deviceId;
     private String checkPlanId;
-    private String detailStatus;
+    private PreserveDetailStatusEnum detailStatus;
 }

@@ -7,15 +7,22 @@ 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.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.TenantId;
 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.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
 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.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -85,4 +92,16 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe
         entity.copyToDTO(tkCheckPlanDTO);
         return tkCheckPlanDTO;
     }
+
+    @Override
+    public List<TkCheckPlanDTO> listByIds(List<String> ids) throws ThingsboardException {
+        QueryWrapper<TkCheckPlanEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkCheckPlanEntity::getTenantId, tenantId.getId().toString());
+        lambda.in(BaseEntity::getId,ids);
+        List<TkCheckPlanEntity> entitys = baseMapper.selectList(wrapper);
+        return Optional.ofNullable(entitys).map(all -> all.stream().map(item -> item.getDTO(TkCheckPlanDTO.class))
+                .collect(Collectors.toList())).orElse(null);
+    }
 }

@@ -2,6 +2,7 @@ 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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -11,17 +12,17 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.PreserveDetailStatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.PreservePlanStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkPreservePlanEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkRepairRecordEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkPreserveDetailMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
-import org.thingsboard.server.dao.yunteng.service.TkPreserveDetailService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -35,43 +36,20 @@ import java.util.stream.Collectors;
 public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveDetailMapper, TkPreserveDetailEntity>
         implements TkPreserveDetailService {
 
-    private final TkDeviceService tkdeviceService;
+    private final TkCheckPlanService tkCheckPlanService;
 
     @Override
-    public TkPageData<TkPreserveDetailDTO> page(TkPreserveDetailDTO condition) throws ThingsboardException {
+    public TkPageData<TkPreserveDetailDTO> page(Map<String, Object> params) throws ThingsboardException {
+        params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
         TkPageData<TkPreserveDetailDTO> result = new TkPageData<>();
-        QueryWrapper<TkPreserveDetailEntity> wrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<TkPreserveDetailEntity> lambda = wrapper.lambda();
-        TenantId tenantId = SpringBeanUtils.getTenantId();
-        lambda.eq(TkPreserveDetailEntity::getTenantId, tenantId.getId().toString());
-
-        if (StringUtils.isNotBlank(condition.getPreservePlanId())) {
-            lambda.eq(TkPreserveDetailEntity::getPreservePlanId, condition.getPreservePlanId());
+        IPage<TkPreserveDetailEntity> page =
+                getPage(params, "pd.create_time", false);
+        IPage<TkPreserveDetailDTO> pageData = baseMapper.getPreserveDetailPage(page, params);
+        if (pageData != null) {
+            result.setItems(pageData.getRecords());
         }
+        result.setTotal(Long.valueOf(pageData.getTotal()).intValue());
 
-        lambda.orderByDesc(TenantBaseEntity::getCreateTime);
-
-        Page<TkPreserveDetailEntity> page = new Page<>();
-        page.setCurrent(condition.getPage());
-        page.setSize(condition.getPageSize());
-        page = baseMapper.selectPage(page, wrapper);
-
-        if (page != null && CollectionUtils.isNotEmpty(page.getRecords())) {
-            Map<String, DeviceDTO> deviceMap = new HashMap<>();
-            List<TkPreserveDetailDTO> dataList = page.getRecords().stream().map(item -> {
-                TkPreserveDetailDTO dto = item.getDTO(TkPreserveDetailDTO.class);
-                String deviceId = dto.getDeviceId();
-                DeviceDTO deviceDTO = deviceMap.get(deviceId);
-                if (deviceDTO == null) {
-                    deviceDTO = tkdeviceService.checkDeviceByTenantIdAndDeviceId(tenantId.getId(), UUID.fromString(dto.getDeviceId()));
-                    deviceMap.put(deviceId, deviceDTO);
-                }
-                dto.setDeviceInfo(deviceDTO);
-                return dto;
-            }).collect(Collectors.toList());
-            result.setItems(dataList);
-        }
-        result.setTotal(Long.valueOf(page.getTotal()).intValue());
         return result;
     }
 
@@ -93,6 +71,17 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
         return dto;
     }
 
+    @Override
+    public TkPreserveDetailDTO load(String id) {
+        TkPreserveDetailDTO result = null;
+        TkPreserveDetailEntity entity = baseMapper.selectById(id);
+        if (entity != null) {
+            result = new TkPreserveDetailDTO();
+            entity.copyToDTO(result);
+        }
+        return result;
+    }
+
     private void checkDto(TkPreserveDetailDTO dto) throws ThingsboardException {
         if (StringUtils.isBlank(dto.getDeviceId())) {
             throw new TkDataValidationException("设备不能为空！");
@@ -110,8 +99,8 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
 
-        if (StringUtils.isBlank(dto.getDetailStatus())) {
-            dto.setDetailStatus(PreserveDetailStatusEnum.UNEXECUTED.name());
+        if (dto.getDetailStatus() == null) {
+            dto.setDetailStatus(PreserveDetailStatusEnum.UNEXECUTED);
         }
     }
 
@@ -150,8 +139,20 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
         lambda.eq(TkPreserveDetailEntity::getPreservePlanId, planId);
         List<TkPreserveDetailEntity> entities = baseMapper.selectList(wrapper);
         if (CollectionUtils.isNotEmpty(entities)) {
+            List<String> checkPlanIdList = entities.stream().map(TkPreserveDetailEntity::getCheckPlanId).collect(Collectors.toList());
+            Map<String, String> checkPlanMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(checkPlanIdList)) {
+                List<TkCheckPlanDTO> checkPlanList = tkCheckPlanService.listByIds(checkPlanIdList);
+                checkPlanMap = checkPlanList.stream().collect(Collectors.toMap(BaseDTO::getId, TkCheckPlanDTO::getName));
+            }
+            Map<String, String> finalCheckPlanMap = checkPlanMap;
             List<TkPreserveDetailDTO> dataList = entities.stream().map(item -> {
                 TkPreserveDetailDTO dto = item.getDTO(TkPreserveDetailDTO.class);
+                String checkPlanId = item.getCheckPlanId();
+                String checkPlanName = finalCheckPlanMap.get(checkPlanId);
+                if (StringUtils.isNotBlank(checkPlanName)) {
+                    dto.setCheckPlanName(checkPlanName);
+                }
                 return dto;
             }).collect(Collectors.toList());
             return dataList;
@@ -160,4 +161,20 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
         }
 
     }
+
+    @Override
+    public void updateStatus(String id, String status) throws ThingsboardException {
+        TkPreserveDetailEntity entity = baseMapper.selectById(id);
+        if (entity == null) {
+            throw new TkDataValidationException("保养明细不存在！");
+        }
+        PreserveDetailStatusEnum statusEnum = PreserveDetailStatusEnum.valueOf(status);
+        if (statusEnum == null) {
+            throw new TkDataValidationException("保养明细状态不存在！");
+        }
+        entity.setDetailStatus(statusEnum);
+        LambdaQueryWrapper<TkPreserveDetailEntity> filter = new QueryWrapper<TkPreserveDetailEntity>().lambda()
+                .eq(TkPreserveDetailEntity::getId, entity.getId());
+        baseMapper.update(entity, filter);
+    }
 }

 package org.thingsboard.server.dao.yunteng.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailEntity;
 
+import java.util.Map;
+
 @Mapper
 public interface TkPreserveDetailMapper extends BaseMapper<TkPreserveDetailEntity> {
+    IPage<TkPreserveDetailDTO> getPreserveDetailPage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 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.List;
 import java.util.Map;
 
 public interface TkCheckPlanService extends BaseService<TkCheckPlanEntity> {
@@ -14,4 +16,6 @@ public interface TkCheckPlanService extends BaseService<TkCheckPlanEntity> {
     boolean delete(String id);
 
     TkCheckPlanDTO get(String id);
+
+    List<TkCheckPlanDTO> listByIds(List<String> ids) throws ThingsboardException;
 }

@@ -6,18 +6,23 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailEntity;
 
 import java.util.List;
+import java.util.Map;
 
-public interface TkPreserveDetailService extends BaseService<TkPreserveDetailEntity>{
+public interface TkPreserveDetailService extends BaseService<TkPreserveDetailEntity> {
 
-    TkPageData<TkPreserveDetailDTO> page(TkPreserveDetailDTO condition) throws ThingsboardException;
+    TkPageData<TkPreserveDetailDTO> page(Map<String, Object> params) throws ThingsboardException;
 
     TkPreserveDetailDTO save(TkPreserveDetailDTO dto) throws ThingsboardException;
 
+    TkPreserveDetailDTO load(String id);
+
     boolean delete(String id);
 
     boolean deleteByPlanId(String planId);
 
-    void deleteNotInIdEqPlanId(String planId,List<String> notinIds);
+    void deleteNotInIdEqPlanId(String planId, List<String> notinIds);
 
     List<TkPreserveDetailDTO> listByPlanId(String planId) throws ThingsboardException;
+
+    void updateStatus(String id, String status) throws ThingsboardException;
 }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TkPreserveDetailMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailDTO" id="preserveDetailMap">
+        <result property="detailCode" column="detail_code"/>
+        <result property="preserveDetail" column="preserve_detail"/>
+        <result property="preservePlanId" column="preserve_plan_id"/>
+        <result property="deviceId" column="device_id"/>
+        <result property="checkPlanId" column="check_plan_id"/>
+        <result property="checkPlanName" column="checkPlanName"/>
+        <result property="detailStatus" column="detail_status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <association property="deviceInfo" javaType="org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO">
+            <id property="id" column="device_id"/>
+            <result property="name" column="daName"/>
+            <result property="code" column="daCode"/>
+            <result property="categoryId" column="category_id"/>
+            <result property="status" column="daStatus" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+            <result property="directorId" column="director_id"/>
+            <result property="isOnline" column="is_online"/>
+            <result property="deviceImg" column="device_img"/>
+            <result property="brand" column="brand"/>
+            <result property="modelNum" column="model_num"/>
+            <result property="specifications" column="specifications"/>
+            <result property="manufacturer" column="manufacturer"/>
+            <result property="buyDate" column="buy_date"/>
+            <result property="price" column="price"/>
+            <result property="productDate" column="product_date"/>
+            <result property="receiveDate" column="receive_date"/>
+            <result property="registeDate" column="registe_date"/>
+            <result property="supplierId" column="supplier_id"/>
+            <result property="description" column="daDescription"/>
+        </association>
+    </resultMap>
+    <select id="getPreserveDetailPage" resultMap="preserveDetailMap">
+        SELECT
+        pd.id,pd.detail_code,pd.preserve_detail,pd.preserve_plan_id,pd.device_id,
+        pd.check_plan_id,pd.detail_status,cp.name as checkPlanName,
+        da.name as daName,da.code as daCode,da.category_id,da.status as daStatus,da.director_id,da.is_online,
+        da.brand,da.model_num,da.specifications,da.manufacturer,da.buy_date,da.price,da.product_date,
+        da.receive_date,da.registe_date,da.supplier_id,da.device_img,da.description as daDescription,
+        pd.tenant_id,pd.create_time,pd.updater,pd.update_time,pd.creator
+        from qg_preserve_detail pd
+        inner join qg_device_account da on da.id=pd.device_id
+        inner join qg_check_plan cp on cp.id=pd.check_plan_id
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND pd.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.preservePlanId !=null and queryMap.preservePlanId !=''">
+                AND pd.preserve_plan_id = #{queryMap.preservePlanId}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file