blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
fuliqi
2024-11-14 e9af9f5cfeddbe5c0b33a3060b8ea6364c51e744 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java


@@ -1,5 +1,8 @@


package com.ycl.platform.service.impl;




import com.alibaba.excel.EasyExcel;


import com.alibaba.excel.ExcelWriter;


import com.alibaba.excel.write.metadata.WriteSheet;


import com.alibaba.fastjson2.JSON;


import com.alibaba.fastjson2.JSONArray;


import com.alibaba.fastjson2.JSONObject;


@@ -12,7 +15,9 @@


import com.ycl.config.PlatformConfig;


import com.ycl.exception.ServiceException;


import com.ycl.platform.domain.entity.*;


import com.ycl.platform.domain.excel.ErrorExport;


import com.ycl.platform.domain.excel.PointExport;


import com.ycl.platform.domain.excel.WorkOrderWhiteExport;


import com.ycl.platform.domain.form.*;


import com.ycl.platform.domain.query.*;


import com.ycl.platform.domain.vo.*;


@@ -40,6 +45,7 @@


import constant.RedisConstant;


import enumeration.ErrorType;


import enumeration.general.*;


import jakarta.servlet.http.HttpServletResponse;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.lang3.ObjectUtils;


@@ -61,10 +67,13 @@


import org.springframework.util.StringUtils;


import pojo.CascadeOption;




import java.io.IOException;


import java.io.OutputStream;


import java.time.LocalDateTime;


import java.time.ZoneId;


import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.function.Function;


import java.util.stream.Collectors;




/**


@@ -86,10 +95,10 @@


    private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;


    private final WorkOrderErrorTypeServiceImpl workOrderErrorTypeService;


    private final WorkOrderErrorTypeMapper workOrderErrorTypeMapper;


    private final WorkOrderWhiteMapper workOrderWhiteMapper;


    private final SysConfigMapper configMapper;


    private final ReportMapper reportMapper;


    private final WorkOrderCheckImgMapper workOrderCheckImgMapper;


    private final WorkOrderWhiteMapper workOrderWhiteMapper;


    private final DeviceInfoMapper deviceInfoMapper;


    private final ApplicationContext applicationContext;


    @Value("${rtsp.server:http://127.0.0.1:7788}")


@@ -111,17 +120,10 @@


    @Transactional(rollbackFor = Exception.class)


    public Boolean batchAddWorkOrder(List<WorkOrder> workOrderList){


        int total = workOrderList.size();


        // 查询出白名单列表


        List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());


        // 遍历工单列表，判断是否在白名单中


        workOrderList = workOrderList.stream().filter(item -> !serialNumbers.contains(item.getSerialNumber()))


                .collect(Collectors.toList());


        //清理数据


        workOrderList = workOrderList.stream().filter(item -> {


            return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());


        }).collect(Collectors.toList());


        if (CollectionUtils.isEmpty(workOrderList)) {


            return Boolean.TRUE;


        }


        // 根据国标码去重


        workOrderList = workOrderList.stream()


                .collect(Collectors.toMap(


@@ -129,6 +131,12 @@


                        p -> p,


                        (existing, replacement) -> existing // 冲突时保留第一个


                )).values().stream().collect(Collectors.toList());


        //检查白名单


        workOrderList = checkWhite(workOrderList);




        if (CollectionUtils.isEmpty(workOrderList)) {


            return Boolean.TRUE;


        }


        List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());


        // 查出数据库中国标码对应的未完成的工单


        List<WorkOrder> inDatabaseWorkOrderList = baseMapper.getNotFinishedWorkOrders(serialNumberList);


@@ -311,6 +319,8 @@


        log.info("传入工单总数: {}，实际添加工单数：{}, 实际修改工单数：{}", total, waitAddList.size(), updateNum);


        return Boolean.TRUE;


    }






    /**


     * 添加


     *


@@ -319,6 +329,16 @@


     */


    @Override


    public Result add(WorkOrderForm form) {


        //检查白名单


        List<WorkOrder> data = new ArrayList<>();


        WorkOrder workOrder = WorkOrderForm.getEntityByForm(form, null);


        data.add(workOrder);


        data = checkWhite(data);


        if (CollectionUtils.isEmpty(data)) {


            return Result.error("该设备的故障类型在白名单中，不能添加工单");


        }


        WorkOrder entity = data.get(0);




        //查redis今日工单数量


        int workOrderNum = 0;


        //UUID作为value，保证上锁的线程自己解锁


@@ -334,13 +354,7 @@


        } else {


            return Result.error("工单正在添加，请稍后再试");


        }


        WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);


        // 查询出白名单列表


        List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());


        // 遍历工单列表，判断是否在白名单中


         if (serialNumbers.contains(entity.getSerialNumber())){


            return Result.error("该设备在白名单中，不能添加工单");


        }else {




            entity.setCreateTime(DateUtils.getNowDate());


            entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);


            Date now = new Date();


