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
8da47f51
Commit
8da47f51
authored
May 25, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步用户
parent
ea6ad660
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
13 deletions
+46
-13
doc/api.md
doc/api.md
+1
-0
smart-office-manager/src/main/java/com/mortals/xhx/common/key/Constant.java
...er/src/main/java/com/mortals/xhx/common/key/Constant.java
+1
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/model/vo/BasicSetVo.java
...ava/com/mortals/xhx/module/basic/model/vo/BasicSetVo.java
+1
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/service/impl/BasicSetServiceImpl.java
...ls/xhx/module/basic/service/impl/BasicSetServiceImpl.java
+30
-13
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/web/BasicSetController.java
.../com/mortals/xhx/module/basic/web/BasicSetController.java
+13
-0
No files found.
doc/api.md
View file @
8da47f51
...
...
@@ -2552,6 +2552,7 @@ data| object |数据对象
  
showElectDesc| String |显示电子门牌信息自定义内容
  
showMeet| Integer |显示会议室门牌信息(0.显示时间,1.自定义内容)
  
showMeetDesc| String |显示会议室门牌信息自定义内容
  
siteName| String |站点名称
  
basicStatusList| Arrays |状态配置列表
  
statusName| String |状态名称
  
statusColor| String |状态颜色值
...
...
smart-office-manager/src/main/java/com/mortals/xhx/common/key/Constant.java
View file @
8da47f51
...
...
@@ -72,6 +72,7 @@ public final class Constant {
* 令牌前缀
*/
public
static
final
String
LOGIN_DEVICE_KEY
=
"login_device_key"
;
public
static
final
String
DEFAULT_SITENAME
=
"default_sitename"
;
/** 基础代码版本 Z-BASE.MANAGER-S1.0.0 */
public
final
static
String
BASEMANAGER_VERSION
=
"Z-BASE.MANAGER-S1.0.0"
;
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/model/vo/BasicSetVo.java
View file @
8da47f51
...
...
@@ -17,5 +17,6 @@ import java.util.Date;
public
class
BasicSetVo
extends
BaseEntityLong
{
private
String
siteName
;
}
\ No newline at end of file
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/service/impl/BasicSetServiceImpl.java
View file @
8da47f51
package
com.mortals.xhx.module.basic.service.impl
;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.xhx.common.key.Constant
;
import
org.springframework.stereotype.Service
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.framework.exception.AppException
;
...
...
@@ -11,28 +15,41 @@ import com.mortals.xhx.module.basic.model.BasicStatusEntity;
import
com.mortals.xhx.module.basic.model.BasicStatusQuery
;
import
com.mortals.xhx.module.basic.service.BasicStatusService
;
import
org.springframework.util.ObjectUtils
;
import
java.util.Date
;
import
java.util.Arrays
;
import
java.util.List
;
import
lombok.extern.slf4j.Slf4j
;
/**
* BasicSetService
* 基础设置 service实现
*
* @author zxfei
* @date 2023-05-23
*/
* BasicSetService
* 基础设置 service实现
*
* @author zxfei
* @date 2023-05-23
*/
@Service
(
"basicSetService"
)
@Slf4j
public
class
BasicSetServiceImpl
extends
AbstractCRUDServiceImpl
<
BasicSetDao
,
BasicSetEntity
,
Long
>
implements
BasicSetService
{
@Autowired
private
BasicStatusService
basicStatusService
;
@Override
protected
void
findAfter
(
BasicSetEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
BasicSetEntity
>
list
)
throws
AppException
{
super
.
findAfter
(
params
,
pageInfo
,
context
,
list
);
String
siteName
=
GlobalSysInfo
.
getParamValue
(
Constant
.
DEFAULT_SITENAME
,
"宜宾市民中心"
);
list
.
forEach
(
item
->
{
item
.
setSiteName
(
siteName
);
});
}
@Override
protected
void
saveAfter
(
BasicSetEntity
entity
,
Context
context
)
throws
AppException
{
if
(!
ObjectUtils
.
isEmpty
(
entity
.
getBasicStatusList
()))
{
entity
.
getBasicStatusList
().
stream
().
peek
(
item
->
{
if
(!
ObjectUtils
.
isEmpty
(
entity
.
getBasicStatusList
()))
{
entity
.
getBasicStatusList
().
stream
().
peek
(
item
->
{
item
.
setBasicSetId
(
entity
.
getId
());
item
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
item
.
setCreateTime
(
new
Date
());
...
...
@@ -44,10 +61,10 @@ public class BasicSetServiceImpl extends AbstractCRUDServiceImpl<BasicSetDao, Ba
@Override
protected
void
updateAfter
(
BasicSetEntity
entity
,
Context
context
)
throws
AppException
{
if
(!
ObjectUtils
.
isEmpty
(
entity
.
getBasicStatusList
()))
{
if
(!
ObjectUtils
.
isEmpty
(
entity
.
getBasicStatusList
()))
{
Long
[]
basicStatusIds
=
basicStatusService
.
find
(
new
BasicStatusQuery
().
basicSetId
(
entity
.
getId
())).
stream
().
map
(
BasicStatusEntity:
:
getId
).
toArray
(
Long
[]::
new
);
basicStatusService
.
remove
(
basicStatusIds
,
context
);
entity
.
getBasicStatusList
().
stream
().
peek
(
item
->{
basicStatusService
.
remove
(
basicStatusIds
,
context
);
entity
.
getBasicStatusList
().
stream
().
peek
(
item
->
{
item
.
setBasicSetId
(
entity
.
getId
());
item
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
item
.
setCreateTime
(
new
Date
());
...
...
@@ -62,7 +79,7 @@ public class BasicSetServiceImpl extends AbstractCRUDServiceImpl<BasicSetDao, Ba
@Override
protected
void
removeAfter
(
Long
[]
ids
,
Context
context
,
int
result
)
throws
AppException
{
List
<
BasicStatusEntity
>
basicStatuslist
=
basicStatusService
.
find
(
new
BasicStatusQuery
().
basicSetIdList
(
Arrays
.
asList
(
ids
)));
basicStatusService
.
removeList
(
basicStatuslist
,
context
);
basicStatusService
.
removeList
(
basicStatuslist
,
context
);
super
.
removeAfter
(
ids
,
context
,
result
);
}
}
\ No newline at end of file
smart-office-manager/src/main/java/com/mortals/xhx/module/basic/web/BasicSetController.java
View file @
8da47f51
package
com.mortals.xhx.module.basic.web
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.module.basic.model.BasicSetQuery
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -52,5 +55,15 @@ public class BasicSetController extends BaseCRUDJsonBodyMappingController<BasicS
super
.
init
(
model
,
context
);
}
@Override
protected
void
saveBefore
(
BasicSetEntity
entity
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
BasicSetEntity
basicSetEntity
=
this
.
service
.
selectOne
(
new
BasicSetQuery
(),
context
);
if
(!
ObjectUtils
.
isEmpty
(
basicSetEntity
)){
entity
.
setId
(
basicSetEntity
.
getId
());
}
super
.
saveBefore
(
entity
,
model
,
context
);
}
}
\ 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