设备列表导出优化

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -165,6 +165,11 @@ public class DeviceApiController {
             deviceService.update(deviceEntity);
             rsp.setData(deviceResp);
             deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ONLINE);
+        } catch (AppException e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
         } catch (Exception e) {
             log.error("接收数据失败", e);
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
@@ -193,6 +198,11 @@ public class DeviceApiController {
                 String token = authTokenService.createToken(userEntity);
                 rsp.setData(token);
             }
+        } catch (AppException e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
         } catch (Exception e) {
             log.error("异常", e);
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
@@ -249,6 +259,11 @@ public class DeviceApiController {
                 deviceInitResp.setSiteList(new ArrayList<>());
             }
             rsp.setData(deviceInitResp);
+        } catch (AppException e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
         } catch (Exception e) {
             log.error("异常", e);
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
@@ -350,6 +365,11 @@ public class DeviceApiController {
             deviceResp.setContent(content);
 
             rsp.setData(deviceResp);
+        } catch (AppException e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
         } catch (Exception e) {
             log.error("接收数据失败", e);
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
@@ -399,6 +419,11 @@ public class DeviceApiController {
         try {
             DownMsgTask downMsgTask = new DownMsgTask(list, platformService, productService, deviceService, deviceLogService);
             sendTaskThreadPool.execute(downMsgTask);
+        } catch (AppException e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
         } catch (Exception e) {
             log.error("接收数据失败", e);
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -79,7 +79,7 @@ POST {{baseUrl}}/api/register
 Content-Type: application/json
 
 {
-  "deviceCode": "c12345678"
+  "deviceCode": "a109"
 }
 
 > {%