水电表平台修改10

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/EnergyDataController.java

@@ -68,4 +68,9 @@ public class EnergyDataController {
     public Result countEnergy(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return iEnergyDataService.countEnergy(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/sumCount")
+    public Result sumCount(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.sumCount(httpServletRequest, paramsMap);
+    }
 }

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

@@ -83,9 +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/IEnergyDataService.java

@@ -33,4 +33,7 @@ public interface IEnergyDataService extends IService<EnergyData> {
 
     Result countEnergy(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
+
+    Result sumCount(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
 }

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

@@ -11,17 +11,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.DataUill;
-import com.huimv.env.common.entity.BasePigpen;
-import com.huimv.env.common.entity.EnergyData;
-import com.huimv.env.common.entity.EnergyElectricity;
-import com.huimv.env.common.entity.EnergyWater;
+import com.huimv.env.common.entity.*;
 import com.huimv.env.common.entity.dto.EnergyDto;
 import com.huimv.env.common.entity.vo.EnergyAllDataVo;
 import com.huimv.env.common.entity.vo.EnergyDataVo;
-import com.huimv.env.common.mapper.BasePigpenMapper;
-import com.huimv.env.common.mapper.EnergyDataMapper;
-import com.huimv.env.common.mapper.EnergyElectricityMapper;
-import com.huimv.env.common.mapper.EnergyWaterMapper;
+import com.huimv.env.common.mapper.*;
 import com.huimv.env.common.service.IEnergyDataService;
 import com.huimv.env.common.utils.Result;
 import com.huimv.env.common.utils.ResultCode;
@@ -29,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
 
@@ -464,7 +459,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+" 00:00:00", endTime +" 23:59:59").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);
             }
@@ -474,7 +469,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 +" 00:00:00", endTime +" 23:59:59").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);
             }
@@ -553,6 +548,29 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
 
+    @Autowired
+    private EnergyEnvDeviceMapper envDeviceMapper;
+
+    @Override
+    public Result sumCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        //dian
+        QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", 26).eq("chip_code",deviceCode);
+        queryWrapper1.ge("upload_date", "2023-10-23 00:00:00");
+        queryWrapper1.orderByAsc("id");
+        List<EnergyWater> electricities = waterMapper.selectList(queryWrapper1);
+        BigDecimal sum = BigDecimal.ZERO;
+        for (EnergyWater electricity : electricities) {
+            BigDecimal decimal = new BigDecimal(electricity.getWaterValue());
+            sum = sum.add(decimal);
+            electricity.setOther3(sum.toString());
+            waterMapper.updateById(electricity);
+            System.out.println("修改成功！");
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
 
     /*数组排序*/
     public static JSONArray jsonArraySort(JSONArray jsonArr, String sortKey, boolean is_desc) {

huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DataServiceImpl.java

@@ -81,13 +81,20 @@ public class DataServiceImpl implements DataService {
         envWater.setOriginalDate(payload);
         envWater.setOther1(unitName);
         envWater.setOther2(farmName);
+
         envWater.setDeviceType(Integer.parseInt(devType));
+        BigDecimal bigDecimal = new BigDecimal(one.getOther3());
         if(str <0 ){
             envWater.setElectricityValue( String.format("%.1f", (double)originalData*transformer/10.0));
+            BigDecimal bigDecimal1 = new BigDecimal(String.format("%.1f", (double) originalData * transformer / 10.0));
+            envWater.setOther3(bigDecimal.add(bigDecimal1).toString());
         }else if (str == 0){
             envWater.setElectricityValue("0");
+            envWater.setOther3(bigDecimal.toString());
         }else {
             envWater.setElectricityValue( String.format("%.1f", (double)str*transformer/10.0));
+            BigDecimal bigDecimal1 = new BigDecimal(String.format("%.1f", (double)str*transformer/10.0));
+            envWater.setOther3(bigDecimal.add(bigDecimal1).toString());
         }
         envWater.setVoltage(voltage);
         energyElectricityService.save(envWater);
@@ -119,13 +126,18 @@ public class DataServiceImpl implements DataService {
         envWater.setOther1(unitName);
         envWater.setOther2(farmName);
         envWater.setOriginalDate(payload);
+        BigDecimal bigDecimal = new BigDecimal(one.getOther3());
         if(str <0 ){
             envWater.setWaterValue( String.format("%.1f", (double)originalData*transformer/10.0));
+            BigDecimal bigDecimal1 = new BigDecimal(String.format("%.1f", (double)originalData*transformer/10.0));
+            envWater.setOther3(bigDecimal.add(bigDecimal1).toString());
         }else if (str == 0){
             envWater.setWaterValue("0");
-
+            envWater.setOther3(bigDecimal.toString());
         }else {
             envWater.setWaterValue( String.format("%.1f", (double)str*transformer/10.0));
+            BigDecimal bigDecimal1 = new BigDecimal(String.format("%.1f", (double)str*transformer/10.0));
+            envWater.setOther3(bigDecimal.add(bigDecimal1).toString());
         }
 
         envWater.setVoltage(voltage);