From 70772bf30351f8727f1066393993e8f3c6fcdc2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Mon, 1 Aug 2022 08:51:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APIService/pom.xml | 35 ----------- pom.xml | 1 - storeroom/pom.xml | 11 ++-- .../controller/ApiServiceController.java | 60 ++++++++++++++++++ .../controller/TestApiServiceController.java | 61 ------------------- .../{ApiService.java => ThirdApiService.java} | 3 +- ...viceImpl.java => ThirdApiServiceImpl.java} | 10 ++- system/pom.xml | 5 -- 8 files changed, 71 insertions(+), 115 deletions(-) delete mode 100644 APIService/pom.xml create mode 100644 storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/ApiServiceController.java delete mode 100644 storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java rename storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/{ApiService.java => ThirdApiService.java} (94%) rename storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/{ApiServiceImpl.java => ThirdApiServiceImpl.java} (97%) diff --git a/APIService/pom.xml b/APIService/pom.xml deleted file mode 100644 index d74e20d..0000000 --- a/APIService/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - yxk_StoreroomSystem - com.storeroom - 1.0 - - 4.0.0 - - APIService - 第三方接口服务 - - - 17 - 17 - - - - - com.storeroom - common - 1.0 - - - com.ejlchina - okhttps-fastjson - 3.5.2 - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 62ed041..456c30a 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,6 @@ logging archives storeroom - APIService 智能库房综合管理系统 diff --git a/storeroom/pom.xml b/storeroom/pom.xml index 99cd16b..f934c72 100644 --- a/storeroom/pom.xml +++ b/storeroom/pom.xml @@ -23,16 +23,17 @@ common 1.0 - - com.storeroom - APIService - 1.0 - + io.netty netty-all 4.1.33.Final + + com.ejlchina + okhttps-fastjson + 3.5.2 + \ No newline at end of file diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/ApiServiceController.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/ApiServiceController.java new file mode 100644 index 0000000..6c93ea1 --- /dev/null +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/ApiServiceController.java @@ -0,0 +1,60 @@ +package com.storeroom.modules.storeroom3d.controller; + +import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.annotaion.rest.AnonymousPostMapping; +import com.storeroom.modules.storeroom3d.service.PushService; +import com.storeroom.modules.storeroom3d.service.ThirdApiService; +import com.storeroom.utils.ApiResponse; +import com.storeroom.utils.MacUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Set; + +@RestController +@RequestMapping("/api/service/") +@Api(tags = "测试第三方接口") +@RequiredArgsConstructor +public class ApiServiceController { + + private final ThirdApiService apiService; + private final PushService pushService; + + @ApiOperation("获取库房token") + @AnonymousGetMapping("token") + public ApiResponse getToken() { + return ApiResponse.success(apiService.getToken()); + } + + @ApiOperation("获取所有设备") + @AnonymousGetMapping("list") + public ApiResponse getAllDevice() { + return ApiResponse.success(apiService.getDeviceAll()); + } + + @AnonymousGetMapping("ip") + @ApiOperation("获取内网ip") + public ApiResponse getIp() { + return ApiResponse.success(MacUtil.getIpAddress()); + } + + + @ApiOperation("获取报警信息") + @AnonymousGetMapping("getcuralarm") + public ApiResponse getInfo() { + Object objMsg = apiService.getAllDeviceAlarm(); + pushService.pushMsgToAll(objMsg.toString()); + return ApiResponse.success(apiService.getAllDeviceAlarm()); + } + + @ApiOperation("获取设备监控参数实时值") + @AnonymousPostMapping("getrealtimedata") + public ApiResponse getrealtimedata(@RequestBody Set deviceIds) { + + return ApiResponse.success(apiService.getRealTimeData(deviceIds)); + } +} diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java deleted file mode 100644 index 5bc5e85..0000000 --- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.storeroom.modules.storeroom3d.controller; - - -import com.storeroom.annotaion.rest.AnonymousGetMapping; -import com.storeroom.annotaion.rest.AnonymousPostMapping; -import com.storeroom.modules.storeroom3d.service.ApiService; -import com.storeroom.modules.storeroom3d.service.PushService; -import com.storeroom.utils.ApiResponse; -import com.storeroom.utils.MacUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Set; - -@RestController -@RequestMapping("/api/service/") -@Api(tags = "测试第三方接口") -@RequiredArgsConstructor -public class TestApiServiceController { - - private final ApiService apiService; - private final PushService pushService; - - @ApiOperation("获取库房token") - @AnonymousGetMapping("token") - public ApiResponse getToken() { - return ApiResponse.success(apiService.getToken()); - } - - @ApiOperation("获取所有设备") - @AnonymousGetMapping("list") - public ApiResponse getAllDevice() { - return ApiResponse.success(apiService.getDeviceAll()); - } - - @AnonymousGetMapping("ip") - @ApiOperation("获取内网ip") - public ApiResponse getIp() { - return ApiResponse.success(MacUtil.getIpAddress()); - } - - - @ApiOperation("获取报警信息") - @AnonymousGetMapping("getcuralarm") - public ApiResponse getInfo() { - Object objMsg = apiService.getAllDeviceAlarm(); - pushService.pushMsgToAll(objMsg.toString()); - return ApiResponse.success(apiService.getAllDeviceAlarm()); - } - - @ApiOperation("获取设备监控参数实时值") - @AnonymousPostMapping("getrealtimedata") - public ApiResponse getrealtimedata(@RequestBody Set deviceIds) { - - return ApiResponse.success(apiService.getRealTimeData(deviceIds)); - } -} diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ApiService.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ThirdApiService.java similarity index 94% rename from storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ApiService.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ThirdApiService.java index 53391c0..cd07b63 100644 --- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ApiService.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ThirdApiService.java @@ -5,7 +5,7 @@ import com.storeroom.modules.storeroom3d.service.dto.DeviceAllDto; import java.util.List; import java.util.Set; -public interface ApiService { +public interface ThirdApiService { /** * 获取环控token @@ -33,5 +33,4 @@ public interface ApiService { * @return */ Object getRealTimeData(Set deviceIds); - } diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ApiServiceImpl.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java similarity index 97% rename from storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ApiServiceImpl.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java index 296b93c..8b9d8d2 100644 --- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ApiServiceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java @@ -4,7 +4,7 @@ package com.storeroom.modules.storeroom3d.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.storeroom.exception.BaseException; -import com.storeroom.modules.storeroom3d.service.ApiService; +import com.storeroom.modules.storeroom3d.service.ThirdApiService; import com.storeroom.modules.storeroom3d.service.dto.DeviceAllDto; import com.storeroom.modules.storeroom3d.service.dto.GetCurAlarmDto; import com.storeroom.modules.storeroom3d.service.dto.RealTimeDataDto; @@ -23,12 +23,10 @@ import org.springframework.util.ObjectUtils; import java.util.*; import java.util.concurrent.TimeUnit; - -@Service("ApiServiceImpl") +@Service("ThirdApiServiceImpl") @RequiredArgsConstructor @CacheConfig(cacheNames = "thirdApi") -public class ApiServiceImpl implements ApiService { - +public class ThirdApiServiceImpl implements ThirdApiService { String access_token = ""; private final RedisUtils redisUtils; @@ -139,7 +137,7 @@ public class ApiServiceImpl implements ApiService { } }); //PushServiceImpl pushService=new PushServiceImpl(); - // pushService.pushMsgToAll(result); + // pushService.pushMsgToAll(result); return result; } else { throw new BaseException("访问失败" + response.getStatusLine().getStatusCode() + ""); diff --git a/system/pom.xml b/system/pom.xml index e6ee983..799e954 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -87,11 +87,6 @@ storeroom 1.0 - - com.storeroom - APIService - 1.0 -