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
90a5d123
authored
Sep 12, 2023
by
李小龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
saas菜单启用接口
parent
ebd707b8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
212 additions
and
27 deletions
db/inti-elder.sql
saas-module/src/main/java/com/makeit/controller/saas/SaasMenuController.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmConfigServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
server-service/src/main/java/com/makeit/service/saas/SaasMenuService.java
server-service/src/main/java/com/makeit/service/saas/impl/SaasMenuServiceImpl.java
server-service/src/main/java/com/makeit/task/IotSyncTask.java
server-service/src/main/java/com/makeit/utils/AlarmConfigCacheUtil.java
server-service/src/main/java/com/makeit/utils/DeviceCacheUtil.java
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
db/inti-elder.sql
View file @
90a5d123
...
@@ -244,7 +244,7 @@ CREATE TABLE `plat_device`
...
@@ -244,7 +244,7 @@ CREATE TABLE `plat_device`
registration_date
datetime
NOT
NULL
COMMENT
'注册时间'
,
registration_date
datetime
NOT
NULL
COMMENT
'注册时间'
,
last_online_data
datetime
NOT
NULL
COMMENT
'最后上线时间'
,
last_online_data
datetime
NOT
NULL
COMMENT
'最后上线时间'
,
description
VARCHAR
(
1024
)
DEFAULT
NULL
COMMENT
'说明'
,
description
VARCHAR
(
1024
)
DEFAULT
NULL
COMMENT
'说明'
,
status
char
(
1
)
NOT
NULL
COMMENT
'状态 数据字典 1 在线 0离线
'
,
status
varchar
(
36
)
DEFAULT
NULL
COMMENT
'状态 DeviceState
'
,
org_id
varchar
(
64
)
NULL
COMMENT
'组织id'
,
org_id
varchar
(
64
)
NULL
COMMENT
'组织id'
,
city_org_id
varchar
(
64
)
NULL
COMMENT
'城市组织id'
,
city_org_id
varchar
(
64
)
NULL
COMMENT
'城市组织id'
,
district_org_id
varchar
(
64
)
NULL
COMMENT
'区组织id'
,
district_org_id
varchar
(
64
)
NULL
COMMENT
'区组织id'
,
...
...
saas-module/src/main/java/com/makeit/controller/saas/SaasMenuController.java
View file @
90a5d123
...
@@ -2,6 +2,7 @@ package com.makeit.controller.saas;
...
@@ -2,6 +2,7 @@ package com.makeit.controller.saas;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.dto.StatusDTO
;
import
com.makeit.common.response.ApiResponseEntity
;
import
com.makeit.common.response.ApiResponseEntity
;
import
com.makeit.common.response.ApiResponseUtils
;
import
com.makeit.common.response.ApiResponseUtils
;
import
com.makeit.global.annotation.Action
;
import
com.makeit.global.annotation.Action
;
...
@@ -33,47 +34,47 @@ import java.util.List;
...
@@ -33,47 +34,47 @@ import java.util.List;
public
class
SaasMenuController
{
public
class
SaasMenuController
{
@Autowired
@Autowired
private
SaasMenuService
plat
MenuService
;
private
SaasMenuService
saas
MenuService
;
@Action
(
module
=
"saas端-菜单"
,
name
=
"列表"
,
code
=
"
plat
:menu:list"
)
@Action
(
module
=
"saas端-菜单"
,
name
=
"列表"
,
code
=
"
saas
:menu:list"
)
@ApiOperation
(
"列表"
)
@ApiOperation
(
"列表"
)
@PostMapping
(
"list"
)
@PostMapping
(
"list"
)
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
list
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
list
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
return
ApiResponseUtils
.
success
(
plat
MenuService
.
list
(
dto
));
return
ApiResponseUtils
.
success
(
saas
MenuService
.
list
(
dto
));
}
}
@Action
(
module
=
"saas端-菜单"
,
name
=
"树形列表"
,
code
=
"
plat
:menu:tree"
)
@Action
(
module
=
"saas端-菜单"
,
name
=
"树形列表"
,
code
=
"
saas
:menu:tree"
)
@ApiOperation
(
"树形列表"
)
@ApiOperation
(
"树形列表"
)
@PostMapping
(
"tree"
)
@PostMapping
(
"tree"
)
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
tree
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
tree
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
return
ApiResponseUtils
.
success
(
plat
MenuService
.
tree
(
dto
));
return
ApiResponseUtils
.
success
(
saas
MenuService
.
tree
(
dto
));
}
}
@ApiOperation
(
"列表(AuthIgnore)"
)
@ApiOperation
(
"列表(AuthIgnore)"
)
@PostMapping
(
"listAuthIgnore"
)
@PostMapping
(
"listAuthIgnore"
)
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
listAuthIgnore
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
listAuthIgnore
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
return
ApiResponseUtils
.
success
(
plat
MenuService
.
list
(
dto
));
return
ApiResponseUtils
.
success
(
saas
MenuService
.
list
(
dto
));
}
}
@ApiOperation
(
"树形列表(AuthIgnore)"
)
@ApiOperation
(
"树形列表(AuthIgnore)"
)
@PostMapping
(
"treeAuthIgnore"
)
@PostMapping
(
"treeAuthIgnore"
)
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
treeAuthIgnore
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
public
ApiResponseEntity
<
List
<
SaasMenuDTOVO
>>
treeAuthIgnore
(
@RequestBody
SaasMenuQueryDTO
dto
)
{
return
ApiResponseUtils
.
success
(
plat
MenuService
.
tree
(
dto
));
return
ApiResponseUtils
.
success
(
saas
MenuService
.
tree
(
dto
));
}
}
@Action
(
module
=
"saas端-菜单"
,
name
=
"新增"
,
code
=
"
plat
:menu:add"
)
@Action
(
module
=
"saas端-菜单"
,
name
=
"新增"
,
code
=
"
saas
:menu:add"
)
@ApiOperation
(
"新增"
)
@ApiOperation
(
"新增"
)
@PostMapping
(
"add"
)
@PostMapping
(
"add"
)
public
ApiResponseEntity
<
String
>
add
(
@Validated
@RequestBody
SaasMenuDTOVO
dto
)
{
public
ApiResponseEntity
<
String
>
add
(
@Validated
@RequestBody
SaasMenuDTOVO
dto
)
{
String
id
=
plat
MenuService
.
add
(
dto
);
String
id
=
saas
MenuService
.
add
(
dto
);
return
ApiResponseUtils
.
success
(
id
);
return
ApiResponseUtils
.
success
(
id
);
}
}
@Action
(
module
=
"saas端-菜单"
,
name
=
"编辑"
,
code
=
"
plat
:menu:edit"
)
@Action
(
module
=
"saas端-菜单"
,
name
=
"编辑"
,
code
=
"
saas
:menu:edit"
)
@ApiOperation
(
"编辑"
)
@ApiOperation
(
"编辑"
)
@PostMapping
(
"edit"
)
@PostMapping
(
"edit"
)
public
ApiResponseEntity
<?>
edit
(
@Validated
@RequestBody
SaasMenuDTOVO
dto
)
{
public
ApiResponseEntity
<?>
edit
(
@Validated
@RequestBody
SaasMenuDTOVO
dto
)
{
plat
MenuService
.
edit
(
dto
);
saas
MenuService
.
edit
(
dto
);
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
}
}
...
@@ -81,21 +82,29 @@ public class SaasMenuController {
...
@@ -81,21 +82,29 @@ public class SaasMenuController {
@ApiOperation
(
"详情"
)
@ApiOperation
(
"详情"
)
@PostMapping
(
"view"
)
@PostMapping
(
"view"
)
public
ApiResponseEntity
<
SaasMenuDTOVO
>
view
(
@RequestBody
BaseIdDTO
dto
)
{
public
ApiResponseEntity
<
SaasMenuDTOVO
>
view
(
@RequestBody
BaseIdDTO
dto
)
{
return
ApiResponseUtils
.
success
(
plat
MenuService
.
view
(
dto
.
getId
()));
return
ApiResponseUtils
.
success
(
saas
MenuService
.
view
(
dto
.
getId
()));
}
}
@Action
(
module
=
"saas端-菜单"
,
name
=
"删除"
,
code
=
"
plat
:menu:del"
)
@Action
(
module
=
"saas端-菜单"
,
name
=
"删除"
,
code
=
"
saas
:menu:del"
)
@ApiOperation
(
"删除"
)
@ApiOperation
(
"删除"
)
@PostMapping
(
"del"
)
@PostMapping
(
"del"
)
public
ApiResponseEntity
<?>
del
(
@RequestBody
BaseIdDTO
dto
)
{
public
ApiResponseEntity
<?>
del
(
@RequestBody
BaseIdDTO
dto
)
{
platMenuService
.
del
(
dto
.
getId
());
saasMenuService
.
del
(
dto
.
getId
());
return
ApiResponseUtils
.
success
();
}
@Action
(
module
=
"saas端-菜单"
,
name
=
"启用禁用"
,
code
=
"saas:menu:changeStatus"
)
@ApiOperation
(
"启用禁用"
)
@PostMapping
(
"changeStatus"
)
public
ApiResponseEntity
<
Void
>
changeStatus
(
@RequestBody
StatusDTO
dto
)
{
saasMenuService
.
changeStatus
(
dto
);
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
}
}
@ApiOperation
(
"同步"
)
@ApiOperation
(
"同步"
)
@PostMapping
(
"sync"
)
@PostMapping
(
"sync"
)
public
ApiResponseEntity
<?>
sync
()
{
public
ApiResponseEntity
<?>
sync
()
{
plat
MenuService
.
sync
();
saas
MenuService
.
sync
();
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
}
}
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmConfigServiceImpl.java
View file @
90a5d123
...
@@ -14,17 +14,13 @@ import com.makeit.enums.id.IdConst;
...
@@ -14,17 +14,13 @@ import com.makeit.enums.id.IdConst;
import
com.makeit.exception.BusinessException
;
import
com.makeit.exception.BusinessException
;
import
com.makeit.global.aspect.tenant.TenantIdUtil
;
import
com.makeit.global.aspect.tenant.TenantIdUtil
;
import
com.makeit.mapper.platform.alarm.PlatAlarmConfigMapper
;
import
com.makeit.mapper.platform.alarm.PlatAlarmConfigMapper
;
import
com.makeit.module.admin.dto.plat.PlatTenantDTOVO
;
import
com.makeit.module.system.entity.SysConfig
;
import
com.makeit.module.system.entity.SysConfigCategory
;
import
com.makeit.service.platform.alarm.PlatAlarmConfigService
;
import
com.makeit.service.platform.alarm.PlatAlarmConfigService
;
import
com.makeit.service.platform.auth.PlatUserService
;
import
com.makeit.service.platform.auth.PlatUserService
;
import
com.makeit.utils.AlarmConfigCacheUtil
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.StreamUtil
;
import
com.makeit.utils.data.convert.StreamUtil
;
import
com.makeit.utils.data.validate.MapUtil
;
import
com.makeit.utils.old.StringUtils
;
import
com.makeit.utils.old.StringUtils
;
import
com.makeit.utils.sql.join.JoinUtil
;
import
com.makeit.utils.sql.join.JoinUtil
;
import
com.makeit.utils.user.plat.PlatUserVO
;
import
com.makeit.vo.platform.alarm.PlatAlarmConfigListVO
;
import
com.makeit.vo.platform.alarm.PlatAlarmConfigListVO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -32,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -32,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.function.BiConsumer
;
import
java.util.function.BiConsumer
;
/**
/**
...
@@ -49,6 +44,9 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
...
@@ -49,6 +44,9 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
@Autowired
@Autowired
private
PlatUserService
platUserService
;
private
PlatUserService
platUserService
;
@Autowired
private
AlarmConfigCacheUtil
alarmConfigUtil
;
@Override
@Override
public
List
<
PlatAlarmConfigListVO
>
list
(
PlatAlarmConfigQueryDTO
dto
)
{
public
List
<
PlatAlarmConfigListVO
>
list
(
PlatAlarmConfigQueryDTO
dto
)
{
...
@@ -76,6 +74,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
...
@@ -76,6 +74,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
save
(
alarmConfig
);
save
(
alarmConfig
);
alarmConfigUtil
.
put
(
alarmConfig
);
}
}
@Override
@Override
...
@@ -91,12 +91,19 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
...
@@ -91,12 +91,19 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
updateById
(
alarmConfig
);
updateById
(
alarmConfig
);
alarmConfigUtil
.
put
(
alarmConfig
);
}
}
@Override
@Override
@Transactional
@Transactional
public
void
edit
(
PlatAlarmConfigDTOVO
dto
)
{
public
void
edit
(
PlatAlarmConfigDTOVO
dto
)
{
updateById
(
BeanDtoVoUtils
.
convert
(
dto
,
PlatAlarmConfig
.
class
));
PlatAlarmConfig
alarmConfig
=
BeanDtoVoUtils
.
convert
(
dto
,
PlatAlarmConfig
.
class
);
updateById
(
alarmConfig
);
alarmConfigUtil
.
put
(
alarmConfig
);
}
}
@Override
@Override
...
@@ -144,6 +151,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
...
@@ -144,6 +151,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
alarmConfig
.
setStatus
(
dto
.
getStatus
());
alarmConfig
.
setStatus
(
dto
.
getStatus
());
updateById
(
alarmConfig
);
updateById
(
alarmConfig
);
alarmConfigUtil
.
put
(
alarmConfig
);
}
}
@Override
@Override
...
@@ -162,6 +171,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
...
@@ -162,6 +171,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
alarmConfig
.
setContentAudit
(
null
);
alarmConfig
.
setContentAudit
(
null
);
updateById
(
alarmConfig
);
updateById
(
alarmConfig
);
alarmConfigUtil
.
put
(
alarmConfig
);
}
}
@Transactional
@Transactional
...
@@ -193,6 +204,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
...
@@ -193,6 +204,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
});
});
saveBatch
(
configList
);
saveBatch
(
configList
);
alarmConfigUtil
.
putAll
(
configList
);
}
}
}
}
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
View file @
90a5d123
...
@@ -519,6 +519,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
...
@@ -519,6 +519,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
private
LambdaQueryWrapper
<
PlatOrg
>
getLambdaQueryWrapper
(
PlatOrgQueryDTO
dto
)
{
private
LambdaQueryWrapper
<
PlatOrg
>
getLambdaQueryWrapper
(
PlatOrgQueryDTO
dto
)
{
LambdaQueryWrapper
<
PlatOrg
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
PlatOrg
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getParentId
()),
PlatOrg:
:
getParentId
,
dto
.
getParentId
())
queryWrapper
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getParentId
()),
PlatOrg:
:
getParentId
,
dto
.
getParentId
())
.
like
(
StringUtils
.
isNotBlank
(
dto
.
getName
()),
PlatOrg:
:
getName
,
dto
.
getName
())
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getType
()),
PlatOrg:
:
getType
,
dto
.
getType
())
.
orderByDesc
(
BaseEntity:
:
getUpdateDate
);
.
orderByDesc
(
BaseEntity:
:
getUpdateDate
);
return
queryWrapper
;
return
queryWrapper
;
}
}
...
@@ -529,15 +531,26 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
...
@@ -529,15 +531,26 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
LambdaQueryWrapper
<
PlatOrg
>
queryWrapper
=
getLambdaQueryWrapper
(
platOrgQueryDTO
);
LambdaQueryWrapper
<
PlatOrg
>
queryWrapper
=
getLambdaQueryWrapper
(
platOrgQueryDTO
);
List
<
PlatOrg
>
list
=
list
(
queryWrapper
);
List
<
PlatOrg
>
list
=
list
(
queryWrapper
);
List
<
PlatOrg
>
orgTree
=
createOrgTree2
(
list
);
if
(
CollectionUtils
.
isEmpty
(
list
)){
return
new
ArrayList
<>();
}
Set
<
String
>
filterSet
=
list
.
stream
().
flatMap
(
vo
->
{
String
path
=
vo
.
getPath
()+
","
+
vo
.
getId
();
String
[]
split
=
path
.
split
(
","
);
return
Stream
.
of
(
split
);
}).
collect
(
Collectors
.
toSet
());
List
<
PlatOrg
>
total
=
list
();
List
<
PlatOrg
>
orgTree
=
createOrgTree2
(
total
,
filterSet
);
return
orgTree
;
return
orgTree
;
}
}
private
List
<
PlatOrg
>
createOrgTree2
(
List
<
PlatOrg
>
orgList
){
private
List
<
PlatOrg
>
createOrgTree2
(
List
<
PlatOrg
>
orgList
,
Set
<
String
>
filterSet
){
if
(
CollectionUtils
.
isEmpty
(
orgList
)){
if
(
CollectionUtils
.
isEmpty
(
orgList
)){
return
new
ArrayList
<>();
return
new
ArrayList
<>();
}
}
Map
<
String
,
List
<
PlatOrg
>>
parentMap
=
orgList
.
stream
().
collect
(
Collectors
.
groupingBy
(
PlatOrg:
:
getParentId
));
Map
<
String
,
List
<
PlatOrg
>>
parentMap
=
orgList
.
stream
()
.
filter
(
vo
->
filterSet
.
contains
(
vo
.
getId
()))
.
collect
(
Collectors
.
groupingBy
(
PlatOrg:
:
getParentId
));
orgList
.
forEach
(
vo
->{
orgList
.
forEach
(
vo
->{
vo
.
setChildren
(
parentMap
.
get
(
vo
.
getId
()));
vo
.
setChildren
(
parentMap
.
get
(
vo
.
getId
()));
});
});
...
...
server-service/src/main/java/com/makeit/service/saas/SaasMenuService.java
View file @
90a5d123
package
com
.
makeit
.
service
.
saas
;
package
com
.
makeit
.
service
.
saas
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.makeit.common.dto.StatusDTO
;
import
com.makeit.entity.saas.SaasMenu
;
import
com.makeit.entity.saas.SaasMenu
;
import
com.makeit.module.admin.dto.saas.SaasMenuDTOVO
;
import
com.makeit.module.admin.dto.saas.SaasMenuDTOVO
;
import
com.makeit.module.admin.dto.saas.SaasMenuQueryDTO
;
import
com.makeit.module.admin.dto.saas.SaasMenuQueryDTO
;
...
@@ -30,4 +31,6 @@ public interface SaasMenuService extends IService<SaasMenu> {
...
@@ -30,4 +31,6 @@ public interface SaasMenuService extends IService<SaasMenu> {
void
sync
();
void
sync
();
void
changeStatus
(
StatusDTO
dto
);
}
}
server-service/src/main/java/com/makeit/service/saas/impl/SaasMenuServiceImpl.java
View file @
90a5d123
...
@@ -2,6 +2,7 @@ package com.makeit.service.saas.impl;
...
@@ -2,6 +2,7 @@ package com.makeit.service.saas.impl;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.makeit.common.dto.StatusDTO
;
import
com.makeit.entity.saas.SaasMenu
;
import
com.makeit.entity.saas.SaasMenu
;
import
com.makeit.entity.saas.SaasRoleMenu
;
import
com.makeit.entity.saas.SaasRoleMenu
;
import
com.makeit.enums.CodeMessageEnum
;
import
com.makeit.enums.CodeMessageEnum
;
...
@@ -332,5 +333,20 @@ public class SaasMenuServiceImpl extends ServiceImpl<SaasMenuMapper, SaasMenu> i
...
@@ -332,5 +333,20 @@ public class SaasMenuServiceImpl extends ServiceImpl<SaasMenuMapper, SaasMenu> i
return
button
;
return
button
;
}
}
@Transactional
@Override
public
void
changeStatus
(
StatusDTO
dto
)
{
if
(
Arrays
.
stream
(
CommonEnum
.
values
()).
noneMatch
(
e
->
e
.
getValue
().
equals
(
dto
.
getStatus
())))
{
throw
new
BusinessException
(
CodeMessageEnum
.
SYSTEM_ERROR
);
}
SaasMenu
saasMenu
=
getById
(
dto
.
getId
());
if
(
saasMenu
.
getStatus
().
equals
(
dto
.
getStatus
()))
{
throw
new
BusinessException
(
CodeMessageEnum
.
SYSTEM_ERROR
);
}
saasMenu
.
setStatus
(
dto
.
getStatus
());
updateById
(
saasMenu
);
}
}
}
server-service/src/main/java/com/makeit/task/IotSyncTask.java
View file @
90a5d123
...
@@ -47,7 +47,7 @@ public class IotSyncTask {
...
@@ -47,7 +47,7 @@ public class IotSyncTask {
* 启用状态的租户才同步
* 启用状态的租户才同步
* 新增和更新平台端设备表
* 新增和更新平台端设备表
*/
*/
@Scheduled
(
cron
=
"0 0 */1 * * ?"
)
//
@Scheduled(cron = "0 0 */1 * * ?")
@TenantIdIgnore
@TenantIdIgnore
public
void
syncEquipmentInfo
()
{
public
void
syncEquipmentInfo
()
{
log
.
info
(
"开始执行同步设备信息接口"
);
log
.
info
(
"开始执行同步设备信息接口"
);
...
@@ -131,5 +131,10 @@ public class IotSyncTask {
...
@@ -131,5 +131,10 @@ public class IotSyncTask {
});
});
return
deviceMap
.
values
();
return
deviceMap
.
values
();
}
}
/**
* 床位id 绑定的所有设备
* 房间id 绑定的所有设备
*
*/
}
}
server-service/src/main/java/com/makeit/utils/AlarmConfigCacheUtil.java
0 → 100644
View file @
90a5d123
package
com
.
makeit
.
utils
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.makeit.entity.platform.alarm.PlatAlarmConfig
;
import
com.makeit.enums.CommonEnum
;
import
com.makeit.global.aspect.tenant.TenantIdIgnore
;
import
com.makeit.service.platform.alarm.PlatAlarmConfigService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.ApplicationArguments
;
import
org.springframework.boot.ApplicationRunner
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
import
java.util.concurrent.ConcurrentHashMap
;
@Component
public
class
AlarmConfigCacheUtil
implements
ApplicationRunner
{
/**
* key orgId|type
* todo 放redis
*/
private
static
final
ConcurrentHashMap
<
String
,
PlatAlarmConfig
>
CACHE
=
new
ConcurrentHashMap
<>(
16
);
@Autowired
private
PlatAlarmConfigService
platAlarmConfigService
;
public
List
<
PlatAlarmConfig
>
getAll
()
{
List
<
PlatAlarmConfig
>
list
=
platAlarmConfigService
.
list
(
new
LambdaQueryWrapper
<
PlatAlarmConfig
>().
eq
(
PlatAlarmConfig:
:
getStatus
,
CommonEnum
.
YES
.
getValue
()));
return
list
;
}
public
void
put
(
PlatAlarmConfig
alarmConfig
)
{
if
(
StringUtils
.
equals
(
CommonEnum
.
YES
.
getValue
(),
alarmConfig
.
getStatus
()))
{
CACHE
.
put
(
alarmConfig
.
getOrgId
()
+
"|"
+
alarmConfig
.
getAlarmType
(),
alarmConfig
);
}
else
{
CACHE
.
remove
(
alarmConfig
.
getOrgId
()
+
"|"
+
alarmConfig
.
getAlarmType
());
}
}
public
void
putAll
(
List
<
PlatAlarmConfig
>
alarmConfigs
)
{
alarmConfigs
.
forEach
(
vo
->
{
put
(
vo
);
});
}
public
PlatAlarmConfig
get
(
String
orgIdType
)
{
return
CACHE
.
get
(
orgIdType
);
}
/**
* Callback used to run the bean.
*
* @param args incoming application arguments
* @throws Exception on error
*/
@Override
@TenantIdIgnore
public
void
run
(
ApplicationArguments
args
)
throws
Exception
{
List
<
PlatAlarmConfig
>
list
=
getAll
();
list
.
stream
().
forEach
(
vo
->
{
put
(
vo
);
});
}
}
server-service/src/main/java/com/makeit/utils/DeviceCacheUtil.java
0 → 100644
View file @
90a5d123
package
com
.
makeit
.
utils
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.global.aspect.tenant.TenantIdIgnore
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.ApplicationArguments
;
import
org.springframework.boot.ApplicationRunner
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
import
java.util.concurrent.ConcurrentHashMap
;
@Component
public
class
DeviceCacheUtil
implements
ApplicationRunner
{
/**
* key
* todo 放redis
*/
private
static
final
ConcurrentHashMap
<
String
,
PlatDevice
>
CACHE
=
new
ConcurrentHashMap
<>(
16
);
@Autowired
private
PlatDeviceService
platDeviceService
;
public
List
<
PlatDevice
>
getAll
()
{
List
<
PlatDevice
>
list
=
platDeviceService
.
list
(
new
LambdaQueryWrapper
<
PlatDevice
>());
return
list
;
}
public
void
put
(
PlatDevice
platDevice
)
{
CACHE
.
put
(
platDevice
.
getOriDeviceId
(),
platDevice
);
}
public
void
putAll
(
List
<
PlatDevice
>
platDevices
)
{
platDevices
.
forEach
(
vo
->
{
put
(
vo
);
});
}
public
PlatDevice
get
(
String
oriDeviceId
)
{
return
CACHE
.
get
(
oriDeviceId
);
}
/**
* Callback used to run the bean.
*
* @param args incoming application arguments
* @throws Exception on error
*/
@Override
@TenantIdIgnore
public
void
run
(
ApplicationArguments
args
)
throws
Exception
{
List
<
PlatDevice
>
list
=
getAll
();
list
.
stream
().
forEach
(
vo
->
{
put
(
vo
);
});
}
}
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
View file @
90a5d123
This diff is collapsed.
Click to expand it.
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