*

L

14 小时以前 1dacf2305187f5c2fb44f03b6b754c46cb73ba25

 src/main/java/com/zy/asrs/controller/RgvController.java

@@ -348,20 +348,31 @@
            if (rgvProtocol == null) {
                continue;
            }
            RingThroughParam ringThroughParam = new RingThroughParam();
            try {
                if (rgvProtocol.getRgvPos() == null || rgvProtocol.getModeType() == null || rgvProtocol.getStatusType() == null) {
                    log.warn("环穿位置信息存在空字段，跳过该RGV: rgvNo={}", rgv.getId());
                    continue;
                }
                RingThroughParam ringThroughParam = new RingThroughParam();

            ringThroughParam.setIndex(rgv.getId());
                ringThroughParam.setIndex(rgv.getId());
//            ringThroughParam.setIndex(i);
//            double[] doubles = Utils.RingThroughXY2(perimeter, NumUtils.GetRandomIntInRange(183));
//            double[] doubles = Utils.RingThroughXYRgv(perimeter, perimeter-rgvProtocol.RgvPos.doubleValue());
            double[] doubles = Utils.getRgvPosNew(perimeter, rgvProtocol.RgvPos.doubleValue());
//            double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
                double[] doubles = Utils.getRgvPosNew(perimeter, rgvProtocol.getRgvPos().doubleValue());

            ringThroughParam.setValueX(doubles[0]);
            ringThroughParam.setValueY(doubles[1]);
            ringThroughParam.setModeColor(rgvProtocol.modeType.color);
            ringThroughParam.setStatusColor(rgvProtocol.statusType.color);
            result.add(ringThroughParam);
                ringThroughParam.setValueX(doubles[0]);
                ringThroughParam.setValueY(doubles[1]);
                ringThroughParam.setModeColor(rgvProtocol.getModeType().color);
                ringThroughParam.setStatusColor(rgvProtocol.getStatusType().color);
                if (rgvProtocol.getModeType() == RgvModeType.AUTO){
                    ringThroughParam.setAnimation(2);
                }
                result.add(ringThroughParam);
            } catch (Exception e) {
                // 单台RGV数据异常不影响其它RGV绘制
                log.error("环穿位置信息处理异常，跳过该RGV: rgvNo={}", rgv.getId(), e);
            }
        }
        return R.ok().add(result);
    }
@@ -373,6 +384,9 @@
        List<RingThroughParam> result = new ArrayList<>();
        List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
        for (BasDevpPosition basDevpPosition : basDevpPositions){
            if (basDevpPosition.getDevRegion() == 0){
                continue;
            }
            RingThroughParam ringThroughParam = new RingThroughParam();

            ringThroughParam.setModeColor("#FFFFFF");
@@ -569,4 +583,23 @@
        return R.ok();
    }

}
    @PostMapping("/disable/task/delete1")
//    @ManagerAuth(memo = "初始化任务")
    public R taskDisabledelete1(@RequestParam Long wrkNo){
        Date now = new Date();
        log.info("/disable/task/delete1===》初始化任务！！！wrkNo:{},data:{}",wrkNo,new Date());
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
        if (Cools.isEmpty(wrkMast)){
            return R.error().add("未找到此任务，异常！！！");
        }
        wrkMast.setWrkSts(1L);
        wrkMast.setRgvNo(0);
        wrkMast.setAppeTime(now);
        wrkMast.setLogErrTime(now);
        if (wrkMastService.updateById(wrkMast)){
            return R.ok();
        }
        return R.error("初始化失败！！！");
    }

}