#

luxiaotao1123

2022-09-20 a14d14287e3502a46e2894770b5d2d9df6dd8e1f

#

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

@@ -16,6 +16,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -37,6 +38,42 @@
    @Autowired
    private BasDevpService basDevpService;

    @GetMapping("/io/mode/info/site")
    @ManagerAuth(memo = "充电模式")
    public R ioMode(){
        List<Map<String, Object>> res = new ArrayList<>();
        for (DevpSlave devp : slaveProperties.getDevp()) {
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<String, Object> map1 = new HashMap<>();
            map1.put("floor", 1);
            map1.put("modeVal", devpThread.charge0);
            map1.put("modeDesc", devpThread.charge0?"充电中":"关闭");
            res.add(map1);
            Map<String, Object> map2 = new HashMap<>();
            map2.put("floor", 2);
            map2.put("modeVal", devpThread.charge1);
            map2.put("modeDesc", devpThread.charge1?"充电中":"关闭");
            res.add(map2);
            Map<String, Object> map3 = new HashMap<>();
            map3.put("floor", 3);
            map3.put("modeVal", devpThread.charge2);
            map3.put("modeDesc", devpThread.charge2?"充电中":"关闭");
            res.add(map3);
        }
        return R.ok().add(res);
    }

    @PostMapping("/io/mode/action/site")
    @ManagerAuth(memo = "充电控制")
    public R ioModeAction(@RequestParam("floor") Integer floor, @RequestParam("charge") Boolean charge){
        for (DevpSlave devp : slaveProperties.getDevp()) {
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            boolean res = devpThread.charge(floor - 1, charge);
            return res?R.ok():R.error();
        }
        return R.ok();
    }

    @PostMapping("/table/site")
    @ManagerAuth(memo = "站点信息表")
    public R siteTable(){

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

@@ -268,11 +268,13 @@
     * @param index 充电桩序号 0 开始
     * @param open true 开始充电；false 结束充电
     */
    public void charge(int index, boolean open) {
    public boolean charge(int index, boolean open) {
        OperateResult write = siemensS7Net.Write("DB102.50." + index + 3, open);
        if (!write.IsSuccess) {
            log.error("输送线plc编号={} {}号充电桩{}控制失败", slave.getId(), index + 1, open?"打开":"关闭");
            return false;
        }
        return true;
    }

    @Override

 src/main/webapp/views/pipeline.html

@@ -215,26 +215,28 @@
        if (ioModeData != null && ioModeData.length > 1) {
            ioModeData.forEach(function(e) {
                if (e.floor === Number(floor)) {
                    if (e.modeVal === 3 || e.modeVal === 4) {
                        layer.confirm('确定切换为入库模式吗？',function () {
                            $.ajax({
                                url: baseUrl+ "/site/io/mode/action/site",
                                headers: {'token': localStorage.getItem('token')},
                                data: {floor: e.floor},
                                method: 'POST',
                                success: function (res) {
                                    if (res.code === 200){
                                        layer.msg("暂时不能切换！", {icon: 1})
                                    } else if (res.code === 403){
                                        window.location.href = baseUrl+"/login";
                                    }  else {
                                        console.log(res.msg);
                                    }
                    console.log()
                    layer.confirm('确定切换充电状态吗？',function () {
                        $.ajax({
                            url: baseUrl+ "/site/io/mode/action/site",
                            headers: {'token': localStorage.getItem('token')},
                            data: {
                                floor: e.floor,
                                charge: !e.modeVal
                            },
                            method: 'POST',
                            success: function (res) {
                                if (res.code === 200){
                                    layer.msg(res.msg, {icon: 1})
                                } else if (res.code === 403){
                                    window.location.href = baseUrl+"/login";
                                }  else {
                                    console.log(res.msg);
                                }
                            });
                            layer.closeAll();
                        })
                    }
                            }
                        });
                        layer.closeAll();
                    })
                }
            });
        }