diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index d445c1f..7f17210 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index d445c1f..7f17210 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java index dad7f4b..8401e2f 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java @@ -1,13 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; /** * 船舶数据信息 Mapper 接口 * * @author a203 */ -public interface ShipMapper extends BaseMapper { +public interface ShipMapper extends BaseMapper { } diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index d445c1f..7f17210 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java index dad7f4b..8401e2f 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java @@ -1,13 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; /** * 船舶数据信息 Mapper 接口 * * @author a203 */ -public interface ShipMapper extends BaseMapper { +public interface ShipMapper extends BaseMapper { } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml deleted file mode 100644 index 3023a3f..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index d445c1f..7f17210 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java index dad7f4b..8401e2f 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java @@ -1,13 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; /** * 船舶数据信息 Mapper 接口 * * @author a203 */ -public interface ShipMapper extends BaseMapper { +public interface ShipMapper extends BaseMapper { } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml deleted file mode 100644 index 3023a3f..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java new file mode 100644 index 0000000..29c2312 --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author a203 + */ +@Data +@TableName("bus_env_ship") +public class ShipDataModel extends Model { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; +} diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index d445c1f..7f17210 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java index dad7f4b..8401e2f 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java @@ -1,13 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; /** * 船舶数据信息 Mapper 接口 * * @author a203 */ -public interface ShipMapper extends BaseMapper { +public interface ShipMapper extends BaseMapper { } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml deleted file mode 100644 index 3023a3f..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java new file mode 100644 index 0000000..29c2312 --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author a203 + */ +@Data +@TableName("bus_env_ship") +public class ShipDataModel extends Model { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java deleted file mode 100644 index 44d769a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import lombok.Data; - -/** - * @author a203 - */ -@Data -@TableName("bus_env_ship") -public class ShipTestModel extends Model { - /** - * 主键 - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - @TableField("CREATE_TIME") - private String createTime; - - @TableField("DATA_CONTENT") - private String dataContent; -} diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index d445c1f..7f17210 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java index dad7f4b..8401e2f 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java @@ -1,13 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; /** * 船舶数据信息 Mapper 接口 * * @author a203 */ -public interface ShipMapper extends BaseMapper { +public interface ShipMapper extends BaseMapper { } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml deleted file mode 100644 index 3023a3f..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java new file mode 100644 index 0000000..29c2312 --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author a203 + */ +@Data +@TableName("bus_env_ship") +public class ShipDataModel extends Model { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java deleted file mode 100644 index 44d769a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import lombok.Data; - -/** - * @author a203 - */ -@Data -@TableName("bus_env_ship") -public class ShipTestModel extends Model { - /** - * 主键 - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - @TableField("CREATE_TIME") - private String createTime; - - @TableField("DATA_CONTENT") - private String dataContent; -} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java index 68f1119..0f10d31 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.ShipDTO; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; import java.util.List; @@ -11,13 +11,13 @@ * * @author a203 */ -public interface IShipService extends IService { +public interface IShipService extends IService { /** * 查询圆形区域最新船舶信息 * * @param rgn 包含圆形区域信息，格式：圆心纬度,圆心经度,半径；经纬 度单位为 1/10000 分，半径单位海里。每次调用的半径不 能超过 80 海里 * @param age 船位时间在此范围内的数据；最小 1 分 钟（默认），最大 240 分钟 - * @return {@link List} + * @return {@link List< ShipDataModel >} */ List shipsInCircle(String rgn, int age); } diff --git a/casic-environment/pom.xml b/casic-environment/pom.xml index d5805b1..cb3e654 100644 --- a/casic-environment/pom.xml +++ b/casic-environment/pom.xml @@ -47,11 +47,6 @@ ${fastjson.version} - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.neuronrobotics nrjavaserial 5.1.1 diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 616ab47..2c3aea4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -38,10 +38,7 @@ private final ILandPointService landPointService; private final IRoutePointService routePointService; - public TyphoonServiceImpl(IAddressConfigService configService, - ITyphoonDetailService detailService, - ILandPointService landPointService, - IRoutePointService routePointService) { + public TyphoonServiceImpl(IAddressConfigService configService, ITyphoonDetailService detailService, ILandPointService landPointService, IRoutePointService routePointService) { this.configService = configService; this.detailService = detailService; this.landPointService = landPointService; @@ -63,12 +60,10 @@ */ @Override public void saveTyphoonList() { - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/saveTyphoon?"; - log.info("saveTyphoonList ===> " + url); /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonListModel listModel = JSON.parseObject(res, new TypeReference() { }); @@ -103,12 +98,9 @@ List typhoons = this.baseMapper.selectCurrentTyphoon(); for (Typhoon typhoon : typhoons) { /** - * 获取台风接口数据 + * TODO 改为天通获取台风数据 * */ - String url = Constant.HTTP_HEADER + obtainEnvAddress() + "/environment/typhoonDetail?typhoonId=" + typhoon.getTyphoonId(); - log.info("updateTyphoonDetail ===> " + url); - - String res = HttpRequestHelper.doGet(url); + String res = ""; if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { TyphoonDetailModel detailModel = JSON.parseObject(res, new TypeReference() { }); @@ -195,18 +187,12 @@ @Override public TyphoonDetailDTO typhoonDetail(String typhoonId) { - TyphoonDetail typhoonDetail = detailService.getOne( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + TyphoonDetail typhoonDetail = detailService.getOne(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); if (typhoonDetail == null) { return null; } - List landPoints = landPointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); - List routePoints = routePointService.list( - new QueryWrapper().eq("TYPHOON_ID", typhoonId) - ); + List landPoints = landPointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); + List routePoints = routePointService.list(new QueryWrapper().eq("TYPHOON_ID", typhoonId)); return new TyphoonDetailDTO(typhoonDetail, landPoints, routePoints); } } diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index e040627..9b7c27b 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 1b1e5de..8cc99b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -2,12 +2,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import lombok.NonNull; -import okhttp3.*; - -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * 网络请求工具 @@ -18,36 +12,6 @@ public static final int SUCCESS_CODE = 200; - public static RequestBody createRequestBody(String value) { - return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), value); - } - - public static String doPost(Request request) { - return streamResponse(request); - } - - public static String doGet(String url) { - return streamResponse(new Request.Builder() - .url(url) - .build()); - } - - private static String streamResponse(@NonNull Request request) { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(20, TimeUnit.SECONDS) - .build(); - Call call = httpClient.newCall(request); - try { - Response response = call.execute(); - return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - } catch (IOException e) { - e.printStackTrace(); - } - return ""; - } - public static int getResponseCode(String value) { if (value.contains("error")) { return 404; diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 65f3c26..0e751ce 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -67,11 +67,6 @@ fastjson ${fastjson.version} - - com.squareup.okhttp3 - okhttp - 4.9.1 - org.locationtech.spatial4j diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index d445c1f..7f17210 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -42,11 +42,6 @@ - com.squareup.okhttp3 - okhttp - 4.9.1 - - com.alibaba fastjson ${fastjson.version} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java index dad7f4b..8401e2f 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/ShipMapper.java @@ -1,13 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; /** * 船舶数据信息 Mapper 接口 * * @author a203 */ -public interface ShipMapper extends BaseMapper { +public interface ShipMapper extends BaseMapper { } diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml b/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml deleted file mode 100644 index 3023a3f..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dao/mapping/ShipMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java new file mode 100644 index 0000000..29c2312 --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipDataModel.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author a203 + */ +@Data +@TableName("bus_env_ship") +public class ShipDataModel extends Model { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java deleted file mode 100644 index 44d769a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/model/ShipTestModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import lombok.Data; - -/** - * @author a203 - */ -@Data -@TableName("bus_env_ship") -public class ShipTestModel extends Model { - /** - * 主键 - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - @TableField("CREATE_TIME") - private String createTime; - - @TableField("DATA_CONTENT") - private String dataContent; -} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java index 68f1119..0f10d31 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IShipService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.ShipDTO; -import com.casic.missiles.modular.system.model.ShipTestModel; +import com.casic.missiles.modular.system.model.ShipDataModel; import java.util.List; @@ -11,13 +11,13 @@ * * @author a203 */ -public interface IShipService extends IService { +public interface IShipService extends IService { /** * 查询圆形区域最新船舶信息 * * @param rgn 包含圆形区域信息，格式：圆心纬度,圆心经度,半径；经纬 度单位为 1/10000 分，半径单位海里。每次调用的半径不 能超过 80 海里 * @param age 船位时间在此范围内的数据；最小 1 分 钟（默认），最大 240 分钟 - * @return {@link List} + * @return {@link List< ShipDataModel >} */ List shipsInCircle(String rgn, int age); } 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 db48851..6d1c1b7 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 @@ -6,11 +6,12 @@ import com.casic.missiles.modular.system.dao.ShipMapper; import com.casic.missiles.modular.system.dto.ShipDTO; import com.casic.missiles.modular.system.dto.remote.ShipRemoteData; -import com.casic.missiles.modular.system.model.ShipTestModel; -import com.casic.missiles.modular.system.service.IAddressConfigService; +import com.casic.missiles.modular.system.model.AisLog; +import com.casic.missiles.modular.system.model.ShipDataModel; import com.casic.missiles.modular.system.service.IAisLogService; import com.casic.missiles.modular.system.service.IShipService; import com.casic.missiles.modular.system.utils.HttpRequestHelper; +import com.casic.missiles.modular.system.utils.TimeUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -26,44 +27,29 @@ @Slf4j @Service -public class ShipServiceImpl extends ServiceImpl implements IShipService { - - private final IAddressConfigService configService; +public class ShipServiceImpl extends ServiceImpl implements IShipService { private final IAisLogService logService; - public ShipServiceImpl(IAddressConfigService configService, IAisLogService logService) { - this.configService = configService; + public ShipServiceImpl(IAisLogService logService) { this.logService = logService; } @Override public List shipsInCircle(String rgn, int age) { -// AddressConfigDTO addressConfig = configService.selectLastConfig(); -// String aisIp = addressConfig.getAisIp(); -// if (aisIp.contains(Constant.HTTP_HEADER)) { -// aisIp = aisIp.replace(Constant.HTTP_HEADER, ""); -// } -// String url = Constant.HTTP_HEADER + aisIp + "/ais/shipsInCircle?rgn=" + rgn + "&age=" + age; -// log.info("shipsInCircle ===> " + url); -// -// /** -// * 获取AIS接口数据 -// * */ -// String res = HttpRequestHelper.doGet(url); //TODO 模拟天通返回数据 - List models = this.list(); + List models = this.list(); Random random = new Random(); - ShipTestModel shipTestModel = models.get(random.nextInt(models.size())); + ShipDataModel shipTestModel = models.get(random.nextInt(models.size())); String res = shipTestModel.getDataContent(); //先解析出code，根据code判断 if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(res)) { //请求成功才保存ais访问记录 -// AisLog aisLog = new AisLog(); -// aisLog.setRequestParam(url); -// aisLog.setResponse(res); -// aisLog.setRequestTime(TimeUtil.getCurrentTime()); -// logService.save(aisLog); + AisLog aisLog = new AisLog(); + aisLog.setRequestParam(""); + aisLog.setResponse(res); + aisLog.setRequestTime(TimeUtil.getCurrentTime()); + logService.save(aisLog); ShipRemoteData remoteData = JSON.parseObject(res, new TypeReference() { });