diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java index 3980cdc..147524d 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java @@ -26,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -47,7 +46,7 @@ private DeviceDataListService deviceDataListService; @GetMapping(value = "/data/deviceExport") - public void simExport(Integer deviceType) throws IOException { + public void simExport(Integer deviceType) { DeviceDataExportEnum exportEnum = DeviceDataExportEnum.typeOf(deviceType); if (exportEnum == null) { @@ -85,7 +84,7 @@ private void wrapDeviceType(Map typeMap, List> maps) { if (CollectionUtil.isNotEmpty(maps)) { maps.stream().forEach(map -> { - if (map.containsKey("device_type")&&map.get("device_type")!=null) { + if (map.containsKey("device_type") && map.get("device_type") != null) { map.put("device_type", typeMap.get(Convert.toStr(map.get("device_type"))).getTypeName()); } }); @@ -109,7 +108,7 @@ //告警统计查询 Map typeMap = getDeviceTypes(); List> alarms = deviceDataListService.selectAlarmRecords(deviceType, startTime, endTime); - wrapDeviceType(typeMap,alarms); + wrapDeviceType(typeMap, alarms); export(AlarmDataExportEnum.DATA_ALARM.getDefines(), alarms, AlarmDataExportEnum.DATA_ALARM.name()); } @@ -121,7 +120,7 @@ } Map typeMap = getDeviceTypes(); List> reportDataNums = deviceDataListService.selectReportDataNum(exportEnum, startTime, endTime); - wrapDeviceType(typeMap,reportDataNums); + wrapDeviceType(typeMap, reportDataNums); export(exportEnum.getDefines(), reportDataNums, exportEnum.name()); }