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
60d234c8
Commit
60d234c8
authored
Jun 21, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加应用分类列表
parent
fe037c82
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
7 deletions
+5
-7
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java
...java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java
+1
-1
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
...m/mortals/xhx/module/app/service/impl/AppServiceImpl.java
+0
-1
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+1
-3
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
...c/test/java/com/mortals/httpclient/app/AppController.http
+1
-0
base-manager/src/test/java/com/mortals/httpclient/system/system.http
...r/src/test/java/com/mortals/httpclient/system/system.http
+2
-2
No files found.
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java
View file @
60d234c8
...
...
@@ -28,7 +28,7 @@ public class SyncTreeSiteThread implements Runnable {
SiteService
siteService
=
SpringUtils
.
getBean
(
SiteService
.
class
);
List
<
SiteTreeSelect
>
siteTreeSelects
=
siteService
.
siteTree
(
context
);
siteService
.
setSiteTree
(
siteTreeSelects
,
context
);
log
.
info
(
"刷新用户站点树=》userID:{} siteIds:{} siteTree:{}"
,
context
.
getUser
().
getId
(),
context
.
getUser
().
getSiteIds
(),
JSON
.
toJSONString
(
siteService
.
getSiteTree
(
context
)));
//
log.info("刷新用户站点树=》userID:{} siteIds:{} siteTree:{}",context.getUser().getId(),context.getUser().getSiteIds(), JSON.toJSONString(siteService.getSiteTree(context)));
}
}
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @
60d234c8
...
...
@@ -114,7 +114,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
}
else
{
item
.
setAppIconUrl
(
item
.
getAppIconPath
());
}
};
super
.
findAfter
(
params
,
pageInfo
,
context
,
list
);
}
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
60d234c8
...
...
@@ -208,7 +208,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
public
List
<
SiteTreeSelect
>
siteTree
(
Context
context
)
{
Map
<
String
,
AreaEntity
>
areaMap
=
new
HashMap
<>();
SiteQuery
siteQuery
=
new
SiteQuery
();
//如果站点为空 或者用户为空 返回空数组
if
(
context
.
getUser
()
==
null
)
{
return
new
ArrayList
<>();
...
...
@@ -224,7 +223,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
}
}
//查詢指定的站點ids
log
.
info
(
String
.
format
(
"siteQuery==>%s"
,
JSON
.
toJSONString
(
siteQuery
)));
//
log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery)));
siteList
=
this
.
find
(
siteQuery
);
}
//如果是管理员 默认全部站点
...
...
@@ -325,7 +324,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
@Override
protected
void
updateAfter
(
SiteEntity
entity
,
Context
context
)
throws
AppException
{
super
.
updateAfter
(
entity
,
context
);
//刷新站点树
Rest
<
String
>
rest
=
userFeign
.
synchSiteAuth
();
if
(
rest
.
getCode
().
equals
(
YesNoEnum
.
YES
.
getValue
()))
{
...
...
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @
60d234c8
...
...
@@ -20,6 +20,7 @@ Content-Type: application/json
{
"page":1,
"size":1
}
...
...
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @
60d234c8
...
...
@@ -122,7 +122,7 @@ Content-Type: application/json
{
"method":"post",
"type":
2
,
"type":
1
,
"path":"/api/edge-service-agent/1.0/46ce3be3269e8894/cxyhbhsfz_",
"body":"{\"idCardNo\":\"41010229611620007X\",\"orgNo\":\"10080000\"}"
}
...
...
@@ -133,7 +133,7 @@ Content-Type: application/json
{
"method":"post",
"type":
2
,
"type":
1
,
"path":"/api/edge-service-agent/1.0/8d0b663762f8bba6/cxbzlb_",
"body":"{\"accountId\":\"1018145\"}"
}
...
...
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