Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart-office-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart-office-platform
Commits
a3c64e4c
Commit
a3c64e4c
authored
Nov 30, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改权限
parent
206eca6c
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
66 additions
and
3 deletions
+66
-3
smart-office-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
.../xhx/base/framework/interceptor/AuthTokenServiceImpl.java
+6
-2
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/web/BasicStatusController.java
...m/mortals/xhx/module/basic/web/BasicStatusController.java
+7
-1
smart-office-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
...a/com/mortals/xhx/module/device/web/DeviceController.java
+7
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/gocome/web/GocomeRecordController.java
...mortals/xhx/module/gocome/web/GocomeRecordController.java
+8
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java
...rtals/xhx/module/metting/web/MettingRecordController.java
+10
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeController.java
...a/com/mortals/xhx/module/notice/web/NoticeController.java
+7
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeRoomController.java
...m/mortals/xhx/module/notice/web/NoticeRoomController.java
+7
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomDeviceController.java
...com/mortals/xhx/module/room/web/RoomDeviceController.java
+7
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomWorkmanController.java
...om/mortals/xhx/module/room/web/RoomWorkmanController.java
+7
-0
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
View file @
a3c64e4c
...
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.core.annotation.Order
;
import
org.springframework.core.annotation.Order
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
...
@@ -104,8 +105,11 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
...
@@ -104,8 +105,11 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
Claims
claims
=
parseToken
(
token
);
Claims
claims
=
parseToken
(
token
);
String
uuid
=
(
String
)
claims
.
get
(
SysConstains
.
LOGIN_USER_KEY
);
String
uuid
=
(
String
)
claims
.
get
(
SysConstains
.
LOGIN_USER_KEY
);
String
userKey
=
getTokenKey
(
uuid
);
String
userKey
=
getTokenKey
(
uuid
);
cacheService
.
select
(
portalDb
);
/* cacheService.select(portalDb);
String
userStr
=
cacheService
.
get
(
userKey
);
String userStr = cacheService.get(userKey);*/
RedisTemplate
<
String
,
String
>
redisTemplate
=
cacheService
.
selectDbRedisTemplate
(
portalDb
);
String
userStr
=
redisTemplate
.
opsForValue
().
get
(
userKey
);
//刷新token时间
//刷新token时间
UserEntity
userEntity
=
JSONObject
.
parseObject
(
userStr
,
UserEntity
.
class
);
UserEntity
userEntity
=
JSONObject
.
parseObject
(
userStr
,
UserEntity
.
class
);
if
(!
ObjectUtils
.
isEmpty
(
userEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
userEntity
))
{
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/web/BasicStatusController.java
View file @
a3c64e4c
package
com.mortals.xhx.module.basic.web
;
package
com.mortals.xhx.module.basic.web
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -45,5 +47,9 @@ public class BasicStatusController extends BaseCRUDJsonBodyMappingController<Bas
...
@@ -45,5 +47,9 @@ public class BasicStatusController extends BaseCRUDJsonBodyMappingController<Bas
super
.
init
(
model
,
context
);
super
.
init
(
model
,
context
);
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
BasicStatusEntity
query
)
{
return
super
.
list
(
query
);
}
}
}
\ No newline at end of file
smart-office-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @
a3c64e4c
package
com.mortals.xhx.module.device.web
;
package
com.mortals.xhx.module.device.web
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
@@ -88,6 +89,12 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
...
@@ -88,6 +89,12 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
super
.
init
(
model
,
context
);
super
.
init
(
model
,
context
);
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
DeviceEntity
query
)
{
return
super
.
list
(
query
);
}
/**
/**
* 设备激活
* 设备激活
*/
*/
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/gocome/web/GocomeRecordController.java
View file @
a3c64e4c
package
com.mortals.xhx.module.gocome.web
;
package
com.mortals.xhx.module.gocome.web
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
...
@@ -57,6 +59,12 @@ public class GocomeRecordController extends BaseCRUDJsonBodyMappingController<Go
...
@@ -57,6 +59,12 @@ public class GocomeRecordController extends BaseCRUDJsonBodyMappingController<Go
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
GocomeRecordEntity
query
)
{
return
super
.
list
(
query
);
}
@Override
@Override
protected
void
doListBefore
(
GocomeRecordEntity
query
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
protected
void
doListBefore
(
GocomeRecordEntity
query
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
super
.
doListBefore
(
query
,
model
,
context
);
super
.
doListBefore
(
query
,
model
,
context
);
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java
View file @
a3c64e4c
...
@@ -2,6 +2,8 @@ package com.mortals.xhx.module.metting.web;
...
@@ -2,6 +2,8 @@ package com.mortals.xhx.module.metting.web;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.model.OrderCol
;
...
@@ -17,6 +19,7 @@ import com.mortals.xhx.module.room.service.RoomDeviceService;
...
@@ -17,6 +19,7 @@ import com.mortals.xhx.module.room.service.RoomDeviceService;
import
com.mortals.xhx.module.room.service.RoomService
;
import
com.mortals.xhx.module.room.service.RoomService
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
...
@@ -47,6 +50,13 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
...
@@ -47,6 +50,13 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
super
.
setModuleDesc
(
"会议记录"
);
super
.
setModuleDesc
(
"会议记录"
);
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
MettingRecordEntity
query
)
{
return
super
.
list
(
query
);
}
@Override
@Override
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"meetStatus"
,
paramService
.
getParamBySecondOrganize
(
"MettingRecord"
,
"meetStatus"
));
this
.
addDict
(
model
,
"meetStatus"
,
paramService
.
getParamBySecondOrganize
(
"MettingRecord"
,
"meetStatus"
));
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeController.java
View file @
a3c64e4c
package
com.mortals.xhx.module.notice.web
;
package
com.mortals.xhx.module.notice.web
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -46,4 +48,9 @@ public class NoticeController extends BaseCRUDJsonBodyMappingController<NoticeSe
...
@@ -46,4 +48,9 @@ public class NoticeController extends BaseCRUDJsonBodyMappingController<NoticeSe
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
NoticeEntity
query
)
{
return
super
.
list
(
query
);
}
}
}
\ No newline at end of file
smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeRoomController.java
View file @
a3c64e4c
package
com.mortals.xhx.module.notice.web
;
package
com.mortals.xhx.module.notice.web
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -46,4 +48,9 @@ public class NoticeRoomController extends BaseCRUDJsonBodyMappingController<Noti
...
@@ -46,4 +48,9 @@ public class NoticeRoomController extends BaseCRUDJsonBodyMappingController<Noti
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
NoticeRoomEntity
query
)
{
return
super
.
list
(
query
);
}
}
}
\ No newline at end of file
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomDeviceController.java
View file @
a3c64e4c
package
com.mortals.xhx.module.room.web
;
package
com.mortals.xhx.module.room.web
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -46,4 +48,9 @@ public class RoomDeviceController extends BaseCRUDJsonBodyMappingController<Room
...
@@ -46,4 +48,9 @@ public class RoomDeviceController extends BaseCRUDJsonBodyMappingController<Room
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
RoomDeviceEntity
query
)
{
return
super
.
list
(
query
);
}
}
}
\ No newline at end of file
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomWorkmanController.java
View file @
a3c64e4c
package
com.mortals.xhx.module.room.web
;
package
com.mortals.xhx.module.room.web
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -46,4 +48,9 @@ public class RoomWorkmanController extends BaseCRUDJsonBodyMappingController<Roo
...
@@ -46,4 +48,9 @@ public class RoomWorkmanController extends BaseCRUDJsonBodyMappingController<Roo
}
}
@Override
@UnAuth
public
Rest
<
Object
>
list
(
@RequestBody
RoomWorkmanEntity
query
)
{
return
super
.
list
(
query
);
}
}
}
\ No newline at end of file
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