下载excel，功能，基础架子

@@ -160,10 +160,10 @@ public class CgoNmsController {
              */
              */
 //            if (result.getWaybillNoMaster() != null && result.getWaybillNoMaster() != "") { }
 //            if (result.getWaybillNoMaster() != null && result.getWaybillNoMaster() != "") { }
             ResultExitData asmInfo = getCgoAsmFeign.getInfo(result.getWaybillNoMaster());
             ResultExitData asmInfo = getCgoAsmFeign.getInfo(result.getWaybillNoMaster());
-            //设置代理人全称
-            result.setFullName(asmInfo.getFullName());
-            //设置货主类型
-            result.setTheShipperType(asmInfo.getTheShipperType());
+            //设置结算代理人
+            result.setCountName(asmInfo.getCountName());
+            //设置订舱代理人
+            result.setOrderName(asmInfo.getOrderName());
             //设置品名
             //设置品名
             result.setSdCargoName(asmInfo.getSdCargoName());
             result.setSdCargoName(asmInfo.getSdCargoName());
             //设置二级类名称
             //设置二级类名称

@@ -100,9 +100,9 @@ public class NmsController {
         String sid = request.getHeader("Authorization");
         String sid = request.getHeader("Authorization");
         log.info("token的值：" + sid);
         log.info("token的值：" + sid);
         final String startTime = sdf.format(new Date());
         final String startTime = sdf.format(new Date());
-        System.out.println("开始时间：" + startTime);
+        ResultWs resultStart = new ResultWs("数据开始获取，开始时间："+ startTime);
+
         sendMsgByWebsocket("开始时间：" + startTime, sid);
         sendMsgByWebsocket("开始时间：" + startTime, sid);
-        System.out.println("出港数据，开始获取");
         ResultJson resultJson = new ResultJson();
         ResultJson resultJson = new ResultJson();
 
 
         /**
         /**

 package com.sunyo.wlpt.cgonms.provide.excle;
 package com.sunyo.wlpt.cgonms.provide.excle;
 
 
 import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
 import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
-import com.sunyo.wlpt.cgonms.provide.domain.ResultExitDataList;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,23 +11,14 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.io.*;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.List;
+import java.util.UUID;
 
 
-import lombok.extern.slf4j.Slf4j;
-import oracle.sql.DATE;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author 子诚
  * @author 子诚
- * Description：
+ * Description：导入Excel到本地
  * 时间：2020/5/29 10:04
  * 时间：2020/5/29 10:04
  */
  */
 @Slf4j
 @Slf4j
@@ -35,6 +26,14 @@ import java.util.Map;
 @RequestMapping("/exit")
 @RequestMapping("/exit")
 public class ExitExcel {
 public class ExitExcel {
 
 
+    @Value("${path.disc}")
+    private String disc;
+    @Value("${path.dir}")
+    private String dir;
+
+    final SimpleDateFormat sdfShort = new SimpleDateFormat("yyyy-MM-dd");
+    final SimpleDateFormat sdfLong = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
     @PostMapping("/excel")
     @PostMapping("/excel")
     public void getExit(@RequestBody List<ResultExitData> exitInfoList, HttpServletResponse httpServletResponse) {
     public void getExit(@RequestBody List<ResultExitData> exitInfoList, HttpServletResponse httpServletResponse) {
         exportExcel(exitInfoList, httpServletResponse);
         exportExcel(exitInfoList, httpServletResponse);
@@ -121,13 +120,13 @@ public class ExitExcel {
             //航班号
             //航班号
             excelTitle[12] = ResultExitData.getFlightNo();
             excelTitle[12] = ResultExitData.getFlightNo();
             //航班日期
             //航班日期
-            excelTitle[13] = String.valueOf(ResultExitData.getFlightDate());
+            excelTitle[13] = sdfShort.format(ResultExitData.getFlightDate());
             //航班时间
             //航班时间
-            excelTitle[14] = String.valueOf(ResultExitData.getFlightTime());
+            excelTitle[14] = sdfLong.format(ResultExitData.getFlightTime());
             //航班计划日期
             //航班计划日期
-            excelTitle[15] = String.valueOf(ResultExitData.getFlightPlanDate());
+            excelTitle[15] = sdfShort.format(ResultExitData.getFlightPlanDate());
             //航班计划时间
             //航班计划时间
-            excelTitle[16] = String.valueOf(ResultExitData.getFlightPlanTime());
+            excelTitle[16] = sdfLong.format(ResultExitData.getFlightPlanTime());
             //航段
             //航段
             excelTitle[17] = ResultExitData.getSegment();
             excelTitle[17] = ResultExitData.getSegment();
             //机号
             //机号
@@ -151,9 +150,21 @@ public class ExitExcel {
                 row.createCell(j).setCellValue(excelTitle[j]);
                 row.createCell(j).setCellValue(excelTitle[j]);
             }
             }
         }
         }
+
+        String file_name= UUID.randomUUID().toString().replaceAll("-", "");
         // 设置文件名
         // 设置文件名
-        String title = "export.xls";
-        String filePath = "H:" + File.separator + title;
+        String title = file_name+".xls";
+
+        String filePath = disc+":" + File.separator + dir + File.separator + title;
+        /**
+         * 创建文件夹
+         */
+        File testFile = new File(filePath);
+        File fileParent = testFile.getParentFile();
+        if (!fileParent.exists()) {
+            // 能创建多级目录
+            fileParent.mkdirs();
+        }
         try {
         try {
             FileOutputStream fos = new FileOutputStream(filePath);
             FileOutputStream fos = new FileOutputStream(filePath);
             workbook.write(fos);
             workbook.write(fos);
@@ -164,6 +175,5 @@ public class ExitExcel {
         } catch (IOException e) {
         } catch (IOException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-
     }
     }
 }
 }

@@ -42,6 +42,15 @@ public class ResultWs<T> implements Serializable {
         this.status = status;
         this.status = status;
     }
     }
 
 
+    public ResultWs(String message, String status) {
+        this.message = message;
+        this.status = status;
+    }
+
+    public ResultWs(String message) {
+        this.message = message;
+    }
+
     public ResultWs(String sid, String message, T data, String status) {
     public ResultWs(String sid, String message, T data, String status) {
         this.sid = sid;
         this.sid = sid;
         this.message = message;
         this.message = message;

-package com.sunyo.wlpt.cgonms.provide.socket;
-
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author 子诚
- * Description：WebSocket服务端
- * 时间：2020/5/28 11:24
- */
-//@Component
-@Slf4j
-//@ServerEndpoint(value = "/websocket")
-public class WebSocketServer {
-    /**
-     * 在线数量
-     */
-    private static final AtomicInteger OnlineCount = new AtomicInteger(0);
-
-    /**
-     * concurrent包的线程安全Set，用来存放每个客户端对应的Session对象。
-     */
-    private static CopyOnWriteArraySet<Session> SessionSet = new CopyOnWriteArraySet<>();
-
-
-    /**
-     * 连接建立成功调用的方法
-     */
-    @OnOpen
-    public void onOpen(Session session) throws IOException {
-        SessionSet.add(session);
-        // 在线数量，加1
-        int cnt = OnlineCount.incrementAndGet();
-        log.info("有连接加入，当前连接数为：{}", cnt);
-        SendMessage(session, "服务端回消息：连接成功");
-    }
-
-    /**
-     * 连接关闭调用的方法
-     */
-    @OnClose
-    public void onClose(Session session) {
-        SessionSet.remove(session);
-        // 在线数量，减1
-        int cnt = OnlineCount.decrementAndGet();
-        log.info("有连接关闭，当前连接数为：{}", cnt);
-    }
-
-    /**
-     * 收到客户端消息后调用的方法
-     *
-     * @param message 客户端发送过来的消息
-     */
-    @OnMessage
-    public void onMessage(String message, Session session) throws IOException {
-        log.info("来自客户端的消息：{}", message);
-
-//        JSONObject jsonObject = JSONObject.parseObject(message);
-//        Object flightNo = jsonObject.get("flightNo");
-//        Object flightDate = jsonObject.get("flightDate");
-//        log.info("flight: {},flightDate: {}", flightNo,flightDate);
-        SendMessage(session, "服务端收到消息，消息内容：" + message);
-    }
-
-    /**
-     * 出现错误
-     */
-    @OnError
-    public void onError(Session session, Throwable error) {
-        log.error("发生错误：{}，Session ID： {}", error.getMessage(), session.getId());
-    }
-
-    /**
-     * 发送消息，实践表明，每次浏览器刷新，session会发生变化。
-     *
-     * @param session session
-     * @param message 消息
-     */
-    private static void SendMessage(Session session, String message) throws IOException {
-
-        session.getBasicRemote().sendText(String.format("%s (From Server，Session ID=%s)", message, session.getId()));
-
-    }
-
-    /**
-     * 群发消息
-     *
-     * @param message 消息
-     */
-    public static void BroadCastInfo(String message) throws IOException {
-        for (Session session : SessionSet) {
-            if (session.isOpen()) {
-                SendMessage(session, message);
-            }
-        }
-    }
-
-    /**
-     * 指定Session发送消息
-     *
-     * @param sessionId sessionId
-     * @param message   消息
-     */
-    public static void SendMessage(String sessionId, String message) throws IOException {
-        Session session = null;
-        for (Session s : SessionSet) {
-            if (s.getId().equals(sessionId)) {
-                session = s;
-                break;
-            }
-        }
-        if (session != null) {
-            SendMessage(session, message);
-        } else {
-            log.warn("没有找到你指定ID的会话：{}", sessionId);
-        }
-    }
-
-}

@@ -80,3 +80,9 @@ management:
       show-details: always
       show-details: always
     shutdown:
     shutdown:
       enabled: true
       enabled: true
+
+path:
+  # 盘的位置
+  disc: H
+  # 文件夹的位置，就一个文件夹
+  dir: exitExcel