by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: by2025:9d4a58e0aa8e900967bfee083c16562c76a39376
Branches Tags
by2025:master by2025:prod by2025:main
...
compare: by2025:1a51f9073133669d951f71e0e9f6ebd14e2d30ad
Branches Tags
by2025:master by2025:prod by2025:main

2 Commits
9d4a58e0aa ... 1a51f90731

Author SHA1 Message Date
15683799673
1a51f90731 E8服务合并到安放模块
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m49s
Details
2025-06-24 22:06:47 +08:00
15683799673
0b5555ed65 E8服务合并到安放模块 2025-06-24 22:04:26 +08:00
63 changed files with 150 additions and 1715 deletions
Expand all files Collapse all files

27
ruoyi-modules/E8Service/Dockerfile
View File

@@ -1,27 +0,0 @@
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
#FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
#FROM findepi/graalvm:java17-native
LABEL maintainer="Lion Li"
RUN mkdir -p /smartparks/E8Service/logs \
/smartparks/E8Service/temp \
/smartparks/E8Service/agent
WORKDIR /ruoyi/system
ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
ADD ./target/E8Service.jar ./E8Service.jar
SHELL ["/bin/bash", "-c"]
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-system \
#-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
-XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
-jar E8Service.jar

133
ruoyi-modules/E8Service/pom.xml
View File

@@ -1,133 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>E8Service</artifactId>
<description>
E8Service-e8服务接口
</description>
<dependencies>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-nacos</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sentinel</artifactId>
</dependency>
<!-- RuoYi Common Log -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-service-impl</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-dubbo</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-seata</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-encrypt</artifactId>
</dependency>
<!-- RuoYi Api System -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-system</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-resource</artifactId>
</dependency>
<!-- RuoYi Api System -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-workflow</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

22
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/E8ServiceApplication.java
View File

@@ -1,22 +0,0 @@
package org.dromara.E8Service;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
/**
* 系统模块
*
* @author ruoyi
*/
@EnableDubbo
@SpringBootApplication
public class E8ServiceApplication {
public static void main(String[] args) {
SpringApplication application = new SpringApplication(E8ServiceApplication.class);
application.setApplicationStartup(new BufferingApplicationStartup(2048));
application.run(args);
System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ ");
}
}

34
ruoyi-modules/E8Service/src/main/resources/application.yml
View File

@@ -1,34 +0,0 @@
# Tomcat
server:
port: 7777
# Spring
spring:
application:
# 应用名称
name: E8Service
profiles:
# 环境配置
active: @profiles.active@
--- # nacos 配置
spring:
cloud:
nacos:
# nacos 服务地址
server-addr: @nacos.server@
username: @nacos.username@
password: @nacos.password@
discovery:
# 注册组
group: @nacos.discovery.group@
namespace: ${spring.profiles.active}
config:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
config:
import:
- optional:nacos:application-common.yml
- optional:nacos:datasource.yml
- optional:nacos:${spring.application.name}.yml

10
ruoyi-modules/E8Service/src/main/resources/banner.txt
View File

@@ -1,10 +0,0 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
_ _
(_) | |
_ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___
| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \
| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | |
|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_|
__/ | __/ |
|___/ |___/

28
ruoyi-modules/E8Service/src/main/resources/logback-plus.xml
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/${project.artifactId}" />
<!-- 日志输出格式 -->
<property name="console.log.pattern"
value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${console.log.pattern}</pattern>
<charset>utf-8</charset>
</encoder>
</appender>
<include resource="logback-common.xml" />
<include resource="logback-logstash.xml" />
<!-- 开启 skywalking 日志收集 -->
<include resource="logback-skylog.xml" />
<!--系统操作日志-->
<root level="info">
<appender-ref ref="console" />
</root>
</configuration>

4
ruoyi-modules/Sis/src/main/java/org/dromara/iot/IotyApplication.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/SisApplication.java
View File

