水电表平台修改5

huimv-env-admin/src/main/java/com/huimv/env/admin/HuimvAdminApplication.java

@@ -19,9 +19,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
-@ComponentScans({@ComponentScan("com.huimv.env.common.utils"), @ComponentScan("com.huimv.env.common.service"),@ComponentScan("com.huimv.env.common.config")})
+@ComponentScans({@ComponentScan("com.huimv.env.common.utils"), @ComponentScan("com.huimv.env.common.service"),@ComponentScan("com.huimv.env.common.config")
+        , @ComponentScan("com.huimv.env.admin.service")})
 @EntityScan(value = "com.huimv.env.common.entity")
 @MapperScan("com.huimv.env.common.mapper")
+@MapperScan("com.huimv.env.admin.mapper")
 @EnableScheduling
 //@EnableDiscoveryClient
 public class HuimvAdminApplication {

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

@@ -18,8 +18,11 @@ 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;
@@ -38,7 +41,8 @@ public class WaterAndElectricity {
     private EnergyEnvDeviceMapper envDeviceMapper;
 
 
-    @Scheduled(cron = "0 0/20 * * * ? ")
+
+    @Scheduled(cron = "0 0 */1 * * ? ")
     private void sendDate() throws Exception {
         QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", 26);
@@ -46,9 +50,9 @@ public class WaterAndElectricity {
         Date date = new Date();//获取当前时间
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
-        calendar.add(Calendar.MINUTE, -20);// 20分钟前
+        calendar.add(Calendar.HOUR, -1);// 20分钟前
         //获取到完整的时间
-        SimpleDateFormat sdf=  new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         JSONArray jsonArray = new JSONArray();
 
         for (EnergyEnvDevice device : devices) {
@@ -77,14 +81,27 @@ public class WaterAndElectricity {
             jsonArray.add(jsonObject);
         }
 
-        RestTemplate restTemplate = new RestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-
-        HttpEntity<JSONArray> httpEntity = new HttpEntity<>(jsonArray, headers);
+//        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);
 
-        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);
     }
 }

huimv-env-common/src/main/java/com/huimv/env/common/config/InterceptorConfig.java

@@ -22,7 +22,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/huimvAdmin/admin/my/*")
+                excludePathPatterns("/huimvAdmin/admin/my/*","/huimvAdmin/arrange-record/test")
                 .excludePathPatterns("/huimvAdmin/receive/feed");
     }
 }