新增推送云端接口

depot-intelligent/src/main/java/com/DepotIntelligentApplication.java

@@ -6,10 +6,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.web.client.RestTemplate;
 
+@EnableAsync
 @EnableEurekaClient
 @SpringBootApplication
 @ServletComponentScan

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/pushs/service/impl/GrainPushsServiceImpl.java

@@ -15,10 +15,7 @@ import com.chinaitop.depot.intelligent.grainsituation.model.TWarningThresholdHis
 import com.chinaitop.depot.intelligent.grainsituation.service.TWarningThresholdHistoryService;
 import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
 import com.chinaitop.depot.intelligent.pushs.service.GrainPushsService;
-import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
-import com.chinaitop.depot.intelligent.utils.UuidUtils;
-import com.chinaitop.depot.intelligent.utils.VerificationSourceUtils;
-import com.chinaitop.depot.intelligent.utils.WarningMessage;
+import com.chinaitop.depot.intelligent.utils.*;
 import com.google.common.collect.Lists;
 import com.unissoft.model.ResponseEntity;
 import com.unissoft.model.TypeEnum;
@@ -61,6 +58,9 @@ public class GrainPushsServiceImpl implements GrainPushsService {
     @Resource
     private TWarningThresholdHistoryService tWarningThresholdHistoryService;
 
+    @Resource
+    private LongRangeUtils longRangeUtils;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseEntity uploadGrainTemperatureData(String dataSource, String grainTemperatureData) {
@@ -219,7 +219,8 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                         });
                         Double lsyerMax = 250.0;
                         Double wlsyerMin = 250.0;
-                        BigDecimal lsyerAvg = new BigDecimal(250).setScale(2, RoundingMode.HALF_UP);;
+                        BigDecimal lsyerAvg = new BigDecimal(250).setScale(2, RoundingMode.HALF_UP);
+                        ;
                         if (bigList.size() > 0) {
                             lsyerAvg = bigList.stream().reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(bigList.size()), 1, BigDecimal.ROUND_HALF_UP);
                             lsyerMax = lsyerMins.size() == 0 ? 0.0 : Collections.max(lsyerMins);
@@ -314,18 +315,27 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                 }
                 if (tWarningThresholdHistorieList.size() > 0) {
                     tWarningThresholdHistoryMapper.insertBatch(tWarningThresholdHistorieList);
-                    List<TWarningThresholdHistory> collect = tWarningThresholdHistorieList.stream().filter(TWarningThresholdHistory -> TWarningThresholdHistory.getwWarning().equals("0")).collect(Collectors.toList());
+                   /* List<TWarningThresholdHistory> collect = tWarningThresholdHistorieList.stream().filter(TWarningThresholdHistory -> TWarningThresholdHistory.getwWarning().equals("0")).collect(Collectors.toList());
                     boolean alarmDetails = resolutionToSendAlarmService.getAlarmDetails(collect);
                     if (!alarmDetails) {
                         collect.forEach(obj -> {
                             obj.setIsSend("2");
                             tWarningThresholdHistoryService.updateById(obj);
                         });
-                    }
+                    }*/
+                }
+                //调用远程服务同步测温数据
+                if (tTestdataList.size() > 0) {
+                    longRangeUtils.asyncMethodGrainData(tTestdataList);
+                }
+                if (tTestdataLayerArrayList.size() > 0) {
+                    longRangeUtils.asyncMethodGrainLayerData(tTestdataLayerArrayList);
+                }
+                if (tWarningThresholdHistorieList.size() > 0) {
+                    longRangeUtils.asyncMethodWarningThresholdData(tWarningThresholdHistorieList);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
             logger.info(e.getMessage());
             throw new RuntimeException(TypeEnum.ED.getCode() + "  " + TypeEnum.ED.getDesc());
         }

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/utils/JsonToObjectUtils.java

@@ -1,6 +1,9 @@
 package com.chinaitop.depot.intelligent.utils;
 
 import com.chinaitop.depot.intelligent.grainsituation.model.TPoints;
+import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
+import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLayer;
+import com.chinaitop.depot.intelligent.grainsituation.model.TWarningThresholdHistory;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -28,7 +31,6 @@ public class JsonToObjectUtils {
             JavaType javaType = mapper.getTypeFactory().constructParametricType(ArrayList.class, Class.forName(packageName));
             object = mapper.readValue(str, javaType);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.info("json转换异常  "+e.getMessage());
         }
         return object;
@@ -47,7 +49,6 @@ public class JsonToObjectUtils {
             JavaType javaType = mapper.getTypeFactory().constructParametricType(ArrayList.class, classs);
             object = mapper.readValue(str, javaType);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.info("json转换异常  "+e.getMessage());
         }
         return object;
@@ -66,7 +67,6 @@ public class JsonToObjectUtils {
             mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
             object = mapper.readValue(str, Class.forName(packageName));
         } catch (Exception e) {
-            e.printStackTrace();
             logger.info("json转换异常  "+e.getMessage());
         }
         return object;
@@ -84,7 +84,6 @@ public class JsonToObjectUtils {
             mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
             object = mapper.readValue(str, classs);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.info("json转换异常  "+e.getMessage());
         }
         return object;
