#

1

3 天以前 6af7661ac19895e577606f0b3a2982c63923935c

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

@@ -12,13 +12,11 @@
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasRgvMapService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
@@ -32,6 +30,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
@@ -43,6 +42,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.*;

/**
@@ -66,6 +66,8 @@
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private BasRgvService basRgvService;
    @Autowired
    private BasRgvMapService basRgvMapService;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -113,8 +115,31 @@
            StaProtocol staProtocol = entry.getValue();
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            for (BasRgv basRgv: basRgvs){
                if (basRgv.getRgvNo().equals(entry.getKey()) ){
                    staProtocol.setWorkNo(basRgv.getWrkNo1());
                BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo(basRgv.getRgvNo());
                if(basRgv.getRgvNo() == 1 ){
                    if(entry.getKey() == 1){
                        staProtocol.setWorkNo(basRgv.getWrkNo1());
                        staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
                        staProtocol.setAutoing(basRgv.getStatus() == 1);
                        staProtocol.setLoading(staProtocol.getWorkNo()>0);
                    }else if(entry.getKey() == 2){
                        staProtocol.setWorkNo(basRgv.getWrkNo2());
                        staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
                        staProtocol.setAutoing(basRgv.getStatus() == 1);
                        staProtocol.setLoading(staProtocol.getWorkNo()>0);
                    }
                }else if(basRgv.getRgvNo() == 2){
                    if(entry.getKey() == 3){
                        staProtocol.setWorkNo(basRgv.getWrkNo1());
                        staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
                        staProtocol.setAutoing(basRgv.getStatus() == 1);
                        staProtocol.setLoading(staProtocol.getWorkNo()>0);
                    }else if(entry.getKey() == 4){
                        staProtocol.setWorkNo(basRgv.getWrkNo2());
                        staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
                        staProtocol.setAutoing(basRgv.getStatus() == 1);
                        staProtocol.setLoading(staProtocol.getWorkNo()>0);
                    }
                }
            }
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
@@ -203,7 +228,14 @@
        return R.ok().add(list);
    }

    /****************************************************************/
//    @PostMapping("/latest/data/rgv")
//    @ManagerAuth(memo = "RGV实时数据")
//    public R rgvLatestData(){
//        return R.ok().add(list);
//    }


        /****************************************************************/
    /************************** 详情操作 ******************************/
    /****************************************************************/

@@ -319,4 +351,15 @@
        return R.ok().add(JSON.toJSONString(jsonObjects));
    }

    @GetMapping("/getLedInfos")
    public R getLedInfos(HttpServletRequest request) {
        String remoteAddr = request.getRemoteAddr();
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getIp().equals(remoteAddr)) {
                return R.ok().add(slave);
            }
        }
        return R.ok();
    }

}