时差超4小时 不接入功图

src/main/java/com/gct/tools/etlcamelhuge/routeconfig/CamelRestConfiguration.java

@@ -60,7 +60,7 @@ public class CamelRestConfiguration extends RouteBuilder {
         return string;
     }
 
-    public static String getDate() {
+    public String getDate() {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
         String date = df.format(new java.util.Date());// new Date()为获取当前系统时间
         return date;
@@ -81,7 +81,7 @@ public class CamelRestConfiguration extends RouteBuilder {
         String totalPower = "/upData/总有功功率";
         String casePress = "/upData/套压";
         String oilPress = "/upData/油压";
-
+        System.out.println("开始 :wellId: " + wellId +"wellName:" + wellName + "date"+ date + "sysdate" + new Date());
         map.put("ACurrent", Double.valueOf("".equals(getParams(wellId + ACurrent)) ? "0" : getParams(wellId + ACurrent)));
         map.put("BCurrent", Double.valueOf("".equals(getParams(wellId + BCurrent)) ? "0" : getParams(wellId + BCurrent)));
         map.put("CCurrent", Double.valueOf("".equals(getParams(wellId + CCurrent)) ? "0" : getParams(wellId + CCurrent)));
@@ -92,6 +92,7 @@ public class CamelRestConfiguration extends RouteBuilder {
         map.put("totalPower", Double.valueOf("".equals(getParams(wellId + totalPower)) ? "0" : getParams(wellId + totalPower)));
         map.put("casePress", Double.valueOf("".equals(getParams(wellId + casePress)) ? "0" : getParams(wellId + casePress)));
         map.put("oilPress", Double.valueOf("".equals(getParams(wellId + oilPress)) ? "0" : getParams(wellId + oilPress)));
+        System.out.println("over");
         insertCurrentTimeParams(map, wellName,date);
 
 
@@ -306,8 +307,8 @@ public class CamelRestConfiguration extends RouteBuilder {
                     long time2 = yunpingtai.getTime();
                     Date date = new Date();
                     long time3 = date.getTime();
-                    int hours1 = (int) ((time3 - time2) / (1000 * 60 * 60));
-                    int hours = (int) ((time2 - time1) / (1000 * 60 * 60));
+                    int hours1 = Math.abs((int) ((time3 - time2) / (1000 * 60 * 60)));
+                    int hours = Math.abs((int) ((time2 - time1) / (1000 * 60 * 60)));
                     //云平台和采集时间相差要小于4小时
                     if (hours < 4 && !"".equals(gtsj) && hours1 < 4) {
                         z.setZd_init_sgt(gtsj);//位移载荷点
@@ -324,24 +325,24 @@ public class CamelRestConfiguration extends RouteBuilder {
                     } else {
                         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
                         String dateNow = df.format(new java.util.Date());
-
-                        z.setZd_init_sgt(gtsj);//位移载荷点
+                        ZDJG_WELL well = new ZDJG_WELL();
+                        well.setZd_init_sgt(gtsj);//位移载荷点
 //
                         if (jsonObject.getString("strokeFrequency") != null) {
-                            z.setStroke(CALUtil.round((Double.valueOf(jsonObject.getString("stroke"))) * 100) / 100);//冲程，但GTSB_2的冲程是CC字段
+                            well.setStroke(CALUtil.round((Double.valueOf(jsonObject.getString("stroke"))) * 100) / 100);//冲程，但GTSB_2的冲程是CC字段
                         }
                         if (jsonObject.getString("stroke") != null) {
-                            z.setFrequence(CALUtil.round((Double.valueOf(jsonObject.getString("strokeFrequency"))) * 100) / 100);//冲次，但GTSB_2的冲次是PJXC字段
+                            well.setFrequence(CALUtil.round((Double.valueOf(jsonObject.getString("strokeFrequency"))) * 100) / 100);//冲次，但GTSB_2的冲次是PJXC字段
                         }
-                        z.setProd_date(dateNow);
-                        z.setBz(rtutime);
-                        z.setSxzh(Double.parseDouble(jsonObject.getString("maxLoad")));//最大载荷
-                        z.setXxzh(Double.parseDouble(jsonObject.getString("minLoad")));//最小载荷
-                        z.setWell_common_name(well_id);
-
-                        z.setErrorInfo("采集时间错误");
-                        if (accessWellMap.get(z.getWell_common_name()) != null)
-                            insertData(z);
+                        well.setProd_date(dateNow);
+                        well.setBz(rtutime);
+                        well.setSxzh(Double.parseDouble(jsonObject.getString("maxLoad")));//最大载荷
+                        well.setXxzh(Double.parseDouble(jsonObject.getString("minLoad")));//最小载荷
+                        well.setWell_common_name(well_id);
+
+                        well.setErrorInfo("采集时间错误");
+                        if (accessWellMap.get(well.getWell_common_name()) != null)
+                            insertData(well);
                     }
 
                 }
@@ -356,8 +357,7 @@ public class CamelRestConfiguration extends RouteBuilder {
 
     @Override
     public synchronized void configure() throws Exception {
-
-
+        String date = getDate();
         getAccessWell();
         JSONObject body = new JSONObject();
         Map<String,String> map = new HashMap<>();
@@ -383,7 +383,7 @@ public class CamelRestConfiguration extends RouteBuilder {
                         exchange -> {
                             Message in = exchange.getIn();
                             HashMap<String, Object> aRow = in.getBody(HashMap.class);
-                            if (aRow.get("typeName").toString().indexOf("油井") > 0) {
+                            if (aRow.get("typeName") != null && aRow.get("typeName").toString().indexOf("油井") > 0) {
                                 getCurrentTimeParams(aRow.get("id").toString(), aRow.get("code").toString(),map.get("date"));
                                 Double phd = "".equals(loadPhdDate(aRow.get("id").toString())) ? 0 : Double.valueOf(loadPhdDate(aRow.get("id").toString()));
                                 ZDJG_WELL zdjg_well = loadGtData(aRow.get("id") + "/analyse/功图数据", aRow.get("code").toString(), "2021-08-17");

src/main/resources/application.yml

@@ -163,7 +163,7 @@ management:
       cors:
         allow-credentials: off
 server:
-  port: 11101
+  port: 1015
 
 
 rocketmq: