Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_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_gov_platform
Commits
ab4314cc
Commit
ab4314cc
authored
Jan 21, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
初始化站点资源
parent
9b2790f1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
103 additions
and
20 deletions
+103
-20
base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
.../java/com/mortals/xhx/busiz/web/DemoWebApiController.java
+76
-8
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
...in/java/com/mortals/xhx/module/site/model/SiteEntity.java
+12
-12
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteVo.java
...ain/java/com/mortals/xhx/module/site/model/vo/SiteVo.java
+5
-0
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
...test/java/com/mortals/httpclient/site/SiteController.http
+3
-0
base-manager/src/test/java/com/mortals/httpclient/system/system.http
...r/src/test/java/com/mortals/httpclient/system/system.http
+7
-0
No files found.
base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
View file @
ab4314cc
...
...
@@ -21,11 +21,11 @@ import com.mortals.xhx.module.dept.model.DeptQuery;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
com.mortals.xhx.module.matter.model.MatterEntity
;
import
com.mortals.xhx.module.matter.model.MatterQuery
;
import
com.mortals.xhx.module.matter.service.MatterExtService
;
import
com.mortals.xhx.module.matter.service.MatterService
;
import
com.mortals.xhx.module.site.model.SiteEntity
;
import
com.mortals.xhx.module.site.model.SiteMatterEntity
;
import
com.mortals.xhx.module.site.model.SiteMatterQuery
;
import
com.mortals.xhx.module.site.model.*
;
import
com.mortals.xhx.module.site.service.SiteMatterService
;
import
com.mortals.xhx.module.site.service.SiteService
;
import
com.mortals.xhx.module.site.service.SiteThemeMatterService
;
import
com.mortals.xhx.module.site.service.SiteThemeService
;
import
com.mortals.xhx.module.window.model.WindowEntity
;
...
...
@@ -47,10 +47,7 @@ import org.springframework.util.ObjectUtils;
import
org.springframework.util.StopWatch
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -82,6 +79,13 @@ public class DemoWebApiController {
private
AppDatasetService
appDatasetService
;
@Autowired
private
AppInfoFieldService
appInfoFieldService
;
@Autowired
private
MatterExtService
matterExtService
;
@Autowired
private
SiteService
siteService
;
@Autowired
private
SiteThemeService
siteThemeService
;
@PostMapping
(
value
=
"testGov"
)
...
...
@@ -322,6 +326,70 @@ public class DemoWebApiController {
}
@PostMapping
(
value
=
"saveSiteMatters"
)
@UnAuth
public
Rest
<
String
>
saveSiteMatters
(
@RequestBody
SiteQuery
siteQuery
)
{
log
.
info
(
"保存站点事项相关=="
);
//复制部门
Long
copySiteId
=
siteQuery
.
getCopySiteId
();
Long
targetSiteId
=
siteQuery
.
getTargetSiteId
();
List
<
DeptEntity
>
deptEntityList
=
deptService
.
find
(
new
DeptQuery
().
siteId
(
copySiteId
).
source
(
SourceEnum
.
政务网
.
getValue
()));
deptEntityList
.
stream
().
forEach
(
item
->
{
item
.
setSiteId
(
targetSiteId
);
item
.
setId
(
null
);
item
.
setDeptNumber
(
item
.
getDeptNumber
()
+
"_"
+
targetSiteId
);
});
deptService
.
save
(
deptEntityList
);
SiteEntity
siteEntity
=
siteService
.
get
(
targetSiteId
);
//保存站点事项
List
<
MatterEntity
>
matterList
=
matterService
.
getDao
().
getMatterListByAreaCode
(
new
MatterQuery
().
areaCode
(
siteQuery
.
getAreaCode
()).
source
(
SourceEnum
.
政务网
.
getValue
()));
List
<
SiteMatterEntity
>
targetSiteMatterEntities
=
new
ArrayList
<>();
for
(
MatterEntity
matterEntity
:
matterList
)
{
DeptEntity
deptEntity
=
deptService
.
getExtCache
(
matterEntity
.
getDeptCode
());
SiteMatterEntity
siteMatterEntity
=
new
SiteMatterEntity
();
siteMatterEntity
.
initAttrValue
();
//SiteEntity siteEntity = siteService.get(siteId);
siteMatterEntity
.
setSiteId
(
siteEntity
.
getId
());
siteMatterEntity
.
setSiteName
(
siteEntity
.
getSiteName
());
siteMatterEntity
.
setMatterId
(
matterEntity
.
getId
());
siteMatterEntity
.
setMatterCode
(
matterEntity
.
getMatterNo
());
siteMatterEntity
.
setMatterName
(
matterEntity
.
getMatterName
());
siteMatterEntity
.
setSource
(
matterEntity
.
getSource
());
siteMatterEntity
.
setEventTypeShow
(
matterEntity
.
getEventTypeShow
());
siteMatterEntity
.
setDeptName
(
deptEntity
==
null
?
""
:
deptEntity
.
getName
());
siteMatterEntity
.
setDeptId
(
deptEntity
==
null
?
-
1L
:
deptEntity
.
getId
());
siteMatterEntity
.
setDeptCode
(
deptEntity
==
null
?
""
:
deptEntity
.
getDeptNumber
());
siteMatterEntity
.
setCreateUserId
(
1L
);
siteMatterEntity
.
setCreateTime
(
new
Date
());
targetSiteMatterEntities
.
add
(
siteMatterEntity
);
}
siteMatterService
.
save
(
targetSiteMatterEntities
);
//同步主题
List
<
SiteThemeEntity
>
siteThemeEntities
=
siteThemeService
.
find
(
new
SiteThemeQuery
().
siteId
(
copySiteId
));
for
(
SiteThemeEntity
siteThemeEntity
:
siteThemeEntities
)
{
siteThemeEntity
.
setId
(
null
);
siteThemeEntity
.
setSiteId
(
targetSiteId
);
}
siteThemeService
.
save
(
siteThemeEntities
);
List
<
SiteThemeMatterEntity
>
siteThemeMatterEntities
=
siteThemeMatterService
.
find
(
new
SiteThemeMatterQuery
().
siteId
(
copySiteId
));
for
(
SiteThemeMatterEntity
siteThemeMatterEntity
:
siteThemeMatterEntities
)
{
siteThemeMatterEntity
.
setId
(
null
);
siteThemeMatterEntity
.
setSiteId
(
targetSiteId
);
siteThemeMatterEntity
.
setSiteName
(
siteEntity
.
getSiteName
());
}
siteThemeMatterService
.
save
(
siteThemeMatterEntities
);
return
Rest
.
ok
();
}
@PostMapping
(
value
=
"limit"
)
@UnAuth
//@TokenBucketLimit
...
...
@@ -354,7 +422,7 @@ public class DemoWebApiController {
sb
.
append
(
String
.
format
(
"INSERT INTO `mortals_sys_app_info_field`(`id`, `datasetId`, `fieldCode`, `fieldName`, `fieldType`, `fieldTypeValue`, `dataType`, `fieldValue`, `defaultValue`, `fieldLen`, `fieldNull`, `isList`, `fieldOrderNo`, `remark`, `createTime`, `createUserId`, `updateTime`, `updateUserId`, `serviceApi`, `serviceApiParams`) VALUES (null, %s, 'name', '政策全称', 'input', '', 'string', '', '', 128, 0, 1, 99, '', '2024-05-29 17:55:38', 1, '2024-05-29 17:55:38', 1, '', '');"
,
appDatasetEntity
.
getId
()));
sb
.
append
(
"\n"
);
}
log
.
info
(
"sql:{}"
,
sb
.
toString
());
log
.
info
(
"sql:{}"
,
sb
.
toString
());
//INSERT INTO `mortals_sys_app_info_field`(`id`, `datasetId`, `fieldCode`, `fieldName`, `fieldType`, `fieldTypeValue`, `dataType`, `fieldValue`, `defaultValue`, `fieldLen`, `fieldNull`, `isList`, `fieldOrderNo`, `remark`, `createTime`, `createUserId`, `updateTime`, `updateUserId`, `serviceApi`, `serviceApiParams`) VALUES (null, 755, 'name', '政策全称', 'input', '', 'string', '', '', 128, 0, 1, 99, '', '2024-05-29 17:55:38', 1, '2024-05-29 17:55:38', 1, '', '');
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
View file @
ab4314cc
...
...
@@ -197,33 +197,33 @@ public class SiteEntity extends SiteVo {
this
.
proCode
=
""
;
this
.
cityCode
=
""
;
this
.
districtCode
=
""
;
this
.
siteIp
=
""
;
this
.
sitePort
=
""
;
this
.
siteIp
=
"
127.0.0.1
"
;
this
.
sitePort
=
"
80
"
;
this
.
longitude
=
""
;
this
.
latitude
=
""
;
this
.
siteTel
=
""
;
this
.
siteTel
=
"
13808095770
"
;
this
.
detailAddress
=
""
;
this
.
siteRemark
=
""
;
this
.
amWorkStartTime
=
null
;
this
.
amWorkEndTime
=
null
;
this
.
pmWorkStartTime
=
null
;
this
.
pmWorkEndTime
=
null
;
this
.
workday1
=
0
;
this
.
workday2
=
0
;
this
.
workday3
=
0
;
this
.
workday4
=
0
;
this
.
workday5
=
0
;
this
.
workday1
=
1
;
this
.
workday2
=
1
;
this
.
workday3
=
1
;
this
.
workday4
=
1
;
this
.
workday5
=
1
;
this
.
workday6
=
0
;
this
.
workday7
=
0
;
this
.
onlineTake
=
1
;
this
.
appointment
=
1
;
this
.
gowMap
=
1
;
this
.
level
=
0
;
this
.
building
=
0
;
this
.
level
=
1
;
this
.
building
=
1
;
this
.
logoPath
=
""
;
this
.
englishName
=
""
;
this
.
leadingOfficial
=
""
;
this
.
leadingOfficialTelephone
=
""
;
this
.
leadingOfficial
=
"
张三
"
;
this
.
leadingOfficialTelephone
=
"
13808095770
"
;
this
.
modelIds
=
""
;
this
.
govAffairStyle
=
""
;
this
.
complaintHotline
=
""
;
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteVo.java
View file @
ab4314cc
...
...
@@ -34,4 +34,9 @@ public class SiteVo extends BaseEntityLong {
private
List
<
String
>
modelData
;
private
Long
copySiteId
;
private
Long
targetSiteId
;
}
\ No newline at end of file
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @
ab4314cc
...
...
@@ -170,3 +170,6 @@ POST {{baseUrl}}/site/getSitesGroupByAreaLevel
Content-Type: application/json
{"areaLevel":3,"siteName": "%翠屏区%"}
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @
ab4314cc
...
...
@@ -271,3 +271,10 @@ Content-Type: application/json
}
###保存站点事项与主题事项
POST {{baseUrl}}/test/saveSiteMatters
Content-Type: application/json
{"copySiteId":11,"targetSiteId": 50,"areaCode": "511523000000"}
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