#26-03-10-00

zzgtfwq

22 小时以前 6299fb7b7732947e9f997c92599b1772b8884962

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
@@ -11,16 +12,17 @@
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.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;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.RgvThread2;
import com.zy.core.Slave;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -28,14 +30,14 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.MelsecCrnThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.*;
import com.zy.system.entity.license.LicenseVerify;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -61,6 +63,10 @@
    private LocMastMapper locMastMapper;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private BasRgvService basRgvService;
    @Autowired
    private BasRgvMapService basRgvMapService;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -83,7 +89,23 @@
            }
        }
        Thread.sleep(200L);
        SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);

        //验证许可证是否有效
        try{
            boolean systemSign = SystemProperties.WCS_RUNNING_STATUS.get();
            if (!systemSign){
                if (new LicenseVerify().verify()){
                    SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
//                    SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
                    return R.ok();
                }
                return R.error("许可证验证失败！").add("许可证验证失败！");
            }
        } catch (Exception e){
            log.error("许可证验证失败！！异常：{}",e.getMessage());
            return R.error();
        }
        SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
    }

@@ -102,10 +124,39 @@
                stations.putAll(devpThread.getStation());
            }
        }
        List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
        for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
            SiteLatestDataVo vo = new SiteLatestDataVo();
            StaProtocol staProtocol = entry.getValue();
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            for (BasRgv basRgv: basRgvs){
                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()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vo.setNearbySta(staProtocol.getNearbySta());
@@ -192,7 +243,14 @@
        return R.ok().add(list);
    }

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


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