修改下发设备开柜指令

sst-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.device.web;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
@@ -14,6 +15,7 @@ import com.mortals.xhx.common.pdu.device.DeviceModuleUsePdu;
 import com.mortals.xhx.common.pdu.device.DeviceNotifyPdu;
 import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.feign.device.IDeviceAlarmFeign;
 import com.mortals.xhx.feign.device.IDeviceFeign;
 import com.mortals.xhx.feign.device.IDeviceModuleUseFeign;
@@ -262,18 +264,23 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         try {
             DeviceNotifyPdu pdu = new DeviceNotifyPdu();
             List<String> deviceCodeList = new ArrayList<>();
-            DevicePdu devicePdu = new DevicePdu();
-            devicePdu.setSiteId(device.getSiteId());
-            devicePdu.setProductName("取件柜");
-            Rest<RespData<List<DevicePdu>>> restd = deviceFeign.list(devicePdu);
-            if (restd.getCode().equals(YesNoEnum.YES.getValue())) {
-                if(restd.getData()!=null && restd.getData().getData().size()>0) {
-                    deviceCodeList.add(restd.getData().getData().get(0).getDeviceCode());
+            if(StringUtils.isNotEmpty(device.getTargetDevice())){
+                deviceCodeList.add(device.getTargetDevice());
+            }else {
+                DevicePdu devicePdu = new DevicePdu();
+                devicePdu.setSiteId(device.getSiteId());
+                devicePdu.setProductName("取件柜");
+                Rest<RespData<List<DevicePdu>>> restd = deviceFeign.list(devicePdu);
+                if (restd.getCode().equals(YesNoEnum.YES.getValue())) {
+                    if (restd.getData() != null && restd.getData().getData().size() > 0) {
+                        deviceCodeList.add(restd.getData().getData().get(0).getDeviceCode());
+                    }
                 }
             }
-//
-//
-//            deviceCodeList.add(device.getTargetDevice());
+
+            if(deviceCodeList.size()==0){
+                throw new AppException("指令发送失败，没有找到适配的取件柜");
+            }
             pdu.setDeviceCodeList(deviceCodeList);
             pdu.setAction("openBox");
             JSONObject jsonObject = new JSONObject();