工单下发分页优化

xiangpei

2024-08-24 9610cc33eb1fec9e9ba9dc9c8fc1032cb6e6058a

工单下发分页优化

 ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java

@@ -32,6 +32,11 @@
    private Integer unitId;

    /**
     * 故障类型
     */
    private List<String> errorTypeList;

    /**
     * 工单id
     */
    @JsonProperty("ids")

 ycl-server/src/main/java/com/ycl/platform/service/HKErrorTypeService.java

New file
@@ -0,0 +1,76 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.result.HK.*;

import java.util.List;

/**
 * 海康检测
 *
 * @author：xp
 * @date：2024/8/24 17:45
 */
public interface HKErrorTypeService {

    /**
     * 抓拍数据量监测结果  车辆/人脸
     *
     */
    void snapshotDataMonitorTaskCheck(List<SnapshotDataMonitorResult> dataList);


    /**
     * 采集设备属性监测结果(人脸)
     *
     */
    void monitorDetailTaskCheck(List<MonitoringDetailResult> dataList);


    /**
     * 卡口属性监测结果
     *
     */
    void crossDetailTaskCheck(List<CrossDetailResult> dataList);


    /**
     * 数据完整性监测结果
     *
     */
    void dataIntegrityMonitoringTaskCheck(List<DataIntegrityMonitoringResult> dataList);


    /**
     * 属性识别准确监测结果
     *
     */
    void attrRecognitionMonitorTaskCheck(List<AttrRecognitionMonitorResult> dataList);


    /**
     * 抓拍数据时延监测结果
     *
     */
    void snapshopDelayMonitorTaskCheck(List<SnapshotDelayMonitorResult> dataList);


    /**
     * 图片访问监测结果
     *
     */
    void picAccessTaskCheck(List<PicAccessResult> dataList);


    /**
     * 车辆设备抽检指标监测结果
     *
     */
    void vehicleDeviceSamplingTaskCheck(List<VehicleDeviceSamplingResult> dataList);


    /**
     * 人脸设备抽检指标监测结果
     *
     */
    void faceDeviceSamplingTaskCheck(List<FaceDeviceSamplingResult> dataList);
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/HKErrorTypeServiceImpl.java

New file
@@ -0,0 +1,74 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.service.HKErrorTypeService;
import com.ycl.platform.service.WorkOrderService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @author：xp
 * @date：2024/8/24 17:58
 */
@Service
@RequiredArgsConstructor
public class HKErrorTypeServiceImpl implements HKErrorTypeService {

    private final WorkOrderService workOrderService;

    /**
     * 抓拍数据量监测结果  车辆/人脸
     *
     * @param dataList
     */
    @Override
    public void snapshotDataMonitorTaskCheck(List<SnapshotDataMonitorResult> dataList) {

    }

    @Override
    public void monitorDetailTaskCheck(List<MonitoringDetailResult> dataList) {

    }

    @Override
    public void crossDetailTaskCheck(List<CrossDetailResult> dataList) {
//        dataList.stream().map(item -> {
//            WorkOrder workOrder = new WorkOrder();
//            if (item.get)
//        })
    }

    @Override
    public void dataIntegrityMonitoringTaskCheck(List<DataIntegrityMonitoringResult> dataList) {

    }

    @Override
    public void attrRecognitionMonitorTaskCheck(List<AttrRecognitionMonitorResult> dataList) {

    }

    @Override
    public void snapshopDelayMonitorTaskCheck(List<SnapshotDelayMonitorResult> dataList) {

    }

    @Override
    public void picAccessTaskCheck(List<PicAccessResult> dataList) {

    }

    @Override
    public void vehicleDeviceSamplingTaskCheck(List<VehicleDeviceSamplingResult> dataList) {

    }

    @Override
    public void faceDeviceSamplingTaskCheck(List<FaceDeviceSamplingResult> dataList) {

    }
}

 ycl-server/src/main/java/com/ycl/task/HKTask.java

@@ -87,7 +87,7 @@
    }


    //抓拍数据量监测结果
    // 抓拍数据量监测结果
    public void snapshotDataMonitorTask() {
        log.info("开始执行抓拍数据量检测结果数据同步");
        /** 车辆数据 */
@@ -285,6 +285,7 @@
        //TODO:工单处理
        log.info("结束图片访问监测结果数据同步");
    }

    //车辆设备抽检指标监测结果
    public void vehicleDeviceSamplingTask() {
        log.info("开始执行车辆设备抽检指标监测结果数据同步");

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -39,11 +39,11 @@
        FROM
        t_work_order wo
        INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
        LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
        LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
        INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
        INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
            collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
        LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
        LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
        WHERE
        wo.deleted = 0
        <if test="query.workOrderNo != null and query.workOrderNo != ''">
@@ -65,19 +65,25 @@

    <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
        SELECT
            wo.*,
            u.unit_name,
        wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
        u.unit_name,
            p.yw_person_name,
            yp.province_tag,
            yp.important_tag,
            yp.important_command_image_tag,
            odr.create_time as distributeTime,
            su.nick_name as realName
            su.nick_name as realName,
            tm.name as source,
            GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR '、') AS errorType
        FROM
            t_work_order wo
                INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
                INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
                INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
                INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
                    collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
                LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
                LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
                INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
                LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_no = wo.work_order_no AND odr.deleted = 0
                LEFT JOIN sys_user su ON su.user_id = odr.user_id
        WHERE
@@ -88,6 +94,18 @@
            <if test="query.status != null and query.status != ''">
                AND wo.status = #{query.status}
            </if>
            <if test="query.keyword != null and query.keyword != ''">
                AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword}, '%'))
            </if>
        GROUP BY
            wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
            u.unit_name,
            p.yw_person_name,
            yp.province_tag,
            yp.important_tag,
            yp.important_command_image_tag,
            odr.create_time,
            su.nick_name
        ORDER BY wo.create_time DESC
    </select>