修改目录结构

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;

APIService/src/main/java/com/storeroom/controller/TestApiServiceController.java → 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<Object> getInfo() {
         Object objMsg = apiService.getAllDeviceAlarm();
-        //pushService.pushMsgToAll(objMsg.toString());
+        pushService.pushMsgToAll(objMsg.toString());
         return ApiResponse.success(apiService.getAllDeviceAlarm());
     }
 
     @ApiOperation("获取设备监控参数实时值")
     @AnonymousPostMapping("getrealtimedata")
     public ApiResponse<Object> getrealtimedata(@RequestBody Set<String> deviceIds) {
-        ;
+
         return ApiResponse.success(apiService.getRealTimeData(deviceIds));
     }
 }

APIService/src/main/java/com/storeroom/service/ApiService.java → 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;

APIService/src/main/java/com/storeroom/service/dto/DeviceAllDto.java → 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;

APIService/src/main/java/com/storeroom/service/dto/GetCurAlarmDto.java → 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

APIService/src/main/java/com/storeroom/service/dto/RealTimeDataDto.java → 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;

APIService/src/main/java/com/storeroom/service/dto/ResultDto.java → 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;

APIService/src/main/java/com/storeroom/service/impl/ApiServiceImpl.java → 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;