From d4405c1941bbf61db0ff16164ec76a0996c75729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Fri, 29 Jul 2022 16:36:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/device/service/impl/DeviceImpl.java | 1 - .../controller/TestApiServiceController.java | 11 ++++++----- .../modules/storeroom3d}/service/ApiService.java | 4 ++-- .../storeroom3d}/service/dto/DeviceAllDto.java | 2 +- .../storeroom3d}/service/dto/GetCurAlarmDto.java | 4 +--- .../storeroom3d}/service/dto/RealTimeDataDto.java | 2 +- .../modules/storeroom3d}/service/dto/ResultDto.java | 2 +- .../storeroom3d}/service/impl/ApiServiceImpl.java | 10 +++++----- 8 files changed, 17 insertions(+), 19 deletions(-) rename {APIService/src/main/java/com/storeroom => storeroom/src/main/java/com/storeroom/modules/storeroom3d}/controller/TestApiServiceController.java (86%) rename {APIService/src/main/java/com/storeroom => storeroom/src/main/java/com/storeroom/modules/storeroom3d}/service/ApiService.java (80%) rename {APIService/src/main/java/com/storeroom => storeroom/src/main/java/com/storeroom/modules/storeroom3d}/service/dto/DeviceAllDto.java (83%) rename {APIService/src/main/java/com/storeroom => storeroom/src/main/java/com/storeroom/modules/storeroom3d}/service/dto/GetCurAlarmDto.java (93%) rename {APIService/src/main/java/com/storeroom => storeroom/src/main/java/com/storeroom/modules/storeroom3d}/service/dto/RealTimeDataDto.java (95%) rename {APIService/src/main/java/com/storeroom => storeroom/src/main/java/com/storeroom/modules/storeroom3d}/service/dto/ResultDto.java (82%) rename {APIService/src/main/java/com/storeroom => storeroom/src/main/java/com/storeroom/modules/storeroom3d}/service/impl/ApiServiceImpl.java (96%) diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java index 4286e81..c67f132 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java @@ -8,7 +8,6 @@ import com.storeroom.modules.device.service.dto.DeviceInfoDto; import com.storeroom.modules.device.service.dto.DeviceTypeDto; import com.storeroom.modules.device.service.mapstruct.DeviceInfoMapper; import com.storeroom.modules.device.service.mapstruct.DeviceTypeMapper; -import com.storeroom.service.ApiService; import com.storeroom.utils.*; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; diff --git a/APIService/src/main/java/com/storeroom/controller/TestApiServiceController.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java similarity index 86% rename from APIService/src/main/java/com/storeroom/controller/TestApiServiceController.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java index a94cd2c..5bc5e85 100644 --- a/APIService/src/main/java/com/storeroom/controller/TestApiServiceController.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java @@ -1,9 +1,10 @@ -package com.storeroom.controller; +package com.storeroom.modules.storeroom3d.controller; import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; -import com.storeroom.service.ApiService; +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; @@ -22,7 +23,7 @@ import java.util.Set; public class TestApiServiceController { private final ApiService apiService; - //private final PushService pushService; + private final PushService pushService; @ApiOperation("获取库房token") @AnonymousGetMapping("token") @@ -47,14 +48,14 @@ public class TestApiServiceController { @AnonymousGetMapping("getcuralarm") public ApiResponse getInfo() { Object objMsg = apiService.getAllDeviceAlarm(); - //pushService.pushMsgToAll(objMsg.toString()); + 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/APIService/src/main/java/com/storeroom/service/ApiService.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ApiService.java similarity index 80% rename from APIService/src/main/java/com/storeroom/service/ApiService.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ApiService.java index 4da64b7..53391c0 100644 --- a/APIService/src/main/java/com/storeroom/service/ApiService.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ApiService.java @@ -1,6 +1,6 @@ -package com.storeroom.service; +package com.storeroom.modules.storeroom3d.service; -import com.storeroom.service.dto.DeviceAllDto; +import com.storeroom.modules.storeroom3d.service.dto.DeviceAllDto; import java.util.List; import java.util.Set; diff --git a/APIService/src/main/java/com/storeroom/service/dto/DeviceAllDto.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/DeviceAllDto.java similarity index 83% rename from APIService/src/main/java/com/storeroom/service/dto/DeviceAllDto.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/DeviceAllDto.java index c62e233..ebd9c96 100644 --- a/APIService/src/main/java/com/storeroom/service/dto/DeviceAllDto.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/DeviceAllDto.java @@ -1,4 +1,4 @@ -package com.storeroom.service.dto; +package com.storeroom.modules.storeroom3d.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/APIService/src/main/java/com/storeroom/service/dto/GetCurAlarmDto.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/GetCurAlarmDto.java similarity index 93% rename from APIService/src/main/java/com/storeroom/service/dto/GetCurAlarmDto.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/GetCurAlarmDto.java index ef7989e..0603063 100644 --- a/APIService/src/main/java/com/storeroom/service/dto/GetCurAlarmDto.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/GetCurAlarmDto.java @@ -1,12 +1,10 @@ -package com.storeroom.service.dto; +package com.storeroom.modules.storeroom3d.service.dto; import lombok.Getter; import lombok.Setter; import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; import java.util.Objects; @Getter diff --git a/APIService/src/main/java/com/storeroom/service/dto/RealTimeDataDto.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/RealTimeDataDto.java similarity index 95% rename from APIService/src/main/java/com/storeroom/service/dto/RealTimeDataDto.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/RealTimeDataDto.java index 3757b78..580f1ca 100644 --- a/APIService/src/main/java/com/storeroom/service/dto/RealTimeDataDto.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/RealTimeDataDto.java @@ -1,4 +1,4 @@ -package com.storeroom.service.dto; +package com.storeroom.modules.storeroom3d.service.dto; import lombok.Getter; diff --git a/APIService/src/main/java/com/storeroom/service/dto/ResultDto.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/ResultDto.java similarity index 82% rename from APIService/src/main/java/com/storeroom/service/dto/ResultDto.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/ResultDto.java index 321ef06..4d6efc0 100644 --- a/APIService/src/main/java/com/storeroom/service/dto/ResultDto.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/ResultDto.java @@ -1,4 +1,4 @@ -package com.storeroom.service.dto; +package com.storeroom.modules.storeroom3d.service.dto; import lombok.Getter; diff --git a/APIService/src/main/java/com/storeroom/service/impl/ApiServiceImpl.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ApiServiceImpl.java similarity index 96% rename from APIService/src/main/java/com/storeroom/service/impl/ApiServiceImpl.java rename to storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ApiServiceImpl.java index da05ad2..296b93c 100644 --- a/APIService/src/main/java/com/storeroom/service/impl/ApiServiceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ApiServiceImpl.java @@ -1,13 +1,13 @@ -package com.storeroom.service.impl; +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.service.ApiService; -import com.storeroom.service.dto.DeviceAllDto; -import com.storeroom.service.dto.GetCurAlarmDto; -import com.storeroom.service.dto.RealTimeDataDto; +import com.storeroom.modules.storeroom3d.service.ApiService; +import com.storeroom.modules.storeroom3d.service.dto.DeviceAllDto; +import com.storeroom.modules.storeroom3d.service.dto.GetCurAlarmDto; +import com.storeroom.modules.storeroom3d.service.dto.RealTimeDataDto; import com.storeroom.utils.FastjsonUtils; import com.storeroom.utils.HttpUtils; import com.storeroom.utils.RedisUtils;