| @@ -75,9 +75,9 @@ public class WxCarDaHuaCallBackController extends WxParkCallBackBaseController { | |||||
| **/ | **/ | ||||
| @PostMapping(value = "/PostCarInInfo") | @PostMapping(value = "/PostCarInInfo") | ||||
| public Result parkInCallback(@RequestBody Map<String, Object> paramMap) { | public Result parkInCallback(@RequestBody Map<String, Object> paramMap) { | ||||
| log.info("["+getIpAddr()+"] keTuoCarCallback parkIn: " + paramMap.toString()); | |||||
| log.info("["+getIpAddr()+"] daHuaCarCallback parkIn: " + paramMap.toString()); | |||||
| //解析车易付参数 | //解析车易付参数 | ||||
| return super.parkInCallBack(EnumCarVendor.CAR_KETUO, EnumCarCmd.CAR_KETUO_CALLBACK_PARK_IN, paramMap); | |||||
| return super.parkInCallBack(EnumCarVendor.CAR_DAHUA, EnumCarCmd.CAR_DAHUA_CALLBACK_PARK_IN, paramMap); | |||||
| } | } | ||||
| @@ -90,22 +90,22 @@ public class WxCarDaHuaCallBackController extends WxParkCallBackBaseController { | |||||
| **/ | **/ | ||||
| @PostMapping(value = "/PostCarOutInfo") | @PostMapping(value = "/PostCarOutInfo") | ||||
| public Result parkOutCallback(@RequestBody Map<String, Object> paramMap) { | public Result parkOutCallback(@RequestBody Map<String, Object> paramMap) { | ||||
| log.info("["+getIpAddr()+"] keTuoCarCallback parkOut: " + paramMap.toString()); | |||||
| return super.parkOutCallBack(EnumCarVendor.CAR_KETUO, EnumCarCmd.CAR_KETUO_CALLBACK_PARK_OUT, paramMap); | |||||
| log.info("["+getIpAddr()+"] daHuaCarCallback parkOut: " + paramMap.toString()); | |||||
| return super.parkOutCallBack(EnumCarVendor.CAR_DAHUA, EnumCarCmd.CAR_DAHUA_CALLBACK_PARK_OUT, paramMap); | |||||
| } | } | ||||
| @PostMapping(value = "/unbind") | @PostMapping(value = "/unbind") | ||||
| public Result unbindCallback(@RequestBody Map<String, Object> paramMap) { | public Result unbindCallback(@RequestBody Map<String, Object> paramMap) { | ||||
| log.info("["+getIpAddr()+"] keTuoCarCallback unbind: " + paramMap.toString()); | |||||
| log.info("["+getIpAddr()+"] daHuaCarCallback unbind: " + paramMap.toString()); | |||||
| //解析车易付参数 | //解析车易付参数 | ||||
| return super.unbindCarCallBack(EnumCarVendor.CAR_KETUO, EnumCarCmd.CAR_KETUO_CALLBACK_UNBIND, paramMap); | |||||
| return super.unbindCarCallBack(EnumCarVendor.CAR_DAHUA, EnumCarCmd.CAR_DAHUA_CALLBACK_UNBIND, paramMap); | |||||
| } | } | ||||
| @PostMapping(value = "/PostPayFeeInfo") | @PostMapping(value = "/PostPayFeeInfo") | ||||
| public Result paidCallback(@RequestBody Map<String, Object> paramMap) { | public Result paidCallback(@RequestBody Map<String, Object> paramMap) { | ||||
| log.info("["+getIpAddr()+"] keTuoCarCallback paid: " + paramMap.toString()); | |||||
| log.info("["+getIpAddr()+"] daHuaCarCallback paid: " + paramMap.toString()); | |||||
| //解析车易付参数 | //解析车易付参数 | ||||
| return super.paidCallback(EnumCarVendor.CAR_KETUO, EnumCarCmd.CAR_KETUO_CALLBACK_PAID, paramMap); | |||||
| return super.paidCallback(EnumCarVendor.CAR_DAHUA, EnumCarCmd.CAR_DAHUA_CALLBACK_PAID, paramMap); | |||||
| } | } | ||||
| } | } | ||||
| @@ -49,7 +49,12 @@ public enum EnumCarCmd { | |||||
| CAR_KETUO_CALLBACK_PARK_IN(640,"科拓进场通知"), | CAR_KETUO_CALLBACK_PARK_IN(640,"科拓进场通知"), | ||||
| CAR_KETUO_CALLBACK_PARK_OUT(641,"科拓出场通知"), | CAR_KETUO_CALLBACK_PARK_OUT(641,"科拓出场通知"), | ||||
| CAR_KETUO_CALLBACK_UNBIND(642,"科拓解绑车牌通知"), | CAR_KETUO_CALLBACK_UNBIND(642,"科拓解绑车牌通知"), | ||||
| CAR_KETUO_CALLBACK_PAID(643,"科拓支付通知") | |||||
| CAR_KETUO_CALLBACK_PAID(643,"科拓支付通知"), | |||||
| CAR_DAHUA_CALLBACK_PARK_IN(644,"大华进场通知"), | |||||
| CAR_DAHUA_CALLBACK_PARK_OUT(645,"大华出场通知"), | |||||
| CAR_DAHUA_CALLBACK_UNBIND(646,"大华解绑车牌通知"), | |||||
| CAR_DAHUA_CALLBACK_PAID(647,"大华支付通知") | |||||
| ; | ; | ||||
| public static EnumCarCmd getEnum(Integer code) { | public static EnumCarCmd getEnum(Integer code) { | ||||
| @@ -72,6 +77,7 @@ public enum EnumCarCmd { | |||||
| list.add(CAR_FUTE_CALLBACK_PARK_IN.getCode()); | list.add(CAR_FUTE_CALLBACK_PARK_IN.getCode()); | ||||
| list.add(CAR_LIFANG_CALLBACK_PARK_IN.getCode()); | list.add(CAR_LIFANG_CALLBACK_PARK_IN.getCode()); | ||||
| list.add(CAR_KETUO_CALLBACK_PARK_IN.getCode()); | list.add(CAR_KETUO_CALLBACK_PARK_IN.getCode()); | ||||
| list.add(CAR_DAHUA_CALLBACK_PARK_IN.getCode()); | |||||
| return list; | return list; | ||||
| } | } | ||||
| @@ -86,6 +92,7 @@ public enum EnumCarCmd { | |||||
| list.add(CAR_FUTE_CALLBACK_PARK_OUT.getCode()); | list.add(CAR_FUTE_CALLBACK_PARK_OUT.getCode()); | ||||
| list.add(CAR_LIFANG_CALLBACK_PARK_OUT.getCode()); | list.add(CAR_LIFANG_CALLBACK_PARK_OUT.getCode()); | ||||
| list.add(CAR_KETUO_CALLBACK_PARK_OUT.getCode()); | list.add(CAR_KETUO_CALLBACK_PARK_OUT.getCode()); | ||||
| list.add(CAR_DAHUA_CALLBACK_PARK_OUT.getCode()); | |||||
| return list; | return list; | ||||
| } | } | ||||
| @@ -100,6 +107,7 @@ public enum EnumCarCmd { | |||||
| list.add(CAR_FUTE_CALLBACK_PAID.getCode()); | list.add(CAR_FUTE_CALLBACK_PAID.getCode()); | ||||
| list.add(CAR_LIFANG_CALLBACK_PAID.getCode()); | list.add(CAR_LIFANG_CALLBACK_PAID.getCode()); | ||||
| list.add(CAR_KETUO_CALLBACK_PAID.getCode()); | list.add(CAR_KETUO_CALLBACK_PAID.getCode()); | ||||
| list.add(CAR_DAHUA_CALLBACK_PAID.getCode()); | |||||
| return list; | return list; | ||||
| } | } | ||||