导出

microservice-admin/pom.xml

@@ -96,11 +96,6 @@
       <artifactId>amqp-client</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>easyexcel</artifactId>
-      <version>3.0.5</version>
-    </dependency>
   </dependencies>
 
 </project>

microservice-admin/src/main/java/com/devplatform/admin/common/utils/DateUtil.java

@@ -1180,6 +1180,8 @@ public class DateUtil {
       if(daysBetweenDates(time2,time1) > 2){
         type = 2;
       }
+    }else if(StringUtils.isBlank(startTime) || StringUtils.isBlank(endTime)){
+      type = 2;
     }
     return type;
   }

microservice-admin/src/main/java/com/devplatform/admin/common/utils/ExportExcelFx.java

+package com.devplatform.admin.common.utils;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Administrator
+ */
+public class ExportExcelFx {
+  /** 显示的导出表的标题 */
+  private String title;
+  /** 导出表的列名 */
+  private List<String> rowName;
+  private List<Map<String,Object>> varList;
+
+  /** 构造函数，传入要导出的数据 */
+  public ExportExcelFx(Map<String, Object> model) {
+    this.varList = (List<Map<String,Object>>) model.get("list");
+    this.rowName = (List<String>) model.get("titles");
+    this.title = (String) model.get("title");
+  }
+
+  /**
+   * 导出数据
+    * @param out
+   */
+  public void export(OutputStream out) {
+    try {
+      Workbook workbook = new XSSFWorkbook();
+      Sheet sheet = workbook.createSheet(title);
+      // sheet样式定义【】
+      CellStyle columnTopStyle = this.getColumnTopStyle(workbook);
+      CellStyle style = this.getStyle(workbook);
+
+      // 定义所需列数
+      int columnNum = rowName.size();
+      Row rowRowName = sheet.createRow(0);
+      sheet.setDefaultColumnWidth(18);
+
+      // 将列头设置到sheet的单元格中
+      for (int n = 0; n < columnNum; n++) {
+        Cell cellRowName = rowRowName.createCell(n, CellType.STRING);
+        cellRowName.setCellValue(rowName.get(n));
+        cellRowName.setCellStyle(columnTopStyle);
+      }
+
+      if(varList != null && varList.size() > 0) {
+        for (int i = 0; i < varList.size(); i++) {
+          Row rowRowName2 = sheet.createRow(i+1);
+          List<String> strList2 = new ArrayList<>();
+          //序号
+          strList2.add((i+1)+"");
+          strList2.add(varList.get(i).get("electric_energy").toString());
+          strList2.add(DateUtils.format((Date) varList.get(i).get("create_time"),"yyyy-MM-dd HH:mm:ss"));
+          // 将列头设置到sheet的单元格中
+          for (int n = 0; n < columnNum; n++) {
+            Cell cellRowName = rowRowName2.createCell(n, CellType.STRING);
+            cellRowName.setCellValue(strList2.get(n));
+            cellRowName.setCellStyle(columnTopStyle);
+          }
+        }
+      }
+
+      if (workbook != null) {
+        try {
+          workbook.write(out);
+        } catch (Exception e) {
+          e.printStackTrace();
+        } finally {
+          try {
+            out.close();
+          } catch (IOException e) {
+            e.printStackTrace();
+          }
+        }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  /**
+   * 列头单元格样式
+   * @param workbook
+   * @return
+   */
+  public CellStyle getColumnTopStyle(Workbook workbook) {
+    // 设置字体
+    Font font = workbook.createFont();
+
+    // 设置字体大小
+    font.setFontHeightInPoints((short) 12);
+    // 字体加粗
+    font.setBold(false);
+    // 设置字体名字
+    font.setFontName("宋体");
+    // 设置样式
+    CellStyle style = workbook.createCellStyle();
+    // 在样式中应用设置的字体
+    style.setFont(font);
+    // 设置自动换行
+    style.setWrapText(true);
+    // 设置水平对齐的样式为居中对齐；
+    style.setAlignment(HorizontalAlignment.CENTER);
+    style.setVerticalAlignment(VerticalAlignment.CENTER);
+    return style;
+  }
+
+  public CellStyle getStyle(Workbook workbook) {
+    // 设置字体
+    Font font = workbook.createFont();
+    // 设置字体大小
+    font.setFontHeightInPoints((short) 11);
+    // 字体加粗
+    font.setBold(false);
+    // 设置字体名字
+    font.setFontName("宋体");
+    // 设置样式;
+    CellStyle style = workbook.createCellStyle();
+    // 在样式用应用设置的字体;
+    style.setFont(font);
+    // 设置自动换行;
+    style.setWrapText(false);
+    // 设置水平对齐的样式为居中对齐;
+    style.setAlignment(HorizontalAlignment.LEFT);
+    // 设置垂直对齐的样式为居中对齐;
+    style.setVerticalAlignment(VerticalAlignment.CENTER);
+    return style;
+  }
+
+}

microservice-admin/src/main/java/com/devplatform/admin/common/utils/ExportExcel3.java → microservice-admin/src/main/java/com/devplatform/admin/common/utils/ExportSnqxzExcel.java

@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * @author Administrator
  */
-public class ExportExcel3 {
+public class ExportSnqxzExcel {
   /** 显示的导出表的标题 */
   private String title;
   /** 导出表的列名 */
@@ -21,7 +21,7 @@ public class ExportExcel3 {
   private List<SnqxzInfoHour> varList;
 
   /** 构造函数，传入要导出的数据 */
-  public ExportExcel3(Map<String, Object> model) {
+  public ExportSnqxzExcel(Map<String, Object> model) {
     this.varList = (List<SnqxzInfoHour>) model.get("list");
     this.rowName = (List<String>) model.get("titles");
     this.title = (String) model.get("title");

microservice-admin/src/main/java/com/devplatform/admin/common/utils/ExportExcel4.java → microservice-admin/src/main/java/com/devplatform/admin/common/utils/ExportSwqxzExcel.java

@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * @author Administrator
  */
-public class ExportExcel4 {
+public class ExportSwqxzExcel {
   /** 显示的导出表的标题 */
   private String title;
   /** 导出表的列名 */
@@ -21,7 +21,7 @@ public class ExportExcel4 {
   private List<SwqxzInfoHour> varList;
 
   /** 构造函数，传入要导出的数据 */
-  public ExportExcel4(Map<String, Object> model) {
+  public ExportSwqxzExcel(Map<String, Object> model) {
     this.varList = (List<SwqxzInfoHour>) model.get("list");
     this.rowName = (List<String>) model.get("titles");
     this.title = (String) model.get("title");

microservice-admin/src/main/java/com/devplatform/admin/config/ShiroConfig.java

@@ -84,6 +84,7 @@ public class ShiroConfig {
     filterMap.put("/liStation/queryById", "anon");
     filterMap.put("/sysStationTakeover/anyRouter", "anon");
     filterMap.put("/kanban/export/toExcel", "anon");
+    filterMap.put("/analysis/export/toExcelFx", "anon");
     filterMap.put("/**", "oauth2");
     shiroFilter.setFilterChainDefinitionMap(filterMap);
 

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/AnalysisController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -236,6 +237,20 @@ public class AnalysisController extends AbstractController {
 		return R.ok().put("list", list);
 	}
 
+	/**
+	 * 数据分析-能耗数据-导出
+	 * @param response
+	 * @param startTime
+	 * @param endTime
+	 * @param resourceType
+	 */
+	@GetMapping("/export/toExcelFx")
+	public void excel(HttpServletResponse response, String startTime,String endTime, String resourceType){
+		startTime = DateUtil.getStringOfFirstDay(startTime);
+		endTime = DateUtil.getStringOfLastDay(endTime);
+		analysisService.toExcel(response,startTime,endTime,resourceType);
+	}
+
 	/**
 	 * 设备故障分析
 	 * @param params

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/KanBanController.java

@@ -71,6 +71,11 @@ public class KanBanController extends AbstractController {
         return R.ok().put("page",page);
     }
 
+    /**
+     * 数据看板-历史数据-导出
+     * @param response
+     * @param params
+     */
     @GetMapping("/export/toExcel")
     public void excel(HttpServletResponse response,@RequestParam Map<String, Object> params){
         params.put("startTime", DateUtil.getStringOfFirstDay((String) params.get("startTime")));

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/AnalysisService.java

 package com.devplatform.admin.modules.eq.service;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -14,4 +15,6 @@ public interface AnalysisService {
     List<List<String>> getEnergyListTb(String resourceId, String startTime,String endTime, String resourceType);
 
     List<List<String>> getEnergyListFx(String startTime,String endTime, String resourceType);
+
+    void toExcel(HttpServletResponse response, String startTime, String endTime, String resourceType);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/AnalysisServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.devplatform.admin.common.utils.Constants;
 import com.devplatform.admin.common.utils.DateUtil;
 import com.devplatform.admin.common.utils.DateUtils;
+import com.devplatform.admin.common.utils.ExportExcelFx;
 import com.devplatform.admin.modules.eq.service.*;
 import com.devplatform.admin.modules.liresource.bean.LiResource;
 import com.devplatform.admin.modules.liresource.service.LiResourceService;
@@ -14,6 +15,8 @@ import com.devplatform.admin.modules.sys.service.SysSystemParamsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -270,4 +273,61 @@ public class AnalysisServiceImpl implements AnalysisService {
         }
         return listTj;
     }
+
+    @Override
+    public void toExcel(HttpServletResponse response, String startTime, String endTime, String resourceType) {
+        OutputStream out = null;
+        try {
+            List<Map<String,Object>> list = new ArrayList<>();
+            String title = "";
+            if(Constants.STRING_1.equals(resourceType)){
+                title = "全部";
+                int type = DateUtil.checkTimeToType(startTime,endTime);
+                if(type == Constants.INT_1){
+                    list = totalHourService.queryList(startTime,endTime);
+                }else if(type == Constants.INT_2 || type == Constants.INT_3){
+                    list = totalDayService.queryList(startTime,endTime);
+                }else if(type == Constants.INT_4){
+                    list = totalMonthService.queryList(startTime,endTime);
+                }
+            }else if(Constants.ID_PFJ.equals(resourceType)){
+                title = "排风机";
+                list = pfjInfoService.queryListByParam(startTime,endTime);
+            }else if(Constants.ID_JFKTP.equals(resourceType)){
+                title = "空调";
+                list = jfktpInfoService.queryListByParam(startTime,endTime);
+            }else if(Constants.ID_SB.equals(resourceType)){
+                title = "水泵";
+                list = sbInfoService.queryListByParam(startTime,endTime);
+            }else if(Constants.ID_FLRBJZ.equals(resourceType)){
+                title = "风冷热泵机组";
+                list = flrbInfoService.queryListByParam(startTime,endTime);
+            }else if(Constants.ID_SLSWJ.equals(resourceType)){
+                title = "多联新风室外机";
+                list = dlswjInfoService.queryListByParam(startTime,endTime);
+            }
+
+            String fileName = "energy.xlsx";
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/x-download");
+            response.addHeader("Content-Disposition", "attachment;filename=" + fileName);
+            out = response.getOutputStream();
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("title", title);
+            List<String> strList = new ArrayList<>();
+            strList.add("序号");
+            strList.add("用电量");
+            strList.add("时间");
+            map.put("titles", strList);
+
+            map.put("list", list);
+            ExportExcelFx ee = new ExportExcelFx(map);
+            ee.export(out);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+
+    }
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/PfjInfoServiceImpl.java

 package com.devplatform.admin.modules.eq.service.impl;
 
-import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.devplatform.admin.common.utils.Constants;
 import com.devplatform.admin.common.utils.DateUtil;
@@ -84,7 +83,6 @@ public class PfjInfoServiceImpl extends MyBaseServiceImpl<PfjInfoDao, PfjInfo> i
     @Override
     public void toExcel(HttpServletResponse response, Map<String, Object> params) {
         OutputStream out = null;
-        ExcelWriter writer = null;
         try {
             String startTime = (String) params.get("startTime");
             String endTime = (String) params.get("endTime");
@@ -97,8 +95,6 @@ public class PfjInfoServiceImpl extends MyBaseServiceImpl<PfjInfoDao, PfjInfo> i
             }else if(type == Constants.INT_4){
                 list = pfjInfoMonthService.queryList(params);
             }
-
-//            String fileName = new String("排风机历史数据".getBytes("utf-8"),"iso-8859-1") + ".xlsx";
             String fileName = "pfj.xlsx";
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/x-download");
@@ -118,23 +114,6 @@ public class PfjInfoServiceImpl extends MyBaseServiceImpl<PfjInfoDao, PfjInfo> i
             map.put("list", list);
             ExportExcel2 ee = new ExportExcel2(map);
             ee.export(out);
-
-
-
-
-
-
-
-//            writer = EasyExcel.write(fileName, ExcelInfo.class).file(out).build();
-
-//            List<List<ExcelInfo>> lists = Lists.partition(list,50000);
-//            for (int i = 0; i < lists.size(); i++) {
-//                WriteSheet writeSheet = EasyExcel.writerSheet(0, "sheet" ).build();
-//                WriteSheet writeSheet = EasyExcel.writerSheet(i, "sheet" + (i + 1)).build();
-                // 分页去数据库查询数据 这里可以去数据库查询每一页的数据
-//                writer.write(lists.get(i), writeSheet);
-//                writer.write(list, writeSheet);
-//            }
         }catch (Exception e){
             e.printStackTrace();
         }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SnqxzInfoHourServiceImpl.java

 package com.devplatform.admin.modules.eq.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.devplatform.admin.common.utils.ExportExcel3;
+import com.devplatform.admin.common.utils.ExportSnqxzExcel;
 import com.devplatform.admin.modules.eq.bean.SnqxzInfoHour;
 import com.devplatform.admin.modules.eq.dao.SnqxzInfoHourDao;
 import com.devplatform.admin.modules.eq.model.SnqxzInfoHourModel;
@@ -76,7 +76,7 @@ public class SnqxzInfoHourServiceImpl extends MyBaseServiceImpl<SnqxzInfoHourDao
             map.put("titles", strList);
 
             map.put("list", list);
-            ExportExcel3 ee = new ExportExcel3(map);
+            ExportSnqxzExcel ee = new ExportSnqxzExcel(map);
             ee.export(out);
         }catch (Exception e){
             e.printStackTrace();

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SwqxzInfoHourServiceImpl.java

 package com.devplatform.admin.modules.eq.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.devplatform.admin.common.utils.ExportExcel4;
+import com.devplatform.admin.common.utils.ExportSwqxzExcel;
 import com.devplatform.admin.modules.eq.bean.SwqxzInfoHour;
 import com.devplatform.admin.modules.eq.dao.SwqxzInfoHourDao;
 import com.devplatform.admin.modules.eq.model.SwqxzInfoHourModel;
@@ -71,7 +71,7 @@ public class SwqxzInfoHourServiceImpl extends MyBaseServiceImpl<SwqxzInfoHourDao
             map.put("titles", strList);
 
             map.put("list", list);
-            ExportExcel4 ee = new ExportExcel4(map);
+            ExportSwqxzExcel ee = new ExportSwqxzExcel(map);
             ee.export(out);
         }catch (Exception e){
             e.printStackTrace();

microservice-admin/src/main/resources/mapper/eq/DlswjInfoDayMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from dlswj_info_day t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from dlswj_info_day t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/DlswjInfoHourMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from dlswj_info_hour t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from dlswj_info_hour t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 

microservice-admin/src/main/resources/mapper/eq/DlswjInfoMonthMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from dlswj_info_month t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from dlswj_info_month t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/FlrbInfoDayMapper.xml

@@ -44,7 +44,7 @@
 	</select>
 
 	<select id="queryPageListByParam" resultType="java.util.Map">
-		select t.* from flrb_info_day t
+		select t.create_time,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electric_energy from flrb_info_day t
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
 			and t.resource_id = #{params.resourceId}
@@ -58,6 +58,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		<if test="params.sort != null and params.sort != '' and params.order != null and params.order != ''">
 			ORDER BY ${params.sort} ${params.order}
 		</if>
@@ -67,7 +68,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
+		select create_time,cast(sum(cast(electric_energy as decimal(10, 2))) as decimal(10, 2)) as electric_energy
 		from flrb_info_day
 		where 1=1
 		<if test="(startTime == null or startTime == '') and (endTime == null or endTime == '')">
@@ -83,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from flrb_info_day t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from flrb_info_day t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -98,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/FlrbInfoHourMapper.xml

@@ -44,7 +44,7 @@
 	</select>
 
 	<select id="queryPageListByParam" resultType="java.util.Map">
-		select t.* from flrb_info_hour t
+		select t.create_time,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electric_energy from flrb_info_hour t
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
 			and t.resource_id = #{params.resourceId}
@@ -58,6 +58,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		<if test="params.sort != null and params.sort != '' and params.order != null and params.order != ''">
 			ORDER BY ${params.sort} ${params.order}
 		</if>
@@ -67,7 +68,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
+		select create_time,cast(sum(cast(electric_energy as decimal(10, 2))) as decimal(10, 2)) as electric_energy
 		from flrb_info_hour
 		where 1=1
 		<if test="(startTime == null or startTime == '') and (endTime == null or endTime == '')">
@@ -83,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from flrb_info_hour t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from flrb_info_hour t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -98,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/FlrbInfoMonthMapper.xml

@@ -44,7 +44,7 @@
 	</select>
 
 	<select id="queryPageListByParam" resultType="java.util.Map">
-		select t.* from flrb_info_month t
+		select t.create_time,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electric_energy from flrb_info_month t
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
 			and t.resource_id = #{params.resourceId}
@@ -58,6 +58,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		<if test="params.sort != null and params.sort != '' and params.order != null and params.order != ''">
 			ORDER BY ${params.sort} ${params.order}
 		</if>
@@ -67,7 +68,7 @@
 	</select>
 
 	<select id="queryListByParam" resultType="java.util.Map">
-		select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
+		select create_time,cast(sum(cast(electric_energy as decimal(10, 2))) as decimal(10, 2)) as electric_energy
 		from flrb_info_month
 		where 1=1
 		<if test="(startTime == null or startTime == '') and (endTime == null or endTime == '')">
@@ -83,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from flrb_info_month t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from flrb_info_month t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -98,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/JfktpInfoDayMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from jfktp_info_day t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from jfktp_info_day t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/JfktpInfoHourMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from jfktp_info_hour t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from jfktp_info_hour t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,8 +99,8 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
-
 	</select>
 </mapper>
 

microservice-admin/src/main/resources/mapper/eq/JfktpInfoMonthMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from jfktp_info_month t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from jfktp_info_month t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/PfjInfoDayMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from pfj_info_day t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from pfj_info_day t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 

microservice-admin/src/main/resources/mapper/eq/PfjInfoHourMapper.xml

@@ -83,7 +83,7 @@
 		order by create_time
 	</select>
 	<select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from pfj_info_hour t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from pfj_info_hour t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -98,6 +98,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by create_time
 		ORDER BY t.create_time
 	</select>
 

microservice-admin/src/main/resources/mapper/eq/PfjInfoMonthMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from pfj_info_month t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from pfj_info_month t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SbInfoDayMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from sb_info_day t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from sb_info_day t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 

microservice-admin/src/main/resources/mapper/eq/SbInfoHourMapper.xml

@@ -83,7 +83,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from sb_info_hour t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from sb_info_hour t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -98,6 +98,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 

microservice-admin/src/main/resources/mapper/eq/SbInfoMonthMapper.xml

@@ -84,7 +84,7 @@
 		order by create_time
 	</select>
     <select id="queryList" resultType="com.devplatform.admin.modules.eq.bean.ExcelInfo">
-		select lr.name as name,lr.code as code ,t.create_time as createTime,t.electric_energy as electricEnergy from sb_info_month t
+		select lr.name as name,lr.code as code ,t.create_time as createTime,cast(sum(cast(t.electric_energy as decimal(10, 2))) as decimal(10, 2)) as electricEnergy from sb_info_month t
 		left join li_resource lr on lr.id = t.resource_id
 		where 1=1
 		<if test="params.resourceId!=null and params.resourceId!=''">
@@ -99,6 +99,7 @@
 		<if test="params.endTime != null and params.endTime != ''">
 			and t.create_time &lt;= #{params.endTime}
 		</if>
+		group by t.create_time
 		ORDER BY t.create_time
 	</select>
 </mapper>