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
6c65d087
Commit
6c65d087
authored
May 31, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加用户扩展xml
parent
f2903390
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
11 deletions
+16
-11
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+2
-0
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
.../java/com/mortals/xhx/module/site/web/SiteController.java
+3
-9
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
...test/java/com/mortals/httpclient/site/SiteController.http
+11
-2
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
6c65d087
...
@@ -213,11 +213,13 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -213,11 +213,13 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
AreaEntity
areaTemp
=
areaService
.
getExtCache
(
siteEntity
.
getAreaCode
());
AreaEntity
areaTemp
=
areaService
.
getExtCache
(
siteEntity
.
getAreaCode
());
if
(
areaCode
.
equals
(
areaTemp
.
getAreaCode
()))
{
if
(
areaCode
.
equals
(
areaTemp
.
getAreaCode
()))
{
siteList
.
add
(
siteEntity
);
siteList
.
add
(
siteEntity
);
return
;
}
else
{
}
else
{
if
(!
ObjectUtils
.
isEmpty
(
areaTemp
.
getPid
()))
{
if
(!
ObjectUtils
.
isEmpty
(
areaTemp
.
getPid
()))
{
AreaEntity
areaEntity
=
areaService
.
selectOne
(
new
AreaQuery
().
iid
(
areaTemp
.
getPid
()));
AreaEntity
areaEntity
=
areaService
.
selectOne
(
new
AreaQuery
().
iid
(
areaTemp
.
getPid
()));
if
(!
ObjectUtils
.
isEmpty
(
areaEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
areaEntity
))
{
getSite
(
areaEntity
.
getAreaCode
(),
siteList
,
siteEntity
);
getSite
(
areaEntity
.
getAreaCode
(),
siteList
,
siteEntity
);
}
}
}
}
}
}
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @
6c65d087
package
com.mortals.xhx.module.site.web
;
package
com.mortals.xhx.module.site.web
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.Result
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BasePhpCRUDJsonMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.module.model.model.ModelQuery
;
import
com.mortals.xhx.module.model.model.ModelQuery
;
import
com.mortals.xhx.module.model.service.ModelService
;
import
com.mortals.xhx.module.model.service.ModelService
;
import
com.mortals.xhx.module.site.model.SiteBusinessEntity
;
import
com.mortals.xhx.module.site.model.SiteEntity
;
import
com.mortals.xhx.module.site.model.SiteEntity
;
import
com.mortals.xhx.module.site.model.SiteTreeSelect
;
import
com.mortals.xhx.module.site.model.SiteTreeSelect
;
import
com.mortals.xhx.module.site.service.SiteService
;
import
com.mortals.xhx.module.site.service.SiteService
;
...
@@ -22,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -22,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.*
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
/**
/**
...
...
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @
6c65d087
###站点列表
###站点列表
POST {{baseUrl}}/site/list
POST {{baseUrl}}/site/list
Authorization:
Bearer
{{authToken}}
Authorization: {{authToken}}
Content-Type: application/json
Content-Type: application/json
{
{
...
@@ -67,9 +67,18 @@ Accept: application/json
...
@@ -67,9 +67,18 @@ Accept: application/json
###构建站点树
###构建站点树
GET {{baseUrl}}/site/siteTree
GET {{baseUrl}}/site/siteTree
Authorization:
Bearer
{{authToken}}
Authorization: {{authToken}}
Accept: application/json
Accept: application/json
###站点列表
POST {{baseUrl}}/site/getFlatSitesByAreaCode?areaCode=510000000000
Authorization: {{authToken}}
Content-Type: application/json
{
"areaCode":"510000000000"
}
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