导出查询结果

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

@@ -1,7 +1,9 @@
 package com.ruoyi.monitoring.controller;
 
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.ruoyi.common.utils.ExcelUtil;
 import com.ruoyi.common.web.domain.PageData;
 import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
@@ -10,9 +12,8 @@ import com.ruoyi.monitoring.service.ICmcTemperatureService;
 import com.ruoyi.common.web.controller.BaseController;
 import org.noear.solon.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 水温监测
@@ -38,31 +39,15 @@ public class CmcTemperatureController extends BaseController {
         return cmcTemperatureService.list(qw);
     }
 
-    private QueryWrapper getQW(CmcTemperature cmcTemperature) {
-        QueryWrapper qw = QueryWrapper.create();
-        qw.and(CmcTemperature::getId).eq(cmcTemperature.getId());
-        qw.and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo());
-        qw.and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo());
-        qw.and(CmcTemperature::getData).eq(cmcTemperature.getData());
-        qw.and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt());
-        qw.and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ());
-        qw.and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime());
-        qw.and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime());
-        qw.orderBy(CmcTemperature::getDatetime).desc();
-        return qw;
-    }
-
     /**
      * 根据点位查询水温监测列表
      */
     @Get
     @Mapping("listByInfo")
-    public PageData<CmcTemperature> listByInfo(Page<CmcTemperature> page, CmcTemperature cmcTemperature, String Info) {
-        CmcChannel channel = new CmcChannel();
-        channel.setInfo(Info);
-        int channelSize = cmcChannelService.listChannel(channel).size();
+    public PageData<CmcTemperature> listByInfo(Page<CmcTemperature> page, CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
+        int channelSize = cmcChannelService.listChannel(cmcChannel).size();
         page.setPageSize(page.getPageSize() * channelSize);
-        QueryWrapper qw = getQW(cmcTemperature, Info);
+        QueryWrapper qw = getQW(cmcTemperature, cmcChannel);
         List<CmcTemperature> records = cmcTemperatureService.list(qw);
         List<CmcTemperature> temperatureList = new ArrayList<>();
         int total = 0;
@@ -84,7 +69,7 @@ public class CmcTemperatureController extends BaseController {
             Date fifteenMinutesAgo = new Date(fifteenMinutesAgoMillis);
             temperature.setStartTime(fifteenMinutesAgo);
             temperature.setEndTime(cmcTemperature.getStartTime());
-            QueryWrapper qw1 = getQW(temperature, Info);
+            QueryWrapper qw1 = getQW(temperature, cmcChannel);
             temperatureList = cmcTemperatureService.list(qw1);
             temperatureList.addAll(records);
             if (channelSize > 30) {
@@ -121,72 +106,98 @@ public class CmcTemperatureController extends BaseController {
      */
     @Get
     @Mapping("listAllByInfo")
-    public PageData<CmcTemperature> listAllByInfo(CmcTemperature cmcTemperature, String Info) {
-        CmcChannel channel = new CmcChannel();
-        channel.setInfo(Info);
-        int channelSize = cmcChannelService.listChannel(channel).size();
-        QueryWrapper qw = getQW(cmcTemperature, Info);
-        List<CmcTemperature> records = cmcTemperatureService.list(qw);
-        List<CmcTemperature> temperatureList = new ArrayList<>();
-        if (records.size() > 2) {
-            long diffInMillis;
-            // 第30条与第31条数据时间差 毫秒
-            if (channelSize > 30) {
-                diffInMillis = records.get(30).getDatetime().getTime() - records.get(29).getDatetime().getTime();
-                // 时间差超过15分钟，删最后10条数据
-                if (diffInMillis / 1000 / 60 > 15)
-                    records.subList(records.size() - channelSize + 30, records.size()).clear();
+    public PageData<CmcTemperature> listAllByInfo(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
+        int channelSize = cmcChannelService.listChannel(cmcChannel).size();
+        List<CmcTemperature> temperatureList = cmcTemperatureService.listTemperature(cmcTemperature, cmcChannel);
+        return getPageData(temperatureList).total(temperatureList.size() / channelSize);
+    }
+
+    /**
+     * 导出用户列表
+     */
+    @Post
+    @Mapping("export")
+    public void export(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
+        List<CmcTemperature> temperatureList = cmcTemperatureService.listTemperature(cmcTemperature, cmcChannel);
+        List<ExcelExportEntity> entityList = new ArrayList<>();
+        ExcelExportEntity timeColumn = new ExcelExportEntity("时间", "Datetime");
+        timeColumn.setNeedMerge(true);
+        timeColumn.setWidth(20);
+        entityList.add(timeColumn);
+        cmcChannelService.listChannel(cmcChannel).forEach(channel -> {
+            ExcelExportEntity entity = new ExcelExportEntity(channel.getInfo(), channel.getSensorNo().toString());
+            entityList.add(entity);
+        });
+        List<Map<String, Object>> dataList = prepareData(temperatureList);
+        ExcelUtil.customExport(entityList, dataList);
+    }
+
+    private static List<Map<String, Object>> prepareData(List<CmcTemperature> temperatureList) {
+        Map<String, Map<Long, Float>> timeDataMap = new LinkedHashMap<>();
+        Set<Long> locations = new TreeSet<>();
+
+        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<>());
             }
-            // 第1条数据与0时时间差 毫秒
-            diffInMillis = records.get(0).getDatetime().getTime() - cmcTemperature.getStartTime().getTime();
-            if (diffInMillis / 1000 / 60 > 15)
-                records.subList(records.size() - channelSize, records.size()).clear();
-            CmcTemperature temperature = new CmcTemperature();
-            long fifteenMinutesAgoMillis = cmcTemperature.getStartTime().getTime() - (15 * 60 * 1000);
-            Date fifteenMinutesAgo = new Date(fifteenMinutesAgoMillis);
-            temperature.setStartTime(fifteenMinutesAgo);
-            temperature.setEndTime(cmcTemperature.getStartTime());
-            QueryWrapper qw1 = getQW(temperature, Info);
-            temperatureList = cmcTemperatureService.list(qw1);
-            temperatureList.addAll(records);
-            if (channelSize > 30) {
-                for (int i = 0; i < temperatureList.size() - channelSize + 1; i = i + channelSize) {
-                    Date minTime = temperatureList.get(i).getDatetime();
-                    if (temperatureList.get(i + 10).getDatetime().getTime() > minTime.getTime()) {
-                        for (int j = i + 10; j < i + channelSize; j++) {
-                            temperatureList.get(j).setDatetime(minTime);
-                        }
-                    } else {
-                        if (temperatureList.get(i + 30).getDatetime().getTime() > minTime.getTime()) {
-                            for (int j = i + 30; j < i + channelSize; j++) {
-                                temperatureList.get(j).setDatetime(minTime);
-                            }
-                        }
-                    }
-                }
+
+            timeDataMap.get(dateTme).put(sensorNo, cmcTemperature.getData());
+        }
+
+        // 转换为导出格式
+        List<Map<String, Object>> exportData = new ArrayList<>();
+
+        for (Map.Entry<String, Map<Long, Float>> entry : timeDataMap.entrySet()) {
+            Map<String, Object> rowData = new HashMap<>();
+            rowData.put("Datetime", entry.getKey());
+
+            Map<Long, Float> locationData = entry.getValue();
+            for (Long location : locations) {
+                rowData.put(String.valueOf(location), locationData.get(location));
             }
+
+            exportData.add(rowData);
         }
-        return getPageData(temperatureList).total(temperatureList.size() / channelSize);
+        return exportData;
+    }
+
+    private QueryWrapper getQW(CmcTemperature cmcTemperature) {
+        QueryWrapper qw = QueryWrapper.create();
+        qw.and(CmcTemperature::getId).eq(cmcTemperature.getId());
+        qw.and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo());
+        qw.and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo());
+        qw.and(CmcTemperature::getData).eq(cmcTemperature.getData());
+        qw.and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt());
+        qw.and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ());
+        qw.and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime());
+        qw.and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime());
+        qw.orderBy(CmcTemperature::getDatetime).desc();
+        return qw;
     }
 
