#

cpT

7 天以前 c3d37562d45e05b1830c965ce8d6febc9c40b39b

#

 src/main/java/com/zy/core/enums/RedisKeyType.java

@@ -30,6 +30,8 @@
    DEVICE_ERR_ACTIVE_DUAL_CRN("device_err_active_dual_crn_"),
    DEVICE_STATION_MOVE_RESET("device_station_move_reset_"),

    CRN_SEND_COMMAND_LOCK("crn_send_command_lock_"),

    GENERATE_IN_TASK_LIMIT("generate_in_task_limit_"),

    GENERATE_FAKE_IN_TASK_LIMIT("generate_fake_in_task_limit_"),

 src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java

@@ -6,9 +6,12 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.network.api.ZyCrnConnectApi;
@@ -101,7 +104,12 @@
                            array[7] = (short) 0;
                            array[8] = (short) 0;
                            array[9] = (short) 0;
                            OperateResult taskClearResult = siemensNet.Write("DB100.0", array);

                            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
                            Object lock = redisUtil.get(RedisKeyType.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
                            if (lock == null) {
                                OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
                            }
                        }
                    }
                }
@@ -121,6 +129,8 @@

    @Override
    public CommandResponse sendCommand(CrnCommand command) {
        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
        redisUtil.set(RedisKeyType.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 5);
        CommandResponse response = new CommandResponse(false);
        try {
            if (null == command) {

 src/main/webapp/components/DevpCard.js

@@ -204,7 +204,7 @@
      let that = this;
      //下发命令
      $.ajax({
        url: baseUrl + "/station/command/move",
        url: baseUrl + "/station/command/reset",
        headers: {
          token: localStorage.getItem("token"),
        },