水电表平台修改6

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

@@ -2,6 +2,7 @@ package com.huimv.env.admin.controller;
 
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.env.common.entity.BasePigpen;
 import com.huimv.env.common.service.IBasePigpenService;
 import com.huimv.env.common.utils.Result;
@@ -79,4 +80,22 @@ public class BasePigpenController {
         }
         return basePigpenService.list(farmCode,buildName,stageCode);
     }
+
+    @PostMapping( "/addTest")
+    public void addTest(@RequestBody Map<String,String> map) {
+        String farmId = map.get("farmId");
+        BasePigpen id = basePigpenService.getOne(new QueryWrapper<BasePigpen>().eq("farm_id",farmId).orderByDesc("id").last(" limit 1"));
+        String count = map.get("count");
+        for (int i = 0; i < Integer.parseInt(count); i++) {
+            BasePigpen basePigpen = new BasePigpen();
+            basePigpen.setParentId(id.getParentId());
+            basePigpen.setFarmId(id.getFarmId());
+            basePigpen.setFType(id.getFType());
+            basePigpen.setSort(id.getSort());
+            basePigpen.setStageCode(id.getStageCode());
+            basePigpen.setOther2(id.getOther2());
+            basePigpen.setBuildName(String.valueOf(i+2));
+            basePigpenService.save(basePigpen);
+        }
+    }
 }

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

