调用增加参数处理：预警类型和卡口距离类型

download-center-server/src/main/java/com/shanghaichengdi/downloadcenterserver/controller/PicDownloadController.java

@@ -36,11 +36,9 @@ public class PicDownloadController {
     PicDownload picDownload = JSONObject.parseObject(data, PicDownload.class);
 //    log.info("接收到的数据为：{}",JSONObject.toJSON(picDownload));
     PicDownloadFaced faced =
-        new PicDownloadFaced(picDownload.getImageUrls(), picDownload.getPassTime(),picDownload.getId(),picDownload.getBayonetId());
+        new PicDownloadFaced(picDownload.getImageUrls(), picDownload.getPassTime(),picDownload.getId(),picDownload.getBayonetId(),picDownload.getWarningType(),picDownload.getDistanceType());
     try {
-      if (!"8".equals(faced.getBayonetId())) {
         faced.start();
-      }
     } catch (Exception e) {
 //      log.info("下载失败,原因：{}",e.getMessage());
       return new ResultMsg<String>().setMsg("下载失败").setCode(ResultState.ERROR).setData(null).toJSON();

download-center-server/src/main/java/com/shanghaichengdi/downloadcenterserver/domain/PicDownload.java

@@ -16,4 +16,6 @@ public class PicDownload {
   private String passTime;
   private String id;
   private String bayonetId;
+  private List<String> warningType;
+  private String distanceType;
 }

download-center-server/src/main/java/com/shanghaichengdi/downloadcenterserver/faced/AnalyseFaced.java

@@ -25,13 +25,14 @@ public class AnalyseFaced {
   private final static String GH_CLOUD_HISTORY_SERVER = "http://10.83.68.108:8090/ghjgBayonetDataShareApi/analyse/history/receive";
 
 
-  public static String shipCoverAnalyse(String id, String filePath, String bayonetId) {
+  public static String shipCoverAnalyse(String id, String filePath, String bayonetId, String distanceType) {
     HttpRequest post = HttpUtil.createPost(SHIP_COVER);
     Map<String, String> headers = new HashMap<>();
     headers.put("Content-Type", "application/json;charset=utf-8");
     post.addHeaders(headers);
     Map<String, String> param = new LinkedHashMap<>();
     param.put("file", DOWNLOAD_FILE_DIR + filePath);
+    param.put("type", distanceType);
     String responseBody = post.body(JSONObject.toJSONString(param))
         .setReadTimeout(3600000)
         .execute()

download-center-server/src/main/java/com/shanghaichengdi/downloadcenterserver/faced/PicDownloadFaced.java

@@ -25,14 +25,18 @@ public class PicDownloadFaced extends Thread {
   private List<String> imageUrls;
   private String passTime;
   private String id;
+  private List<String> warningType;
+  private String distanceType;
   @Getter
   private String bayonetId;
 
-  public PicDownloadFaced(List<String> imageUrls, String passTime, String id, String bayonetId) {
+  public PicDownloadFaced(List<String> imageUrls, String passTime, String id, String bayonetId, List<String> warningType, String distanceType)  {
     this.imageUrls = imageUrls;
     this.passTime = passTime;
     this.id = id;
     this.bayonetId = bayonetId;
+    this.warningType = warningType;
+    this.distanceType = distanceType;
   }
 
   @Override
@@ -85,17 +89,26 @@ public class PicDownloadFaced extends Thread {
 //    log.warn("======>   取出并移除首位元素:{}", JSONObject.toJSONString(UrlData.URL_IMG_TO_SAVE.poll()));
     Map<String, List<String>> polled = UrlData.URL_IMG_TO_SAVE.poll();
     String id = new ArrayList<>(polled.keySet()).get(0);
-    if ("1".equals(bayonetId) || "2".equals(bayonetId)) {
-      AnalyseFaced.lifeJacketAnalyse(id, polled.get(id), bayonetId);
-    }else{
-    if (!"8".equals(bayonetId)) {
-      AnalyseFaced.shipCoverAnalyse(id, polled.get(id).get(0), bayonetId);
+    if (warningType.contains("7")) {
+      AnalyseFaced.shipCoverAnalyse(id, polled.get(id).get(0), bayonetId, distanceType);
+    }
+    if (warningType.contains("9")) {
+      AnalyseFaced.boatFlagAnalyse(id, polled.get(id), bayonetId);
+    }
+    if (warningType.contains("8")) {
       AnalyseFaced.lifeJacketAnalyse(id, polled.get(id), bayonetId);
-      if (!"14".equals(bayonetId)) {
-        AnalyseFaced.boatFlagAnalyse(id, polled.get(id), bayonetId);
-        }
-      }
     }
+//    if ("1".equals(bayonetId) || "2".equals(bayonetId)) {
+//      AnalyseFaced.lifeJacketAnalyse(id, polled.get(id), bayonetId);
+//    }else{
+//    if (!"8".equals(bayonetId)) {
+//      AnalyseFaced.shipCoverAnalyse(id, polled.get(id).get(0), bayonetId);
+//      AnalyseFaced.lifeJacketAnalyse(id, polled.get(id), bayonetId);
+//      if (!"14".equals(bayonetId)) {
+//        AnalyseFaced.boatFlagAnalyse(id, polled.get(id), bayonetId);
+//        }
+//      }
+//    }
   }
 
   private synchronized static void addQueue(String id, List<String> imgUrlToSave) {