Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
secure
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
胡懿
secure
Commits
5e606194
Commit
5e606194
authored
Oct 22, 2025
by
胡懿
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改kafka地址,增加未识别到设备类型的判断
parent
7c13140a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
5 deletions
+24
-5
DeviceIllLogInfo.java
...ub-biz/src/main/java/cn/gintone/dto/DeviceIllLogInfo.java
+1
-1
DeviceConnetRuleInfoServiceImpl.java
...a/cn/gintone/service/DeviceConnetRuleInfoServiceImpl.java
+20
-1
application-dev.yaml
yudao-server/src/main/resources/application-dev.yaml
+1
-1
application.yaml
yudao-server/src/main/resources/application.yaml
+2
-2
No files found.
gt-club/gt-club-biz/src/main/java/cn/gintone/dto/DeviceIllLogInfo.java
View file @
5e606194
...
@@ -14,7 +14,7 @@ public class DeviceIllLogInfo {
...
@@ -14,7 +14,7 @@ public class DeviceIllLogInfo {
private
String
deviceTypeName
;
// 设备类型名称
private
String
deviceTypeName
;
// 设备类型名称
private
String
deviceSn
;
// 设备类型名称
private
String
deviceSn
;
// 设备类型名称
private
String
accessed
;
// 访问时间
private
String
accessed
;
// 访问时间
private
String
illType
;
// 日志类型() noRule:无规则,disconnected:掉线
private
String
illType
;
// 日志类型() noRule:无规则,disconnected:掉线
, noType:无类型
private
String
clientIp
;
// 访问端ip
private
String
clientIp
;
// 访问端ip
private
String
remark
;
// 备注
private
String
remark
;
// 备注
...
...
gt-club/gt-club-biz/src/main/java/cn/gintone/service/DeviceConnetRuleInfoServiceImpl.java
View file @
5e606194
...
@@ -163,7 +163,26 @@ public class DeviceConnetRuleInfoServiceImpl implements DeviceConnetRuleInfoServ
...
@@ -163,7 +163,26 @@ public class DeviceConnetRuleInfoServiceImpl implements DeviceConnetRuleInfoServ
DeviceTypeDO
deviceTypeDO
=
deviceTypeMapper
.
selectOne
(
new
QueryWrapper
<
DeviceTypeDO
>().
lambda
()
DeviceTypeDO
deviceTypeDO
=
deviceTypeMapper
.
selectOne
(
new
QueryWrapper
<
DeviceTypeDO
>().
lambda
()
.
eq
(
DeviceTypeDO:
:
getModelCode
,
deviceLogInfo
.
getDeviceTypeBs
())
.
eq
(
DeviceTypeDO:
:
getModelCode
,
deviceLogInfo
.
getDeviceTypeBs
())
);
);
if
(
null
==
deviceTypeDO
)
{
DeviceIllLogInfo
deviceIllLogInfo
=
new
DeviceIllLogInfo
();
deviceIllLogInfo
.
setRoleId
(
deviceLogInfo
.
getRoleId
());
deviceIllLogInfo
.
setRoleName
(
deviceLogInfo
.
getRoleName
());
deviceIllLogInfo
.
setUserId
(
deviceLogInfo
.
getUserId
());
deviceIllLogInfo
.
setUsername
(
deviceLogInfo
.
getUsername
());
deviceIllLogInfo
.
setDeviceId
(
deviceLogInfo
.
getDeviceId
());
deviceIllLogInfo
.
setDeviceName
(
deviceLogInfo
.
getDeviceName
());
deviceIllLogInfo
.
setDeviceTypeId
(
""
);
deviceIllLogInfo
.
setDeviceTypeBs
(
deviceLogInfo
.
getDeviceTypeBs
());
deviceIllLogInfo
.
setDeviceTypeName
(
deviceLogInfo
.
getDeviceTypeName
());
deviceIllLogInfo
.
setAccessed
(
deviceLogInfo
.
getAccessed
());
deviceIllLogInfo
.
setClientIp
(
deviceLogInfo
.
getClientIp
());
deviceIllLogInfo
.
setRemark
(
deviceLogInfo
.
getRemark
());
deviceIllLogInfo
.
setIllType
(
"noType"
);
MyIotDbUtils
.
inserOneDeviceLogInfo_ill
(
iotDbConfig
,
deviceIllLogInfo
);
return
;
}
String
userId
=
deviceLogInfo
.
getUserId
();
String
userId
=
deviceLogInfo
.
getUserId
();
if
(
null
==
userId
||
""
.
equals
(
userId
))
{
if
(
null
==
userId
||
""
.
equals
(
userId
))
{
DeviceIllLogInfo
deviceIllLogInfo
=
new
DeviceIllLogInfo
();
DeviceIllLogInfo
deviceIllLogInfo
=
new
DeviceIllLogInfo
();
...
@@ -224,7 +243,7 @@ public class DeviceConnetRuleInfoServiceImpl implements DeviceConnetRuleInfoServ
...
@@ -224,7 +243,7 @@ public class DeviceConnetRuleInfoServiceImpl implements DeviceConnetRuleInfoServ
deviceIllLogInfo
.
setUsername
(
deviceLogInfo
.
getUsername
());
deviceIllLogInfo
.
setUsername
(
deviceLogInfo
.
getUsername
());
deviceIllLogInfo
.
setDeviceId
(
deviceLogInfo
.
getDeviceId
());
deviceIllLogInfo
.
setDeviceId
(
deviceLogInfo
.
getDeviceId
());
deviceIllLogInfo
.
setDeviceName
(
deviceLogInfo
.
getDeviceName
());
deviceIllLogInfo
.
setDeviceName
(
deviceLogInfo
.
getDeviceName
());
deviceIllLogInfo
.
setDeviceTypeId
(
deviceTypeDO
.
getId
()
+
""
);
deviceIllLogInfo
.
setDeviceTypeId
(
deviceTypeDO
.
getId
()
==
null
?
""
:
deviceTypeDO
.
getId
()
+
""
);
deviceIllLogInfo
.
setDeviceTypeBs
(
deviceLogInfo
.
getDeviceTypeBs
());
deviceIllLogInfo
.
setDeviceTypeBs
(
deviceLogInfo
.
getDeviceTypeBs
());
deviceIllLogInfo
.
setDeviceTypeName
(
deviceLogInfo
.
getDeviceTypeName
());
deviceIllLogInfo
.
setDeviceTypeName
(
deviceLogInfo
.
getDeviceTypeName
());
deviceIllLogInfo
.
setAccessed
(
deviceLogInfo
.
getAccessed
());
deviceIllLogInfo
.
setAccessed
(
deviceLogInfo
.
getAccessed
());
...
...
yudao-server/src/main/resources/application-dev.yaml
View file @
5e606194
...
@@ -134,7 +134,7 @@ rocketmq:
...
@@ -134,7 +134,7 @@ rocketmq:
# Kafka 配置项,对应 KafkaProperties 配置类
# Kafka 配置项,对应 KafkaProperties 配置类
kafka
:
kafka
:
cluster1
:
cluster1
:
bootstrap-servers
:
59.195.13.20
9
:9092
bootstrap-servers
:
59.195.13.20
8
:9092
# bootstrap-servers: 192.168.19.128:9092
# bootstrap-servers: 192.168.19.128:9092
producer
:
producer
:
retries
:
3
retries
:
3
...
...
yudao-server/src/main/resources/application.yaml
View file @
5e606194
...
@@ -3,8 +3,8 @@ spring:
...
@@ -3,8 +3,8 @@ spring:
name
:
yudao-server
name
:
yudao-server
profiles
:
profiles
:
active
:
local
#
active: local
#
active: dev
active
:
dev
main
:
main
:
allow-circular-references
:
true
# 允许循环依赖,因为项目是三层架构,无法避免这个情况。
allow-circular-references
:
true
# 允许循环依赖,因为项目是三层架构,无法避免这个情况。
...
...
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