From 871efa21e6c95520e9825ae1f2338c9a919fdd5d Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期日, 15 十月 2023 17:57:48 +0800
Subject: [PATCH] 用户端代码

---
 src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java b/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java
index 55413b6..ee09031 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java
@@ -103,7 +103,6 @@
                     lfd= getTime(lfd);
                     terminaleDataWarpper.setLfd(lfd);
                 }catch (Exception e){
-                    terminaleDataWarpper.setLfd(lfd);
                 }
 
                 String available = JSONObject.parseObject(attributes.toString()).get("available_for_pickup").toString();
@@ -135,17 +134,20 @@
                         terminaleDataWarpper.setCtf(CTF);
                     }
                 }
-                if("PENDING".equals(terminaleDataWarpper.getLineHold()) && ToolUtil.isNotEmpty(lfd)){
+                if("PENDING".equals(terminaleDataWarpper.getLineHold()) && !"null".equals(lfd)){
                     terminaleDataWarpper.setLineHold("RELEASE");
                 }
-                if("PENDING".equals(terminaleDataWarpper.getCustomHold()) && ToolUtil.isNotEmpty(lfd)){
+                if("PENDING".equals(terminaleDataWarpper.getCustomHold()) && !"null".equals(lfd)){
                     terminaleDataWarpper.setCustomHold("RELEASE");
                 }
-                if("PENDING".equals(terminaleDataWarpper.getPierpass()) && ToolUtil.isNotEmpty(lfd)){
+                if("PENDING".equals(terminaleDataWarpper.getPierpass()) && !"null".equals(lfd)){
                     terminaleDataWarpper.setPierpass("RELEASE");
                 }
-                if("PENDING".equals(terminaleDataWarpper.getCtf()) && ToolUtil.isNotEmpty(lfd)){
+                if("PENDING".equals(terminaleDataWarpper.getCtf()) && !"null".equals(lfd)){
                     terminaleDataWarpper.setCtf("RELEASE");
+                }
+                if(ToolUtil.isEmpty(location) &&  "null".equals(lfd)){
+                    terminaleDataWarpper.setClosedArea("ON VESSEL");
                 }
                 break;
             }
@@ -161,10 +163,34 @@
         return terminaleDataWarpper;
     }
 
+
+
+    public static String getContainerNoOne(String shipmentId, String containerNo) {
+        int i=0;
+        String s = HttpRequest.sendGet("https://api.terminal49.com/v2/shipments/"+shipmentId, "");
+        TerminaleDataWarpper terminaleDataWarpper = new TerminaleDataWarpper();
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(s);
+            Object data = jsonObject.get("data");
+            Object attributes = JSONObject.parseObject(data.toString()).get("attributes");
+            Object time = JSONObject.parseObject(attributes.toString()).get("pod_eta_at");
+            return String.valueOf(time).substring(0,10);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static void main(String[] args) {
+        TerminaleDataWarpper tcnu6817755 = getContainerNo("7e4c2878-235f-4414-8804-9dd6568a5d6f", "TCNU6817755");
+        System.out.println(tcnu6817755);
+    }
+
     public static String getTime(String time) throws ParseException {
         String t = time.substring(0, time.indexOf("T"))+" 00:00:00";
         Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(t);
-        String format = new SimpleDateFormat("dd/MM/yyyy").format(parse);
+        String format = new SimpleDateFormat("MM/dd/yyyy").format(parse);
         return format;
     }
 }

--
Gitblit v1.7.1