接口联调修改

增加保养详情状态

@@ -371,3 +371,18 @@ CREATE TABLE "public"."qg_supplier" (
    "update_time" timestamp(6),
    CONSTRAINT "qg_supplier_pkey" PRIMARY KEY ("id")
 );
+
+CREATE TABLE "public"."qg_preserve_detail_status" (
+ "id" varchar(36)  NOT NULL,
+ "preserve_record_id" varchar(36),
+ "preserve_detail_id" varchar(36),
+ "status" varchar(50),
+ "tenant_id" varchar(36),
+ "create_time" timestamp(6),
+ "creator" varchar(36),
+ "updater" varchar(36),
+ "update_time" timestamp(6),
+ CONSTRAINT "qg_preserve_detail_status_pkey" PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "public"."qg_preserve_detail_status" IS '保养记录明细状态';

@@ -1119,3 +1119,16 @@ CREATE TABLE IF NOT EXISTS qg_supplier (
   "update_time" timestamp(6),
   CONSTRAINT "qg_supplier_pkey" PRIMARY KEY ("id")
 );
+
+CREATE TABLE IF NOT EXISTS qg_preserve_detail_status (
+  "id" varchar(36)  NOT NULL,
+  "preserve_record_id" varchar(36),
+  "preserve_detail_id" varchar(36),
+  "status" varchar(50),
+  "tenant_id" varchar(36),
+  "create_time" timestamp(6),
+  "creator" varchar(36),
+  "updater" varchar(36),
+  "update_time" timestamp(6),
+  CONSTRAINT "qg_preserve_detail_status_pkey" PRIMARY KEY ("id")
+);
\ No newline at end of file

@@ -26,7 +26,7 @@ public class TkPreserveDetailDTO extends TenantDTO {
     @ApiModelProperty(value = "方案id")
     private String checkPlanId;
 
-    @ApiModelProperty(value = "方案id")
+    @ApiModelProperty(value = "方案名称")
     private String checkPlanName;
 
     @ApiModelProperty(value = "执行状态(UNEXECUTED未执行，EXECUTED已执行)")

+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
+public class TkPreserveDetailStatusDTO extends TenantDTO {
+
+    @ApiModelProperty(value = "保养记录id")
+    private String preserveRecordId;
+
+    @ApiModelProperty(value = "保养明细id")
+    private String preserveDetailId;
+
+    @ApiModelProperty(value = "执行状态")
+    private PreserveDetailStatusEnum status;
+
+    @ApiModelProperty(value = "方案明细")
+    private String preserveDetail;
+
+    @ApiModelProperty(value = "设备信息")
+    private TkDeviceAccountDTO deviceInfo;
+}

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.enums.PreserveRecordStatusEnum;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -36,6 +37,9 @@ public class TkPreserveRecordDTO extends TenantDTO {
     @ApiModelProperty(value = "保养计划名称")
     private String preservePlanName;
 
+    @ApiModelProperty(value = "保养明细执行状态")
+    private List<TkPreserveDetailStatusDTO> preserveDetailStatusList;
+
     @ApiModelProperty(value = "查询开始时间")
     private LocalDateTime startDate;
 

@@ -681,8 +681,9 @@ public class ModelConstants {
      */
     public static final String TKREPAIRRECORD_TABLE_NAME = "qg_repair_record";
     public static final String TKPRESERVEPLAN_TABLE_NAME = "qg_preserve_plan";//保养计划
-    public static final String TKPRESERVEDETAIL_TABLE_NAME = "qg_preserve_detail";//保养详情
+    public static final String TKPRESERVEDETAIL_TABLE_NAME = "qg_preserve_detail";//保养明细
     public static final String TKPRESERVERECORD_TABLE_NAME = "qg_preserve_record";//保养记录
+    public static final String TKPRESERVEDETAILSTATUS_TABLE_NAME = "qg_preserve_detail_status";//保养明细状态
     public static final String TKDEVICECAGEGORY_TABLE_NAME = "qg_device_cagegory";//设备类别
     public static final String TKDEVICEACCOUNT_TABLE_NAME = "qg_device_account";//设备台账
     public static final String TKINSTALLLOCATION_TABLE_NAME = "qg_install_location";//设备台账

+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;
+
+/**
+ * 保养记录执行明细
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKPRESERVEDETAILSTATUS_TABLE_NAME, autoResultMap = true)
+public class TkPreserveDetailStatusEntity extends TenantBaseEntity {
+    private String preserveRecordId;
+    private String preserveDetailId;
+    private PreserveDetailStatusEnum status;
+
+
+}

@@ -100,10 +100,6 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
         if (StringUtils.isBlank(dto.getTenantId())) {
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
-
-        if (dto.getDetailStatus() == null) {
-            dto.setDetailStatus(PreserveDetailStatusEnum.UNEXECUTED);
-        }
     }
 
 

+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.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailStatusDTO;
+import org.thingsboard.server.common.data.yunteng.enums.PreserveDetailStatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
+import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailStatusEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkPreserveDetailStatusMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkPreserveDetailStatusService;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkPreserveDetailStatusServiceImpl extends AbstractBaseService<TkPreserveDetailStatusMapper, TkPreserveDetailStatusEntity>
+        implements TkPreserveDetailStatusService {
+
+    @Override
+    public TkPreserveDetailStatusDTO save(TkPreserveDetailStatusDTO dto) throws ThingsboardException {
+        checkDto(dto);
+
+        TkPreserveDetailStatusEntity entity = new TkPreserveDetailStatusEntity();
+        if (StringUtils.isBlank(dto.getId())) {
+            dto.copyToEntity(entity);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<TkPreserveDetailStatusEntity> filter = new QueryWrapper<TkPreserveDetailStatusEntity>().lambda()
+                    .eq(TkPreserveDetailStatusEntity::getId, dto.getId());
+            entity = dto.getEntity(TkPreserveDetailStatusEntity.class);
+            baseMapper.update(entity, filter);
+        }
+        entity.copyToDTO(dto);
+        return dto;
+    }
+
+    @Override
+    public List<TkPreserveDetailStatusDTO> listByPreserveRecordId(List<String> preserveRecordId) throws ThingsboardException {
+        if (CollectionUtils.isEmpty(preserveRecordId)) {
+            throw new TkDataValidationException("保养记录id不能为空！");
+        }
+        return baseMapper.listByPreserveRecordId(preserveRecordId, SpringBeanUtils.getTenantId().getId().toString());
+    }
+
+    private void checkDto(TkPreserveDetailStatusDTO dto) throws ThingsboardException {
+
+
+        if (StringUtils.isBlank(dto.getPreserveRecordId())) {
+            throw new TkDataValidationException("保养记录id不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getPreserveDetailId())) {
+            throw new TkDataValidationException("保养明细id不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
+        }
+
+        if (dto.getStatus() == null) {
+            dto.setStatus(PreserveDetailStatusEnum.UNEXECUTED);
+        }
+    }
+}

@@ -11,17 +11,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.TkPreservePlanDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkPreserveRecordDTO;
-import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.PreservePlanStatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.PreserveRecordStatusEnum;
 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.TkPreserveRecordEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkPreserveRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
+import javax.transaction.Transactional;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +36,8 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
 
     private final TkPreserveDetailService tkPreserveDetailService;
 
+    private final TkPreserveDetailStatusService tkPreserveDetailStatusService;
+
     @Override
     public TkPageData<TkPreserveRecordDTO> page(Map<String, Object> params) throws ThingsboardException {
         TenantId tenantId = SpringBeanUtils.getTenantId();
@@ -62,6 +64,20 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
 
         IPage<TkPreserveRecordDTO> pageData = baseMapper.getPreserveRecordPage(page, params);
         if (pageData != null) {
+            if (CollectionUtils.isNotEmpty(pageData.getRecords())) {
+                List<String> recordIdList = pageData.getRecords().stream().map(BaseDTO::getId).collect(Collectors.toList());
+                List<TkPreserveDetailStatusDTO> preserveDetailStatusList = tkPreserveDetailStatusService.listByPreserveRecordId(recordIdList);
+                if (CollectionUtils.isNotEmpty(preserveDetailStatusList)) {
+                    Map<String, List<TkPreserveDetailStatusDTO>> detailStatusMap = preserveDetailStatusList.stream()
+                            .collect(Collectors.groupingBy(e -> e.getPreserveRecordId()));
+
+                    pageData.getRecords().forEach(e -> {
+                        List<TkPreserveDetailStatusDTO> currentDataList = detailStatusMap.get(e.getId());
+                        e.setPreserveDetailStatusList(currentDataList);
+                    });
+
+                }
+            }
             result.setItems(pageData.getRecords());
         }
         result.setTotal(Long.valueOf(pageData.getTotal()).intValue());
@@ -69,6 +85,7 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
     }
 
     @Override
+    @Transactional
     public TkPreserveRecordDTO save(TkPreserveRecordDTO dto) throws ThingsboardException {
         checkDto(dto);
 
@@ -83,6 +100,14 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
             baseMapper.update(entity, filter);
         }
         entity.copyToDTO(dto);
+        String id = dto.getId();
+        List<TkPreserveDetailStatusDTO> preserveDetailStatusList = dto.getPreserveDetailStatusList();
+        if (CollectionUtils.isNotEmpty(preserveDetailStatusList)) {
+            for (TkPreserveDetailStatusDTO tkPreserveDetailStatusDTO : preserveDetailStatusList) {
+                tkPreserveDetailStatusDTO.setPreserveRecordId(id);
+                tkPreserveDetailStatusService.save(tkPreserveDetailStatusDTO);
+            }
+        }
         return dto;
     }
 
@@ -100,6 +125,10 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
             throw new TkDataValidationException("保养日期不能为空！");
         }
 
+        if (CollectionUtils.isEmpty(dto.getPreserveDetailStatusList())) {
+            throw new TkDataValidationException("保养明细执行状态不能为空！");
+        }
+
         if (StringUtils.isBlank(dto.getTenantId())) {
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailStatusDTO;
+import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailStatusEntity;
+
+import java.util.List;
+
+@Mapper
+public interface TkPreserveDetailStatusMapper extends BaseMapper<TkPreserveDetailStatusEntity> {
+    List<TkPreserveDetailStatusDTO> listByPreserveRecordId(@Param("preserveRecordId") List<String> preserveRecordId, @Param("tenantId") String tenantId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailStatusDTO;
+import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailStatusEntity;
+
+import java.util.List;
+
+public interface TkPreserveDetailStatusService  extends BaseService<TkPreserveDetailStatusEntity> {
+    TkPreserveDetailStatusDTO save(TkPreserveDetailStatusDTO dto) throws ThingsboardException;
+
+    List<TkPreserveDetailStatusDTO> listByPreserveRecordId(List<String> preserveRecordId) throws ThingsboardException;
+}

@@ -2,6 +2,7 @@
 <!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="id" column="id"/>
         <result property="detailCode" column="detail_code"/>
         <result property="preserveDetail" column="preserve_detail"/>
         <result property="preservePlanId" column="preserve_plan_id"/>

+<?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.TkPreserveDetailStatusMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailStatusDTO"
+               id="preserveDetailStatusMap">
+        <result property="id" column="id"/>
+        <result property="preserveRecordId" column="preserve_record_id"/>
+        <result property="preserveDetailId" column="preserve_detail_id"/>
+        <result property="status" column="status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="preserveDetail" column="preserve_detail"/>
+        <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="listByPreserveRecordId" resultMap="preserveDetailStatusMap">
+        SELECT pds.id
+        , pds.preserve_record_id
+        , pds.preserve_detail_id
+        , pds.status
+        , pd.preserve_detail,
+        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
+        , pds.tenant_id
+        , pds.create_time
+        , pds.updater
+        , pds.update_time
+        , pds.creator
+        from qg_preserve_detail_status pds
+        inner join qg_preserve_detail pd on pd.id = pds.preserve_detail_id
+        inner join qg_device_account da on da.id=pd.device_id
+        <where>
+            <if test="tenantId !=null and tenantId !=''">
+                AND pds.tenant_id = #{tenantId}
+            </if>
+            <if test="preserveRecordId !=null">
+                AND pds.preserve_record_id in
+                <foreach collection="preserveRecordId" item="item" index="index"
+                         separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+</mapper>
\ No newline at end of file

@@ -65,6 +65,9 @@
             <if test="queryMap.deviceId !=null and queryMap.deviceId !=''">
                 AND o.device_id = #{queryMap.deviceId}
             </if>
+            <if test="queryMap.deviceName !=null and queryMap.deviceName !=''">
+                AND da.name LIKE concat('%',#{queryMap.deviceName}::TEXT,'%')
+            </if>
             <if test="queryMap.emergency !=null">
                 AND o.emergency = #{queryMap.emergency}
             </if>