Sfoglia il codice sorgente

对外提供接口

459242451@qq.com 3 anni fa
parent
commit
236b38a194

+ 24 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GasCommonController.java

@@ -125,9 +125,12 @@ public class GasCommonController {
 
     @GetMapping("/queryIllegalInfoList")
     @ApiOperation("获取嫌疑或违规船舶信息")
-    public AjaxResult queryIllegalInfoList(@RequestParam String illegalStatus, @RequestParam(required = false, defaultValue = "20") Integer size) {
+    public AjaxResult queryIllegalInfoList(@RequestParam String illegalStatus, @RequestParam(required = false, defaultValue = "20") Integer size, @RequestParam(required = false) String mmsi) {
         Map<String, Object> equalsCondition = new HashMap<>();
         equalsCondition.put("illegalStatus", illegalStatus);
+        if (StrUtil.isNotBlank(mmsi)) {
+            equalsCondition.put("mmsi", mmsi);
+        }
         List<String> orderBy = new ArrayList<>();
         orderBy.add("-createTime");
         Map<String, Object> stringObjectMap = client.searchDocument(equalsCondition,
@@ -142,6 +145,26 @@ public class GasCommonController {
         return AjaxResult.success(Convert.toList(IllegalInfo.class, stringObjectMap.get("pageList")));
     }
 
+//    @GetMapping("/third/queryIllegalInfoList")
+//    @ApiOperation("提供第三方:获取嫌疑或违规船舶信息")
+//    public AjaxResult thirdQueryIllegalInfoList(@RequestParam String mmsi, @RequestParam(required = false, defaultValue = "2") Integer size) {
+//        Map<String, Object> equalsCondition = new HashMap<>();
+//        equalsCondition.put("mmsi", mmsi);
+//        equalsCondition.put("")
+//        List<String> orderBy = new ArrayList<>();
+//        orderBy.add("-createTime");
+//        Map<String, Object> stringObjectMap = client.searchDocument(equalsCondition,
+//                null,
+//                orderBy,
+//                1,
+//                size,
+//                ElasticConstants.AIS_ILLEGAL_SHIP,
+//                ElasticConstants.SO2_ALERT,
+//                ElasticConstants.HEIYAN_SHIP_RECOGNITION);
+//
+//        return AjaxResult.success(Convert.toList(IllegalInfo.class, stringObjectMap.get("pageList")));
+//    }
+
     @GetMapping("/queryDeviceList")
     @ApiOperation("获取所有设备数据")
     public AjaxResult queryDeviceList(@RequestParam(required = false) String monitor) {

+ 2 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -102,7 +102,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/**/*.html",
                         "/**/*.css",
                         "/**/*.js",
-                        "/profile/**"
+                        "/profile/**",
+                        "/gas/common/queryIllegalInfoList"
                 ).permitAll()
                 .antMatchers("/common/download**").anonymous()
                 .antMatchers("/common/download/resource**").anonymous()