#

luxiaotao1123

2020-08-21 59c8b08ce2025c0f4a947ec313d8229eaf464c3d

#

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

@@ -4,17 +4,17 @@
import com.core.common.R;
import com.zy.asrs.domain.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.DevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;
@@ -97,4 +97,63 @@
        return R.ok().add(str.toString());
    }

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

    @GetMapping("/detl/{siteId}")
    public R siteDetl(@PathVariable("siteId") Integer siteId){
        SiteTableVo vo = new SiteTableVo();
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<Integer, StaProtocol> station = devpThread.getStation();
            for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
                if (siteId.equals(entry.getKey())) {
                    StaProtocol staProtocol = entry.getValue();
                    vo.setDevNo(entry.getKey());    // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
                    vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
                    vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
                    vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
                    vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 可出
                    vo.setInreq1(staProtocol.isInreq1()?"Y":"N");       // 需求1
                    vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                    vo.setStaNo(staProtocol.getStaNo());                // 目标站
                    return R.ok().add(vo);
                }
            }
        }
        return R.error("plc已掉线");
    }

    @PostMapping("/detl/update")
    @ManagerAuth(memo = "修改站点数据")
    public R siteDetlUpdate(@RequestParam Integer siteId,
                            @RequestParam Short workNo,
                            @RequestParam Short staNo){
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<Integer, StaProtocol> station = devpThread.getStation();
            for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
                if (siteId.equals(entry.getKey())) {
                    StaProtocol staProtocol = entry.getValue();
                    if (workNo != null) {
                        staProtocol.setWorkNo(workNo);
                    }
                    if (staNo != null) {
                        staProtocol.setStaNo(staNo);
                    }
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
                        return R.ok();
                    } else {
                        return R.error("下发命令失败");
                    }
                }
            }
        }
        return R.error("plc已掉线");
    }


}

 src/main/java/com/zy/core/thread/CrnThread.java

@@ -179,7 +179,7 @@
        OperateResult result = siemensNet.Write("DB8.0", array);
        if (result.IsSuccess) {
            System.out.println(MessageFormat.format("【{0}】[id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
//            readStatus();
        } else {
            System.out.println(MessageFormat.format("【{0}】写入堆垛机plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));

 src/main/java/com/zy/core/thread/DevpThread.java

@@ -54,9 +54,17 @@
                    case 1:
                        read();
                        break;
                    // 写数据
                    // 写数据 ID+目标站
                    case 2:
                        write((StaProtocol)task.getData());
                        break;
                    // 写数据 ID
                    case 3:
                        writeId((StaProtocol)task.getData());
                        break;
                    // 写数据 目标站
                    case 4:
                        writeStaNo((StaProtocol)task.getData());
                        break;
                    default:
                        break;
@@ -129,7 +137,7 @@
    }

    /**
     * 写入 =====> 单站点写入
     * 写入 ID+目标站 =====> 单站点写入
     */
    private void write(StaProtocol staProtocol){
        if (null == staProtocol) {
@@ -137,14 +145,46 @@
        }
        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 工作号
        OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo());    // 目标站
        boolean[] status = new boolean[8];
        status[0] = staProtocol.isAutoing();
        status[1] = staProtocol.isLoading();
        status[2] = staProtocol.isInEnable();
        status[3] = staProtocol.isOutEnable();
        status[4] = staProtocol.isEmptyMk();
        OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status);     //  状态
        if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
//        boolean[] status = new boolean[8];
//        status[0] = staProtocol.isAutoing();
//        status[1] = staProtocol.isLoading();
//        status[2] = staProtocol.isInEnable();
//        status[3] = staProtocol.isOutEnable();
//        status[4] = staProtocol.isEmptyMk();
//        OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status);     //  状态
        if (!write.IsSuccess || !write1.IsSuccess) {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(staProtocol)));
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
        }
    }

    /**
     * 写入 ID =====> 单站点写入
     */
    private void writeId(StaProtocol staProtocol){
        if (null == staProtocol) {
            return;
        }
        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 工作号
        if (!write.IsSuccess ) {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(staProtocol)));
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
        }
    }

    /**
     * 写入 目标站 =====> 单站点写入
     */
    private void writeStaNo(StaProtocol staProtocol){
        if (null == staProtocol) {
            return;
        }
        OperateResult write = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo());    // 目标站
        if (!write.IsSuccess ) {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(staProtocol)));
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
        } else {

 src/main/webapp/static/css/pipeline.css

@@ -96,4 +96,60 @@
    height: 100%;
    overflow: auto;
    resize:none;
}