-    private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
+    private QueryWrapper getQW(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
         QueryWrapper qw = QueryWrapper.create();
         qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
-            .select(CmcChannel::getInfo)
-            .from(CmcTemperature.class)
-            .leftJoin(CmcChannel.class)
-            .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
-            .where(CmcChannel::getInfo).like(Info)
-            .and(CmcTemperature::getId).eq(cmcTemperature.getId())
-            .and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo())
-            .and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo())
-            .and(CmcTemperature::getData).eq(cmcTemperature.getData())
-            .and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt())
-            .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
-            .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
-            .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
-            .orderBy(CmcTemperature::getDatetime).asc()
-            .orderBy(CmcTemperature::getSensorNo).asc();
+                .select(CmcChannel::getInfo)
+                .from(CmcTemperature.class)
+                .leftJoin(CmcChannel.class)
+                .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
+                .where(CmcChannel::getInfo).like(cmcChannel.getInfo())
+                .and(CmcTemperature::getId).eq(cmcTemperature.getId())
+                .and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo())
+                .and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo())
+                .and(CmcTemperature::getData).eq(cmcTemperature.getData())
+                .and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt())
+                .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
+                .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
+                .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
+                .orderBy(CmcTemperature::getDatetime).asc()
+                .orderBy(CmcTemperature::getSensorNo).asc();
         return qw;
     }
 

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/mapper/CmcTemperatureMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.monitoring.mapper;
 
