diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java index 8e500d0..4edebe9 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java @@ -45,7 +45,6 @@ @GetMapping(value = "/log") @ResponseBody public Object log() { - int i = logService.requestAisTimes(); - return ResponseData.success(i); + return ResponseData.success(logService.count()); } } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java index 8e500d0..4edebe9 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java @@ -45,7 +45,6 @@ @GetMapping(value = "/log") @ResponseBody public Object log() { - int i = logService.requestAisTimes(); - return ResponseData.success(i); + return ResponseData.success(logService.count()); } } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java index 90c984f..8635c2d 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java @@ -9,10 +9,5 @@ * @author a203 */ public interface IAisLogService extends IService { - /** - * 查询圆形区域最新船舶信息 - * - * @return int - */ - int requestAisTimes(); + } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java index 8e500d0..4edebe9 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java @@ -45,7 +45,6 @@ @GetMapping(value = "/log") @ResponseBody public Object log() { - int i = logService.requestAisTimes(); - return ResponseData.success(i); + return ResponseData.success(logService.count()); } } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java index 90c984f..8635c2d 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java @@ -9,10 +9,5 @@ * @author a203 */ public interface IAisLogService extends IService { - /** - * 查询圆形区域最新船舶信息 - * - * @return int - */ - int requestAisTimes(); + } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java index f73b9c6..79f5ea8 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java @@ -18,9 +18,4 @@ public AisLogServiceImpl() { } - - @Override - public int requestAisTimes() { - return list().size(); - } } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java index 8e500d0..4edebe9 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/ShipController.java @@ -45,7 +45,6 @@ @GetMapping(value = "/log") @ResponseBody public Object log() { - int i = logService.requestAisTimes(); - return ResponseData.success(i); + return ResponseData.success(logService.count()); } } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java index 90c984f..8635c2d 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IAisLogService.java @@ -9,10 +9,5 @@ * @author a203 */ public interface IAisLogService extends IService { - /** - * 查询圆形区域最新船舶信息 - * - * @return int - */ - int requestAisTimes(); + } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java index f73b9c6..79f5ea8 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/AisLogServiceImpl.java @@ -18,9 +18,4 @@ public AisLogServiceImpl() { } - - @Override - public int requestAisTimes() { - return list().size(); - } } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java index 932678f..39db3af 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.ShipMapper; @@ -30,7 +29,6 @@ @Service public class ShipServiceImpl extends ServiceImpl implements IShipService { - private static final int SUCCESS_CODE = 200; private final IAddressConfigService configService; private final IAisLogService logService; @@ -53,7 +51,7 @@ * */ String res = HttpRequestHelper.doGet(url); //先解析出code，根据code判断 - if (SUCCESS_CODE == getResponseCode(res)) { + if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { //请求成功才保存ais访问记录 AisLog aisLog = new AisLog(); aisLog.setRequestParam(url); @@ -71,9 +69,4 @@ } return null; } - - public int getResponseCode(String value) { - JSONObject jsonObject = JSON.parseObject(value); - return jsonObject.getInteger("code"); - } }