#

zjj

12 小时以前 5ea8ebb2dc63183018f74ef87de0bea90c87e74c

#

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

@@ -80,8 +80,8 @@

    @RequestMapping(value = "/basShuttle/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
    public R delete(@RequestParam(value="ids[]") Integer[] ids){
         for (Integer id : ids){
            basShuttleService.deleteById(id);
        }
        return R.ok();

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

@@ -58,6 +58,7 @@
    private List<JSONObject> socketReadResults = new ArrayList<>();
    private List<DeviceMsgModel> socketResults = new ArrayList<>();

    private Long requestReadTime = System.currentTimeMillis();
    //原始设备数据
    private Object originDeviceData;

@@ -199,7 +200,10 @@
            //指令超过2条，不再下发任务状态请求
            TreeSet<String> deviceCommandMsgListKey = deviceMsgUtils.getDeviceCommandMsgListKey(SlaveType.Shuttle, deviceConfig.getDeviceNo());
            if (deviceCommandMsgListKey.size() < 2) {
                if ((System.currentTimeMillis() - requestReadTime) > 500) {
                requestCommand(readStatusCommand);//请求状态
                    requestReadTime = System.currentTimeMillis();
                }
            }

            if (this.socketReadResults.isEmpty()) {