Commit 6be2adc0 by lixian7

Merge branch 'dev' into 'test'

Dev

See merge request !21
parents 17caeedb 4e1951ce
...@@ -3,7 +3,7 @@ app: ...@@ -3,7 +3,7 @@ app:
id: park id: park
# apollo-configService地址 # apollo-configService地址
apollo: apollo:
meta: http://172.26.111.177:8080 meta: http://172.16.25.62:7070
bootstrap: bootstrap:
enabled: true enabled: true
namespaces: Java.park-eureka,Java.park-redis,Java.park-feign,Java.park-mysql,extend namespaces: Java.park-eureka,Java.park-redis,Java.park-feign,Java.park-mysql,extend
......
...@@ -324,7 +324,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i ...@@ -324,7 +324,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
for (ViolationMicRes res : byPlateNumAndType) { for (ViolationMicRes res : byPlateNumAndType) {
ViolationInfoRes info = new ViolationInfoRes(); ViolationInfoRes info = new ViolationInfoRes();
info.setPlateNum(res.getPlateNum()); info.setPlateNum(res.getPlateNum());
info.setAction(res.getVioTypeName()); info.setAction(res.getVioDetailName());
info.setAddress(res.getAddress()); info.setAddress(res.getAddress());
info.setGrade(res.getScore().toString()); info.setGrade(res.getScore().toString());
info.setMoney(res.getForfeit().toString()); info.setMoney(res.getForfeit().toString());
......
...@@ -27,6 +27,6 @@ public class ViolationCache { ...@@ -27,6 +27,6 @@ public class ViolationCache {
*/ */
// @Cacheable(value = "violations", key = "'plateNum:'+#req.plateNum+':plateType:'+#req.plateType", unless = "#result==null or #result.size()==0") // @Cacheable(value = "violations", key = "'plateNum:'+#req.plateNum+':plateType:'+#req.plateType", unless = "#result==null or #result.size()==0")
public List<ViolationMicRes> getByPlateNumAndType(ViolationListByTimeReq req) { public List<ViolationMicRes> getByPlateNumAndType(ViolationListByTimeReq req) {
return violatio.listByTime(req).getData(); return violatio.listByTime(req).fallback().getData();
} }
} }
...@@ -16,7 +16,7 @@ import java.util.List; ...@@ -16,7 +16,7 @@ import java.util.List;
* @author: xieshixiang * @author: xieshixiang
* @time:2020/6/19 15:26 * @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") "dcp-pvt-service-traffic")
public interface ViolationFeign { public interface ViolationFeign {
/** /**
......
...@@ -36,6 +36,12 @@ public class ViolationMicRes { ...@@ -36,6 +36,12 @@ public class ViolationMicRes {
// 违法行为类型(枚举值) // 违法行为类型(枚举值)
private String vioTypeName; private String vioTypeName;
// 违法类型小类
private String vioDetail;
// 违法类型小类(枚举值)
private String vioDetailName;
// 违法行为 // 违法行为
private String vioAct; private String vioAct;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment