blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
fuliqi
2024-09-30 b5df1cee65f3e9dcf554efcd3f1642a8c79d1e76 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java


@@ -56,6 +56,11 @@


import org.springframework.util.CollectionUtils;


import org.springframework.util.StringUtils;




import java.net.HttpURLConnection;


import java.net.URL;


import java.net.URLDecoder;


import java.net.URLEncoder;


import java.nio.charset.StandardCharsets;


import java.text.SimpleDateFormat;


import java.time.LocalDateTime;


import java.time.ZoneId;


@@ -293,14 +298,14 @@


    @Override


    public Result add(WorkOrderForm form) {


        //查redis今日工单数量


        int workOrderNum = 1;


        int workOrderNum = 0;


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


        String requestId = IdUtils.fastSimpleUUID();


        boolean result = redisCache.acquireLock(RedisConstant.WORKORDER_NUM_LOCK, requestId, 10000);


        if (result) {


            //查今日工单量


            Object redisNum = redisCache.getCacheObject(RedisConstant.WORKORDER_NUM);


            workOrderNum = redisNum == null ? 1 : (Integer) redisNum;


            workOrderNum = redisNum == null ? 0 : (Integer) redisNum;


            workOrderNum++;


            redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);


            redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);


@@ -559,7 +564,7 @@


                .select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)


                .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)


                .eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())


                .eq(WorkOrder::getErrorType, data.getErrorType())


                .in(WorkOrder::getErrorType, data.getErrorType())


                .between(WorkOrder::getCreateTime, data.getStart(), data.getEnd())


                .orderByDesc(WorkOrder::getCreateTime)


                .last("limit " + data.getFastNumLimit())


@@ -621,6 +626,7 @@


            ywPointService.updateRecovery(serialNumberList, 1);


            return Result.ok("成功下发" + query.getWorkOrderNOList().size() + "条工单");


        } catch (Exception e) {


            System.out.println(e.getMessage());


            return Result.error("操作失败");


        } finally {


            distributeUnLock();


@@ -759,7 +765,7 @@


        String imgUrl = null;


        if (wvpResult.getCode() == 0) {


            JSONObject data = (JSONObject) wvpResult.getData();


            String rtspUrl = data.getString("mp4"); // 取mp4地址


            String rtspUrl = data.getString("fmp4"); // 取mp4地址


            if (StringUtils.hasText(rtspUrl)) {


                System.out.println("目标地址：" + rtspUrl);


                FFmpegFrameGrabber grabber = null;