/* 详情弹出层 */
#site-detl {
    padding: 30px 10px 0 25px;
    overflow: hidden;
}
#site-detl form {
    overflow: hidden;
}
.form-item {
    margin-bottom: 10px;
}
.form-label {
    display: inline-block;
    width: 70px;
    text-align: right;
}
.form-input {
    display: inline-block;
    padding-left: 15px;
}
.form-input input {
    outline-style: none ;
    border: 1px solid #ccc;
    border-radius: 3px;
    padding: 5px 8px;
    width: 150px;
    font-size: 14px;
    font-weight: bolder;
}
.form-input input:focus{
    border-color: #66afe9;
    outline: 0;
    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);
    box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)
}
.form-button-container {
    text-align: center;
}
.form-button {
    margin: 10px 10px;
    width: 50px;
    height: 30px;
    color:white;
    background-color:cornflowerblue;
    border-radius: 3px;
    border-width: 0;
    outline: none;
    font-size: 15px;
    text-align: center;
    cursor: pointer;
}
.form-button:hover {
    opacity: 0.7;
}

 src/main/webapp/views/index.html

@@ -26,7 +26,7 @@
  </ul>

  <!-- 主体内容 -->
  <iframe id="content" src="console.html"></iframe>
  <iframe id="content" src="pipeline.html"></iframe>

  <footer class="footer">
    Copyright © 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">浙江中扬物流装备有限公司</a>  保留所有权利

 src/main/webapp/views/pipeline.html

@@ -77,30 +77,30 @@
</footer>

<div id="site-detl" style="display: none">
    <div class="layui-form">
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">站点:</label>
            <div class="layui-input-block">
                <input id="siteId" name="siteId" placeholder="请输入站点编号" class="layui-input" lay-verify="required|number" autocomplete="off">
    <form>
        <div class="form-item">
            <label class="form-label">站号:</label>
            <div class="form-input">
                <input id="siteId" name="siteId" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">工作号:</label>
            <div class="layui-input-block">
                <input id="workNo" name="workNo" type="number" placeholder="请输入工作号" class="layui-input" lay-verify="number" autocomplete="off">
        <div class="form-item">
            <label class="form-label">工作号:</label>
            <div class="form-input">
                <input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">目标站:</label>
            <div class="layui-input-block">
                <input id="staNo" name="staNo" type="number" placeholder="请输入目标站" class="layui-input" lay-verify="number" autocomplete="off">
        <div class="form-item">
            <label class="form-label">目标站:</label>
            <div class="form-input">
                <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
            </div>
        </div>
        <div class="layui-form-item cool-button-contain">
            <button class="layui-btn layui-btn-normal" id="print" lay-filter="print" lay-submit="">打印</button>
            <button class="layui-btn layui-btn-primary" id="cancel">取消</button>
        <div class="form-item form-button-container">
            <button class="form-button" id="save">保存</button>
            <button class="form-button" id="cancel" style="background-color: #D0D0D0">取消</button>
        </div>
    </div>
    </form>
</div>
</body>
<script>
@@ -126,27 +126,6 @@
    setInterval(function () {
        getSiteOutput();
    },500);

    $(document).on('click','#site-table tr', function () {
        var siteId = $(this).children("td").eq(0).html();
        if (siteId !== null && siteId !== "") {
            layer.open({
                type: 1,
                title: false,
                shadeClose: true,
                offset: 'rt',
                anim: 5,
                shade: [0],
                area: ['340px', '215px'],
                closeBtn: 0,
                content: $("#site-detl"),
                success: function(layero, index){

                }
            })
        }
    });


    // plc异常信息表获取
    function getPlcError() {
@@ -289,5 +268,52 @@
        $('#site-table tbody').after(html);
    }

    // 详情操作 -------------------------------------------------------------------------
    var layerDetl;
    $(document).on('dblclick ','#site-table tr', function () {
        var siteId = $(this).children("td").eq(0).html();
        if (siteId !== null && siteId !== "") {
            layerDetl = layer.open({
                type: 1,
                title: false,
                shadeClose: true,
                offset: 'rt',
                anim: 5,
                shade: [0],
                area: ['340px', '215px'],
                closeBtn: 0,
                content: $("#site-detl"),
                success: function(layero, index){
                    http.get(baseUrl+ "/site/detl/"+siteId, null, function (res) {
                        $('#siteId').val(siteId);
                        $('#workNo').val(res.data.workNo);
                        $('#staNo').val(res.data.staNo);
                    })
                },
                end: function () {
                    $('#siteId').val("");
                    $('#workNo').val("");
                    $('#staNo').val("");
                }
            })
        }
    });

    $(document).on('click ','#save', function () {
        http.post(baseUrl+ "/site//detl/update", {
            siteId: $('#siteId').val(),
            workNo: $('#workNo').val(),
            staNo:  $('#staNo').val()
        }, function (res) {
            layer.msg("修改成功",{icon: 1,});
        })
    })
    $(document).on('click ','#cancel', function () {
        $('#siteId').val("");
        $('#workNo').val("");
        $('#staNo').val("");
        layer.close(layerDetl);
    })

</script>
</html>