@@ -12,9 +12,9 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
*/
@EnableDubbo
@SpringBootApplication
public class IotyApplication {
public class SisApplication {
public static void main(String[] args) {
SpringApplication application = new SpringApplication(IotyApplication.class);
SpringApplication application = new SpringApplication(SisApplication.class);
application.setApplicationStartup(new BufferingApplicationStartup(2048));
application.run(args);
System.out.println("(♥◠‿◠)ﾉﾞ 设备模块启动成功 ლ(´ڡ`ლ)ﾞ ");

18
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/controller/AccessControlController.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/AccessControlController.java
View File

@@ -1,13 +1,13 @@
package org.dromara.E8Service.controller;
package org.dromara.iot.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.E8Service.Service.business.AccessControlService;
import org.dromara.E8Service.domain.AccessControl.req.RemoteOpenDoorReq;
import org.dromara.E8Service.domain.AccessControl.res.AccessRecordFindRes;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.common.core.domain.R;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.iot.sdk.e8.AccessControlService;
import org.dromara.iot.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq;
import org.dromara.iot.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -51,11 +51,9 @@ public class AccessControlController {
* @return IPage<AccessRecordFindRes>
*/
@PostMapping("/getPageAccessRecordList")
public R<IPage<AccessRecordFindRes>> getPageAccessRecordList(QueryDto dto) {
public R<TableDataInfo<AccessRecordFindRes>> getPageAccessRecordList(QueryDto dto) {
log.info("E8获取门禁记录列表 入参：{}", dto);
IPage<AccessRecordFindRes> page = accessControlService.getPageAccessRecordList(dto);
TableDataInfo<AccessRecordFindRes> page = accessControlService.getPageAccessRecordList(dto);
if (page == null) {
return R.fail("E8获取门禁记录列表，调用失败！");
} else {

26
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/controller/DoorDeviceController.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/DoorDeviceController.java
View File

@@ -1,16 +1,16 @@
package org.dromara.E8Service.controller;
package org.dromara.iot.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.E8Service.Service.base.DoorDeviceService;
import org.dromara.E8Service.domain.DoorDevice.req.DoorDeviceAddReq;
import org.dromara.E8Service.domain.DoorDevice.req.DoorDeviceUpdateReq;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceAddRes;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceFindRes;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceUpdateRes;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.common.core.domain.R;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.iot.sdk.e8.DoorDeviceService;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceUpdateReq;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceFindRes;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceUpdateRes;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -36,9 +36,7 @@ public class DoorDeviceController {
@PostMapping("/findDoorDevice/{id}")
public R<DoorDeviceFindRes> findDoorDevice(@PathVariable Long id) {
log.info("E8接口 查询门禁信息 入参={}", id);
DoorDeviceFindRes doorDeviceInfo = doorDeviceService.findDoorDevice(id);
if (doorDeviceInfo == null) {
return R.fail("E8接口查询门禁信息，调用失败！");
} else {
@@ -106,11 +104,9 @@ public class DoorDeviceController {
* @return IPage<DoorDeviceFindRes>
*/
@PostMapping("/findDoorDeviceList")
public R<IPage<DoorDeviceFindRes>> findDoorDeviceList(@RequestBody QueryDto dto) {
public R<TableDataInfo<DoorDeviceFindRes>> findDoorDeviceList(@RequestBody QueryDto dto) {
log.info("E8接口查询门禁信息列表 入参={}", dto);
IPage<DoorDeviceFindRes> doorDeviceList = doorDeviceService.findDoorDeviceList(dto);
TableDataInfo<DoorDeviceFindRes> doorDeviceList = doorDeviceService.findDoorDeviceList(dto);
if (ObjectUtils.isEmpty(doorDeviceList)) {
return R.fail("E8接口查询门禁信息列表，调用失败！");
} else {

12
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/business/AccessControlService.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/AccessControlService.java
View File

@@ -1,9 +1,9 @@
package org.dromara.E8Service.Service.business;
package org.dromara.iot.sdk.e8;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.E8Service.domain.AccessControl.req.RemoteOpenDoorReq;
import org.dromara.E8Service.domain.AccessControl.res.AccessRecordFindRes;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.iot.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq;
import org.dromara.iot.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes;
import org.dromara.iot.sdk.e8.domain.QueryDto;
/**
* @author lsm
@@ -27,7 +27,7 @@ public interface AccessControlService {
* @param dto 传参
* @return IPage<AccessRecordFindRes>
*/
IPage<AccessRecordFindRes> getPageAccessRecordList(QueryDto dto);
TableDataInfo<AccessRecordFindRes> getPageAccessRecordList(QueryDto dto);
// /**
// * 人员授权

14
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/base/CustomerService.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/CustomerService.java
View File

@@ -1,12 +1,12 @@
package org.dromara.E8Service.Service.base;
package org.dromara.iot.sdk.e8;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.E8Service.domain.custom.req.CustomAddReq;
import org.dromara.E8Service.domain.custom.req.CustomFindReq;
import org.dromara.E8Service.domain.custom.req.CustomUpdateReq;
import org.dromara.E8Service.domain.custom.res.CustomAddRes;
import org.dromara.E8Service.domain.custom.res.CustomFindRes;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.dromara.iot.sdk.e8.domain.custom.req.CustomAddReq;
import org.dromara.iot.sdk.e8.domain.custom.req.CustomFindReq;
import org.dromara.iot.sdk.e8.domain.custom.req.CustomUpdateReq;
import org.dromara.iot.sdk.e8.domain.custom.res.CustomAddRes;
import org.dromara.iot.sdk.e8.domain.custom.res.CustomFindRes;
/**
* @author lsm

18
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/base/DoorDeviceService.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/DoorDeviceService.java
View File

@@ -1,12 +1,12 @@
package org.dromara.E8Service.Service.base;
package org.dromara.iot.sdk.e8;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.E8Service.domain.DoorDevice.req.DoorDeviceAddReq;
import org.dromara.E8Service.domain.DoorDevice.req.DoorDeviceUpdateReq;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceAddRes;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceFindRes;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceUpdateRes;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceUpdateReq;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceFindRes;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceUpdateRes;
import org.dromara.iot.sdk.e8.domain.QueryDto;
/**
* @author lsm
@@ -29,7 +29,7 @@ public interface DoorDeviceService {
* @param dto 入参
* @return IPage<DoorDeviceFindRes>
*/
IPage<DoorDeviceFindRes> findDoorDeviceList(QueryDto dto);
TableDataInfo<DoorDeviceFindRes> findDoorDeviceList(QueryDto dto);
/**
* 新增门禁信息

10
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/base/LiftService.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/LiftService.java
View File

@@ -1,11 +1,11 @@
package org.dromara.E8Service.Service.base;
package org.dromara.iot.sdk.e8;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.E8Service.domain.lift.req.LiftAddReq;
import org.dromara.E8Service.domain.lift.req.LiftUpdateReq;
import org.dromara.E8Service.domain.lift.res.LiftFindRes;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.dromara.iot.sdk.e8.domain.lift.req.LiftAddReq;
import org.dromara.iot.sdk.e8.domain.lift.req.LiftUpdateReq;
import org.dromara.iot.sdk.e8.domain.lift.res.LiftFindRes;
/**
* @author zcxlsm

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/business/VoucherControlService.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/VoucherControlService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.Service.business;
package org.dromara.iot.sdk.e8;
/**
* @author lsm

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/ApiResp.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/ApiResp.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain;
package org.dromara.iot.sdk.e8.domain;
import lombok.AllArgsConstructor;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/QueryDto.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/QueryDto.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain;
package org.dromara.iot.sdk.e8.domain;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/AccessControl/req/AccessRecordFindReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.AccessControl.req;
package org.dromara.iot.sdk.e8.domain.accesscontrol.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/AccessControl/req/RemoteOpenDoorReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.AccessControl.req;
package org.dromara.iot.sdk.e8.domain.accesscontrol.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/AccessControl/res/AccessRecordFindRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.AccessControl.res;
package org.dromara.iot.sdk.e8.domain.accesscontrol.res;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/custom/req/CustomAddReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomAddReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.custom.req;
package org.dromara.iot.sdk.e8.domain.custom.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/custom/req/CustomFindReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomFindReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.custom.req;
package org.dromara.iot.sdk.e8.domain.custom.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/custom/req/CustomUpdateReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomUpdateReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.custom.req;
package org.dromara.iot.sdk.e8.domain.custom.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/custom/res/CustomAddRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomAddRes.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.custom.res;
package org.dromara.iot.sdk.e8.domain.custom.res;
import lombok.Data;

6
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/custom/res/CustomFindRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomFindRes.java
View File

@@ -1,9 +1,9 @@
package org.dromara.E8Service.domain.custom.res;
package org.dromara.iot.sdk.e8.domain.custom.res;
import lombok.Data;
import org.dromara.E8Service.domain.enums.AreaTypeEnum;
import org.dromara.E8Service.domain.enums.UserTypeEnum;
import org.dromara.iot.sdk.e8.domain.enums.AreaTypeEnum;
import org.dromara.iot.sdk.e8.domain.enums.UserTypeEnum;
import java.util.List;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/DoorDevice/req/DoorDeviceAddReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceAddReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.DoorDevice.req;
package org.dromara.iot.sdk.e8.domain.door.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/DoorDevice/req/DoorDeviceFindReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceFindReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.DoorDevice.req;
package org.dromara.iot.sdk.e8.domain.door.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/DoorDevice/req/DoorDeviceUpdateReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceUpdateReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.DoorDevice.req;
package org.dromara.iot.sdk.e8.domain.door.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/DoorDevice/res/DoorDeviceAddRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceAddRes.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.DoorDevice.res;
package org.dromara.iot.sdk.e8.domain.door.res;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/DoorDevice/res/DoorDeviceFindRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceFindRes.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.DoorDevice.res;
package org.dromara.iot.sdk.e8.domain.door.res;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/DoorDevice/res/DoorDeviceUpdateRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceUpdateRes.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.DoorDevice.res;
package org.dromara.iot.sdk.e8.domain.door.res;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/enums/AreaTypeEnum.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/AreaTypeEnum.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.enums;
package org.dromara.iot.sdk.e8.domain.enums;
/**
* @author lsm

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/enums/UserTypeEnum.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/UserTypeEnum.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.enums;
package org.dromara.iot.sdk.e8.domain.enums;
/**
* @author zcxlsm

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/lift/req/LiftAddReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftAddReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.lift.req;
package org.dromara.iot.sdk.e8.domain.lift.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/lift/req/LiftFindReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftFindReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.lift.req;
package org.dromara.iot.sdk.e8.domain.lift.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/lift/req/LiftUpdateReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftUpdateReq.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.lift.req;
package org.dromara.iot.sdk.e8.domain.lift.req;
import lombok.Data;

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/lift/res/LiftAddRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftAddRes.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.lift.res;
package org.dromara.iot.sdk.e8.domain.lift.res;
/**
* @author lsm

2
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/domain/lift/res/LiftFindRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftFindRes.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.domain.lift.res;
package org.dromara.iot.sdk.e8.domain.lift.res;
import lombok.Data;

31
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/business/impl/AccessControlServiceImpl.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/AccessControlServiceImpl.java
View File

@@ -1,19 +1,18 @@
package org.dromara.E8Service.Service.business.impl;
package org.dromara.iot.sdk.e8.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.E8Service.Service.business.AccessControlService;
import org.dromara.E8Service.domain.AccessControl.req.AccessRecordFindReq;
import org.dromara.E8Service.domain.AccessControl.req.RemoteOpenDoorReq;
import org.dromara.E8Service.domain.AccessControl.res.AccessRecordFindRes;
import org.dromara.E8Service.domain.ApiResp;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.E8Service.utils.E8ApiUtil;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.iot.sdk.e8.AccessControlService;
import org.dromara.iot.sdk.e8.domain.accesscontrol.req.AccessRecordFindReq;
import org.dromara.iot.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq;
import org.dromara.iot.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes;
import org.dromara.iot.sdk.e8.domain.ApiResp;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.dromara.iot.sdk.e8.utils.E8ApiUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -70,7 +69,7 @@ public class AccessControlServiceImpl implements AccessControlService {
* @return IPage<AccessRecordFindRes>
*/
@Override
public IPage<AccessRecordFindRes> getPageAccessRecordList(QueryDto dto) {
public TableDataInfo<AccessRecordFindRes> getPageAccessRecordList(QueryDto dto) {
// 创建一个参数映射，用于存储API请求的参数
Map<String, Object> params = new HashMap<>();
// 将分页索引和最大结果数放入参数映射中
@@ -85,19 +84,17 @@ public class AccessControlServiceImpl implements AccessControlService {
if (!apiResp.getSuccess()) {
return null;
}
// 将API响应的结果转换为JSON字符串，再转换为Map对象
Map<String, Object> result = JSONUtil.toBean(JSONUtil.toJsonStr(apiResp.getResult()), new TypeReference<>() {
}, false);
// 创建一个分页对象，传入分页索引和最大结果数
IPage<AccessRecordFindRes> page = new Page<>(dto.getPageIndex(), dto.getMaxResultCount());
TableDataInfo<AccessRecordFindRes> tableData = new TableDataInfo<>();
// 从结果映射中获取总记录数，转换为长整型后设置到分页对象中
page.setTotal(Long.parseLong(result.get("total").toString()));
tableData.setTotal(Long.parseLong(result.get("total").toString()));
// 从结果映射中获取项目列表，转换为访问记录信息列表后设置到分页对象中
page.setRecords(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), AccessRecordFindRes.class));
tableData.setRows(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), AccessRecordFindRes.class));
// 返回填充了数据的分页对象
return page;
return tableData;
}
/**

20
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/base/impl/CustomerServiceImpl.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/CustomerServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.Service.base.impl;
package org.dromara.iot.sdk.e8.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.TypeReference;
@@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.E8Service.Service.base.CustomerService;
import org.dromara.E8Service.domain.ApiResp;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.E8Service.domain.custom.req.CustomAddReq;
import org.dromara.E8Service.domain.custom.req.CustomFindReq;
import org.dromara.E8Service.domain.custom.req.CustomUpdateReq;
import org.dromara.E8Service.domain.custom.res.CustomAddRes;
import org.dromara.E8Service.domain.custom.res.CustomFindRes;
import org.dromara.E8Service.utils.E8ApiUtil;
import org.dromara.iot.sdk.e8.CustomerService;
import org.dromara.iot.sdk.e8.domain.ApiResp;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.dromara.iot.sdk.e8.domain.custom.req.CustomAddReq;
import org.dromara.iot.sdk.e8.domain.custom.req.CustomFindReq;
import org.dromara.iot.sdk.e8.domain.custom.req.CustomUpdateReq;
import org.dromara.iot.sdk.e8.domain.custom.res.CustomAddRes;
import org.dromara.iot.sdk.e8.domain.custom.res.CustomFindRes;
import org.dromara.iot.sdk.e8.utils.E8ApiUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

37
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/base/impl/DoorDeviceServiceImpl.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/DoorDeviceServiceImpl.java
View File

@@ -1,22 +1,21 @@
package org.dromara.E8Service.Service.base.impl;
package org.dromara.iot.sdk.e8.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.E8Service.Service.base.DoorDeviceService;
import org.dromara.E8Service.domain.ApiResp;
import org.dromara.E8Service.domain.DoorDevice.req.DoorDeviceAddReq;
import org.dromara.E8Service.domain.DoorDevice.req.DoorDeviceFindReq;
import org.dromara.E8Service.domain.DoorDevice.req.DoorDeviceUpdateReq;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceAddRes;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceFindRes;
import org.dromara.E8Service.domain.DoorDevice.res.DoorDeviceUpdateRes;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.E8Service.utils.E8ApiUtil;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.iot.sdk.e8.DoorDeviceService;
import org.dromara.iot.sdk.e8.domain.ApiResp;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceFindReq;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceUpdateReq;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceFindRes;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceUpdateRes;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.dromara.iot.sdk.e8.utils.E8ApiUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -75,7 +74,7 @@ public class DoorDeviceServiceImpl implements DoorDeviceService {
* @return IPage<DoorDeviceFindRes>
*/
@Override
public IPage<DoorDeviceFindRes> findDoorDeviceList(QueryDto dto) {
public TableDataInfo<DoorDeviceFindRes> findDoorDeviceList(QueryDto dto) {
// 创建一个参数映射，用于存储API请求所需的参数
Map<String, Object> params = new HashMap<>();
// 将分页索引和最大结果数放入参数映射中
@@ -93,19 +92,17 @@ public class DoorDeviceServiceImpl implements DoorDeviceService {
// 如果响应不成功，则返回null
return null;
}
// 将API响应结果转换为Map对象，以便后续处理
Map<String, Object> result = JSONUtil.toBean(JSONUtil.toJsonStr(apiResp.getResult()), new TypeReference<>() {
}, false);
// 创建一个分页对象，用于存储处理后的门禁设备信息
IPage<DoorDeviceFindRes> page = new Page<>(dto.getPageIndex(), dto.getMaxResultCount());
TableDataInfo<DoorDeviceFindRes> tableDataInfo = new TableDataInfo<>();
// 设置分页对象的总记录数
page.setTotal(Long.parseLong(result.get("total").toString()));
tableDataInfo.setTotal(Long.parseLong(result.get("total").toString()));
// 将API响应结果中的门禁设备信息列表转换为DoorDeviceFindRes对象列表，并设置到分页对象中
page.setRecords(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), DoorDeviceFindRes.class));
tableDataInfo.setRows(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), DoorDeviceFindRes.class));
// 返回处理后的分页对象
return page;
return tableDataInfo;
}
/**

22
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/Service/base/impl/LiftServiceImpl.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/LiftServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.E8Service.Service.base.impl;
package org.dromara.iot.sdk.e8.impl;
import cn.hutool.core.bean.BeanUtil;
@@ -6,20 +6,18 @@ import cn.hutool.core.lang.TypeReference;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.annotation.Resource;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.E8Service.Service.base.LiftService;
import org.dromara.E8Service.domain.ApiResp;
import org.dromara.E8Service.domain.QueryDto;
import org.dromara.E8Service.domain.lift.req.LiftAddReq;
import org.dromara.E8Service.domain.lift.req.LiftFindReq;
import org.dromara.E8Service.domain.lift.req.LiftUpdateReq;
import org.dromara.E8Service.domain.lift.res.LiftFindRes;
import org.dromara.E8Service.utils.E8ApiUtil;
import org.dromara.iot.sdk.e8.LiftService;
import org.dromara.iot.sdk.e8.domain.ApiResp;
import org.dromara.iot.sdk.e8.domain.QueryDto;
import org.dromara.iot.sdk.e8.domain.lift.req.LiftAddReq;
import org.dromara.iot.sdk.e8.domain.lift.req.LiftFindReq;
import org.dromara.iot.sdk.e8.domain.lift.req.LiftUpdateReq;
import org.dromara.iot.sdk.e8.domain.lift.res.LiftFindRes;
import org.dromara.iot.sdk.e8.utils.E8ApiUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

9
ruoyi-modules/E8Service/src/main/java/org/dromara/E8Service/utils/E8ApiUtil.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/utils/E8ApiUtil.java
View File

@@ -1,10 +1,10 @@
package org.dromara.E8Service.utils;
package org.dromara.iot.sdk.e8.utils;
import cn.hutool.crypto.digest.DigestUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import org.dromara.E8Service.domain.ApiResp;
import org.dromara.iot.sdk.e8.domain.ApiResp;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
@@ -57,7 +57,6 @@ public class E8ApiUtil {
.header("sign", sign)
.body(base64Body)
.execute()) {
return JSONUtil.toBean(response.body(), ApiResp.class);
}
}
@@ -118,13 +117,13 @@ public class E8ApiUtil {
// 创建HttpRequest对象，设置请求参数
// 使用 try-with-resources 确保资源释放
try(HttpResponse response = HttpRequest.post(url)
try (HttpResponse response = HttpRequest.post(url)
.header("Content-Type", "multipart/form-data")
.header("key", KEY)
.header("sign", sign)
.header("timestamp", timestamp)
.form("file", imageByte, "image.jpg")
.execute()){
.execute()) {
return JSONUtil.toBean(response.body(), ApiResp.class);
}

5
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/UnViewAiBoxApi.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/UnViewAiBoxApi.java
View File

@@ -1,8 +1,7 @@
package org.dromara.iot.service.unview;
package org.dromara.iot.sdk.unview;
import java.awt.*;
import java.util.List;
import static org.dromara.iot.service.unview.model.UvModel.*;
import static org.dromara.iot.sdk.unview.model.UvModel.*;
public interface UnViewAiBoxApi {

2
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/model/UvModel.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/UvModel.java
View File

@@ -1,4 +1,4 @@
package org.dromara.iot.service.unview.model;
package org.dromara.iot.sdk.unview.model;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/model/enums/AlarmModelEnum.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmModelEnum.java
View File

@@ -1,4 +1,4 @@
package org.dromara.iot.service.unview.model.enums;
package org.dromara.iot.sdk.unview.model.enums;
/**
* [

2
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/model/enums/AlarmTypeEnum.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmTypeEnum.java
View File

@@ -1,4 +1,4 @@
package org.dromara.iot.service.unview.model.enums;
package org.dromara.iot.sdk.unview.model.enums;
import java.util.Objects;

2
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/model/enums/UniViewApiEnum.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/UniViewApiEnum.java
View File

@@ -1,4 +1,4 @@
package org.dromara.iot.service.unview.model.enums;
package org.dromara.iot.sdk.unview.model.enums;
import lombok.Getter;
import org.springframework.http.HttpMethod;

10
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/service/UnViewAiBoxApiService.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/UnViewAiBoxApiService.java
View File

@@ -1,11 +1,11 @@
package org.dromara.iot.service.unview.service;
package org.dromara.iot.sdk.unview.service;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.dromara.iot.service.unview.UnViewAiBoxApi;
import org.dromara.iot.service.unview.model.enums.UniViewApiEnum;
import org.dromara.iot.service.unview.utils.UniViewHttp;
import org.dromara.iot.sdk.unview.UnViewAiBoxApi;
import org.dromara.iot.sdk.unview.model.enums.UniViewApiEnum;
import org.dromara.iot.sdk.unview.utils.UniViewHttp;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Arrays;
@@ -13,7 +13,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.dromara.iot.service.unview.model.UvModel.*;
import static org.dromara.iot.sdk.unview.model.UvModel.*;
/**

6
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/service/VideoAlarmService.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/VideoAlarmService.java
View File

@@ -1,8 +1,8 @@
package org.dromara.iot.service.unview.service;
package org.dromara.iot.sdk.unview.service;
import lombok.extern.slf4j.Slf4j;
import org.dromara.iot.service.unview.model.UvModel;
import org.dromara.iot.service.unview.model.enums.AlarmTypeEnum;
import org.dromara.iot.sdk.unview.model.UvModel;
import org.dromara.iot.sdk.unview.model.enums.AlarmTypeEnum;
import org.springframework.stereotype.Service;
/**

8
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/utils/UniViewHttp.java → ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/utils/UniViewHttp.java
View File

@@ -1,4 +1,4 @@
package org.dromara.iot.service.unview.utils;
package org.dromara.iot.sdk.unview.utils;
import cn.hutool.core.util.IdUtil;
@@ -7,8 +7,8 @@ import cn.hutool.http.HttpStatus;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import lombok.extern.slf4j.Slf4j;
import org.dromara.iot.service.unview.model.UvModel;
import org.dromara.iot.service.unview.model.enums.UniViewApiEnum;
import org.dromara.iot.sdk.unview.model.UvModel;
import org.dromara.iot.sdk.unview.model.enums.UniViewApiEnum;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.dromara.iot.service.unview.model.UvModel.*;
import static org.dromara.iot.sdk.unview.model.UvModel.*;
/**

56
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/api/base/DoorDeviceService.java
View File

@@ -1,56 +0,0 @@
package org.dromara.iot.service.e8.api.base;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.iot.service.e8.model.DoorDevice.req.DoorDeviceAddReq;
import org.dromara.iot.service.e8.model.DoorDevice.req.DoorDeviceUpdateReq;
import org.dromara.iot.service.e8.model.DoorDevice.res.DoorDeviceAddRes;
import org.dromara.iot.service.e8.model.DoorDevice.res.DoorDeviceFindRes;
import org.dromara.iot.service.e8.model.QueryDto;
/**
* @author lsm
* @apiNote DoorDeviceService
* @since 2025/6/20
*/
public interface DoorDeviceService {
/**
* 查询门禁信息
*
* @param id 入参
* @return DoorDeviceFindRes
*/
DoorDeviceFindRes findDoorDevice(Long id);
/**
* 门禁信息分页查询
*
* @param dto 入参
* @return IPage<DoorDeviceFindRes>
*/
IPage<DoorDeviceFindRes> findDoorDeviceList(QueryDto dto);
/**
* 新增门禁信息
*
* @param addReq 入参
* @return DoorDeviceAddRes
*/
DoorDeviceAddRes addDoorDevice(DoorDeviceAddReq addReq);
/**
* 门禁信息修改
*
* @param updateReq 入参
* @return Boolean
*/
Boolean updateDoorDevice(DoorDeviceUpdateReq updateReq);
/**
* 删除门禁信息
*
* @param id 入参
* @return Boolean
*/
Boolean deleteDoorDevice(Integer id);
}

173
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/api/base/impl/DoorDeviceServiceImpl.java
View File

@@ -1,173 +0,0 @@
package org.dromara.iot.service.e8.api.base.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.dromara.iot.service.e8.api.base.DoorDeviceService;
import org.dromara.iot.service.e8.model.ApiResp;
import org.dromara.iot.service.e8.model.DoorDevice.req.DoorDeviceAddReq;
import org.dromara.iot.service.e8.model.DoorDevice.req.DoorDeviceFindReq;
import org.dromara.iot.service.e8.model.DoorDevice.req.DoorDeviceUpdateReq;
import org.dromara.iot.service.e8.model.DoorDevice.res.DoorDeviceAddRes;
import org.dromara.iot.service.e8.model.DoorDevice.res.DoorDeviceFindRes;
import org.dromara.iot.service.e8.model.QueryDto;
import org.dromara.iot.service.e8.utils.E8ApiUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
/**
* @author lsm
* @apiNote DoorDeviceServiceImpl
* @since 2025/6/20
*/
@Slf4j
@Service
public class DoorDeviceServiceImpl implements DoorDeviceService {
private final static String DOOR_DEVICE_GET_PAGE_LIST = "/api/e8door/man-device-info/get-page-list";
private final static String DOOR_DEVICE_GET_FIRST_OR_DEFAULT = "/api/E8Door/man-device-info/{id}";
private final static String DOOR_DEVICE_CREATE = "/api/E8Door/man-device-info";
private final static String DOOR_DEVICE_UPDATE = "/api/E8Door/man-device-info/{id}/update";
private final static String DOOR_DEVICE_DELETE = "/api/E8Door/man-device-info/{id}";
@Resource
private E8ApiUtil e8ApiUtil;
/**
* 查询门禁信息
*
* @param id 传参
* @return DoorDeviceFindRes
*/
@Override
public DoorDeviceFindRes findDoorDevice(Long id) {
// 使用给定的ID替换API模板中的{id}占位符
String api = DOOR_DEVICE_GET_FIRST_OR_DEFAULT.replace("{id}", id.toString());
// 调用E8 API工具类的doGetOrDel方法发送GET请求，并获取响应结果
ApiResp apiResp = e8ApiUtil.doGetOrDel(api, null, false);
// 检查API响应是否成功
if (!apiResp.getSuccess()) {
log.debug("查询E8门禁信息失败 msg:{}", apiResp);
// 如果响应不成功，则返回null
return null;
}
// 将API响应结果转换为指定的Java对象，并返回该对象
return JSONUtil.toBean(JSONUtil.toJsonStr(apiResp.getResult()), DoorDeviceFindRes.class);
}
/**
* 门禁信息分页查询
*
* @param dto 传参
* @return IPage<DoorDeviceFindRes>
*/
@Override
public IPage<DoorDeviceFindRes> findDoorDeviceList(QueryDto dto) {
// 创建一个参数映射，用于存储API请求所需的参数
Map<String, Object> params = new HashMap<>();
// 将分页索引和最大结果数放入参数映射中
params.put("PageIndex", dto.getPageIndex());
params.put("MaxResultCount", dto.getMaxResultCount());
// 将查询DTO转换为JSON字符串，再转换为Map对象，然后放入参数映射中
params.put("QueryDto", JSONUtil.toBean(JSONUtil.toJsonStr(dto.getQueryDto()), DoorDeviceFindReq.class));
// 调用第三方API，获取门禁设备分页列表
ApiResp apiResp = e8ApiUtil.doPost(params, DOOR_DEVICE_GET_PAGE_LIST);
log.info("apiResp:{}", apiResp);
// 如果API调用不成功，则返回null
if (!apiResp.getSuccess()) {
log.debug("分页查询E8门禁信息失败 msg:{}", apiResp);
return null;
}
// 将API响应结果转换为Map对象，以便后续处理
Map<String, Object> result = JSONUtil.toBean(JSONUtil.toJsonStr(apiResp.getResult()), new TypeReference<>() {
}, false);
// 创建一个分页对象，用于存储处理后的门禁设备信息
IPage<DoorDeviceFindRes> page = new Page<>(dto.getPageIndex(), dto.getMaxResultCount());
// 设置分页对象的总记录数
page.setTotal(Long.parseLong(result.get("total").toString()));
// 将API响应结果中的门禁设备信息列表转换为DoorDeviceFindRes对象列表，并设置到分页对象中
page.setRecords(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), DoorDeviceFindRes.class));
// 返回处理后的分页对象
return page;
}
/**
* 新增门禁信息
*
* @param addReq 传参
* @return Boolean
*/
@Override
public DoorDeviceAddRes addDoorDevice(DoorDeviceAddReq addReq) {
// 将DoorDeviceAddReq转为Map对象，以便作为API请求的参数
Map<String, Object> params = BeanUtil.beanToMap(addReq);
// 调用第三方API进行门禁设备创建，并传入转换后的参数
ApiResp apiResp = e8ApiUtil.doPost(params, DOOR_DEVICE_CREATE);
if (!apiResp.getSuccess()) {
log.info("新增E8门禁信息，msg:{}", apiResp);
return null;
}
return JSONUtil.toBean(JSONUtil.toJsonStr(apiResp.getResult()), DoorDeviceAddRes.class);
}
/**
* 门禁信息修改
*
* @param updateReq 传参
* @return Boolean
*/
@Override
public Boolean updateDoorDevice(DoorDeviceUpdateReq updateReq) {
// 构造门设备更新API的URL
String api = DOOR_DEVICE_UPDATE.replace("{id}", updateReq.getId().toString());
// 将门设备信息对象转换为键值对形式的参数
Map<String, Object> params = BeanUtil.beanToMap(updateReq);
// 调用API进行门设备信息更新
ApiResp apiResp = e8ApiUtil.doPost(params, api);
// 返回API调用是否成功的结果
return apiResp.getSuccess();
}
/**
* 删除门禁信息
*
* @param id 传参
* @return Boolean
*/
@Override
public Boolean deleteDoorDevice(Integer id) {
// 构造删除门设备的API路径，使用设备ID替换占位符
String api = DOOR_DEVICE_DELETE.replace("{id}", id.toString());
// 调用E8 API工具类进行HTTP DELETE请求，参数为构造的API路径和null（因为DELETE请求通常不需要请求体）
ApiResp apiResp = e8ApiUtil.doGetOrDel(api, null, true);
// 返回API响应的成功标志
return apiResp.getSuccess();
}
}

38
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/model/ApiResp.java
View File

@@ -1,38 +0,0 @@
package org.dromara.iot.service.e8.model;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* @author lsm
* @apiNote ApiResp
* @since 2025/6/20
*/
@Data
@AllArgsConstructor
public class ApiResp {
/**
* success为false时返回错误信息
*/
private String message;
/**
* sessionId
*/
private Long sessionId;
/**
* 返回处理结果（数据由具体接口决定）
*/
private Object result;
/**
* true表示成功，false表示失败
*/
private Boolean success;
/**
* 状态码 0表示成功，1表示失败
*/
private Integer code;
}

140
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/model/DoorDevice/req/DoorDeviceAddReq.java
View File

@@ -1,140 +0,0 @@
package org.dromara.iot.service.e8.model.DoorDevice.req;
import lombok.Data;
/**
* @author lsm
* @apiNote DoorDeviceAddReq
* @since 2025/6/20
*/
@Data
public class DoorDeviceAddReq {
/**
* 设备名称
*/
private String name;
/**
* 父设备ID
*/
private Long parentId;
/**
* 设备IP
*/
private String ip;
/**
* 设备端口
*/
private Long port;
/**
* 设备MAC
*/
private String mac;
/**
* 子网掩码
*/
private String netMask;
/**
* 设备网关
*/
private String gatewayIP;
/**
* 设备产品线类型
* 0:车行 1:车位 2:人行
*/
private Integer productType;
/**
* 设备类型
* 2201:一体式门禁 2202:分体式门禁 2203:人脸门禁 2204:梯控 2207:人脸盒子终端
* 2208:人脸盒子面板机 2209:一体式读头 2211:梯控读头 2102:电子哨兵
*/
private Long type;
/**
* 业务逻辑设备类
*/
private Integer logicType;
/**
* 设备型号
*/
private Integer model;
/**
* 设备序列号
*/
private String sn;
/**
* 设备CPUID
*/
private String cpuID;
/**
* 设备在线状态 0:离线 1:在线 2:未知
*/
private Integer status;
/**
* 设备在线状态描述
*/
private String statusDescription;
/**
* 机号
*/
private String macNo;
/**
* 蓝牙地址
*/
private String bluetoothAddr;
/**
* 设备层级
*/
private Integer deviceLevel;
/**
* 备注
*/
private String remark;
/**
* 设备通讯方式 0:TCP/IP 1:RS485
*/
private Integer commType;
/**
* 旧IP
*/
private String oldIp;
/**
* 旧端口号
*/
private Integer oldPort;
/**
* 旧机号
*/
private String oldMacNo;
/**
* 工单号（设备搜索）
*/
private String projectNumber;
/**
* 固件版本信息（设备搜索）
*/
private String version;
}

43
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/model/DoorDevice/req/DoorDeviceFindReq.java
View File

@@ -1,43 +0,0 @@
package org.dromara.iot.service.e8.model.DoorDevice.req;
import lombok.Data;
/**
* @author lsm
* @apiNote DoorDeviceFindReq
* @since 2025/6/20
*/
@Data
public class DoorDeviceFindReq {
/**
* 主键
*/
private Long id;
/**
* 是否脱敏 true脱敏，敏感信息加***隐藏；false完整显示
*/
private Boolean isViewFullData;
/**
* 设备名称
*/
private String name;
/**
* 设备类型
* 2201:一体式门禁 2202:分体式门禁 2203:人脸门禁 2204:梯控 2207:人脸盒子终端
* 2208:人脸盒子面板机 2209:一体式读头 2211:梯控读头 2102:电子哨兵
*/
private Long type;
/**
* 设备型号
*/
private Integer model;
/**
* 设备在线状态 0:离线 1:在线 2:未知
*/
private Integer status;
}

139
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/model/DoorDevice/req/DoorDeviceUpdateReq.java
View File

@@ -1,139 +0,0 @@
package org.dromara.iot.service.e8.model.DoorDevice.req;
import lombok.Data;
/**
* @author lsm
* @apiNote DoorDeviceUpdateReq
* @since 2025/6/20
*/
@Data
public class DoorDeviceUpdateReq {
/**
* 主键
*/
private Long id;
/**
* 设备名称
*/
private String name;
/**
* 父设备ID
*/
private Long parentId;
/**
* 设备IP
*/
private String ip;
/**
* 设备端口
*/
private Long port;
/**
* 设备MAC
*/
private String mac;
/**
* 子网掩码
*/
private String netMask;
/**
* 设备网关
*/
private String gatewayIP;
/**
* 设备产品线类型
* 0:车行 1:车位 2:人行
*/
private Integer productType;
/**
* 设备类型
* 2201:一体式门禁 2202:分体式门禁 2203:人脸门禁 2204:梯控 2207:人脸盒子终端
* 2208:人脸盒子面板机 2209:一体式读头 2211:梯控读头 2102:电子哨兵
*/
private Long type;
/**
* 业务逻辑设备类
*/
private Integer logicType;
/**
* 设备型号
*/
private Integer model;
/**
* 设备序列号
*/
private String sn;
/**
* 设备CPUID
*/
private String cpuID;
/**
* 机号
*/
private String macNo;
/**
* 蓝牙地址
*/
private String bluetoothAddr;
/**
* 设备层级
*/
private Integer deviceLevel;
/**
* 设备是否需要系统升级
*/
private Boolean isNeedUpgrade;
/**
* 备注
*/
private String remark;
/**
* 设备通讯方式 0:TCP/IP 1:RS485
*/
private Integer commType;
/**
* 旧IP
*/
private String oldIp;
/**
* 旧端口号
*/
private Integer oldPort;
/**
* 旧机号
*/
private String oldMacNo;
/**
* 工单号（设备搜索）
*/
private String projectNumber;
/**
* 固件版本信息（设备搜索）
*/
private String version;
}

198
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/model/DoorDevice/res/DoorDeviceAddRes.java
View File

@@ -1,198 +0,0 @@
package org.dromara.iot.service.e8.model.DoorDevice.res;
import lombok.Data;
import java.util.List;
/**
* @author lsm
* @apiNote DoorDeviceAddRes
* @since 2025/6/20
*/
@Data
public class DoorDeviceAddRes {
/**
* 设备ID
*/
private Long id;
/**
* 创建时间
*/
private String creationTime;
/**
* 创建者ID
*/
private String creatorId;
/**
* 修改时间
*/
private String lastModificationTime;
/**
* 修改者ID
*/
private String lastModifierId;
/**
* 是否删除
*/
private Boolean isDeleted;
/**
* 删除者ID
*/
private String deleterId;
/**
* 删除时间
*/
private String deletionTime;
/**
* 设备编号
*/
private String no;
/**
* 设备编号编码
*/
private Integer noCode;
/**
* cloudId
*/
private String cloudId;
/**
* name
*/
private String name;
/**
* 父级设备名称
*/
private String parentName;
/**
* 父级设备ID，默认0
*/
private Integer parentId;
/**
* 管理机IP
*/
private String masterIp;
/**
* 设备IP
*/
private String ip;
/**
* 设备端口
*/
private Long port;
/**
* 设备MAC
*/
private String mac;
/**
* 子网掩码
*/
private String netMask;
/**
* 设备网关
*/
private String gatewayIP;
/**
* 设备产品线类型 0:车行 1:车位 2:人行
*/
private Integer productType;
/**
* 设备类型
*/
private Long type;
/**
* 设备类型描述
*/
private String typeDescription;
/**
* 业务逻辑设备类型
*/
private Integer logicType;
/**
* 设备型号
*/
private Integer model;
/**
* 设备型号描述
*/
private String modelDescription;
/**
* 机号
*/
private String modelName;
/**
* 设备序列号
*/
private String sn;
/**
* 设备CPUID
*/
private String cpuID;
/**
* 设备在线状态 0:离线 1:在线 2:未知
*/
private Integer status;
/**
* 设备在线状态描述
*/
private String statusDescription;
/**
* 机号
*/
private String macNo;
/**
* 蓝牙地址
*/
private String bluetoothAddr;
/**
* 设备层级
*/
private Integer deviceLevel;
/**
* 父级设备路径 默认空
*/
private String parentIdPath;
/**
* 是否需要升级
*/
private Boolean isNeedUpgrade;
/**
* 项目ID
*/
private Integer projectId;
/**
* 创建者
*/
private String creatorName;
/**
* 关联门
*/
private String relDoors;
/**
* int32 出入口类型 0:未知 1:入口 2:出口
*/
private Integer gatewayType;
/**
* 出入口类型
*/
private String gatewayTypeDesc;
/**
* 备注
*/
private String remark;
/**
* 设备通讯方式 0:TCP/IP 1:RS485
*/
private Integer commType;
/**
* 工单号（设备搜索）
*/
private String projectNumber;
/**
* 固件版本信息（设备搜索）
*/
private String version;
/**
* 子设备列表
*/
private List<DoorDeviceAddRes> childList;
}

251
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/model/DoorDevice/res/DoorDeviceFindRes.java
View File

@@ -1,251 +0,0 @@
package org.dromara.iot.service.e8.model.DoorDevice.res;
import lombok.Data;
import java.util.List;
/**
* @author lsm
* @apiNote DoorDeviceFindRes
* @since 2025/6/20
*/
@Data
public class DoorDeviceFindRes {
/**
* 主键
*/
private Long id;
/**
* 创建时间
*/
private String creationTime;
/**
* 创建人
*/
private String creatorId;
/**
* 最后修改时间
*/
private String lastModificationTime;
/**
* 最后修改人
*/
private String lastModifierId;
/**
* 是否删除
*/
private Boolean isDeleted;
/**
* 删除人
*/
private String deleterId;
/**
* 删除时间
*/
private String deletionTime;
/**
* 设备编号
*/
private String no;
/**
* 设备编号序列号
*/
private Integer noCode;
/**
* 设备对接平台的ID
*/
private String cloudId;
/**
* 设备名称
*/
private String name;
/**
* 父设备ID
*/
private Long parentId;
/**
* 父设备名称
*/
private String parentName;
/**
* 管理机IP
*/
private String masterIp;
/**
* 设备IP
*/
private String ip;
/**
* 设备端口
*/
private Long port;
/**
* 设备MAC
*/
private String mac;
/**
* 子网掩码
*/
private String netMask;
/**
* 设备网关
*/
private String gatewayIP;
/**
* 设备产品线类型
* 0:车行 1:车位 2:人行
*/
private Integer productType;
/**
* 设备类型
* 2201:一体式门禁 2202:分体式门禁 2203:人脸门禁 2204:梯控 2207:人脸盒子终端
* 2208:人脸盒子面板机 2209:一体式读头 2211:梯控读头 2102:电子哨兵
*/
private Long type;
/**
* 设备类型描述
*/
private String typeDescription;
/**
* 业务逻辑设备类
*/
private Integer logicType;
/**
* 设备型号
*/
private Integer model;
/**
* 设备型号描述
*/
private String modelDescription;
/**
* 设备型号名称
*/
private String modelName;
/**
* 设备序列号
*/
private String sn;
/**
* 设备CPUID
*/
private String cpuID;
/**
* 设备在线状态 0:离线 1:在线 2:未知
*/
private Integer status;
/**
* 设备在线状态描述
*/
private String statusDescription;
/**
* 机号
*/
private String macNo;
/**
* 蓝牙地址
*/
private String bluetoothAddr;
/**
* 设备层级
*/
private Integer deviceLevel;
/**
* 父级设备路径ID列表
*/
private String parentIdPath;
/**
* 设备是否需要系统升级
*/
private Boolean isNeedUpgrade;
/**
* 项目ID
*/
private Integer projectId;
/**
* 设备关联的区域组ID
*/
private Integer deviceGroupId;
/**
* 创建人名称
*/
private String creatorName;
/**
* 关联门
*/
private String relDoors;
/**
* 出入口类型 0:未知 1:入口 2:出口
*/
private Integer gatewayType;
/**
* 出入口类型
*/
private String gatewayTypeDesc;
/**
* 备注
*/
private String remark;
/**
* 子设备列表
*/
private List<DoorDeviceFindRes> childList;
/**
* 设备通讯方式 0:TCP/IP 1:RS485
*/
private Integer commType;
/**
* 工单号（设备搜索）
*/
private String projectNumber;
/**
* 固件版本信息（设备搜索）
*/
private String version;
}

26
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/model/QueryDto.java
View File

@@ -1,26 +0,0 @@
package org.dromara.iot.service.e8.model;
import lombok.Data;
/**
* @author lsm
* @apiNote QueryDto
* @since 2025/6/20
*/
@Data
public class QueryDto {
/**
* 页数
*/
private Integer pageIndex;
/**
* 每页条数
*/
private Integer maxResultCount;
/**
* 请求参数
*/
private Object queryDto;
}

221
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/e8/utils/E8ApiUtil.java
View File

@@ -1,221 +0,0 @@
package org.dromara.iot.service.e8.utils;
import cn.hutool.crypto.digest.DigestUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import org.dromara.iot.service.e8.model.ApiResp;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author lsm
* @apiNote E8ApiUtil
* @since 2025/6/20
*/
@Component
public class E8ApiUtil {
private static final String BASE_URL = "http://192.168.8.230:50014";
private static final String SECRET_KEY = "ZG4ocLq1";
private static final String KEY = "b97c7090379f490bb4b2ead0f57fd1bf";
/**
* 发起Post请求
*
* @param params 请求入参
* @param api 请求接口
* @return 请求结果
*/
public ApiResp doPost(Map<String, Object> params, String api) {
// 时间戳
String timestamp = Long.toString(System.currentTimeMillis());
// sign签名
String sign = getPostSign(params, api, timestamp);
// url
String url = BASE_URL + api;
// 将params转换为JSON字符串
String jsonBody = JSONUtil.toJsonStr(params);
// 对请求体进行Base64加密，指定UTF-8编码，避免乱码
String base64Body = Base64.getEncoder().encodeToString(jsonBody.getBytes(StandardCharsets.UTF_8));
// 发送请求获取响应
// 使用 try-with-resources 确保资源释放
try (HttpResponse response = HttpRequest.post(url)
.header("Content-Type", "application/json")
.header("key", KEY)
.header("timestamp", timestamp)
.header("sign", sign)
.body(base64Body)
.execute()) {
return JSONUtil.toBean(response.body(), ApiResp.class);
}
}
/**
* 发起Get/Delete请求
*
* @param api 请求接口
* @param paramStr 请求入参
* @return 请求结果
*/
public ApiResp doGetOrDel(String api, String paramStr, Boolean isDelete) {
// 时间戳
String timestamp = Long.toString(System.currentTimeMillis());
// sign签名
String sign = getGetSign(api, timestamp);
// url
String url = BASE_URL + api;
if (isDelete) {
// 发送请求获取响应
// 使用 try-with-resources 确保资源释放
try (HttpResponse response = HttpRequest.delete(url)
.header("key", KEY)
.header("sign", sign)
.header("timestamp", timestamp)
.header("paramstr", paramStr == null ? "50014" : paramStr).execute()) {
return JSONUtil.toBean(response.body(), ApiResp.class);
}
}else {
// 发送请求获取响应
// 使用 try-with-resources 确保资源释放
try (HttpResponse response = HttpRequest.get(url)
.header("key", KEY)
.header("sign", sign)
.header("timestamp", timestamp)
.header("paramstr", paramStr == null ? "50014" : paramStr).execute()) {
return JSONUtil.toBean(response.body(), ApiResp.class);
}
}
}
/**
* 获取Post接口签名Sign
*
* @param params 请求入参
* @param api 请求接口
* @param timestamp 时间戳
* @return Post接口签名sign
*/
public String getPostSign(Map<String, Object> params, String api, String timestamp) {
String url = BASE_URL + api;
// one&two
String paramsUrl = buildUrlWithParams(url, params) + "&timestamp=" + timestamp;
// three
String upperUrl = paramsUrl.toUpperCase();
// four
String secretUrl = upperUrl + SECRET_KEY;
// five(同时剔除问号)
String md5Url = DigestUtil.md5Hex(secretUrl.replace("?", ""));
// six
return md5Url.toUpperCase();
}
/**
* 获取Get接口签名Sign
*
* @param api 请求接口
* @param timestamp 时间戳
* @return get/Delete接口签名sign
*/
public String getGetSign(String api, String timestamp) {
// one
String url = BASE_URL + api + timestamp;
String upperUrl = url.toUpperCase();
// two
String secretUrl = upperUrl + SECRET_KEY;
// three
String md5Url = DigestUtil.md5Hex(secretUrl);
// four
return md5Url.toUpperCase();
}
/**
* Post请求url拼接参数
*
* @param url 请求链接
* @param params 请求入参
* @return 拼接参数后的url
*/
public String buildUrlWithParams(String url, Map<String, Object> params) {
if (params == null || params.isEmpty()) {
return url;
}
// 过滤出指定类型的参数
Map<String, Object> filteredParameters = new LinkedHashMap<>();
for (Map.Entry<String, Object> entry : params.entrySet()) {
Object value = entry.getValue();
// 判断是否符合拼接类型(int,String,Long,DataTime)，并排除空值
if (isSupportedType(value) && !ObjectUtils.isEmpty(value)) {
filteredParameters.put(entry.getKey(), value);
}
}
if (filteredParameters.isEmpty()) {
return url;
}
// 使用 Stream API 对 filteredParameters 按 key 升序排序
Map<String, Object> sortedParameters = filteredParameters.entrySet()
.stream()
.sorted(Map.Entry.comparingByKey())
.collect(Collectors.toMap(
Map.Entry::getKey,
Map.Entry::getValue,
(oldValue, newValue) -> oldValue, // 处理键冲突的情况
LinkedHashMap::new // 保持插入顺序
));
StringBuilder sb = new StringBuilder(url);
if (!url.contains("?")) {
sb.append("?");
} else {
// 如果 URL 中已有查询参数，确保拼接时参数之间用 & 分隔
sb.append("&");
}
for (Map.Entry<String, Object> entry : sortedParameters.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
// 将日期格式化为字符串
if (value instanceof Date) {
value = new SimpleDateFormat("yyyy-MM-dd").format(value);
}
sb.append(key)
.append("=")
.append(value.toString())
.append("&");
}
// 去掉最后的多余 & 符号
sb.setLength(sb.length() - 1);
return sb.toString();
}
/**
* 判断类型是否符合
*
* @return Boolean
*/
public Boolean isSupportedType(Object value) {
return value instanceof Integer || value instanceof String || value instanceof Long || value instanceof Date;
}
}

7
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TbAccessControlServiceImpl.java
View File

@@ -9,16 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.iot.service.e8.api.base.DoorDeviceService;
import org.dromara.iot.service.e8.model.DoorDevice.req.DoorDeviceAddReq;
import org.dromara.iot.service.e8.model.DoorDevice.res.DoorDeviceAddRes;
import org.dromara.iot.sdk.e8.DoorDeviceService;
import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq;
import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes;
import org.springframework.stereotype.Service;
import org.dromara.iot.domain.bo.TbAccessControlBo;
import org.dromara.iot.domain.vo.TbAccessControlVo;
import org.dromara.iot.domain.TbAccessControl;
import org.dromara.iot.mapper.TbAccessControlMapper;
import org.dromara.iot.service.ITbAccessControlService;
import java.util.List;
import java.util.Map;
import java.util.Collection;

8
ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/unview/UniViewConstants.java
View File

@@ -1,8 +0,0 @@
package org.dromara.iot.service.unview;
public class UniViewConstants {
}

1
ruoyi-modules/pom.xml
View File

@@ -16,7 +16,6 @@
<module>ruoyi-workflow</module>
<module>Property</module>
<module>Sis</module>
<module>E8Service</module>
</modules>
<artifactId>ruoyi-modules</artifactId>