Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
extend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
park
extend
Commits
6be2adc0
Commit
6be2adc0
authored
4 years ago
by
lixian7
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 'test'
Dev See merge request
!21
parents
17caeedb
4e1951ce
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
4 deletions
+10
-4
api/src/main/resources/application-pro.yml
+1
-1
domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
+1
-1
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/cache/ViolationCache.java
+1
-1
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/ViolationFeign.java
+1
-1
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/response/ViolationMicRes.java
+6
-0
No files found.
api/src/main/resources/application-pro.yml
View file @
6be2adc0
...
...
@@ -3,7 +3,7 @@ app:
id
:
park
# apollo-configService地址
apollo
:
meta
:
http://172.
26.111.177:808
0
meta
:
http://172.
16.25.62:707
0
bootstrap
:
enabled
:
true
namespaces
:
Java.park-eureka,Java.park-redis,Java.park-feign,Java.park-mysql,extend
...
...
This diff is collapsed.
Click to expand it.
domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
View file @
6be2adc0
...
...
@@ -324,7 +324,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
for
(
ViolationMicRes
res
:
byPlateNumAndType
)
{
ViolationInfoRes
info
=
new
ViolationInfoRes
();
info
.
setPlateNum
(
res
.
getPlateNum
());
info
.
setAction
(
res
.
getVio
Type
Name
());
info
.
setAction
(
res
.
getVio
Detail
Name
());
info
.
setAddress
(
res
.
getAddress
());
info
.
setGrade
(
res
.
getScore
().
toString
());
info
.
setMoney
(
res
.
getForfeit
().
toString
());
...
...
This diff is collapsed.
Click to expand it.
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/cache/ViolationCache.java
View file @
6be2adc0
...
...
@@ -27,6 +27,6 @@ public class ViolationCache {
*/
// @Cacheable(value = "violations", key = "'plateNum:'+#req.plateNum+':plateType:'+#req.plateType", unless = "#result==null or #result.size()==0")
public
List
<
ViolationMicRes
>
getByPlateNumAndType
(
ViolationListByTimeReq
req
)
{
return
violatio
.
listByTime
(
req
).
getData
();
return
violatio
.
listByTime
(
req
).
fallback
().
getData
();
}
}
This diff is collapsed.
Click to expand it.
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/ViolationFeign.java
View file @
6be2adc0
...
...
@@ -16,7 +16,7 @@ import java.util.List;
* @author: xieshixiang
* @time:2020/6/19 15:26
**/
@FeignClient
(
url
=
"http://10.197.236.198:8116"
,
name
=
"edl-pvt-service-traffic"
,
path
=
"violation"
,
contextId
=
@FeignClient
(
name
=
"edl-pvt-service-traffic"
,
path
=
"violation"
,
contextId
=
"dcp-pvt-service-traffic"
)
public
interface
ViolationFeign
{
/**
...
...
This diff is collapsed.
Click to expand it.
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/response/ViolationMicRes.java
View file @
6be2adc0
...
...
@@ -36,6 +36,12 @@ public class ViolationMicRes {
// 违法行为类型(枚举值)
private
String
vioTypeName
;
// 违法类型小类
private
String
vioDetail
;
// 违法类型小类(枚举值)
private
String
vioDetailName
;
// 违法行为
private
String
vioAct
;
...
...
This diff is collapsed.
Click to expand it.
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