+import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
 import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.BaseMapper;
@@ -16,7 +17,8 @@ public interface CmcTemperatureMapper extends BaseMapper<CmcTemperature> {
     /**
      * 查询水温监测列表信息
      * @param cmcTemperature 水温监测信息
+     * @param cmcChannel 监测点位信息
      */
-    List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature);
+    List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature, CmcChannel cmcChannel);
 
 }

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/service/ICmcTemperatureService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.monitoring.service;
 
 import com.mybatisflex.core.service.IService;
+import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
 
 import java.util.List;
@@ -14,7 +15,8 @@ public interface ICmcTemperatureService extends IService<CmcTemperature> {
     /**
      * 查询水温监测列表信息
      * @param cmcTemperature 水温监测信息
+     * @param cmcChannel 监测点位信息
      */
-    List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature);
+    List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature, CmcChannel cmcChannel);
 
 }

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/service/impl/CmcChannelServiceImpl.java

@@ -2,9 +2,7 @@ package com.ruoyi.monitoring.service.impl;
 
 import com.mybatisflex.solon.service.impl.ServiceImpl;
 import com.ruoyi.monitoring.domain.CmcChannel;
-import com.ruoyi.monitoring.domain.CmcTemperature;
 import com.ruoyi.monitoring.mapper.CmcChannelMapper;
-import com.ruoyi.monitoring.mapper.CmcTemperatureMapper;
 import com.ruoyi.monitoring.service.ICmcChannelService;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/service/impl/CmcTemperatureServiceImpl.java

@@ -1,12 +1,18 @@
 package com.ruoyi.monitoring.service.impl;
 
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.solon.service.impl.ServiceImpl;
+import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
+import com.ruoyi.monitoring.mapper.CmcChannelMapper;
 import com.ruoyi.monitoring.mapper.CmcTemperatureMapper;
+import com.ruoyi.monitoring.service.ICmcChannelService;
 import com.ruoyi.monitoring.service.ICmcTemperatureService;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,14 +25,87 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
     @Inject
     CmcTemperatureMapper cmcTemperatureMapper;
 
+    @Inject
+    CmcChannelMapper cmcChannelMapper;
+
+    @Inject
+    ICmcTemperatureService cmcTemperatureService;
+
+    @Inject
+    ICmcChannelService cmcChannelService;
+
     /**
      * 查询水温监测列表信息
      * @param cmcTemperature 水温监测信息
+     * @param cmcChannel 监测点位信息
      * @return 水温监测列表
      */
     @Override
-    public List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature) {
-        return  cmcTemperatureMapper.listTemperature(cmcTemperature);
+    public List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
+        int channelSize = cmcChannelMapper.listChannel(cmcChannel).size();
+        QueryWrapper qw = getQW(cmcTemperature, cmcChannel);
+        List<CmcTemperature> records = cmcTemperatureService.list(qw);
+        List<CmcTemperature> temperatureList = new ArrayList<>();
+        if (records.size() > 2) {
+            long diffInMillis;
+            // 第30条与第31条数据时间差 毫秒
+            if (channelSize > 30) {
+                diffInMillis = records.get(30).getDatetime().getTime() - records.get(29).getDatetime().getTime();
+                // 时间差超过15分钟，删最后10条数据
+                if (diffInMillis / 1000 / 60 > 15)
+                    records.subList(records.size() - channelSize + 30, records.size()).clear();
+            }
+            // 第1条数据与0时时间差 毫秒
+            diffInMillis = records.get(0).getDatetime().getTime() - cmcTemperature.getStartTime().getTime();
+            if (diffInMillis / 1000 / 60 > 15)
+                records.subList(records.size() - channelSize, records.size()).clear();
+            CmcTemperature temperature = new CmcTemperature();
+            long fifteenMinutesAgoMillis = cmcTemperature.getStartTime().getTime() - (15 * 60 * 1000);
+            Date fifteenMinutesAgo = new Date(fifteenMinutesAgoMillis);
+            temperature.setStartTime(fifteenMinutesAgo);
+            temperature.setEndTime(cmcTemperature.getStartTime());
+            QueryWrapper qw1 = getQW(temperature, cmcChannel);
+            temperatureList = cmcTemperatureService.list(qw1);
+            temperatureList.addAll(records);
+            if (channelSize > 30) {
+                for (int i = 0; i < temperatureList.size() - channelSize + 1; i = i + channelSize) {
+                    Date minTime = temperatureList.get(i).getDatetime();
+                    if (temperatureList.get(i + 10).getDatetime().getTime() > minTime.getTime()) {
+                        for (int j = i + 10; j < i + channelSize; j++) {
+                            temperatureList.get(j).setDatetime(minTime);
+                        }
+                    } else {
+                        if (temperatureList.get(i + 30).getDatetime().getTime() > minTime.getTime()) {
+                            for (int j = i + 30; j < i + channelSize; j++) {
+                                temperatureList.get(j).setDatetime(minTime);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return temperatureList;
+    }
+
+    private QueryWrapper getQW(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
+        QueryWrapper qw = QueryWrapper.create();
+        qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
+                .select(CmcChannel::getInfo)
+                .from(CmcTemperature.class)
+                .leftJoin(CmcChannel.class)
+                .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
+                .where(CmcChannel::getInfo).like(cmcChannel.getInfo())
+                .and(CmcTemperature::getId).eq(cmcTemperature.getId())
+                .and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo())
+                .and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo())
+                .and(CmcTemperature::getData).eq(cmcTemperature.getData())
+                .and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt())
+                .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
+                .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
+                .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
+                .orderBy(CmcTemperature::getDatetime).asc()
+                .orderBy(CmcTemperature::getSensorNo).asc();
+        return qw;
     }
 
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.common.utils;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.ruoyi.common.constants.HttpConstant;
 import com.ruoyi.common.web.exception.ServiceException;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -10,6 +11,7 @@ import org.noear.solon.core.handle.Context;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Excel相关处理
@@ -44,4 +46,32 @@ public class ExcelUtil {
         }
     }
 
+    /**
+     * 导出 Excel
+     * @param entityList 字段
+     * @param list 数据
+     * @return
+     */
+    public static <T> void customExport(List<ExcelExportEntity> entityList, List<T> list) {
+        if(list.isEmpty()) {
+            throw new ServiceException("导出数据为空");
+        }
+        Context ctx = ContextUtil.getContext();
+        ctx.contentType(HttpConstant.CONTENT_TYPE_FORM);
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.HSSF);
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams,entityList, list);
+        try {
+            workbook.write(ctx.outputStream());
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                workbook.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
 }

cmc-temperature-ui/src/views/temperature/temMonitor.vue

@@ -119,6 +119,7 @@ const loading = ref(false)
 const totalCount = ref(0)
 const activeTab = ref('table')
 const chartRef = ref(null)
+const { proxy } = getCurrentInstance()
 
 // 搜索表单数据
 const searchForm = reactive({
@@ -348,8 +349,13 @@ const handleExport = () => {
     return
   }
 
-  ElMessage.success('导出功能开发中...')
+  // ElMessage.success('导出功能开发中...')
   // 这里可以添加导出逻辑
+  proxy.$download('monitoring/temperature/export', {    
+    startTime: searchForm.timeRange[0] + ' 00:00:00',
+    endTime: searchForm.timeRange[1] + ' 23:59:59',
+    Info: searchForm.Info
+  }, `水温监测_${searchForm.timeRange[0] + "-" + searchForm.timeRange[1]}.xls`)
 }