水电表平台修改4

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

@@ -1,297 +1,484 @@
-package com.huimv.env.admin.timer;
-
-import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-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.mapper.EnergyElectricityMapper;
-import com.huimv.env.common.mapper.EnergyEnvDeviceMapper;
-import com.huimv.env.common.mapper.EnergyWaterMapper;
-import com.huimv.env.common.service.IEnergyElectricityService;
-import com.huimv.env.common.service.IEnergyWaterService;
-import com.mysql.cj.xdevapi.JsonArray;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Configuration
-@EnableScheduling
-public class WaterAndElectricity {
-    @Autowired
-    private EnergyWaterMapper waterMapper;
-
-    @Autowired
-    private EnergyElectricityMapper electricityMapper;
-
-    @Autowired
-    private EnergyEnvDeviceMapper envDeviceMapper;
-
-
-
-    @Scheduled(cron = "0 59 * * * ? ")
-    private void sendDate() throws Exception {
-        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", 26);
-        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", 26).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", 26).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);
-        }
-
-//        RestTemplate restTemplate = new RestTemplate();
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.setContentType(MediaType.APPLICATION_JSON);
-//
-//        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
-////        Map<String, Object> map = new HashMap<>();
-//        map.put("result", jsonArray);
-//
-//        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(map, headers);
-//
-//        String url = "https://huatong.ifarmcloud.com/huatongApi/energy-data/getData";
-//        String responseBody = restTemplate.postForObject(url, httpEntity, String.class);
-//        System.out.println(responseBody);
-
-        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/getData")
-                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
-        System.out.println(post);
-    }
-
-    @Scheduled(cron = "0 59 * * * ? ")
-    private void sendDate2() throws Exception {
-        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", 29);
-        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", 29).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", 29).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);
-        }
-
-//        RestTemplate restTemplate = new RestTemplate();
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.setContentType(MediaType.APPLICATION_JSON);
-//
-//        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
-////        Map<String, Object> map = new HashMap<>();
-//        map.put("result", jsonArray);
-//
-//        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(map, headers);
-//
-//        String url = "https://huatong.ifarmcloud.com/huatongApi/energy-data/getData";
-//        String responseBody = restTemplate.postForObject(url, httpEntity, String.class);
-//        System.out.println(responseBody);
-
-        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/getData2")
-                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
-        System.out.println(post);
-    }
-
-
-    @Scheduled(cron = "0 59 * * * ? ")
-    private void sendDate3() throws Exception {
-        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", 22);
-        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", 22).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", 22).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);
-        }
-
-//        RestTemplate restTemplate = new RestTemplate();
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.setContentType(MediaType.APPLICATION_JSON);
-//
-//        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
-////        Map<String, Object> map = new HashMap<>();
-//        map.put("result", jsonArray);
-//
-//        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(map, headers);
-//
-//        String url = "https://huatong.ifarmcloud.com/huatongApi/energy-data/getData";
-//        String responseBody = restTemplate.postForObject(url, httpEntity, String.class);
-//        System.out.println(responseBody);
-
-        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/getData3")
-                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
-        System.out.println(post);
-    }
-
-    @Scheduled(cron = "0 59 * * * ? ")
-    private void sendDate4() throws Exception {
-        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", 30);
-        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", 30).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", 30).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);
-        }
-
-//        RestTemplate restTemplate = new RestTemplate();
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.setContentType(MediaType.APPLICATION_JSON);
-//
-//        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
-////        Map<String, Object> map = new HashMap<>();
-//        map.put("result", jsonArray);
-//
-//        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(map, headers);
-//
-//        String url = "https://huatong.ifarmcloud.com/huatongApi/energy-data/getData";
-//        String responseBody = restTemplate.postForObject(url, httpEntity, String.class);
-//        System.out.println(responseBody);
-
-        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/getData4")
-                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
-        System.out.println(post);
-    }
-}
+//package com.huimv.env.admin.timer;
+//
+//import cn.hutool.http.HttpRequest;
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONObject;
+//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.mapper.EnergyElectricityMapper;
+//import com.huimv.env.common.mapper.EnergyEnvDeviceMapper;
+//import com.huimv.env.common.mapper.EnergyWaterMapper;
+//import com.huimv.env.common.service.IEnergyElectricityService;
+//import com.huimv.env.common.service.IEnergyWaterService;
+//import com.mysql.cj.xdevapi.JsonArray;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.http.HttpEntity;
+//import org.springframework.http.HttpHeaders;
+//import org.springframework.http.MediaType;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.util.LinkedMultiValueMap;
+//import org.springframework.util.MultiValueMap;
+//import org.springframework.web.client.RestTemplate;
+//
+//import java.text.SimpleDateFormat;
+//import java.util.*;
+//
+//@Configuration
+//@EnableScheduling
+//public class WaterAndElectricity {
+//    @Autowired
+//    private EnergyWaterMapper waterMapper;
+//
+//    @Autowired
+//    private EnergyElectricityMapper electricityMapper;
+//
+//    @Autowired
+//    private EnergyEnvDeviceMapper envDeviceMapper;
+//
+//
+//
+//    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 26);
+//        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", 26).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", 26).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);
+//        }
+//
+////        RestTemplate restTemplate = new RestTemplate();
+////        HttpHeaders headers = new HttpHeaders();
+////        headers.setContentType(MediaType.APPLICATION_JSON);
+////
+////        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+//////        Map<String, Object> map = new HashMap<>();
+////        map.put("result", jsonArray);
+////
+////        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(map, headers);
+////
+////        String url = "https://huatong.ifarmcloud.com/huatongApi/energy-data/getData";
+////        String responseBody = restTemplate.postForObject(url, httpEntity, String.class);
+////        System.out.println(responseBody);
+//
+//        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/getData")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }
+//
+//    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate2() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 29);
+//        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", 29).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", 29).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);
+//        }
+//
+////        RestTemplate restTemplate = new RestTemplate();
+////        HttpHeaders headers = new HttpHeaders();
+////        headers.setContentType(MediaType.APPLICATION_JSON);
+////
+////        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+//////        Map<String, Object> map = new HashMap<>();
+////        map.put("result", jsonArray);
+////
+////        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(map, headers);
+////
+////        String url = "https://huatong.ifarmcloud.com/huatongApi/energy-data/getData";
+////        String responseBody = restTemplate.postForObject(url, httpEntity, String.class);
+////        System.out.println(responseBody);
+//
+//        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/getData2")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }
+//
+//
+//    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate3() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 22);
+//        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", 22).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", 22).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);
+//        }
+//
+////        RestTemplate restTemplate = new RestTemplate();
+////        HttpHeaders headers = new HttpHeaders();
+////        headers.setContentType(MediaType.APPLICATION_JSON);
+////
+////        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+//////        Map<String, Object> map = new HashMap<>();
+////        map.put("result", jsonArray);
+////
+////        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(map, headers);
+////
+////        String url = "https://huatong.ifarmcloud.com/huatongApi/energy-data/getData";
+////        String responseBody = restTemplate.postForObject(url, httpEntity, String.class);
+////        System.out.println(responseBody);
+//
+//        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/getData3")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }
+//
+//    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate4() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 30);
+//        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", 30).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", 30).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/getData4")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }
+//
+//    //正康21
+//    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate5() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 21);
+//        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", 21).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", 21).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/getData5")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }
+//
+//    //莲花28
+//    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate6() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 28);
+//        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", 28).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", 28).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/getData6")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }
+//    //百风林31
+///*    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate7() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 31);
+//        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", 31).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", 31).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/getData7")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }*/
+//    //瑞溪32
+///*    @Scheduled(cron = "0 59 * * * ? ")
+//    private void sendDate8() throws Exception {
+//        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", 32);
+//        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", 32).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", 32).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/getData8")
+//                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+//        System.out.println(post);
+//    }*/
+//
+//}

huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnergyDataMapper.java

@@ -41,7 +41,7 @@ public interface EnergyDataMapper extends BaseMapper<EnergyData> {
 
     List<EnergyElectricityDataVo> listDay4(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
-    EnergyDataVo listCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+    EnergyDataVo listCount(String farmId);
 
 //    11111
 //    List<EnergyAllDataVo> listYearGas(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);

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

@@ -52,9 +52,9 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     @Override
     public Result listCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
-        EnergyDataVo energyDataVo = dataMapper.listCount(queryWrapper);
+//        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", farmId);
+        EnergyDataVo energyDataVo = dataMapper.listCount(farmId);
 //        QueryWrapper<EnergyWarningInfo> queryWrapper1 = new QueryWrapper<>();
 //        queryWrapper1.eq("farm_id", farmId);
 //        Integer count = warningInfoMapper.selectCount(queryWrapper1);

huimv-env-common/src/main/resources/com/huimv/env/admin/mapper/EnergyDataMapper.xml

@@ -71,11 +71,11 @@
         ORDER BY create_date ASC
     </select>
     <select id="listCount" resultType="com.huimv.env.common.entity.vo.EnergyDataVo">
-        select Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',
-        Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue'
-        now() 'nowTime'
-         from energy_data
-        ${ew.customSqlSegment}
+        SELECT a.waterValue,b.electricityValue,a.farmId,NOW() nowTime  FROM
+(select Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',farm_id farmId FROM energy_water WHERE farm_id=#{farmId}) a
+INNER JOIN (select Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue',farm_id farmId FROM energy_electricity
+ WHERE farm_id=#{farmId}) b
+ON a.farmId=b.farmId
     </select>