*

L

2026-04-22 77e54aec65693683bc2b9ac50e08df6a06c53493

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

@@ -1,6 +1,6 @@
package com.zy.asrs.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -36,7 +36,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.rmi.CORBA.Util;
import java.util.*;

/**
@@ -76,7 +75,7 @@
    @ManagerAuth(memo = "RGV信息表")
    public R rgvStateTable(){
        List<RgvStateTableVo> list = new ArrayList<>();
        List<BasRgv> rgvs = basRgvService.selectList(new EntityWrapper<BasRgv>().orderBy("rgv_no"));
        List<BasRgv> rgvs = basRgvService.list(new QueryWrapper<BasRgv>().orderByAsc("rgv_no"));
        for (BasRgv basRgv : rgvs) {
            // 表格行
            RgvStateTableVo vo = new RgvStateTableVo();
@@ -115,7 +114,7 @@
    @ManagerAuth(memo = "RGV数据表")
    public R rgvMsgTable(){
        List<RgvMsgTableVo> list = new ArrayList<>();
        List<BasRgv> rgvs = basRgvService.selectList(new EntityWrapper<BasRgv>().orderBy("rgv_no"));
        List<BasRgv> rgvs = basRgvService.list(new QueryWrapper<BasRgv>().orderByAsc("rgv_no"));
        for (BasRgv basRgv : rgvs) {
            // 表格行
            RgvMsgTableVo vo = new RgvMsgTableVo();
@@ -133,7 +132,7 @@

            vo.setWorkNo(rgvProtocol.getTaskNo1());  //  任务号
            if (rgvProtocol.getTaskNo1()>0) {
                WrkMast wrkMast = wrkMastService.selectById(rgvProtocol.getTaskNo1());
                WrkMast wrkMast = wrkMastService.getById(rgvProtocol.getTaskNo1());
                if (wrkMast != null) {
                    vo.setStatus(RgvStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                    vo.setSourceStaNo(wrkMast.getSourceStaNo$());    //  源站
@@ -376,7 +375,7 @@
    //  站点位置信息
    public R ringThroughDev(){
        List<RingThroughParam> result = new ArrayList<>();
        List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
        List<BasDevpPosition> basDevpPositions = basDevpPositionService.list(new QueryWrapper<>());
        for (BasDevpPosition basDevpPosition : basDevpPositions){
            if (basDevpPosition.getDevRegion() == 0){
                continue;
@@ -386,7 +385,7 @@
            ringThroughParam.setModeColor("#FFFFFF");
            ringThroughParam.setStatusColor("#FFFFFF");
            try{
                BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",basDevpPosition.getDevNo()));
                BasDevp basDevp = basDevpService.getOne(new QueryWrapper<BasDevp>().eq("dev_no",basDevpPosition.getDevNo()));
                if (basDevp.getAutoing().equals("Y")){
                    if (basDevp.getLoading().equals("Y")){
                        ringThroughParam.setModeColor("#ab1839");
@@ -462,7 +461,7 @@
//    @ManagerAuth(memo = "作业信息")
    public R ringThroughTaskWrkMast(){
        List<RgvWrkMastParam> result = new ArrayList<>();
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
        List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
        for (WrkMast wrkMast : wrkMasts){
            RgvWrkMastParam rgvWrkMastParam = new RgvWrkMastParam(wrkMast);
            if (Cools.isEmpty(rgvWrkMastParam.getRgvNo())){
@@ -490,7 +489,7 @@
    public R ringThroughTaskWrkMastV1(){
        List<BasRgvOpt> result = new ArrayList<>();
        for (int i = 1 ; i<11; i ++){
            BasRgvOpt basRgvOpt = basRgvOptService.selectOne(new EntityWrapper<BasRgvOpt>().eq("rgv_no", i).orderBy("id", false));
            BasRgvOpt basRgvOpt = basRgvOptService.getOne(new QueryWrapper<BasRgvOpt>().eq("rgv_no", i).orderByDesc("id"));
            if (basRgvOpt!=null){
                result.add(basRgvOpt);
            }
@@ -502,13 +501,14 @@
//    @ManagerAuth(memo = "作业信息")
    public R rgvCircularShuttle(){
        List<RgvCircularShuttleParam> result = new ArrayList<>();
        List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.selectList(new EntityWrapper<>());
        List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.list(new QueryWrapper<>());
        for (BasCircularShuttle basCircularShuttle : basCircularShuttleList){
            RgvCircularShuttleParam rgvCircularShuttleParam = new RgvCircularShuttleParam(basCircularShuttle);
            if (!Cools.isEmpty(rgvCircularShuttleParam.getRgvNo())){
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvCircularShuttleParam.getRgvNo());
                if (rgvThread != null) {
                    RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                    rgvCircularShuttleParam.setTaskNo(rgvProtocol.getTaskNo1().intValue());
                    if (rgvProtocol != null) {
                        rgvCircularShuttleParam.setPosition(rgvProtocol.getRgvPos());
                        if (rgvCircularShuttleParam.getStatus()==0){
@@ -542,7 +542,7 @@
    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));
            BasRgvErrLog basRgvErrLog = basRgvErrLogService.getOne(new QueryWrapper<BasRgvErrLog>().eq("rgv_no", i).orderByDesc("id"));
            if (basRgvErrLog!=null){
                result.add(basRgvErrLog);
            }
@@ -556,7 +556,7 @@
    public R rgvDisableStatus(@RequestParam Integer rgvNo,
                              @RequestParam Integer status){
        log.info("/disable/rgv/status===》修改RGV状态！！！rgvNo:{},status:{},data:{}",rgvNo,status,new Date());
        BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_no", rgvNo));
        BasCircularShuttle basCircularShuttle = basCircularShuttleService.getOne(new QueryWrapper<BasCircularShuttle>().eq("rgv_no", rgvNo));
        if (basCircularShuttle == null){
            return R.error().add("未找到此RGV，异常！！！");
        }
@@ -569,11 +569,11 @@
//    @ManagerAuth(memo = "删除任务")
    public R taskDisabledelete(@RequestParam Long wrkNo){
        log.info("/disable/task/delete===》删除任务！！！wrkNo:{},data:{}",wrkNo,new Date());
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
        WrkMast wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wrk_no", wrkNo));
        if (Cools.isEmpty(wrkMast)){
            return R.error().add("未找到此任务，异常！！！");
        }
        wrkMastService.deleteById(wrkMast);
        wrkMastService.removeById(wrkMast);
        return R.ok();
    }

@@ -582,7 +582,7 @@
    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));
        WrkMast wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wrk_no", wrkNo));
        if (Cools.isEmpty(wrkMast)){
            return R.error().add("未找到此任务，异常！！！");
        }