接口联调修改

@@ -11,10 +11,12 @@ 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.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 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.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -35,7 +37,7 @@ public class TkRepairOrderController extends BaseController {
 
     private final TkRepairOrderService tkRepairOrderService;
 
-    private final TkDeviceService tkdeviceService;
+    private final TkDeviceAccountService tkDeviceAccountService;
 
     @PostMapping("/save")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
@@ -44,8 +46,7 @@ public class TkRepairOrderController extends BaseController {
         String currentTenantId = getCurrentUser().getCurrentTenantId();
         dto.setTenantId(currentTenantId);
         if (StringUtils.isNotBlank(dto.getDeviceId())) {
-            DeviceDTO deviceInfo = tkdeviceService.checkDeviceByTenantIdAndDeviceId
-                    (UUID.fromString(currentTenantId), UUID.fromString(dto.getDeviceId()));
+            TkDeviceAccountDTO deviceInfo = tkDeviceAccountService.load(dto.getDeviceId());
             if (deviceInfo == null) {
                 throw new TkDataValidationException("设备不存在！");
             }

@@ -5,6 +5,7 @@ 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.exception.ThingsboardException;
@@ -17,11 +18,13 @@ import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 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.TkDeviceAccountEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceAccountMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -135,6 +138,24 @@ public class TkDeviceAccountServiceImpl extends AbstractBaseService<TkDeviceAcco
     }
 
     @Override
+    public List<String> getIdByDeviceName(String deviceName) throws ThingsboardException {
+        if (StringUtils.isBlank(deviceName)) {
+            throw new TkDataValidationException("设备名称不能为空！");
+        }
+        QueryWrapper<TkDeviceAccountEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkDeviceAccountEntity> lambda = wrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkDeviceAccountEntity::getTenantId, tenantId.getId().toString());
+        lambda.like(TkDeviceAccountEntity::getName, deviceName);
+        List<TkDeviceAccountEntity> entities = baseMapper.selectList(wrapper);
+        if (CollectionUtils.isNotEmpty(entities)) {
+            return entities.stream().map(TkDeviceAccountEntity::getId).distinct().collect(Collectors.toList());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
     public boolean delete(String id) {
         int count = baseMapper.deleteById(id);
         return count > 0;

@@ -38,6 +38,8 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
 
     private final TkCheckPlanService tkCheckPlanService;
 
+    private final TkDeviceAccountService tkDeviceAccountService;
+
     @Override
     public TkPageData<TkPreserveDetailDTO> page(Map<String, Object> params) throws ThingsboardException {
         params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
@@ -181,6 +183,30 @@ public class TkPreserveDetailServiceImpl extends AbstractBaseService<TkPreserveD
     }
 
     @Override
+    public List<String> getPlanIdByDeviceName(String deviceName) throws ThingsboardException {
+        if (StringUtils.isBlank(deviceName)) {
+            throw new TkDataValidationException("设备名称不能为空！");
+        }
+
+        List<String> deviceIdList = tkDeviceAccountService.getIdByDeviceName(deviceName);
+        if (CollectionUtils.isEmpty(deviceIdList)) {
+            return null;
+        }
+
+        QueryWrapper<TkPreserveDetailEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkPreserveDetailEntity> lambda = wrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkPreserveDetailEntity::getTenantId, tenantId.getId().toString());
+        lambda.in(TkPreserveDetailEntity::getDeviceId, deviceIdList);
+        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) {

@@ -50,6 +50,10 @@ public class TkPreservePlanServiceImpl extends AbstractBaseService<TkPreservePla
             lambda.like(TkPreservePlanEntity::getPreserveName, condition.getPreserveName());
         }
 
+        if (condition.getStatus() != null) {
+            lambda.eq(TkPreservePlanEntity::getStatus, condition.getStatus());
+        }
+
         lambda.orderByDesc(TenantBaseEntity::getCreateTime);
 
         Page<TkPreservePlanEntity> page = new Page<>();

@@ -52,6 +52,14 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
             }
         }
 
+        Object deviceName = params.get("deviceName");
+        if (deviceName != null && StringUtils.isNotBlank(deviceName.toString())) {
+            List<String> planIdList = tkPreserveDetailService.getPlanIdByDeviceName(deviceName.toString());
+            if (CollectionUtils.isNotEmpty(planIdList)) {
+                params.put("planIdList", planIdList);
+            }
+        }
+
         IPage<TkPreserveRecordDTO> pageData = baseMapper.getPreserveRecordPage(page, params);
         if (pageData != null) {
             result.setItems(pageData.getRecords());

@@ -5,6 +5,7 @@ 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.exception.ThingsboardException;
@@ -25,6 +26,7 @@ import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
@@ -97,25 +99,15 @@ public class TkRepairRecordServiceImpl extends AbstractBaseService<TkRepairRecor
 
     @Override
     public TkRepairRecordDTO detail(String id) throws ThingsboardException {
-        TkRepairRecordDTO detail = new TkRepairRecordDTO();
-        TkRepairRecordEntity entity = baseMapper.selectById(id);
-        if (entity == null) {
-            throw new TkDataValidationException("数据不存在！");
-        }
-        entity.copyToDTO(detail);
-        String orderId = entity.getOrderId();
-        if (StringUtils.isNotBlank(orderId)) {
-            TkRepairOrderDTO repairOrderDTO = tkRepairOrderService.load(orderId);
-            if (StringUtils.isNotBlank(repairOrderDTO.getReportBy())) {
-                UserDTO reportInfo = tkUserService.findUserInfoById(repairOrderDTO.getReportBy());
-                repairOrderDTO.setReportByName(reportInfo.getRealName());
-            }
-            detail.setTkRepairOrderDTO(repairOrderDTO);
+        Map<String, Object> params = new HashMap<>();
+        params.put("id", id);
+        TkPageData<TkRepairRecordDTO> page = page(params);
+        if (page != null && CollectionUtils.isNotEmpty(page.getItems())) {
+            Optional<TkRepairRecordDTO> first = page.getItems().stream().findFirst();
+            return first.get();
+        } else {
+            return null;
         }
-        UserDTO userInfo = tkUserService.findUserInfoById(detail.getRepairBy());
-        detail.setRepairName(userInfo.getRealName());
-
-        return detail;
     }
 
     @Override

@@ -5,6 +5,7 @@ import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceAccountEntity;
 
+import java.util.List;
 import java.util.Map;
 
 public interface TkDeviceAccountService extends BaseService<TkDeviceAccountEntity> {
@@ -16,6 +17,8 @@ public interface TkDeviceAccountService extends BaseService<TkDeviceAccountEntit
 
     TkDeviceAccountDTO load(String id) throws ThingsboardException;
 
+    List<String> getIdByDeviceName(String deviceName) throws ThingsboardException;
+
     boolean delete(String id);
 
 }

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

@@ -46,7 +46,7 @@
         o.tenant_id,o.create_time,o.updater,o.update_time,o.creator,su.real_name as directorName
         from qg_device_account o
         inner join sys_user su on su.id=o.director_id
-        inner join qg_supplier sp on sp.id=o.supplier_id
+        left join qg_supplier sp on sp.id=o.supplier_id
         inner join qg_device_cagegory dc on dc.id=o.category_id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">

@@ -3,6 +3,7 @@
 <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="recordCode" column="record_code"/>
         <result property="preservePlanId" column="preserve_plan_id"/>
         <result property="preserveDate" column="preserve_date"/>
         <result property="preserveBy" column="preserve_by"/>
@@ -13,7 +14,7 @@
     </resultMap>
     <select id="getPreserveRecordPage" resultMap="preserveRecordMap">
         SELECT
-        r.record_code,r.preserve_plan_id,r.preserve_date,r.preserve_by,r.preserve_status
+        r.id,r.record_code,r.preserve_plan_id,r.preserve_date,r.preserve_by,r.preserve_status
         ,r.tenant_id,r.create_time,r.updater,r.update_time,r.creator
         ,su.real_name as preserveByName,p.preserve_name as preserveName
         from qg_preserve_record r
@@ -23,9 +24,15 @@
             <if test="queryMap.id !=null and queryMap.id !=''">
                 AND r.id = #{queryMap.id}
             </if>
+            <if test="queryMap.preservePlanName !=null and queryMap.preservePlanName !=''">
+                AND p.preserve_name LIKE concat('%',#{queryMap.preservePlanName}::TEXT,'%')
+            </if>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND r.tenant_id = #{queryMap.tenantId}
             </if>
+            <if test="queryMap.preserveStatus !=null and queryMap.preserveStatus !=''">
+                AND r.preserve_status = #{queryMap.preserveStatus}
+            </if>
             <if test="queryMap.preserve_plan_id !=null and queryMap.preserve_plan_id !=''">
                 AND r.status = #{queryMap.preservePlanId}
             </if>

@@ -40,6 +40,9 @@
         inner join qg_device_account da on da.id=ro.device_id
         inner join qg_malfunction_reason mr on mr.id=rr.malfunction_reason_id
         <where>
+            <if test="queryMap.id !=null and queryMap.id !=''">
+                AND rr.id = #{queryMap.id}
+            </if>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND rr.tenant_id = #{queryMap.tenantId}
             </if>
@@ -55,6 +58,9 @@
             <if test="queryMap.deviceId !=null and queryMap.deviceId !=''">
                 AND ro.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.orderCode !=null and queryMap.orderCode !=''">
                 AND ro.order_code LIKE concat('%',#{queryMap.orderCode}::TEXT,'%')
             </if>