@@ -105,7 +104,6 @@ public class JsonToObjectUtils {
             JavaType javaType = mapper.getTypeFactory().constructParametricType(ArrayList.class, classs);
             object = mapper.readValue(str, javaType);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.info("json转换异常  "+e.getMessage());
         }
         return object;
@@ -121,7 +119,52 @@ public class JsonToObjectUtils {
             ObjectMapper mapper = new ObjectMapper();
             return mapper.writeValueAsString(points);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.info("json转换异常  "+e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * list转换字符串
+     * @param tTestdatas list参数
+     * @return
+     */
+    public static String listToStrings(List<TTestdata> tTestdatas){
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+            return mapper.writeValueAsString(tTestdatas);
+        } catch (Exception e) {
+            logger.info("json转换异常  "+e.getMessage());
+        }
+        return null;
+    }
+    /**
+     * list转换字符串
+     * @param tTestdatas list参数
+     * @return
+     */
+    public static String listToLayerStrings(List<TTestdataLayer> tTestdatas){
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+            return mapper.writeValueAsString(tTestdatas);
+        } catch (Exception e) {
+            logger.info("json转换异常  "+e.getMessage());
+        }
+        return null;
+    }
+    /**
+     * list转换字符串
+     * @param tTestdatas list参数
+     * @return
+     */
+    public static String listToWarningThresholdStrings(List<TWarningThresholdHistory> tTestdatas){
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+            return mapper.writeValueAsString(tTestdatas);
+        } catch (Exception e) {
             logger.info("json转换异常  "+e.getMessage());
         }
         return null;

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/utils/LongRangeUtils.java

@@ -0,0 +1,68 @@
+package com.chinaitop.depot.intelligent.utils;
+
+import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
+import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLayer;
+import com.chinaitop.depot.intelligent.grainsituation.model.TWarningThresholdHistory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+
+/**
+ * 文件描述:远程调用类
+ *
+ * @author tongxi.xia
+ * @date 2020年01月11日 16:06
+ */
+
+@Configuration
+public class LongRangeUtils {
+    final static Logger logger = LoggerFactory.getLogger(LongRangeUtils.class);
+    @Value("${cloud_url}")
+    private String cloudUrl;
+    @Value("${cloud_url_layer}")
+    private String cloudUrlLayer;
+    @Value("${cloud_url_warning}")
+    private String cloudUrlWarning;
+
+    @Autowired
+    RestTemplate restTemplate;
+
+    @Async
+    public void asyncMethodGrainData(ArrayList<TTestdata> tTestdataList) {
+        try {
+            String grainJson = JsonToObjectUtils.listToStrings(tTestdataList);
+            restTemplate.postForLocation(cloudUrl, grainJson);
+            logger.info("向云端推送测温成功cloudUrl参数：" + grainJson);
+        } catch (Exception e) {
+            logger.info("向云端推送测温失败cloudUrl参数：" + e.getMessage());
+        }
+    }
+
+    @Async
+    public void asyncMethodGrainLayerData(ArrayList<TTestdataLayer> tTestdataLayerArrayList) {
+        try {
+            String grainJson = JsonToObjectUtils.listToLayerStrings(tTestdataLayerArrayList);
+            restTemplate.postForLocation(cloudUrlLayer, grainJson);
+            logger.info("向云端推送测温成功cloudUrlLayer参数：" + grainJson);
+        } catch (Exception e) {
+            logger.info("向云端推送测温失败cloudUrlLayer参数：" + e.getMessage());
+        }
+    }
+
+    @Async
+    public void asyncMethodWarningThresholdData(ArrayList<TWarningThresholdHistory> tWarningThresholdHistorieList) {
+        try {
+            String grainJson = JsonToObjectUtils.listToWarningThresholdStrings(tWarningThresholdHistorieList);
+            restTemplate.postForLocation(cloudUrlWarning, grainJson);
+            logger.info("向云端推送测温成功cloudUrlWarning参数：" + grainJson);
+        } catch (Exception e) {
+            logger.info("向云端推送测温失败cloudUrlWarning参数：" + e.getMessage());
+        }
+    }
+}

depot-intelligent/src/main/resources/bootstrap.yml

@@ -63,6 +63,14 @@ gas-org-ids: 386,177,273,280,300,31,32,33,35,190,73,72,24,68,65,141
 # 数量检测版本区分version3
 num_version3: :20013
 
+# cloudUrl云端url
+#cloud_url: http://localhost:9029/depotGrain/acceptTemperatureData
+#cloud_url_layer: http://localhost:9029/depotGrain/acceptTemperatureDataLayer
+#cloud_url_warning: http://localhost:9029/depotGrain/acceptTemperatureDataWarning
+cloud_url: http://192.167.120.18:9025/depot-intelligent/depotGrain/acceptTemperatureData
+cloud_url_layer: http://192.167.120.18:9025/depot-intelligent/depotGrain/acceptTemperatureDataLayer
+cloud_url_warning: http://192.167.120.18:9025/depot-intelligent/depotGrain/acceptTemperatureDataWarning
+
 #logging:
 #    level:
 #      com.chinaitop.depot.intelligent.grainsituation.mapper: DEBUG