修改1

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

@@ -1,7 +1,9 @@
 package com.huimv.env.admin.controller;
 
 
-
+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;
@@ -11,6 +13,7 @@ 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;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,8 +21,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * <p>
@@ -75,4 +78,27 @@ public class EnergyWaterController {
         }
     }
 
+    @RequestMapping("/send1")
+    private void sendDate19(@RequestBody Map<String, String> paramsMaps) throws Exception {
+        String farmId = paramsMaps.get("farmId");
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        List<EnergyEnvDevice> devices = envDeviceService.list(queryWrapper);
+        //获取到完整的时间
+        List<EnergyWater> list = new ArrayList<>();
+        for (EnergyEnvDevice device : devices) {
+            QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", device.getFarmId()).eq("chip_code", device.getDeviceCode());
+            List<EnergyWater> waters = energyWaterService.list(queryWrapper1);
+            for (EnergyWater water : waters) {
+                list.add(water);
+            }
+        }
+        HashMap<String, String> paramsMap = new HashMap<>();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("result", list);
+        paramsMap.put("Content-Type", "application/json;charset=utf-8");
+        String post = HttpRequest.post("http://218.76.168.4:10010/huatongApi/energy-data/getData30")
+                .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
+    }
 }