Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
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
廖旭伟
fill-system
Commits
4f96c559
Commit
4f96c559
authored
May 07, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加皮肤相关
parent
37587868
Pipeline
#2604
canceled with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
...a/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
+1
-0
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumPrintServiceImpl.java
...dule/matter/service/impl/MatterDatumPrintServiceImpl.java
+0
-2
fill-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumPrintController.http
...mortals/httpclient/matter/MatterDatumPrintController.http
+5
-4
No files found.
fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
View file @
4f96c559
...
...
@@ -69,6 +69,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
log
.
info
(
"站点名称:{}"
,
site
.
getSiteName
());
DevicePdu
devicePdu
=
new
DevicePdu
();
devicePdu
.
setProductCode
(
"tdj"
);
devicePdu
.
setSiteId
(
site
.
getId
());
devicePdu
.
setSize
(-
1
);
Rest
<
RespData
<
List
<
DevicePdu
>>>
deviceRest
=
deviceFeign
.
list
(
devicePdu
);
log
.
info
(
"deviceRest:{}"
,
JSON
.
toJSONString
(
deviceRest
));
...
...
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumPrintServiceImpl.java
View file @
4f96c559
...
...
@@ -47,9 +47,7 @@ public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterD
entity
.
setMatterName
(
matterDatumEntity
.
getMatterName
());
}
}
entity
.
setOrderId
(
IdUtil
.
simpleUUID
());
String
rootPath
=
this
.
filePath
.
endsWith
(
"/"
)
?
this
.
filePath
:
this
.
filePath
+
"/"
;
Integer
pageByDoc
=
WordUtil
.
getPageByDoc
(
rootPath
+
entity
.
getDocPath
());
entity
.
setPrintPage
(
pageByDoc
);
...
...
fill-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumPrintController.http
View file @
4f96c559
...
...
@@ -15,13 +15,14 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
###打印提交列表
POST {{baseUrl}}/matter/datum/print/list
Authorization: {{authToken}}
Content-Type: application/json
{
"orderId":"d7y4sx",
"materialId":635,
"materialName":"h0er7b",
"createTimeStart": "2023-04-08",
"createTimeEnd": "2023-04-08",
"materialName": "%%",
"matterName": "%%",
"siteId": 1,
"page":1,
"size":10
}
...
...
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