Merge remote-tracking branch 'origin/master'

vince

2023-09-04 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a

 igds-recir/src/main/java/com/ld/igds/temp/manager/TempControlManager.java

@@ -161,7 +161,7 @@
                return tempControl3(param);
            }

// 如果多个设备，需要对设备按分机进行分组
            // 如果多个设备，需要对设备按分机进行分组
            Map<String, List<ExeDevice>> deviceMap = deviceList.stream().collect(Collectors.groupingBy(ExeDevice::getSerId));

            String temp = "";
@@ -202,11 +202,11 @@
        // 获取分机信息
        DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), exeDevice.getSerId());

        if (!Constant.YN_Y.equals(deviceSer.getStatus())) {
            return new DeviceControlResponse(
                    OrderRespEnum.ORDER_ERROR.getCode(),
                    "当前设备所在控制柜【" + deviceSer.getName() + "】不在线，无法执行");
        }
//        if (!Constant.YN_Y.equals(deviceSer.getStatus())) {
//            return new DeviceControlResponse(
//                    OrderRespEnum.ORDER_ERROR.getCode(),
//                    "当前设备所在控制柜【" + deviceSer.getName() + "】不在线，无法执行");
//        }

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