Merge remote-tracking branch 'origin/master'

huimv-env-common/src/main/java/com/huimv/env/common/entity/EnergyEnvDevice.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author author
@@ -83,4 +83,9 @@ public class EnergyEnvDevice implements Serializable {
     private Integer transformer;
     private Integer difference;
 
+    private Integer transformer;
+
+    private Integer difference;
+
+
 }

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnergyDataServiceImpl.java

@@ -448,11 +448,12 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
-        if (!"".equals(startTime) || null != startTime) {
-            startTime = startTime + " 00:00:00";
-            endTime = endTime + " 00:00:00";
-        }
-
+//        if (!"".equals(startTime) || null != startTime) {
+//            startTime = startTime + " 00:00:00";
+//            endTime = endTime + " 23:59:59";
+//        }
+        System.out.println("开始时间：" + startTime);
+        System.out.println("结束时间：" + endTime);
         String isLook = paramsMap.get("isLook");
         String id = paramsMap.get("id");
         String type = paramsMap.get("type");//1 为水 2为电
@@ -463,7 +464,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         if ("1".equals(type)) {
             QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id);
-            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime).orderByDesc("create_date");
+            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date",  startTime+" 00:00:00", endTime +" 23:59:59").orderByDesc("create_date");
             if (isLook.equals("0")) {
                 queryWrapper.ne("water_value", 0);
             }
@@ -473,7 +474,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         } else {
             QueryWrapper<EnergyElectricity> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id);
-            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime).orderByDesc("create_date");
+            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime +" 00:00:00", endTime +" 23:59:59").orderByDesc("create_date");
             if (isLook.equals("0")) {
                 queryWrapper.ne("electricity_value", 0);
             }