Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-08-22 deee597fa30e9a40792a4eb094b6ce45a35bc13f

 igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java

@@ -5,7 +5,10 @@
import com.ld.igds.common.CoreSerService;
import com.ld.igds.common.DepotStatusService;
import com.ld.igds.common.dto.DepotSerData;
import com.ld.igds.constant.*;
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.DepotType;
import com.ld.igds.constant.DeviceType;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.PageResponse;
import com.ld.igds.io.RemoteControlService;
import com.ld.igds.io.RemoteManager;
@@ -22,11 +25,10 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.verb.AreationModel;
import com.ld.igds.verb.dto.VerbParam;
import com.ld.igds.verb.service.CoreAreationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -41,19 +43,17 @@
@Component
public class VerbManager {

    @Autowired
    @Resource
    private CoreCommonService coreCommonService;
    @Autowired
    @Resource
    private CoreDeviceService coreDeviceService;
    @Autowired
    @Resource
    private ExeOrderService exeOrderService;
    @Autowired
    @Resource
    private RemoteManager remoteManager;
    @Autowired
    @Resource
    private CoreSerService coreSerService;
    @Autowired
    private CoreAreationService areationService;
    @Autowired
    @Resource
    private DepotStatusService depotCheckService;

    private RemoteControlService remoteControlService;
@@ -113,6 +113,8 @@
            if (item.getType().equals(DeviceType.TYPE_0B.getCode()))
                listResult.add(item);
            if (item.getType().equals(DeviceType.TYPE_0C.getCode()))
                listResult.add(item);
            if (item.getType().equals(DeviceType.TYPE_04.getCode()))
                listResult.add(item);

            //浅圆仓加上其他设备
@@ -243,11 +245,11 @@
        // 获取分机信息
        DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), serId);

        if (Constant.YN_N.equals(deviceSer.getStatus())) {
            return new DeviceControlResponse(
                    OrderRespEnum.ORDER_ERROR.getCode(),
                    "当前设备所属控制柜[" + deviceSer.getName() + "]不在线，执行失败。");
        }
//        if (Constant.YN_N.equals(deviceSer.getStatus())) {
//            return new DeviceControlResponse(
//                    OrderRespEnum.ORDER_ERROR.getCode(),
//                    "当前设备所属控制柜[" + deviceSer.getName() + "]不在线，执行失败。");
//        }

        DeviceControlRequest request = new DeviceControlRequest();
        request.setDepotId(param.getDepotId());