首页——今日用电量

module_ems/src/main/java/org/jeecg/modules/dataElectricity/controller/DataElectricityController.java

@@ -1,44 +1,31 @@
 package org.jeecg.modules.dataElectricity.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.dataElectricity.entity.DataElectricity;
-import org.jeecg.modules.dataElectricity.entity.DataElectricitySta;
-import org.jeecg.modules.dataElectricity.service.IDataElectricityService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecgframework.poi.util.ExcelUtil;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.dataElectricity.entity.DataElectricity;
+import org.jeecg.modules.dataElectricity.entity.DataElectricitySta;
+import org.jeecg.modules.dataElectricity.service.IDataElectricityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
  * @Description: 分时电量
  * @Author: jeecg-boot
  * @Date:   2024-01-19
@@ -52,6 +39,20 @@ public class DataElectricityController extends JeecgController<DataElectricity,
 	@Autowired
 	private IDataElectricityService dataElectricityService;
 
+	 /**
+	  * 今日用电量
+	  */
+	 @ApiOperation("今日用电量")
+	 @GetMapping("/todayelectricity")
+	 public Result<HashMap> todayelectricity()
+	 {
+		 String dateTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		 // 今日用电量
+		 HashMap hashMap = dataElectricityService.getHourElectricityByDay(dateTime);
+		 return Result.OK(hashMap);
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *

module_ems/src/main/java/org/jeecg/modules/dataElectricity/mapper/DataElectricityMapper.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.dataElectricity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.dataElectricity.entity.DataElectricity;
 import org.jeecg.modules.dataElectricity.vo.DataElectricityVO;
 import org.jeecg.modules.paramquery.dto.ParamQueryDataDTO;
@@ -18,6 +19,16 @@ import java.util.List;
 public interface DataElectricityMapper extends BaseMapper<DataElectricity> {
 
     /**
+     * 获取某天的分时段能源信息
+     * @param day 某天
+     * @return
+     */
+    public Float selectHourElectricityByDay(@Param("day") String day,
+                                            @Param("equipmentcode") String equipmentcode,
+                                            @Param("beginTime") String beginTime,
+                                            @Param("endTime") String endTime);
+
+    /**
      * 监测参数查询——分时电量（有功总电能）
      */
     List<DataElectricityVO> dataList(ParamQueryDataDTO dto);

module_ems/src/main/java/org/jeecg/modules/dataElectricity/service/IDataElectricityService.java

@@ -8,6 +8,7 @@ import org.jeecg.modules.paramquery.dto.ParamQueryDataDTO;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -19,6 +20,13 @@ import java.util.List;
 public interface IDataElectricityService extends IService<DataElectricity> {
 
     /**
+     * 获取某天的分时段能源信息
+     * @param day 某天
+     * @return
+     */
+    public HashMap getHourElectricityByDay(String day);
+
+    /**
      * 监测参数查询——分时电量（有功总电能）
      */
     public List<DataElectricityVO> dataList(ParamQueryDataDTO dto);

module_ems/src/main/java/org/jeecg/modules/dataElectricity/service/impl/DataElectricityServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.dataElectricity.service.impl;
 
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.dataElectricity.entity.DataElectricity;
 import org.jeecg.modules.dataElectricity.entity.DataElectricitySta;
 import org.jeecg.modules.dataElectricity.mapper.DataElectricityMapper;
@@ -36,6 +37,33 @@ public class DataElectricityServiceImpl extends ServiceImpl<DataElectricityMappe
     private DataElectricityMapper dataElectricityMapper;
 
     /**
+     * 获取某天的分时段能源信息
+     * @param day 某天
+     * @return
+     */
+    @Override
+    public HashMap getHourElectricityByDay(String day) {
+        HashMap hashMap = new HashMap();
+        String equipmentcode = "M20230061";
+
+        // 用能趋势
+        List<String> hours = DateUtils.getDaySplitHour();
+        hashMap.put("hours", hours);
+
+        List<Float> elec = new ArrayList<>();
+
+
+        for(int i = 0; i < hours.size(); i++) {
+            elec.add(0f);
+            Float hourSum = dataElectricityMapper.selectHourElectricityByDay(day, equipmentcode, hours.get(i) + ":00", hours.get(i).substring(0,2) + ":59:59");
+            elec.set(i, hourSum);
+        }
+        hashMap.put("elec", elec);
+
+        return hashMap;
+    }
+
+    /**
      * 监测参数查询——分时电量（有功总电能）
      */
     public List<DataElectricityVO> dataList(ParamQueryDataDTO dto){