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
25f25ef3
Commit
25f25ef3
authored
May 10, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
回退站点业务请求列表
parent
e362d766
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+2
-3
base-manager/src/test/java/com/mortals/httpclient/system/system.http
...r/src/test/java/com/mortals/httpclient/system/system.http
+12
-1
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
25f25ef3
...
@@ -16,6 +16,7 @@ import com.mortals.framework.util.DataUtil;
...
@@ -16,6 +16,7 @@ import com.mortals.framework.util.DataUtil;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.AreaLevelDxTypeEnum
;
import
com.mortals.xhx.common.code.AreaLevelDxTypeEnum
;
import
com.mortals.xhx.common.code.AreaLevelEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.key.Constant
;
import
com.mortals.xhx.common.key.Constant
;
import
com.mortals.xhx.common.pdu.RespData
;
import
com.mortals.xhx.common.pdu.RespData
;
...
@@ -454,12 +455,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -454,12 +455,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
throw
new
AppException
(
"当前站点无子区域!"
);
throw
new
AppException
(
"当前站点无子区域!"
);
}
}
siteAreaVo
.
setAreaCode
(
areaEntity
.
getAreaCode
());
siteAreaVo
.
setAreaCode
(
areaEntity
.
getAreaCode
());
siteAreaVo
.
setAreaName
(
"市本级"
);
siteAreaVo
.
setAreaName
(
AreaLevelEnum
.
getByValue
(
areaEntity
.
getAreaLevel
()).
getValue
()==
AreaLevelEnum
.
地市州
.
getValue
()?
"市本级"
:
areaEntity
.
getName
()
);
List
<
SiteEntity
>
siteEntityList
=
this
.
find
(
new
SiteQuery
().
areaCode
(
areaEntity
.
getAreaCode
()));
List
<
SiteEntity
>
siteEntityList
=
this
.
find
(
new
SiteQuery
().
areaCode
(
areaEntity
.
getAreaCode
()));
// List<SiteEntity> siteIdlist = this.getFlatSitesBySiteId(query.getId(), context);
siteAreaVo
.
setSiteList
(
siteEntityList
);
siteAreaVo
.
setSiteList
(
siteEntityList
);
list
.
add
(
siteAreaVo
);
list
.
add
(
siteAreaVo
);
//两层结构{xxx:[{sitename:xxx},{}...],bbb:[{sitename:xxx},{}...]}
//两层结构{xxx:[{sitename:xxx},{}...],bbb:[{sitename:xxx},{}...]}
AreaQuery
areaQuery
=
new
AreaQuery
();
AreaQuery
areaQuery
=
new
AreaQuery
();
areaQuery
.
setPid
(
areaEntity
.
getIid
());
areaQuery
.
setPid
(
areaEntity
.
getIid
());
...
...
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @
25f25ef3
...
@@ -122,11 +122,22 @@ Content-Type: application/json
...
@@ -122,11 +122,22 @@ Content-Type: application/json
{
{
"method":"post",
"method":"post",
"type":
1
,
"type":
2
,
"path":"/api/edge-service-agent/1.0/46ce3be3269e8894/cxyhbhsfz_",
"path":"/api/edge-service-agent/1.0/46ce3be3269e8894/cxyhbhsfz_",
"body":"{\"idCardNo\":\"41010229611620007X\",\"orgNo\":\"10080000\"}"
"body":"{\"idCardNo\":\"41010229611620007X\",\"orgNo\":\"10080000\"}"
}
}
### trans1
POST {{baseUrl}}/mid/trans
Content-Type: application/json
{
"method":"post",
"type": 2,
"path":"/api/edge-service-agent/1.0/8d0b663762f8bba6/cxbzlb_",
"body":"{\"accountId\":\"1018145\"}"
}
###短信设置编辑
###短信设置编辑
GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
Accept: application/json
Accept: 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