Merge branch 'dev' into 'test'

Dev

See merge request !21

api/src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ app:
   id: park
 # apollo-configService地址
 apollo:
-  meta: http://172.26.111.177:8080
+  meta: http://172.16.25.62:7070
   bootstrap:
     enabled: true
     namespaces: Java.park-eureka,Java.park-redis,Java.park-feign,Java.park-mysql,extend

domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java

@@ -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.getVioTypeName());
+            info.setAction(res.getVioDetailName());
             info.setAddress(res.getAddress());
             info.setGrade(res.getScore().toString());
             info.setMoney(res.getForfeit().toString());

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/cache/ViolationCache.java

@@ -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();
     }
 }

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/ViolationFeign.java

@@ -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 {
     /**

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/response/ViolationMicRes.java

@@ -36,6 +36,12 @@ public class ViolationMicRes {
     // 违法行为类型（枚举值）
     private String vioTypeName;
 
+    // 违法类型小类
+    private String vioDetail;
+
+    // 违法类型小类（枚举值）
+    private String vioDetailName;
+
     // 违法行为
     private String vioAct;