Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pseer
gxpt_ht
Commits
fafa968d
Commit
fafa968d
authored
Nov 09, 2023
by
YG8999
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mqtt服务迁移system模块下面
parent
9d66a9a5
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
54 additions
and
28 deletions
+54
-28
DeviceController.java
...in/java/share/web/controller/system/DeviceController.java
+1
-1
pom.xml
share-framework/pom.xml
+0
-15
pom.xml
share-system/pom.xml
+16
-0
MqttConfig.java
share-system/src/main/java/share/system/mqtt/MqttConfig.java
+1
-1
MqttGatewayComponent.java
...src/main/java/share/system/mqtt/MqttGatewayComponent.java
+1
-1
MqttMessageHandler.java
...m/src/main/java/share/system/mqtt/MqttMessageHandler.java
+1
-2
MqttTopicHandler.java
...tem/src/main/java/share/system/mqtt/MqttTopicHandler.java
+1
-1
MultiMqttMessageHandler.java
.../main/java/share/system/mqtt/MultiMqttMessageHandler.java
+1
-1
MyMqttPahoMessageHandler.java
...main/java/share/system/mqtt/MyMqttPahoMessageHandler.java
+1
-1
SnowFlakeUtil.java
...system/src/main/java/share/system/mqtt/SnowFlakeUtil.java
+1
-1
DeviceOpService.java
...m/src/main/java/share/system/service/DeviceOpService.java
+25
-0
DeviceOpServiceImpl.java
...n/java/share/system/service/impl/DeviceOpServiceImpl.java
+5
-4
No files found.
share-admin/src/main/java/share/web/controller/system/DeviceController.java
View file @
fafa968d
...
@@ -17,7 +17,7 @@ import share.common.core.controller.BaseController;
...
@@ -17,7 +17,7 @@ import share.common.core.controller.BaseController;
import
share.common.core.domain.AjaxResult
;
import
share.common.core.domain.AjaxResult
;
import
share.common.enums.BusinessType
;
import
share.common.enums.BusinessType
;
import
share.common.utils.SecurityUtils
;
import
share.common.utils.SecurityUtils
;
import
share.
framework
.mqtt.MqttGatewayComponent
;
import
share.
system
.mqtt.MqttGatewayComponent
;
import
share.system.domain.Device
;
import
share.system.domain.Device
;
import
share.system.domain.vo.DeviceParamVo
;
import
share.system.domain.vo.DeviceParamVo
;
import
share.system.domain.vo.MqttxVo
;
import
share.system.domain.vo.MqttxVo
;
...
...
share-framework/pom.xml
View file @
fafa968d
...
@@ -60,21 +60,6 @@
...
@@ -60,21 +60,6 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-integration
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.integration
</groupId>
<artifactId>
spring-integration-stream
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.integration
</groupId>
<artifactId>
spring-integration-mqtt
</artifactId>
</dependency>
<dependency>
<groupId>
cn.hutool
</groupId>
<groupId>
cn.hutool
</groupId>
<artifactId>
hutool-all
</artifactId>
<artifactId>
hutool-all
</artifactId>
<version>
5.8.16
</version>
<version>
5.8.16
</version>
...
...
share-system/pom.xml
View file @
fafa968d
...
@@ -128,6 +128,21 @@
...
@@ -128,6 +128,21 @@
<artifactId>
commons-lang
</artifactId>
<artifactId>
commons-lang
</artifactId>
<version>
2.4
</version>
<version>
2.4
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-integration
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.integration
</groupId>
<artifactId>
spring-integration-stream
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.integration
</groupId>
<artifactId>
spring-integration-mqtt
</artifactId>
</dependency>
</dependencies>
</dependencies>
</project>
</project>
\ No newline at end of file
share-
framework/src/main/java/share/framework
/mqtt/MqttConfig.java
→
share-
system/src/main/java/share/system
/mqtt/MqttConfig.java
View file @
fafa968d
package
share
.
framework
.
mqtt
;
package
share
.
system
.
mqtt
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
...
share-
framework/src/main/java/share/framework
/mqtt/MqttGatewayComponent.java
→
share-
system/src/main/java/share/system
/mqtt/MqttGatewayComponent.java
View file @
fafa968d
package
share
.
framework
.
mqtt
;
package
share
.
system
.
mqtt
;
import
org.springframework.integration.annotation.MessagingGateway
;
import
org.springframework.integration.annotation.MessagingGateway
;
...
...
share-
framework/src/main/java/share/framework
/mqtt/MqttMessageHandler.java
→
share-
system/src/main/java/share/system
/mqtt/MqttMessageHandler.java
View file @
fafa968d
package
share
.
framework
.
mqtt
;
package
share
.
system
.
mqtt
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.integration.mqtt.support.MqttHeaders
;
import
org.springframework.integration.mqtt.support.MqttHeaders
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.MessageHandler
;
import
org.springframework.messaging.MessageHandler
;
...
...
share-
framework/src/main/java/share/framework
/mqtt/MqttTopicHandler.java
→
share-
system/src/main/java/share/system
/mqtt/MqttTopicHandler.java
View file @
fafa968d
package
share
.
framework
.
mqtt
;
package
share
.
system
.
mqtt
;
import
cn.hutool.core.lang.Assert
;
import
cn.hutool.core.lang.Assert
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
...
...
share-
framework/src/main/java/share/framework
/mqtt/MultiMqttMessageHandler.java
→
share-
system/src/main/java/share/system
/mqtt/MultiMqttMessageHandler.java
View file @
fafa968d
package
share
.
framework
.
mqtt
;
package
share
.
system
.
mqtt
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
share-
framework/src/main/java/share/framework
/mqtt/MyMqttPahoMessageHandler.java
→
share-
system/src/main/java/share/system
/mqtt/MyMqttPahoMessageHandler.java
View file @
fafa968d
package
share
.
framework
.
mqtt
;
package
share
.
system
.
mqtt
;
import
org.springframework.integration.mqtt.core.MqttPahoClientFactory
;
import
org.springframework.integration.mqtt.core.MqttPahoClientFactory
;
import
org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler
;
import
org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler
;
...
...
share-
framework/src/main/java/share/framework
/mqtt/SnowFlakeUtil.java
→
share-
system/src/main/java/share/system
/mqtt/SnowFlakeUtil.java
View file @
fafa968d
package
share
.
framework
.
mqtt
;
package
share
.
system
.
mqtt
;
import
cn.hutool.core.lang.Singleton
;
import
cn.hutool.core.lang.Singleton
;
/**
/**
...
...
share-system/src/main/java/share/system/service/DeviceOpService.java
0 → 100644
View file @
fafa968d
package
share
.
system
.
service
;
import
share.system.domain.vo.DeviceParamVo
;
/**
* @className: share.system.service.DeviceOpService
* @description: 设备操作接口
* @author: lwj
* @create: 2023-11-09 13:58
*/
public
interface
DeviceOpService
{
/**
* 小程序订单开门
* @param deviceParam
*/
void
openDoor
(
DeviceParamVo
deviceParam
);
/**
* 小程序订单开门
* @param roomId 房间id
* @param phone 操作用户
*/
void
openDoor
(
Long
roomId
,
String
phone
);
}
share-
front/src/main/java/share/web/service/DeviceOpService
.java
→
share-
system/src/main/java/share/system/service/impl/DeviceOpServiceImpl
.java
View file @
fafa968d
package
share
.
web
.
service
;
package
share
.
system
.
service
.
impl
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
share.common.enums.DeviceType
;
import
share.common.enums.DeviceType
;
import
share.
framework
.mqtt.MqttGatewayComponent
;
import
share.
system
.mqtt.MqttGatewayComponent
;
import
share.system.domain.Device
;
import
share.system.domain.Device
;
import
share.system.domain.SRoom
;
import
share.system.domain.SRoom
;
import
share.system.domain.vo.DeviceParamVo
;
import
share.system.domain.vo.DeviceParamVo
;
...
@@ -11,18 +11,19 @@ import share.system.domain.vo.MqttxVo;
...
@@ -11,18 +11,19 @@ import share.system.domain.vo.MqttxVo;
import
share.system.mapper.DeviceMapper
;
import
share.system.mapper.DeviceMapper
;
import
share.system.mapper.SRoomMapper
;
import
share.system.mapper.SRoomMapper
;
import
share.system.service.DeviceLogService
;
import
share.system.service.DeviceLogService
;
import
share.system.service.DeviceOpService
;
import
share.system.service.MqttxService
;
import
share.system.service.MqttxService
;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @className: share.
web.service
.DeviceOpService
* @className: share.
system.service.impl
.DeviceOpService
* @description: 设备操作接口
* @description: 设备操作接口
* @author: lwj
* @author: lwj
* @create: 2023-11-09 10:38
* @create: 2023-11-09 10:38
*/
*/
@Service
@Service
public
class
DeviceOpService
{
public
class
DeviceOpService
Impl
implements
DeviceOpService
{
@Autowired
@Autowired
private
MqttGatewayComponent
mqttGatewayComponent
;
private
MqttGatewayComponent
mqttGatewayComponent
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment