故障原因管理接口

设备报修维修接口

@@ -32,6 +32,7 @@ COMMENT ON COLUMN "public"."device"."director_id" IS '负责人id';
 CREATE TABLE "public"."qg_repair_order" (
     "id" varchar(36)  NOT NULL,
     "device_id" varchar(36),
+    "order_code" varchar(50),
     "report_date" timestamp(6),
     "report_by" varchar(36),
     "status" varchar(50),

@@ -35,7 +35,7 @@ public class TkRepairRecordController extends BaseController {
 
     @PostMapping("/save")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
-    @ApiOperation("维修记录保存")
+    @ApiOperation("设备维修")
     public ResponseEntity<TkRepairRecordDTO> save(@RequestBody TkRepairRecordDTO dto) throws ThingsboardException {
         String currentTenantId = getCurrentUser().getCurrentTenantId();
         dto.setTenantId(currentTenantId);
@@ -49,7 +49,7 @@ public class TkRepairRecordController extends BaseController {
 
         TkRepairRecordDTO deviceDTO = tkRepairRecordService.save(dto);
 
-        tkRepairOrderService.updateStatus(dto.getOrderId(),RepairOrderStatusEnum.REPAIRFINISH.name());
+        tkRepairOrderService.updateStatus(dto.getOrderId(), RepairOrderStatusEnum.REPAIRFINISH.name());
         return ResponseEntity.ok(deviceDTO);
     }
 

@@ -13,6 +13,9 @@ import java.time.LocalDateTime;
 @Data
 public class TkRepairOrderDTO extends TenantDTO {
 
+    @ApiModelProperty(value = "维修单编码")
+    private String orderCode;
+
     @ApiModelProperty(value = "设备id")
     private String deviceId;
 
@@ -24,6 +27,9 @@ public class TkRepairOrderDTO extends TenantDTO {
     @ApiModelProperty(value = "报修人")
     private String reportBy;
 
+    @ApiModelProperty(value = "报修人")
+    private String reportByName;
+
     @ApiModelProperty(value = "状态(RepairOrderStatusEnum) SCHEDULING排期中 REPAIRFINISH维修完成 ACCEPTANCEPASSED验收通过")
     private String status;
 

@@ -15,6 +15,8 @@ import java.time.LocalDateTime;
 @TableName(value = ModelConstants.TKREPAIRORDER_TABLE_NAME, autoResultMap = true)
 public class TkRepairOrderEntity extends TenantBaseEntity {
 
+    private String orderCode;
+
     private String deviceId;
 
     private LocalDateTime reportDate;

@@ -8,7 +8,6 @@ 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.User;
 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;
@@ -19,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.CopyUtils;
 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.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairOrderEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkRepairOrderMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -27,10 +27,8 @@ import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
@@ -44,26 +42,32 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
     private final TkDeviceService tkdeviceService;
 
     @Override
-    public TkPageData<TkRepairOrderDTO> page(String tenantId, TkRepairOrderDTO params) {
-        QueryWrapper<TkRepairOrderEntity> queryWrapper = getCondition(tenantId, params);
-        getCondition(tenantId, params);
-        Map<String, Object> queryMap = new HashMap<>();
-        queryMap.put(PAGE, params.getPage());
-        queryMap.put(PAGE_SIZE, params.getPageSize());
-        IPage<TkRepairOrderEntity> page = baseMapper.selectPage(
-                getPage(queryMap, "create_time", false), queryWrapper);
-
-        TkPageData<TkRepairOrderDTO> pageData = getPageData(page, TkRepairOrderDTO.class);
-        if (pageData != null && CollectionUtils.isNotEmpty(pageData.getItems())) {
-            pageData.getItems().forEach(item -> {
+    public TkPageData<TkRepairOrderDTO> page(String tenantId, Map<String, Object> params) {
+        TkPageData<TkRepairOrderDTO> result = new TkPageData<>();
+        IPage<TkRepairOrderEntity> page =
+                getPage(params, "create_time", false);
+
+        IPage<TkRepairOrderDTO> pageData = baseMapper.getRepairOrderPage(page, params);
+        if (pageData != null && CollectionUtils.isNotEmpty(pageData.getRecords())) {
+            Map<String, DeviceDTO> deviceMap = new HashMap<>();
+            pageData.getRecords().forEach(item -> {
                 String deviceId = item.getDeviceId();
                 if (StringUtils.isNotBlank(deviceId)) {
-                    DeviceDTO deviceDTO = tkdeviceService.checkDeviceByTenantIdAndDeviceId(UUID.fromString(tenantId), UUID.fromString(deviceId));
+                    DeviceDTO deviceDTO = deviceMap.get(tenantId);
+                    if (deviceDTO == null) {
+                        deviceDTO = tkdeviceService.checkDeviceByTenantIdAndDeviceId(UUID.fromString(tenantId), UUID.fromString(deviceId));
+                        deviceMap.put(tenantId, deviceDTO);
+                    }
+
                     item.setDeviceInfo(deviceDTO);
                 }
             });
         }
-        return pageData;
+        if (pageData != null) {
+            result.setItems(pageData.getRecords());
+        }
+        result.setTotal(Long.valueOf(pageData.getTotal()).intValue());
+        return result;
     }
 
     private QueryWrapper<TkRepairOrderEntity> getCondition(String tenantId, TkRepairOrderDTO params) {
@@ -136,21 +140,25 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
 
     @Override
     public TkRepairOrderDTO load(String id) throws ThingsboardException {
-        TkRepairOrderDTO result = new TkRepairOrderDTO();
+        TkRepairOrderDTO result = null;
         TkRepairOrderEntity entity = baseMapper.selectById(id);
-        entity.copyToDTO(result);
+        if (entity != null) {
+            entity.copyToDTO(result);
+        }
         return result;
     }
 
     @Override
     public TkRepairOrderDTO loadByDeviceId(String deviceId) throws ThingsboardException {
-        TkRepairOrderDTO result = new TkRepairOrderDTO();
+        TkRepairOrderDTO result = null;
         QueryWrapper<TkRepairOrderEntity> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<TkRepairOrderEntity> lambda = queryWrapper.lambda();
         lambda.eq(TenantBaseEntity::getTenantId, SpringBeanUtils.getTenantId().toString());
         lambda.eq(TkRepairOrderEntity::getDeviceId, deviceId);
         TkRepairOrderEntity entity = baseMapper.selectOne(queryWrapper);
-        entity.copyToDTO(result);
+        if (entity != null) {
+            entity.copyToDTO(result);
+        }
         return result;
     }
 

@@ -5,19 +5,14 @@ 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.User;
 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.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
-import org.thingsboard.server.common.data.yunteng.utils.CopyUtils;
-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.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairRecordEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkRepairRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -27,9 +22,7 @@ import org.thingsboard.server.dao.yunteng.service.TkUserService;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
@@ -54,14 +47,8 @@ public class TkRepairRecordServiceImpl extends AbstractBaseService<TkRepairRecor
         IPage<TkRepairRecordEntity> page =
                 getPage(queryMap, "rr.create_time", false);
         IPage<TkRepairRecordDTO> pageData = baseMapper.getRepairRecordPage(page, queryMap);
-        if (pageData != null && CollectionUtils.isNotEmpty(pageData.getRecords())) {
-            List<TkRepairRecordDTO> dataList = pageData.getRecords().stream().map(item -> {
-                TkRepairRecordDTO dto = new TkRepairRecordDTO();
-                CopyUtils.copyProperties(item, dto);
-                return dto;
-
-            }).collect(Collectors.toList());
-            result.setItems(dataList);
+        if (pageData != null) {
+            result.setItems(pageData.getRecords());
         }
         result.setTotal(Long.valueOf(pageData.getTotal()).intValue());
 

 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.TkRepairOrderDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairOrderEntity;
 
+import java.util.Map;
+
 @Mapper
 public interface TkRepairOrderMapper extends BaseMapper<TkRepairOrderEntity> {
+    IPage<TkRepairOrderDTO> getRepairOrderPage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 }

+<?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.TkRepairOrderMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO" id="repairOrderMap">
+        <!--        <result property="id" column="id"/>-->
+        <!--        <result property="reportDate" column="report_date"/>-->
+        <!--        <result property="deviceId" column="device_id"/>-->
+        <!--        <result property="reportBy" column="report_by"/>-->
+        <!--        <result property="emergency" column="emergency"/>-->
+        <!--        <result property="description" column="description"/>-->
+        <result property="reportByName" column="reportByName"/>
+    </resultMap>
+    <select id="getRepairOrderPage" resultMap="repairOrderMap">
+        SELECT
+        o.id,o.device_id,o.order_code,o.report_date,o.report_by,o.status,o.emergency,o.situation_img,o.description
+        ,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
+        <where>
+            <if test="queryMap.tenantId !=null ">
+                AND o.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.status !=null ">
+                AND o.status = #{queryMap.status}
+            </if>
+            <if test="queryMap.deviceId !=null ">
+                AND o.device_id = #{queryMap.deviceId}
+            </if>
+            <if test="queryMap.emergency !=null ">
+                AND o.emergency = #{queryMap.emergency}
+            </if>
+            <if test="queryMap.startDate !=null ">
+                AND to_char(o.report_date, 'YYYY-MM-DD HH24:MI:SS') &gt;= #{queryMap.startDate}
+            </if>
+            <if test="queryMap.endDate !=null ">
+                AND to_char(o.report_date, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{queryMap.endDate}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file