接口上传测温数据-已注释

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

@@ -22,6 +22,12 @@ import org.springframework.stereotype.Component;
 @Component
 @SuppressWarnings("all")
 public class ConstUtils {
+    // 库到云端同步数据接口
+    public static final String TEP_URL = "/testData/housesToCouldTemperData";
+    public static final String LAYER_URL = "/testDataLayer/housesToCouldTemperData";
+    public static final String WAINING_URL = "/testWarningData/housesToCouldTemperData";
+    public static final String URL = "http://localhost:8765";
+
 
     /**
      * 起始标志

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

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.intelligent.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.intelligent.basicdata.model.TWarningThreshold;
 import com.chinaitop.depot.intelligent.basicdata.service.WarningThresholdService;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TTestdataLayerMapper;
@@ -13,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -29,7 +31,7 @@ import java.util.stream.Collectors;
 
 @Configuration
 public class LongRangeUtils {
-    final static Logger logger = LoggerFactory.getLogger(LongRangeUtils.class);
+    private final static Logger logger = LoggerFactory.getLogger(LongRangeUtils.class);
 
     private final int TEMP = 250;
 
@@ -43,6 +45,7 @@ public class LongRangeUtils {
 
     private final BigDecimal BD_MINUS_THREE = new BigDecimal("-30");
 
+
     @Resource
     private TemperatureRecordService temperatureRecordService;
 
@@ -59,10 +62,9 @@ public class LongRangeUtils {
     private TTestdataLogMapper tTestdataLogMapper;
 
     @Resource
-    private UuidUtils uuidUtils;
-
-    @Resource
     private WarningMessage warningMessage;
+    /*@Resource
+    private RestTemplate restTemplate;*/
 
 
     @Transactional(rollbackFor = Exception.class)
@@ -98,7 +100,7 @@ public class LongRangeUtils {
             }
             String orgId = temperatureRecordService.getOrgId(cDcsCodes.get(INT_ZERO));
             ts.forEach(obj -> {
-                String testdataId = uuidUtils.getCode();
+                String testdataId = UuidUtils.getCode();
                 TTestdata tTestdata = (TTestdata) obj;
                 String house = tTestdata.getStorehouse();
                 Date time = tTestdata.getTime();
@@ -144,7 +146,7 @@ public class LongRangeUtils {
                     BigDecimal wh = threshold.getThreshold();
                     //-1 小于 0 等于 1 大于
                     if (wholeMax.compareTo(wh) == 1 && ilqYq.equals(STR_ZERO)) {
-                        String tid = uuidUtils.getCode();
+                        String tid = UuidUtils.getCode();
                         TWarningThresholdHistory tt = null;
                         StringBuffer desc = new StringBuffer();
                         if (!wholeMax.toString().equals(STR_TEMP)) {
@@ -161,7 +163,7 @@ public class LongRangeUtils {
                         BigDecimal ww = wWarning.getThreshold();
                         BigDecimal subtract = wh.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
                         if (wholeMax.compareTo(subtract) == 1 && ilqYq.equals(STR_ZERO)) {
-                            String tid = uuidUtils.getCode();
+                            String tid = UuidUtils.getCode();
                             StringBuffer desc = new StringBuffer();
                             String str = desc.append("整仓粮温(").append(wholeMax).append(")高于阈值(").append(subtract).append(")").toString();
                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wholeMax, subtract, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
@@ -175,7 +177,7 @@ public class LongRangeUtils {
                     BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
                     //-1 小于 0 等于 1 大于
                     if (wMin.compareTo(wl) == -1 && !wMin.toString().equals(STR_TEMP00) && ilqYq.equals(STR_ZERO)) {
-                        String tid = uuidUtils.getCode();
+                        String tid = UuidUtils.getCode();
                         StringBuffer desc = new StringBuffer();
                         String str = desc.append("整仓粮温(").append(wMin).append(")低于阈值(").append(wl).append(")").toString();
                         TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, wMin, wl, time, str, dataSource2, STR_ZERO, STR_ZERO);
@@ -187,7 +189,7 @@ public class LongRangeUtils {
                         BigDecimal ww = wWarning.getThreshold();
                         BigDecimal wadd = wl.add(ww);//高温减去阈值
                         if (wMin.compareTo(wadd) == -1 && ilqYq.equals(STR_ZERO)) {
-                            String tid = uuidUtils.getCode();
+                            String tid = UuidUtils.getCode();
                             StringBuffer desc = new StringBuffer();
                             String str = desc.append("整仓粮温(").append(wMin).append(")低于阈值(").append(wadd).append(")").toString();
                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wMin, wadd, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
@@ -223,7 +225,7 @@ public class LongRangeUtils {
                     tTestdataLayer.setLmin(lsyerMin);
                     tTestdataLayer.setLhouse(house);
                     tTestdataLayer.setLtime(time);
-                    tTestdataLayer.setId(uuidUtils.getCode());
+                    tTestdataLayer.setId(UuidUtils.getCode());
                     tTestdataLayer.setOrgId(orgId);
                     tTestdataLayer.setDataSource(dataSource2);
                     tTestdataLayer.setLqId(testdataId);
@@ -247,7 +249,7 @@ public class LongRangeUtils {
                                     //-1 小于 0 等于 1 大于
                                     if (te.compareTo(threshold1) == 1) {
                                         // tid id,cfCdoe 仓房编码,threshold 报警实体包括orgID,tthreshold 检测值,wThreshold 预警或报警设置值,date 检测时间,desc 描述信息,mode 0测温，1测虫，2测气,warning 0报警，1预警
-                                        String tid = uuidUtils.getCode();
+                                        String tid = UuidUtils.getCode();
                                         TWarningThresholdHistory tt = null;
                                         StringBuffer desc = new StringBuffer();
                                         if (!te.toString().equals(STR_TEMP00)) {
@@ -265,7 +267,7 @@ public class LongRangeUtils {
                                         BigDecimal ww = wWarning.getThreshold();
                                         BigDecimal subtract = threshold1.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
                                         if (te.compareTo(subtract) == 1 && ilqYq.equals(STR_ZERO)) {
-                                            String tid = uuidUtils.getCode();
+                                            String tid = UuidUtils.getCode();
                                             StringBuffer desc = new StringBuffer();
                                             String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")高于阈值(").append(subtract).append(")").toString();
                                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, subtract, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
@@ -278,7 +280,7 @@ public class LongRangeUtils {
                                     BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
                                     //-1 小于 0 等于 1 大于
                                     if (te.compareTo(wl) == -1 && !te.toString().equals(STR_TEMP00)) {
-                                        String tid = uuidUtils.getCode();
+                                        String tid = UuidUtils.getCode();
                                         StringBuffer desc = new StringBuffer();
                                         String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")低于阈值(").append(wl).append(")").toString();
                                         TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, te, wl, time, str, dataSource2, STR_ZERO, STR_ZERO);
@@ -290,7 +292,7 @@ public class LongRangeUtils {
                                         BigDecimal ww = wWarning.getThreshold();
                                         BigDecimal wadd = wl.add(ww).setScale(2, RoundingMode.HALF_UP);//高温减去阈值
                                         if (te.compareTo(wadd) == -1 && ilqYq.equals(STR_ZERO)) {
-                                            String tid = uuidUtils.getCode();
+                                            String tid = UuidUtils.getCode();
                                             StringBuffer desc = new StringBuffer();
                                             String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")低于阈值(").append(wadd).append(")").toString();
                                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, wadd, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
@@ -305,13 +307,19 @@ public class LongRangeUtils {
             });
 
             if (tTestdataList.size() > INT_ZERO) {
+//                logger.info("tTestdataList: {}", JSON.toJSONString(tTestdataList));
                 temperatureRecordService.insertBatch(tTestdataList);
+//                restTemplate.postForObject(ConstUtils.URL + ConstUtils.TEP_URL, tTestdataList, Object.class);
             }
             if (tTestdataLayerArrayList.size() > INT_ZERO) {
+//                logger.info("tTestdataLayerArrayList: {}", JSON.toJSONString(tTestdataLayerArrayList));
                 tTestdataLayerMapper.insertBatch(tTestdataLayerArrayList);
+//                restTemplate.postForObject(ConstUtils.URL + ConstUtils.LAYER_URL, tTestdataLayerArrayList, Object.class);
             }
             if (tWarningThresholdHistorieList.size() > INT_ZERO) {
+//                logger.info("tWarningThresholdHistorieList: {}", JSON.toJSONString(tWarningThresholdHistorieList));
                 tWarningThresholdHistoryMapper.insertBatch(tWarningThresholdHistorieList);
+//                restTemplate.postForObject(ConstUtils.URL + ConstUtils.WAINING_URL, tWarningThresholdHistorieList, Object.class);
             }
             logger.info("测温数据入库成功2");
         } catch (Exception e) {