Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c80c1326
authored
Sep 14, 2023
by
李小龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
保存行为异常时长记录
parent
196e5182
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java
server-common/src/main/java/com/makeit/utils/user/ThreadLocalUserUtil.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java
View file @
c80c1326
...
...
@@ -143,7 +143,7 @@ public class SaasUserController {
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"sysUserLoginVO"
,
sysUserLoginVO
);
jsonObject
.
put
(
"wechatUserInfo"
,
wechatUserInfo
);
jsonObject
.
put
(
"saasUser"
,
s
ysUserLoginVO
);
jsonObject
.
put
(
"saasUser"
,
s
aasUser
);
return
ApiResponseUtils
.
success
(
jsonObject
);
}
...
...
server-common/src/main/java/com/makeit/utils/user/ThreadLocalUserUtil.java
View file @
c80c1326
...
...
@@ -80,7 +80,7 @@ public class ThreadLocalUserUtil {
WechatUserInfo
wechatUserInfo
=
THREAD_LOCAL_WECHAT_USER
.
get
();
if
(
wechatUserInfo
==
null
)
{
wechatUserInfo
=
TokenUtil
.
getWechatUserDetail
();
THREAD_LOCAL_WECHAT_USER
.
set
(
wechatUserInfo
);
//
THREAD_LOCAL_WECHAT_USER.set(wechatUserInfo);
}
return
wechatUserInfo
;
}
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
View file @
c80c1326
...
...
@@ -105,7 +105,7 @@ public class BehaviorAlarm implements IAlarm{
}
//保存每次进入空间时长
saveDayDurationRecord
(
platAlarmCheckDTO
,
alarmRedisDTO
);
RedisUtil
.
set
(
RedisConst
.
ALARM_DEVICE_ID
+
deviceId
,
null
);
RedisUtil
.
delete
(
RedisConst
.
ALARM_DEVICE_ID
+
deviceId
);
}
}
...
...
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