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
fcb4ca9c
Commit
fcb4ca9c
authored
Nov 29, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加网关考勤绩效路由
parent
4d570bd2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+5
-2
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
...src/test/java/com/mortals/httpclient/http-client.env.json
+1
-1
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
fcb4ca9c
...
@@ -450,14 +450,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -450,14 +450,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
if
(
ObjectUtils
.
isEmpty
(
siteId
))
{
if
(
ObjectUtils
.
isEmpty
(
siteId
))
{
throw
new
AppException
(
"站点Id不能为空!"
);
throw
new
AppException
(
"站点Id不能为空!"
);
}
}
SiteEntity
siteCache
=
this
.
get
Cache
(
siteId
.
toString
()
);
SiteEntity
siteCache
=
this
.
get
(
siteId
);
if
(
ObjectUtils
.
isEmpty
(
siteCache
))
{
if
(
ObjectUtils
.
isEmpty
(
siteCache
))
{
throw
new
AppException
(
"站点不存在,siteId:"
+
siteId
);
throw
new
AppException
(
"站点不存在,siteId:"
+
siteId
);
}
}
//siteList.add(siteCache);
//siteList.add(siteCache);
AreaEntity
areaEntity
=
areaService
.
getExtCache
(
siteCache
.
getAreaCode
());
AreaEntity
areaEntity
=
areaService
.
getExtCache
(
siteCache
.
getAreaCode
());
if
(
ObjectUtils
.
isEmpty
(
areaEntity
))
{
if
(
ObjectUtils
.
isEmpty
(
areaEntity
))
{
throw
new
AppException
(
String
.
format
(
"区域不存在!区域编码:%s"
,
siteCache
.
getAreaCode
()));
areaEntity
=
areaService
.
selectOne
(
new
AreaQuery
().
areaCode
(
siteCache
.
getAreaCode
()));
if
(
ObjectUtils
.
isEmpty
(
areaEntity
))
{
throw
new
AppException
(
String
.
format
(
"区域不存在!区域编码:%s"
,
siteCache
.
getAreaCode
()));
}
}
}
String
matchCode
=
siteCache
.
getAreaCode
().
replaceAll
(
"(0)+$"
,
""
);
String
matchCode
=
siteCache
.
getAreaCode
().
replaceAll
(
"(0)+$"
,
""
);
...
...
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @
fcb4ca9c
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
"baseUrl"
:
"http://192.168.0.60:17211/base"
"baseUrl"
:
"http://192.168.0.60:17211/base"
},
},
"base-test"
:
{
"base-test"
:
{
"baseUrl"
:
"http://192.168.0.
124
:11078/base"
"baseUrl"
:
"http://192.168.0.
98
:11078/base"
},
},
"base-test-https"
:
{
"base-test-https"
:
{
...
...
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