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
34b592eb
Commit
34b592eb
authored
Dec 24, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步业务逻辑
parent
af74f424
Pipeline
#2871
canceled with stages
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
fill-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java
...a/com/mortals/xhx/busiz/web/DeviceCallbackController.java
+2
-10
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java
...mortals/xhx/module/matter/service/MatterDatumService.java
+5
-0
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
.../com/mortals/xhx/module/matter/service/MatterService.java
+4
-0
fill-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+1
-1
No files found.
fill-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java
View file @
34b592eb
...
...
@@ -56,24 +56,16 @@ public class DeviceCallbackController {
matterEntity
.
setId
(
null
);
matterEntity
.
setSiteId
(
copySiteId
);
matterService
.
save
(
matterEntity
);
matterService
.
getMatterDao
().
insert
(
matterEntity
);
matterDatumEntity
.
setMatterId
(
matterEntity
.
getId
());
matterDatumEntity
.
setId
(
null
);
matterDatumEntity
.
setSiteId
(
copySiteId
);
matterDatumService
.
save
(
matterDatumEntity
);
matterDatumService
.
getMatterDatumDao
().
insert
(
matterDatumEntity
);
}
}
}
...
...
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java
View file @
34b592eb
...
...
@@ -2,6 +2,8 @@ package com.mortals.xhx.module.matter.service;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.service.ICRUDService
;
import
com.mortals.xhx.module.matter.dao.MatterDao
;
import
com.mortals.xhx.module.matter.dao.MatterDatumDao
;
import
com.mortals.xhx.module.matter.model.MatterDatumEntity
;
/**
* MatterDatumService
...
...
@@ -13,6 +15,9 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
*/
public
interface
MatterDatumService
extends
ICRUDService
<
MatterDatumEntity
,
Long
>{
MatterDatumDao
getMatterDatumDao
();
/**
* 合成doc数据模板
* @param context
...
...
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
View file @
34b592eb
...
...
@@ -5,6 +5,7 @@ import com.mortals.framework.model.Context;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.Result
;
import
com.mortals.framework.service.ICRUDService
;
import
com.mortals.xhx.module.matter.dao.MatterDao
;
import
com.mortals.xhx.module.matter.model.MatterEntity
;
/**
* MatterService
...
...
@@ -16,6 +17,9 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
*/
public
interface
MatterService
extends
ICRUDService
<
MatterEntity
,
Long
>{
MatterDao
getMatterDao
();
/**
* 站点事项转系统事项
* @param sheetMatterIds
...
...
fill-manager/src/test/java/com/mortals/httpclient/system.http
View file @
34b592eb
...
...
@@ -75,7 +75,7 @@ Content-Type: application/json
###站点树
GET
{{baseUrl}}/
/api/device/copy
GET
http://192.168.0.250:17215/fm
/api/device/copy
Content-Type: application/json
{}
...
...
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