水电表平台修改

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

@@ -79,5 +79,6 @@ public class EnergyEnvDevice implements Serializable {
 
     private String remark;
 
+    private Integer deviceType;
 
 }

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

@@ -80,4 +80,5 @@ public class EnergyWater implements Serializable {
     private Date uploadDate;
 
 
+
 }

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

@@ -73,5 +73,7 @@ public class EnvDevice implements Serializable {
 
     private String ohter3;
 
+    private Integer deviceType;
+
 
 }

huimv-env-common/src/main/java/com/huimv/env/common/service/IEnergyDataService.java

@@ -29,6 +29,8 @@ public interface IEnergyDataService extends IService<EnergyData> {
 
     Result listAll(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
+    Result listAll2(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
     Result countEnergy(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
 }

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

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
 import java.util.*;
 
 /**
@@ -437,27 +438,41 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         String farmId = paramsMap.get("farmId");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
+        String deviceCode = paramsMap.get("deviceCode");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+
         if ("".equals(pageNum) || null == pageNum) {
             pageNum = "1";
         }
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
+        String isLook = paramsMap.get("isLook");
         String id = paramsMap.get("id");
         String type = paramsMap.get("type");//1 为水 2为电
+        if ("".equals(isLook) || null == isLook) {
+            isLook = "1";
+        }
 
         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");
+            if (isLook.equals("0")) {
+                queryWrapper.ne("water_value", 0);
+            }
+            queryWrapper.eq(StringUtils.isNotBlank(deviceCode), "chip_code", deviceCode);
             Page<EnergyWater> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, waterMapper.selectPage(page, queryWrapper));
         } 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");
+            if (isLook.equals("0")) {
+                queryWrapper.ne("electricity_value", 0);
+            }
+            queryWrapper.eq(StringUtils.isNotBlank(deviceCode), "chip_code", deviceCode);
             Page<EnergyElectricity> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, electricityMapper.selectPage(page, queryWrapper));
         }
@@ -465,17 +480,50 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     }
 
     @Override
+    public Result listAll2(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+        String isLook = paramsMap.get("isLook");
+        String id = paramsMap.get("id");
+        String type = paramsMap.get("type");//1 为水 2为电
+        String deviceCode = paramsMap.get("deviceCode");
+        if ("".equals(isLook) || null == isLook) {
+            isLook = "1";
+        }
+        if ("1".equals(type)) {
+            QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id)
+                    .eq(StringUtils.isNotBlank(deviceCode), "chip_code", deviceCode);
+            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime).orderByAsc("upload_date");
+            if (isLook.equals("0")) {
+                queryWrapper.ne("water_value", 0);
+            }
+            return new Result(ResultCode.SUCCESS, waterMapper.selectList(queryWrapper));
+        } else {
+            QueryWrapper<EnergyElectricity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id)
+                    .eq(StringUtils.isNotBlank(deviceCode), "chip_code", deviceCode);
+            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime).orderByAsc("upload_date");
+            if (isLook.equals("0")) {
+                queryWrapper.ne("electricity_value", 0);
+            }
+            return new Result(ResultCode.SUCCESS, electricityMapper.selectList(queryWrapper));
+        }
+    }
+
+    @Override
     public Result countEnergy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
         String deviceCode = paramsMap.get("deviceCode");
         QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).between(StringUtils.isNotBlank(startTime),"create_date", startTime, endTime);
+        queryWrapper.eq("farm_id", farmId).between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
         queryWrapper.eq("chip_code", deviceCode);
         List<EnergyWater> energyWaters = waterMapper.selectList(queryWrapper);
         QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).between(StringUtils.isNotBlank(startTime),"create_date", startTime, endTime);
+        queryWrapper1.eq("farm_id", farmId).between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
         queryWrapper1.eq("chip_code", deviceCode);
         List<EnergyElectricity> electricities = electricityMapper.selectList(queryWrapper1);
         Double waterCount = 0.00;
@@ -490,9 +538,10 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 electricityCount = electricityCount + Double.parseDouble(electricity.getElectricityValue());
             }
         }
+        DecimalFormat def = new DecimalFormat("0.0");
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("waterCount", waterCount);
-        jsonObject.put("electricity", electricityCount);
+        jsonObject.put("waterCount", def.format(waterCount));
+        jsonObject.put("electricity", def.format(electricityCount));
 
 
         return new Result(ResultCode.SUCCESS, jsonObject);

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

@@ -33,6 +33,7 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
         String farmId = paramsMap.get("farmId");
         String pageSize = paramsMap.get("pageSize");
         String pageNo = paramsMap.get("pageNo");
@@ -44,6 +45,12 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
         }
         QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
+        if ("1".equals(type)) {
+            queryWrapper.in("device_type", 1, 2);
+        }
+        if ("3".equals(type)) {
+            queryWrapper.eq("device_type", 3);
+        }
         Page<EnergyEnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS,energyEnvDeviceMapper.selectPage(page, queryWrapper));
     }