*

lsh

5 天以前 ca1971f52b62c18efa1af540431175b8e8ec7cd3

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

@@ -10,10 +10,7 @@
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasCircularShuttleService;
import com.zy.asrs.service.BasDevpPositionService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.asrs.utils.NumUtils;
import com.zy.asrs.utils.Utils;
@@ -57,6 +54,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private BasRgvErrMapper basRgvErrMapper;
    @Autowired
    private BasRgvErrLogService basRgvErrLogService;
    @Autowired
    private BasRgvService basRgvService;
    @Autowired
@@ -370,11 +369,17 @@
        List<RingThroughParam> result = new ArrayList<>();
        List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
        for (BasDevpPosition basDevpPosition : basDevpPositions){
            if (basDevpPosition.getDevNo() == 134){
                continue;
            }
            RingThroughParam ringThroughParam = new RingThroughParam();
            ringThroughParam.setIndex(basDevpPosition.getDevNo());
            double[] doubles = Utils.RingThroughXYSta(perimeter, perimeter-basDevpPosition.getPlcPosition());
            ringThroughParam.setValueX(doubles[0]>50? doubles[0]+6:doubles[0]-1);
            ringThroughParam.setValueY(doubles[1]>50? doubles[1]+6:doubles[1]-1);
//            double[] doubles = Utils.RingThroughXYSta(perimeter, perimeter-basDevpPosition.getPlcPosition());
//            ringThroughParam.setValueX(doubles[0]>50? doubles[0]+6:doubles[0]-1);
//            ringThroughParam.setValueY(doubles[1]>50? doubles[1]+6:doubles[1]-1);
            double[] doubles = Utils.getRgvPosNew(basDevpPosition.getDevNo(),perimeter, basDevpPosition.getPlcPosition());
            ringThroughParam.setValueX(doubles[0]);
            ringThroughParam.setValueY(doubles[1]);
            result.add(ringThroughParam);
        }
        return R.ok().add(result);
@@ -462,6 +467,21 @@
                        if (rgvCircularShuttleParam.getStatus()==0){
                            rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
                        }
                        if (rgvProtocol.getAlarmList().isEmpty()){
                            rgvCircularShuttleParam.setError(0);
                            rgvCircularShuttleParam.setError$("-");
                        } else {
                            StringBuilder alarmList = new StringBuilder();
                            for (Integer alarm : rgvProtocol.getAlarmList()){
                                BasRgvErr rgvErr = basRgvErrMapper.selectById(alarm);
                                alarmList.append((rgvErr==null || rgvErr.getErrName()==null)? "未知异常:"+alarm:rgvErr.getErrName());
                                if (alarm.equals(rgvProtocol.getAlarmList().get(rgvProtocol.getAlarmList().size() - 1))){
                                    break;
                                }
                                alarmList.append("---");
                            }
                            rgvCircularShuttleParam.setError$(alarmList.toString());
                        }
                    }
                }
            }
@@ -470,13 +490,26 @@
        return R.ok().add(result);
    }

    @PostMapping("/task/rgv/circular/shuttle/mast/position/data/v1")
//    @ManagerAuth(memo = "作业信息")
    public R rgvCircularShuttleV1(){
        List<BasRgvErrLog> result = new ArrayList<>();
        for (int i = 1 ; i<11; i ++){
            BasRgvErrLog basRgvErrLog = basRgvErrLogService.selectOne(new EntityWrapper<BasRgvErrLog>().eq("rgv_no", i).orderBy("id", false));
            if (basRgvErrLog!=null){
                result.add(basRgvErrLog);
            }
        }
        return R.ok().add(result);
    }


    @PostMapping("/disable/rgv/status")
//    @ManagerAuth(memo = "修改RGV状态")
    public R rgvDisableStatus(@RequestParam Integer rgvId,
    public R rgvDisableStatus(@RequestParam Integer rgvNo,
                              @RequestParam Integer status){
        log.info("/disable/rgv/status===》修改RGV状态！！！rgvId:{},status:{},data:{}",rgvId,status,new Date());
        BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
        log.info("/disable/rgv/status===》修改RGV状态！！！rgvNo:{},status:{},data:{}",rgvNo,status,new Date());
        BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_no", rgvNo));
        if (basCircularShuttle == null){
            return R.error().add("未找到此RGV，异常！！！");
        }