@@ -355,7 +369,7 @@


            }


            return Result.error("添加失败");


        }


    }






    /**


     * 修改


@@ -501,6 +515,7 @@


            workOrderCheckImgMapper.insert(img);


        }


    }




    @Override


    public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {


        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);


@@ -1055,102 +1070,8 @@


    }




    /**


     * 工单白名单列表


     *


     * @param query 查询


     * @return {@link List }<{@link WorkOrderWhite }>


     * @author


     */


    @Override


    public Result selectWorkOrderWhiteList(WorkOrderWhiteQuery query) {


        IPage<WorkOrderWhite> page = PageUtil.getPage(query, WorkOrderWhite.class);


        workOrderWhiteMapper.page(page, query);


        List<WorkOrderWhite> records = page.getRecords();


        records.forEach(white-> {


            List<String> errorTextList = new ArrayList<>();


            List<String> errorTypeList = JSONArray.parseArray(white.getErrorType(), String.class);


            errorTypeList.forEach(error->{


                String errorText = ErrorType.getDescriptionByValue(error);


                errorTextList.add(errorText);


            });


            white.setErrorType(String.join(",", errorTextList));


        });


        return Result.ok().data(records).total(page.getTotal());


    }




    /**


     * 添加工单白名单


     *


     * @param workOrderWhite 白色工单


     * @return {@link Result }


     * @author


     */


    @Override


    public Result addWorkOrderWhite(WorkOrderWhite workOrderWhite) {


        // 检查是否已经存在该白名单


        WorkOrderWhite flag = workOrderWhiteMapper.selectBySerialNumber(workOrderWhite.getSerialNumber());


        if (flag != null) {


            return Result.error("该设备已存在白名单");


        } else {


            List<String> errorTypeList = workOrderWhite.getErrorTypeList();


            workOrderWhite.setErrorType(JSONArray.toJSONString(errorTypeList));


            workOrderWhite.setCreateBy(SecurityUtils.getUsername());


            workOrderWhiteMapper.insert(workOrderWhite);


            return Result.ok();


        }


    }


    /**


     * 修改工单白名单


     *


     * @param workOrderWhite 白色工单


     * @return {@link Result }


     * @author


     */


    @Override


    public Result updateWorkOrderWhite(WorkOrderWhite workOrderWhite) {


        WorkOrderWhite white = workOrderWhiteMapper.selectBySerialNumber(workOrderWhite.getSerialNumber());


        workOrderWhite.setId(white.getId());


        List<String> errorTypeList = workOrderWhite.getErrorTypeList();


        workOrderWhite.setErrorType(JSONArray.toJSONString(errorTypeList));


        workOrderWhiteMapper.updateById(workOrderWhite);


        return Result.ok();


    }


    /**


     * 批量删除工单白名单


     *


     * @param ids ids


     * @author


     */


    @Override


    public Result batchDeleteWorkOrderWhite(List<String> ids) {


        workOrderWhiteMapper.batchDelete(ids);


        return Result.ok();


    }




    /**


     * 批量导入白名单


     *


     * @param dataList 数据列表


     * @author


     */


    @Override


    public void batchImportWhite(List<PointExport> dataList) {


//        // 获得所有需要新增的白名单对象


//        List<WorkOrderWhite> whitelist = dataList.stream().map(pointExport ->


//                        new WorkOrderWhite(pointExport.getSerialNumber(), pointExport.getPointName(), SecurityUtils.getUsername()))


//                .collect(Collectors.toList());


//        // 获得所有已存在的白名单设备编码


//        List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());


//        // 筛选出新增、修改的白名单对象


//        List<WorkOrderWhite> updateWhiteList = whitelist.stream().filter(white -> serialNumbers.contains(white.getSerialNumber())).collect(Collectors.toList());


//        List<WorkOrderWhite> insertWhiteList = whitelist.stream().filter(white ->!serialNumbers.contains(white.getSerialNumber())).collect(Collectors.toList());


//        // 新增/修改白名单设备记录


//        updateWhiteList.stream().forEach(white -> workOrderWhiteMapper.updateBySerialNumber(white));


//        insertWhiteList.stream().forEach(white -> workOrderWhiteMapper.insert(white));


    }




    /**


     * 检测工单按钮


     *


     * @param workOrderNo


     * @return


     */


@@ -1248,12 +1169,22 @@


        return Result.ok().data(results);


    }




    @Override


    public Result selectWorkOrderWhiteDetail(Integer id) {


        WorkOrderWhite workOrderWhite = workOrderWhiteMapper.getById(id);


        List<String> errorList = JSONArray.parseArray(workOrderWhite.getErrorType(), String.class);


        workOrderWhite.setErrorTypeList(errorList);


        return Result.ok().data(workOrderWhite);


    //白名单校验


    private List<WorkOrder> checkWhite(List<WorkOrder> workOrderList) {


        // 查询出白名单列表


        Map<String, WorkOrderWhite> whiteMap = workOrderWhiteMapper.selectList().stream().collect(Collectors.toMap(WorkOrderWhite::getSerialNumber, Function.identity()));


        workOrderList = workOrderList.stream()


                .filter(workOrder -> {


                    List<String> errorTypeList = workOrder.getErrorTypeList();


                    WorkOrderWhite white = whiteMap.get(workOrder.getSerialNumber());


                    if (white != null) {


                        List<String> whiteErrorListSet = Arrays.asList(white.getErrorType().split(","));


                        errorTypeList.removeIf(whiteErrorListSet::contains);


                    }


                    return !errorTypeList.isEmpty(); // 只保留 errorTypeList 非空的 WorkOrder


                })


                .collect(Collectors.toList());


        return workOrderList;


    }