关联设备台账接口适配修改

@@ -62,7 +62,7 @@ public class TkPreserveRecordController extends BaseController {
             throw new TkDataValidationException("保养记录不存在！");
         }
 
-        tkPreserveRecordServcie.updateStatus(dto.getId(), dto.getPreserveStatus());
+        tkPreserveRecordServcie.updateStatus(dto.getId(), dto.getPreserveStatus().name());
         return ResponseEntity.ok(orderInfo);
     }
 

@@ -91,7 +91,7 @@ public class TkRepairOrderController extends BaseController {
             throws ThingsboardException {
         params.put(PAGE, page);
         params.put(PAGE_SIZE, pageSize);
-        return tkRepairOrderService.page(getCurrentUser().getCurrentTenantId(), params);
+        return tkRepairOrderService.page(params);
     }
 
     @PostMapping("/updateStatus")

@@ -6,6 +6,7 @@ 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.PreserveRecordStatusEnum;
 
 import java.time.LocalDateTime;
 
@@ -27,7 +28,7 @@ public class TkPreserveRecordDTO extends TenantDTO {
     private String preserveBy;
 
     @ApiModelProperty(value = "状态(INCOMPLETE未完成,COMPLETE已完成)")
-    private String preserveStatus;
+    private PreserveRecordStatusEnum preserveStatus;
 
     @ApiModelProperty(value = "保养人员姓名")
     private String preserveByName;

@@ -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.PreserveRecordStatusEnum;
 import org.thingsboard.server.dao.model.ModelConstants;
 
 import java.time.LocalDateTime;
@@ -18,5 +19,5 @@ public class TkPreserveRecordEntity extends TenantBaseEntity {
     private String preservePlanId;
     private LocalDateTime preserveDate;
     private String preserveBy;
-    private String preserveStatus;
+    private PreserveRecordStatusEnum preserveStatus;
 }

@@ -130,7 +130,7 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
     @Override
     public List<TkPreserveDetailDTO> listByPlanId(String planId) throws ThingsboardException {
         if (StringUtils.isBlank(planId)) {
-            throw new TkDataValidationException("方案id不能为空！");
+            throw new TkDataValidationException("计划id不能为空！");
         }
         QueryWrapper<TkPreserveDetailEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<TkPreserveDetailEntity> lambda = wrapper.lambda();
@@ -163,6 +163,24 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
     }
 
     @Override
+    public List<String> getPlanIdByDeviceId(String deviceId) throws ThingsboardException {
+        if (StringUtils.isBlank(deviceId)) {
+            throw new TkDataValidationException("设备id不能为空！");
+        }
+        QueryWrapper<TkPreserveDetailEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkPreserveDetailEntity> lambda = wrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkPreserveDetailEntity::getTenantId, tenantId.getId().toString());
+        lambda.eq(TkPreserveDetailEntity::getDeviceId, deviceId);
+        List<TkPreserveDetailEntity> entities = baseMapper.selectList(wrapper);
+        if (CollectionUtils.isNotEmpty(entities)) {
+            return entities.stream().map(TkPreserveDetailEntity::getPreservePlanId).distinct().collect(Collectors.toList());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
     public void updateStatus(String id, String status) throws ThingsboardException {
         TkPreserveDetailEntity entity = baseMapper.selectById(id);
         if (entity == null) {

@@ -20,10 +20,7 @@ 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.TkPreserveRecordEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkPreserveRecordMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.TkPreservePlanService;
-import org.thingsboard.server.dao.yunteng.service.TkPreserveRecordServcie;
-import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -37,7 +34,7 @@ import java.util.stream.Collectors;
 public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveRecordMapper, TkPreserveRecordEntity>
         implements TkPreserveRecordServcie {
 
-    private final TkUserService tkUserService;
+    private final TkPreserveDetailService tkPreserveDetailService;
 
     @Override
     public TkPageData<TkPreserveRecordDTO> page(Map<String, Object> params) throws ThingsboardException {
@@ -47,6 +44,14 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
         IPage<TkPreserveRecordEntity> page =
                 getPage(params, "create_time", false);
 
+        Object deviceId = params.get("deviceId");
+        if (deviceId != null && StringUtils.isNotBlank(deviceId.toString())) {
+            List<String> planIdList = tkPreserveDetailService.getPlanIdByDeviceId(deviceId.toString());
+            if (CollectionUtils.isNotEmpty(planIdList)) {
+                params.put("planIdList", planIdList);
+            }
+        }
+
         IPage<TkPreserveRecordDTO> pageData = baseMapper.getPreserveRecordPage(page, params);
         if (pageData != null) {
             result.setItems(pageData.getRecords());
@@ -91,8 +96,8 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
 
-        if (StringUtils.isBlank(dto.getPreserveStatus())) {
-            dto.setPreserveStatus(PreserveRecordStatusEnum.INCOMPLETE.name());
+        if (dto.getPreserveStatus() != null) {
+            dto.setPreserveStatus(PreserveRecordStatusEnum.INCOMPLETE);
         }
     }
 
@@ -126,11 +131,11 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
         if (entity == null) {
             throw new TkDataValidationException("保养记录不存在！");
         }
-        PreservePlanStatusEnum statusEnum = PreservePlanStatusEnum.valueOf(status);
+        PreserveRecordStatusEnum statusEnum = PreserveRecordStatusEnum.valueOf(status);
         if (statusEnum == null) {
             throw new TkDataValidationException("保养记录状态不存在！");
         }
-        entity.setPreserveStatus(statusEnum.name());
+        entity.setPreserveStatus(statusEnum);
         LambdaQueryWrapper<TkPreserveRecordEntity> filter = new QueryWrapper<TkPreserveRecordEntity>().lambda()
                 .eq(TkPreserveRecordEntity::getId, entity.getId());
         baseMapper.update(entity, filter);

@@ -13,6 +13,7 @@ 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.TkDeviceAccountDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkPreserveRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
@@ -28,6 +29,7 @@ import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 @Service
@@ -41,12 +43,15 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
     private final TkDeviceAccountService tkDeviceAccountService;
 
     @Override
-    public TkPageData<TkRepairOrderDTO> page(String tenantId, Map<String, Object> params) throws ThingsboardException {
+    public TkPageData<TkRepairOrderDTO> page(Map<String, Object> params) throws ThingsboardException {
         params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
         TkPageData<TkRepairOrderDTO> result = new TkPageData<>();
         IPage<TkRepairOrderEntity> page =
                 getPage(params, "create_time", false);
-
+        Object emergency = params.get("emergency");
+        if (emergency != null && StringUtils.isBlank(emergency.toString())) {
+            params.remove("emergency");
+        }
         IPage<TkRepairOrderDTO> pageData = baseMapper.getRepairOrderPage(page, params);
         if (pageData != null) {
             result.setItems(pageData.getRecords());
@@ -79,19 +84,15 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
 
     @Override
     public TkRepairOrderDTO detail(String id) throws ThingsboardException {
-        TkRepairOrderDTO detail = new TkRepairOrderDTO();
-        TkRepairOrderEntity entity = baseMapper.selectById(id);
-        if (entity == null) {
-            throw new TkDataValidationException("数据不存在！");
-        }
-        entity.copyToDTO(detail);
-        String deviceId = entity.getDeviceId();
-        if (StringUtils.isNotBlank(deviceId)) {
-            TkDeviceAccountDTO deviceDTO = tkDeviceAccountService.load(deviceId);
-            detail.setDeviceInfo(deviceDTO);
+        Map<String, Object> params = new HashMap<>();
+        params.put("id", id);
+        TkPageData<TkRepairOrderDTO> page = page(params);
+        if (page != null && CollectionUtils.isNotEmpty(page.getItems())) {
+            Optional<TkRepairOrderDTO> first = page.getItems().stream().findFirst();
+            return first.get();
+        } else {
+            return null;
         }
-
-        return detail;
     }
 
     @Override

@@ -24,5 +24,7 @@ public interface TkPreserveDetailService extends BaseService<TkPreserveDetailEnt
 
     List<TkPreserveDetailDTO> listByPlanId(String planId) throws ThingsboardException;
 
+    List<String> getPlanIdByDeviceId(String deviceId) throws ThingsboardException;
+
     void updateStatus(String id, String status) throws ThingsboardException;
 }

@@ -10,7 +10,7 @@ import java.util.Map;
 
 public interface TkRepairOrderService extends BaseService<TkRepairOrderEntity> {
 
-    TkPageData<TkRepairOrderDTO> page(String tenantId,Map<String, Object> params) throws ThingsboardException;
+    TkPageData<TkRepairOrderDTO> page(Map<String, Object> params) throws ThingsboardException;
 
     TkRepairOrderDTO save(TkRepairOrderDTO dto) throws ThingsboardException;
 

@@ -2,6 +2,12 @@
 <!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.TkPreserveRecordMapper">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkPreserveRecordDTO" id="preserveRecordMap">
+        <result property="id" column="id"/>
+        <result property="preservePlanId" column="preserve_plan_id"/>
+        <result property="preserveDate" column="preserve_date"/>
+        <result property="preserveBy" column="preserve_by"/>
+        <result property="preserveStatus" column="preserve_status"
+                typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="preserveByName" column="preserveByName"/>
         <result property="preservePlanName" column="preserveName"/>
     </resultMap>
@@ -14,27 +20,34 @@
         inner join sys_user su on su.id=r.preserve_by
         inner join qg_preserve_plan p on p.id=r.preserve_plan_id
         <where>
-            <if test="queryMap.id !=null ">
+            <if test="queryMap.id !=null and queryMap.id !=''">
                 AND r.id = #{queryMap.id}
             </if>
-            <if test="queryMap.tenantId !=null ">
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND r.tenant_id = #{queryMap.tenantId}
             </if>
-            <if test="queryMap.preserve_plan_id !=null ">
+            <if test="queryMap.preserve_plan_id !=null and queryMap.preserve_plan_id !=''">
                 AND r.status = #{queryMap.preservePlanId}
             </if>
-            <if test="queryMap.preserve_by !=null ">
+            <if test="queryMap.preserve_by !=null and queryMap.preserve_by !=''">
                 AND r.device_id = #{queryMap.preserveBy}
             </if>
-            <if test="queryMap.preserve_status !=null ">
+            <if test="queryMap.preserve_status !=null and queryMap.preserve_status !=''">
                 AND r.emergency = #{queryMap.preserveStatus}
             </if>
-            <if test="queryMap.startDate !=null ">
+            <if test="queryMap.startDate !=null and queryMap.startDate !=''">
                 AND to_char(r.preserve_date, 'YYYY-MM-DD HH24:MI:SS') &gt;= #{queryMap.startDate}
             </if>
-            <if test="queryMap.endDate !=null ">
+            <if test="queryMap.endDate !=null and queryMap.endDate !=''">
                 AND to_char(r.preserve_date, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{queryMap.endDate}
             </if>
+            <if test="queryMap.planIdList !=null">
+                AND r.preserve_plan_id in
+                <foreach collection="queryMap.planIdList" item="item" index="index"
+                         separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>
\ No newline at end of file

@@ -3,6 +3,7 @@
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TkRepairOrderMapper">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO" id="repairOrderMap">
+        <result property="id" column="id"/>
         <result property="orderCode" column="order_code"/>
         <result property="deviceId" column="device_id"/>
         <result property="reportDate" column="report_date"/>
@@ -37,6 +38,7 @@
             <result property="registeDate" column="registe_date"/>
             <result property="supplierId" column="supplier_id"/>
             <result property="description" column="daDescription"/>
+            <result property="directorName" column="directorName"/>
         </association>
     </resultMap>
     <select id="getRepairOrderPage" resultMap="repairOrderMap">
@@ -44,12 +46,16 @@
         o.id,o.device_id,o.order_code,o.report_date,o.report_by,o.status,o.emergency,o.situation_img,o.description,
         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,
+        da.receive_date,da.registe_date,da.supplier_id,da.device_img,da.description as daDescription,su2.real_name as directorName,
         o.tenant_id,o.create_time,o.updater,o.update_time,o.creator,su.real_name as reportByName
         from qg_repair_order o
         inner join sys_user su on su.id=o.report_by
         inner join qg_device_account da on da.id=o.device_id
+        inner join sys_user su2 on su2.id=da.director_id
         <where>
+            <if test="queryMap.id !=null ">
+                AND o.id = #{queryMap.id}
+            </if>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND o.tenant_id = #{queryMap.tenantId}
             </if>
@@ -59,7 +65,7 @@
             <if test="queryMap.deviceId !=null and queryMap.deviceId !=''">
                 AND o.device_id = #{queryMap.deviceId}
             </if>
-            <if test="queryMap.emergency !=null and queryMap.emergency !=''">
+            <if test="queryMap.emergency !=null">
                 AND o.emergency = #{queryMap.emergency}
             </if>
             <if test="queryMap.startDate !=null and queryMap.startDate !=''">

@@ -45,6 +45,9 @@
             <if test="queryMap.reportBy !=null and queryMap.reportBy !=''">
                 AND ro.report_by = #{queryMap.reportBy}
             </if>
+            <if test="queryMap.deviceId !=null and queryMap.deviceId !=''">
+                AND ro.device_id = #{queryMap.deviceId}
+            </if>
             <if test="queryMap.orderCode !=null and queryMap.orderCode !=''">
                 AND ro.order_code LIKE concat('%',#{queryMap.orderCode}::TEXT,'%')
             </if>