优化导出

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java

@@ -124,23 +124,25 @@ public class CmcTemperatureController extends BaseController {
         timeColumn.setNeedMerge(true);
         timeColumn.setWidth(20);
         entityList.add(timeColumn);
-        cmcChannelService.listChannel(cmcChannel).forEach(channel -> {
+        List<CmcChannel> channelList = cmcChannelService.listChannel(cmcChannel);
+        channelList.forEach(channel -> {
             ExcelExportEntity entity = new ExcelExportEntity(channel.getInfo(), channel.getSensorNo().toString());
             entityList.add(entity);
         });
-        List<Map<String, Object>> dataList = prepareData(temperatureList);
+        List<Map<String, Object>> dataList = prepareData(channelList, temperatureList);
         ExcelUtil.customExport(entityList, dataList);
     }
 
-    private static List<Map<String, Object>> prepareData(List<CmcTemperature> temperatureList) {
+    private static List<Map<String, Object>> prepareData(List<CmcChannel> channelList, List<CmcTemperature> temperatureList) {
         Map<String, Map<Long, Float>> timeDataMap = new LinkedHashMap<>();
-        Set<Long> locations = new TreeSet<>();
-
+        List<Long> sensors = new ArrayList<>();
+        channelList.forEach(channel ->  {
+            sensors.add(channel.getSensorNo());
+        });
         for (CmcTemperature cmcTemperature : temperatureList) {
             Date datetime = cmcTemperature.getDatetime();
             Long sensorNo = cmcTemperature.getSensorNo();
 
-            locations.add(sensorNo);
             String dateTme = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(datetime);
             if (!timeDataMap.containsKey(dateTme)) {
                 timeDataMap.put(dateTme, new HashMap<>());
@@ -157,8 +159,8 @@ public class CmcTemperatureController extends BaseController {
             rowData.put("Datetime", entry.getKey());
 
             Map<Long, Float> locationData = entry.getValue();
-            for (Long location : locations) {
-                rowData.put(String.valueOf(location), locationData.get(location));
+            for (Long sensor : sensors) {
+                rowData.put(String.valueOf(sensor), locationData.get(sensor));
             }
 
             exportData.add(rowData);

cmc-temperature-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExcelUtil.java

@@ -11,7 +11,6 @@ import org.noear.solon.core.handle.Context;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Excel相关处理