@@ -2,6 +2,12 @@ package com.huimv.env.admin.controller;
 
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.env.common.entity.EnergyElectricity;
+import com.huimv.env.common.entity.EnergyEnvDevice;
+import com.huimv.env.common.entity.EnergyWater;
+import com.huimv.env.common.service.IEnergyElectricityService;
+import com.huimv.env.common.service.IEnergyEnvDeviceService;
 import com.huimv.env.common.service.IEnergyWaterService;
 import com.huimv.env.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,6 +35,10 @@ public class EnergyWaterController {
 
     @Autowired
     private IEnergyWaterService energyWaterService;
+    @Autowired
+    private IEnergyEnvDeviceService envDeviceService;
+    @Autowired
+    private IEnergyElectricityService electricityService;
 
     @RequestMapping("/listPigpen")
     public Result listPigpen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
@@ -38,4 +49,26 @@ public class EnergyWaterController {
     public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return energyWaterService.listData(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/editTest")
+    public void editTest(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String startDate = paramsMap.get("startDate");
+        String endDate = paramsMap.get("endDate");
+        String type = paramsMap.get("type");
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("device_type", type);
+        List<EnergyEnvDevice> list = envDeviceService.list(queryWrapper);
+        for (EnergyEnvDevice energyEnvDevice : list) {
+            QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).eq("chip_code", energyEnvDevice.getDeviceCode())
+                    .between("create_date", startDate, endDate);
+            List<EnergyElectricity> waters = electricityService.list(queryWrapper1);
+            for (EnergyElectricity water : waters) {
+                water.setOther1(energyEnvDevice.getDeviceName());
+                electricityService.updateById(water);
+            }
+        }
+    }
+
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/timer/WaterAndElectricity.java

@@ -518,4 +518,100 @@ public class WaterAndElectricity {
         System.out.println(post);
     }
 
+    //瓦垚头33
+    @Scheduled(cron = "0 59 * * * ? ")
+    private void sendDate10() throws Exception {
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", 33);
+        List<EnergyEnvDevice> devices = envDeviceMapper.selectList(queryWrapper);
+        Date date = new Date();//获取当前时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR, -1);// 20分钟前
+        //获取到完整的时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        JSONArray jsonArray = new JSONArray();
+
+        for (EnergyEnvDevice device : devices) {
+            JSONObject jsonObject = new JSONObject();
+            if (device.getDeviceType() == 3) {
+                //电
+                QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", 33).eq("chip_code", device.getDeviceCode());
+                queryWrapper1.between("upload_date", sdf.format(calendar.getTime()), sdf.format(date));
+                queryWrapper1.select(" IFNULL(SUM(electricity_value),0) electricityValue");
+                EnergyElectricity electricity = electricityMapper.selectOne(queryWrapper1);
+                jsonObject.put("electricity", electricity.getElectricityValue());
+                jsonObject.put("water", 0);
+            } else {
+                //水
+                QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", 33).eq("chip_code", device.getDeviceCode());
+                queryWrapper1.between("upload_date", sdf.format(calendar.getTime()), sdf.format(date));
+                queryWrapper1.select(" IFNULL(SUM(water_value),0) waterValue");
+                EnergyWater water = waterMapper.selectOne(queryWrapper1);
+                jsonObject.put("water", water.getWaterValue());
+                jsonObject.put("electricity", 0);
+            }
+            jsonObject.put("deviceCode", device.getDeviceCode());
+            jsonObject.put("time", sdf.format(date));
+            jsonArray.add(jsonObject);
+        }
+        HashMap<String, String> paramsMap = new HashMap<>();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("result", jsonArray);
+        System.out.println(jsonObject);
+        paramsMap.put("Content-Type", "application/json;charset=utf-8");
+        String post = HttpRequest.post("https://huatong.ifarmcloud.com/huatongApi/energy-data/getData10")
+                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+        System.out.println(post);
+    }
+    //下各水34
+    @Scheduled(cron = "0 59 * * * ? ")
+    private void sendDate11() throws Exception {
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", 34);
+        List<EnergyEnvDevice> devices = envDeviceMapper.selectList(queryWrapper);
+        Date date = new Date();//获取当前时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR, -1);// 20分钟前
+        //获取到完整的时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        JSONArray jsonArray = new JSONArray();
+
+        for (EnergyEnvDevice device : devices) {
+            JSONObject jsonObject = new JSONObject();
+            if (device.getDeviceType() == 3) {
+                //电
+                QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", 34).eq("chip_code", device.getDeviceCode());
+                queryWrapper1.between("upload_date", sdf.format(calendar.getTime()), sdf.format(date));
+                queryWrapper1.select(" IFNULL(SUM(electricity_value),0) electricityValue");
+                EnergyElectricity electricity = electricityMapper.selectOne(queryWrapper1);
+                jsonObject.put("electricity", electricity.getElectricityValue());
+                jsonObject.put("water", 0);
+            } else {
+                //水
+                QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", 34).eq("chip_code", device.getDeviceCode());
+                queryWrapper1.between("upload_date", sdf.format(calendar.getTime()), sdf.format(date));
+                queryWrapper1.select(" IFNULL(SUM(water_value),0) waterValue");
+                EnergyWater water = waterMapper.selectOne(queryWrapper1);
+                jsonObject.put("water", water.getWaterValue());
+                jsonObject.put("electricity", 0);
+            }
+            jsonObject.put("deviceCode", device.getDeviceCode());
+            jsonObject.put("time", sdf.format(date));
+            jsonArray.add(jsonObject);
+        }
+        HashMap<String, String> paramsMap = new HashMap<>();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("result", jsonArray);
+        System.out.println(jsonObject);
+        paramsMap.put("Content-Type", "application/json;charset=utf-8");
+        String post = HttpRequest.post("https://huatong.ifarmcloud.com/huatongApi/energy-data/getData11")
+                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+        System.out.println(post);
+    }
 }

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

@@ -51,10 +51,10 @@ public class DataServiceImpl implements DataService {
             Integer unitId = deviceCode.getUnitId();
             //小口径水表
             if ("01".equals(devType) || "02".equals(devType)){
-                saveShui(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId,deviceCode.getUnitName(),deviceCode.getRemark(),deviceCode.getTransformer(),deviceCode.getDifference());
+                saveShui(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId,deviceCode.getDeviceName(),deviceCode.getRemark(),deviceCode.getTransformer(),deviceCode.getDifference());
             }
             if ("03".equals(devType)){
-                saveDian(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId,deviceCode.getUnitName(),deviceCode.getRemark(),deviceCode.getTransformer(),deviceCode.getDifference());
+                saveDian(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId,deviceCode.getDeviceName(),deviceCode.getRemark(),deviceCode.getTransformer(),deviceCode.getDifference());
             }
         }