更改返回

smartcity-common/src/main/java/com/zcxk/common/model/ResultStatus.java

@@ -36,6 +36,7 @@ public enum ResultStatus {
     DEVICE_NO_FORMAT_WRONG(200002,"请输入16位设备编号"),
     UNIT_FORMAT_WRONG(200003,"单元号限输入不超过4个字符"),
     LOCATION_FORMAT_WRONG(200004,"注册地址限输入不超过100个字符"),
+    NETWORK_CONNECTION_FAILED(200005,"网络连接失败或服务器无响应"),
 
 
 

smartcity-device/src/main/java/com/zcxk/device/controller/DeviceAlarmManagementController.java

@@ -118,17 +118,25 @@ public class DeviceAlarmManagementController {
 			@ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
 			@ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
 			){
-		Page<DeviceAlarm> rtnList = deviceAlarmService.queryDeviceAlarmList(
-				handleStatus, productCategoryId, productId,
-				manufacturerId,customerId, projectId,alarmTypeId,
-				alarmTypeName,provinceId,cityId, regionId,
-				communityId,buildingId,deviceId,deviceNo,
-				location,startTime,endTime,
-				handledUserName,handleResultDesc,
-				handledStartTime,handledEndTime,
-				pageNum, pageSize
-		);
-		return new AjaxMessage<Page<DeviceAlarm>>(ResultStatus.OK,rtnList);
+		try {
+			Page<DeviceAlarm> rtnList = deviceAlarmService.queryDeviceAlarmList(
+					handleStatus, productCategoryId, productId,
+					manufacturerId,customerId, projectId,alarmTypeId,
+					alarmTypeName,provinceId,cityId, regionId,
+					communityId,buildingId,deviceId,deviceNo,
+					location,startTime,endTime,
+					handledUserName,handleResultDesc,
+					handledStartTime,handledEndTime,
+					pageNum, pageSize
+			);
+
+			return new AjaxMessage<Page<DeviceAlarm>>(ResultStatus.OK,rtnList);
+		}catch (Exception e){
+
+			e.printStackTrace();
+			return new AjaxMessage<Page<DeviceAlarm>>(ResultStatus.NETWORK_CONNECTION_FAILED);
+		}
+
 	}
 	@PostMapping("/create")
 	@ApiOperation(value = "创建设备告警")