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
dde48a48
Commit
dde48a48
authored
Sep 08, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新附件添加多个设置
parent
9c48b908
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
smart-office-manager-ui/admin/src/views/workman/list.vue
smart-office-manager-ui/admin/src/views/workman/list.vue
+8
-1
smart-office-manager/src/main/java/com/mortals/xhx/module/room/service/impl/RoomServiceImpl.java
...mortals/xhx/module/room/service/impl/RoomServiceImpl.java
+1
-1
smart-office-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
...s/xhx/module/workman/service/impl/WorkmanServiceImpl.java
+4
-2
smart-office-manager/src/main/resources/config/mybatis-sqlmap-config.xml
...nager/src/main/resources/config/mybatis-sqlmap-config.xml
+1
-1
No files found.
smart-office-manager-ui/admin/src/views/workman/list.vue
View file @
dde48a48
...
...
@@ -205,7 +205,14 @@ export default {
},
isExport
:
false
,
config
:
{
search
:
[],
search
:
[
{
name
:
"
userName
"
,
type
:
"
text
"
,
label
:
"
姓名
"
,
fuzzy
:
true
,
},
],
columns
:
[
{
type
:
"
selection
"
,
width
:
60
},
{
type
:
"
index
"
,
label
:
"
序号
"
,
width
:
50
},
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/room/service/impl/RoomServiceImpl.java
View file @
dde48a48
...
...
@@ -196,7 +196,7 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
}
UploadDeviceReq
uploadDeviceReq
=
new
UploadDeviceReq
();
uploadDeviceReq
.
setDeviceCodeList
(
roomDeviceService
.
find
(
new
RoomDeviceQuery
().
roomId
(
entity
.
getId
())).
stream
().
map
(
i
->
i
.
getDeviceCode
()).
collect
(
Collectors
.
toList
()));
uploadDeviceReq
.
setAction
(
"refresh
Metting
"
);
uploadDeviceReq
.
setAction
(
"refresh
Workman
"
);
messageFeign
.
downMsg
(
uploadDeviceReq
);
}
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
View file @
dde48a48
...
...
@@ -95,18 +95,20 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
@Override
protected
void
updateAfter
(
WorkmanEntity
entity
,
Context
context
)
throws
AppException
{
super
.
updateAfter
(
entity
,
context
);
UploadDeviceReq
uploadDeviceReq
=
new
UploadDeviceReq
();
RoomEntity
roomEntity
=
roomService
.
get
(
entity
.
getRoomId
(),
context
);
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
)){
uploadDeviceReq
.
setDeviceCodeList
(
roomDeviceService
.
find
(
new
RoomDeviceQuery
().
roomId
(
roomEntity
.
getId
())).
stream
().
map
(
i
->
i
.
getDeviceCode
()).
collect
(
Collectors
.
toList
()));
uploadDeviceReq
.
setAction
(
"refreshWorkman"
);
log
.
info
(
"downMsg:{}"
,
JSON
.
toJSONString
(
uploadDeviceReq
));
WorkmanEntity
workmanEntity
=
this
.
get
(
entity
.
getId
());
log
.
info
(
"downMsg:{},workmanName:{}"
,
JSON
.
toJSONString
(
uploadDeviceReq
),
workmanEntity
.
getName
());
messageFeign
.
downMsg
(
uploadDeviceReq
);
}
else
{
log
.
info
(
"roomId:{}"
,
entity
.
getRoomId
());
}
super
.
updateAfter
(
entity
,
context
);
}
@Override
...
...
smart-office-manager/src/main/resources/config/mybatis-sqlmap-config.xml
View file @
dde48a48
...
...
@@ -18,7 +18,7 @@
</plugin>
<plugin
interceptor=
"com.mortals.framework.thirty.mybatis.LogInterceptor"
>
<property
name=
"enableExecutorTime"
value=
"true"
/>
<property
name=
"showSql"
value=
"
tru
e"
/>
<property
name=
"showSql"
value=
"
fals
e"
/>
</plugin>
</plugins>
</configuration>
\ 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