Browse Source

修改包文件

master
刘力 3 years ago
parent
commit
70772bf303
  1. 35
      APIService/pom.xml
  2. 1
      pom.xml
  3. 11
      storeroom/pom.xml
  4. 60
      storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/ApiServiceController.java
  5. 61
      storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java
  6. 3
      storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ThirdApiService.java
  7. 8
      storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java
  8. 5
      system/pom.xml

35
APIService/pom.xml

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>yxk_StoreroomSystem</artifactId>
<groupId>com.storeroom</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>APIService</artifactId>
<name>第三方接口服务</name>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.storeroom</groupId>
<artifactId>common</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.ejlchina</groupId>
<artifactId>okhttps-fastjson</artifactId>
<version>3.5.2</version>
</dependency>
</dependencies>
</project>

1
pom.xml

@ -14,7 +14,6 @@
<module>logging</module>
<module>archives</module>
<module>storeroom</module>
<module>APIService</module>
</modules>
<name>智能库房综合管理系统</name>

11
storeroom/pom.xml

@ -23,16 +23,17 @@
<artifactId>common</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.storeroom</groupId>
<artifactId>APIService</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>com.ejlchina</groupId>
<artifactId>okhttps-fastjson</artifactId>
<version>3.5.2</version>
</dependency>
</dependencies>
</project>

60
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<Object> getToken() {
return ApiResponse.success(apiService.getToken());
}
@ApiOperation("获取所有设备")
@AnonymousGetMapping("list")
public ApiResponse<Object> getAllDevice() {
return ApiResponse.success(apiService.getDeviceAll());
}
@AnonymousGetMapping("ip")
@ApiOperation("获取内网ip")
public ApiResponse<Object> getIp() {
return ApiResponse.success(MacUtil.getIpAddress());
}
@ApiOperation("获取报警信息")
@AnonymousGetMapping("getcuralarm")
public ApiResponse<Object> getInfo() {
Object objMsg = apiService.getAllDeviceAlarm();
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));
}
}

61
storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/TestApiServiceController.java

@ -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<Object> getToken() {
return ApiResponse.success(apiService.getToken());
}
@ApiOperation("获取所有设备")
@AnonymousGetMapping("list")
public ApiResponse<Object> getAllDevice() {
return ApiResponse.success(apiService.getDeviceAll());
}
@AnonymousGetMapping("ip")
@ApiOperation("获取内网ip")
public ApiResponse<Object> getIp() {
return ApiResponse.success(MacUtil.getIpAddress());
}
@ApiOperation("获取报警信息")
@AnonymousGetMapping("getcuralarm")
public ApiResponse<Object> getInfo() {
Object objMsg = apiService.getAllDeviceAlarm();
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));
}
}

3
storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/ApiService.java → 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<String> deviceIds);
}

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

5
system/pom.xml

@ -87,11 +87,6 @@
<artifactId>storeroom</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.storeroom</groupId>
<artifactId>APIService</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

Loading…
Cancel
Save