1

zhangc

2025-04-11 4f713c3b31c6ffa30b9b195330316fe04d43866d

1

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
@@ -8,7 +7,6 @@
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -17,7 +15,6 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.core.thread.impl.FyDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -48,8 +45,8 @@
            FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<String, Object> map2 = new HashMap<>();
            map2.put("floor", 2);
            map2.put("modeVal", devpThread.ioModeOf2F.id);
            map2.put("modeDesc", devpThread.ioModeOf2F.desc);
            //map2.put("modeVal", devpThread.ioModeOf2F.id);
            //map2.put("modeDesc", devpThread.ioModeOf2F.desc);
            res.add(map2);
        }
        return R.ok().add(res);
@@ -72,7 +69,9 @@
            vo.setDevNo(devp.getDevNo());    // 站点编号
            list.add(vo);
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            if (null == staProtocol) {
                continue;
            }
            vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
            vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
            vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
@@ -82,7 +81,8 @@
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
            vo.setLocType1(staProtocol.getWeight() == 1 ? "重" : "轻");
            vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
        }
        return R.ok().add(list);
    }
@@ -92,7 +92,7 @@
    public R plcErrorTable(){
        List<PlcErrorTableVo> list = new ArrayList<>();
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<Integer, StaProtocol> station = devpThread.getStation();

            for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {

 src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java

New file
@@ -0,0 +1,20 @@
package com.zy.asrs.domain.vo;

import lombok.Data;

/**
 * Created by vincent on 2020-06-02
 */
@Data
public class PlcErrorTableVo {

    // 序号
    private Integer no;

    // plc异常描述
    private String plcDesc;

    // 异常
    private String error;

}

 src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java

New file
@@ -0,0 +1,42 @@
package com.zy.asrs.domain.vo;

import lombok.Data;

/**
 * Created by vincent on 2020-06-02
 */
@Data
public class SiteTableVo {

    // 站号
    private Integer devNo;

    // 工作号
    private Short workNo = 0;

    // 自动
    private String autoing = "-";

    // 有物
    private String loading = "-";

    // 可入
    private String inEnable = "-";

    // 可出
    private String outEnable = "-";

    // 需求1
    private String pakMk = "-";

    // 空板信号
    private String emptyMk = "-";

    // 目标站
    private Short staNo = 0;

    //高低库位
    private String locType1 = "-";

    private Short finishWorkNo = 0;
}

 src/main/java/com/zy/core/thread/impl/FyDevpThread.java

@@ -185,6 +185,8 @@
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
            // 根据实时信息更新数据库
            try {
                BasDevpService basConveyorStaService = SpringUtils.getBean(BasDevpService.class);

                List<BasDevp> stations = new ArrayList<>();
                for (Integer sta : staNos2) {
                    StaProtocol staProtocol = station.get(sta);
@@ -192,7 +194,6 @@
                    stations.add(sqlModel);
                }
                if (!stations.isEmpty()) {
                    BasDevpService basConveyorStaService = SpringUtils.getBean(BasDevpService.class);
                    if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
                        throw new Exception("更新数据库数据失败");
                    }

 src/main/webapp/views/pipeline.html

@@ -100,7 +100,7 @@
                        <th>可入</th>
                        <th>可出</th>
                        <th>出入库模式</th>
                        <th>空板信号</th>
                        <th>完结工作号</th>
                        <th>目标站</th>
                        <th>提升机到位信号</th>
                        <th>高低信号</th>
@@ -287,7 +287,7 @@
                        setVal(tr.children("td").eq(4), table[i-1].inEnable);
                        setVal(tr.children("td").eq(5), table[i-1].outEnable);
                        setVal(tr.children("td").eq(6), table[i-1].outInModel);
                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                        setVal(tr.children("td").eq(7), table[i-1].finishWorkNo);
                        setVal(tr.children("td").eq(8), table[i-1].staNo);
                        setVal(tr.children("td").eq(9), table[i-1].liftArrival);
                        setVal(tr.children("td").eq(10), table[i-1].locType1);