'照明系统单个设备状态为开的时长（分钟）汇总和照明系统所有设备状态为开的时长（分钟）汇总接口'

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/DataLgHistoryController.java

@@ -25,7 +25,7 @@ public class DataLgHistoryController {
     @Autowired
     private DataLgHistoryService dataLgHistoryService;
     /**
-     * 数据中心-照明系统能耗统计
+     * 数据中心-照明系统单个设备状态为开的时长（分钟）汇总和照明系统所有设备状态为开的时长（分钟）汇总
      *
      * @param deviceId 设备Id
      * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
@@ -33,7 +33,7 @@ public class DataLgHistoryController {
      * @return
      */
     @GetMapping("ElectricalStatistics")
-    public ApiResult<Map<String,Object>> evBuildHealth(@RequestParam(value = "deviceId") String deviceId,
+    public ApiResult<Map<String,Object>> ElectricalStatistics(@RequestParam(value = "deviceId",required = false) String deviceId,
                                                        @RequestParam(value = "startDate") String startDate,
                                                        @RequestParam(value = "endDate") String endDate){
         return ApiResult.success(dataLgHistoryService.ElectricalStatistics(deviceId,startDate,endDate));

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DataLgHistoryServiceImpl.java

@@ -1,12 +1,14 @@
 package com.usky.park.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.park.domain.DataGrHistory;
 import com.usky.park.domain.DataLgHistory;
 import com.usky.park.mapper.DataLgHistoryMapper;
 import com.usky.park.service.DataLgHistoryService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.apache.catalina.security.SecurityUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -28,12 +30,11 @@ public class DataLgHistoryServiceImpl extends AbstractCrudService<DataLgHistoryM
     {
         Map<String,Object> map = new HashMap<>();
         LambdaQueryWrapper<DataLgHistory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DataLgHistory::getAttributeName,"switch_status")
-                .eq(DataLgHistory::getAttributeData,"1")
-                .eq(DataLgHistory::getDeviceId,deviceId)
-                .between(DataLgHistory::getDataTime,startDate,endDate);
+        queryWrapper.eq(StringUtils.isNotBlank(deviceId),DataLgHistory::getDeviceId,deviceId)
+                .eq(DataLgHistory::getAttributeName,"switch_status")
+                .between(DataLgHistory::getDataTime,startDate,endDate)
+                .eq(DataLgHistory::getAttributeData,"1");
         int count = this.count(queryWrapper);
-        map.put("device_id",deviceId);
         map.put("count",count);
 
         return map;