|
|
@@ -1,18 +1,18 @@
|
|
|
package com.zcxk.charge.web.service.impl;
|
|
|
|
|
|
+import com.zcxk.charge.api.dto.generalview.WaterSupplyChart;
|
|
|
+import com.zcxk.charge.api.dto.homepage.WaterQualityRate;
|
|
|
+import com.zcxk.charge.api.dto.homepage.WaterQualityRateForScene;
|
|
|
import com.zcxk.charge.api.dto.query.DeviceWaterDto;
|
|
|
import com.zcxk.charge.api.dto.query.HomePageReportDto;
|
|
|
import com.zcxk.charge.api.enums.ParamTypeEnum;
|
|
|
import com.zcxk.charge.api.enums.SceneTypeEnum;
|
|
|
import com.zcxk.charge.api.vo.*;
|
|
|
-import com.zcxk.charge.web.client.UserCenterClient;
|
|
|
import com.zcxk.charge.core.dao.HomePageReportMapper;
|
|
|
import com.zcxk.charge.core.dao.MonitorDataReportMapper;
|
|
|
-import com.zcxk.charge.api.dto.generalview.WaterSupplyChart;
|
|
|
-import com.zcxk.charge.api.dto.homepage.WaterQualityRate;
|
|
|
-import com.zcxk.charge.api.dto.homepage.WaterQualityRateForScene;
|
|
|
import com.zcxk.charge.core.entity.MonitorDataEntity;
|
|
|
import com.zcxk.charge.core.entity.MonitorDataValueEntity;
|
|
|
+import com.zcxk.charge.web.client.UserCenterClient;
|
|
|
import com.zcxk.charge.web.service.HomePageReportService;
|
|
|
import com.zcxk.charge.web.service.MonitorDataReportService;
|
|
|
import com.zcxk.core.common.pojo.UserCondition;
|
|
|
@@ -21,11 +21,9 @@ import com.zcxk.core.oauth2.util.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
-import sun.reflect.misc.ConstructorUtil;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.math.RoundingMode;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.time.temporal.TemporalAdjusters;
|
lihui001