| @@ -58,8 +58,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -57,8 +57,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -57,8 +57,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -189,7 +189,7 @@ public class WxParkCallBackBaseController extends BaseController { | |||||
| userCarQ.setTenantId(wxCarCmdLog.getTenantId()); | userCarQ.setTenantId(wxCarCmdLog.getTenantId()); | ||||
| } | } | ||||
| userCarQ.setCarNumber(carNumber); | userCarQ.setCarNumber(carNumber); | ||||
| userCarQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); | |||||
| userCarQ.setVendorType(vendor.getCode()); | |||||
| // TODO 可能多用户关联同一张车牌 | // TODO 可能多用户关联同一张车牌 | ||||
| List<WxCUserCar> userCarList = wxCUserCarService.getList(userCarQ); | List<WxCUserCar> userCarList = wxCUserCarService.getList(userCarQ); | ||||
| boolean bFirst = true; | boolean bFirst = true; | ||||
| @@ -69,11 +69,11 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController | |||||
| * @Author furunxin | * @Author furunxin | ||||
| * @Date 2020/7/8 上午8:27 | * @Date 2020/7/8 上午8:27 | ||||
| **/ | **/ | ||||
| @PostMapping(value = "/cyfParkInCallback") | |||||
| @PostMapping(value = "/park/parkIn") | |||||
| public Result cyfParkInCallback(@RequestBody Map<String, Object> paramMap) { | public Result cyfParkInCallback(@RequestBody Map<String, Object> paramMap) { | ||||
| log.info("["+getIpAddr()+"] cyfParkInCallback: " + paramMap.toString()); | |||||
| log.info("["+getIpAddr()+"] jieshunCarCallback: " + paramMap.toString()); | |||||
| //解析车易付参数 | //解析车易付参数 | ||||
| return super.parkInCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_IN, paramMap); | |||||
| return super.parkInCallBack(EnumCarVendor.CAR_JIESHUN, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_IN, paramMap); | |||||
| } | } | ||||
| @@ -88,7 +88,7 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController | |||||
| public Result cyfParkOutCallback(@RequestBody WxCarCYFVo param) { | public Result cyfParkOutCallback(@RequestBody WxCarCYFVo param) { | ||||
| String requestJson = JSONObject.toJSONString(param); | String requestJson = JSONObject.toJSONString(param); | ||||
| log.info("["+getIpAddr()+"cyfParkOutCallback: " + requestJson); | log.info("["+getIpAddr()+"cyfParkOutCallback: " + requestJson); | ||||
| return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_OUT, param); | |||||
| return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, param); | |||||
| } | } | ||||
| @@ -58,8 +58,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -57,8 +57,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -56,8 +56,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -57,8 +57,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -19,7 +19,11 @@ public enum EnumCarCmd { | |||||
| CAR_CYF_CALLBACK_PARK_IN(620,"车易付进场通知"), | CAR_CYF_CALLBACK_PARK_IN(620,"车易付进场通知"), | ||||
| CAR_CYF_CALLBACK_PARK_OUT(621,"车易付进场通知"), | CAR_CYF_CALLBACK_PARK_OUT(621,"车易付进场通知"), | ||||
| CAR_CYF_CALLBACK_UNBIND(622,"车易付解绑车牌通知"), | CAR_CYF_CALLBACK_UNBIND(622,"车易付解绑车牌通知"), | ||||
| CAR_CYF_CALLBACK_PAID(623,"车易付支付通知") | |||||
| CAR_CYF_CALLBACK_PAID(623,"车易付支付通知"), | |||||
| CAR_JIESHUN_CALLBACK_PARK_IN(624,"捷顺进场通知"), | |||||
| CAR_JIESHUN_CALLBACK_PARK_OUT(625,"捷顺进场通知"), | |||||
| CAR_JIESHUN_CALLBACK_UNBIND(626,"捷顺解绑车牌通知"), | |||||
| CAR_JIESHUN_CALLBACK_PAID(627,"捷顺支付通知") | |||||
| ; | ; | ||||
| public static EnumCarCmd getEnum(Integer code) { | public static EnumCarCmd getEnum(Integer code) { | ||||
| @@ -19,10 +19,33 @@ import lombok.extern.slf4j.Slf4j; | |||||
| @Service | @Service | ||||
| public class JieShunParkCallbackService extends BaseParkService implements ParkCallBackAdapterService { | public class JieShunParkCallbackService extends BaseParkService implements ParkCallBackAdapterService { | ||||
| /** | |||||
| * { | |||||
| “pno”:”平台编号”, | |||||
| “tn”:”令牌”, | |||||
| “ts”:”请求时间” | |||||
| “sn”:”签名”, | |||||
| “ve”:”版本号”, | |||||
| “dataItems”:“[{ | |||||
| \ “itemId\”: \”435FA12F3C4747B0BA48E945868FC420\”, | |||||
| \ “parkName” : \”测试\”, | |||||
| \ “parkCode\” : \” test\”, | |||||
| \ “inTime\” : \”2017-08-28 15:40:41\”, | |||||
| \ “inOperator\”: \”张山\” | |||||
| \ “carNumber” : \”粤-A12345\”, | |||||
| \ “idno” : \”1234455\”, | |||||
| \ “equipCode\”: \”2312313\”, | |||||
| \ “equipName” : \”入口\”, | |||||
| … | |||||
| }, | |||||
| …… | |||||
| ]” | |||||
| } | |||||
| */ | |||||
| @Override | @Override | ||||
| public ParkNotifyParam parseInNoticyParam(Object param) { | public ParkNotifyParam parseInNoticyParam(Object param) { | ||||
| Map<String, Object> paramMap = (Map<String, Object>) param; | Map<String, Object> paramMap = (Map<String, Object>) param; | ||||
| String carNumber = paramMap.get(CYFUtil.CYF_CAR_NUMBER).toString(); | |||||
| String carNumber = paramMap.get(JieShunUtil.CYF_CAR_NUMBER).toString(); | |||||
| String cyfParkId = paramMap.get(CYFUtil.CYF_PARK_ID).toString(); | String cyfParkId = paramMap.get(CYFUtil.CYF_PARK_ID).toString(); | ||||
| String parkName = paramMap.get(CYFUtil.CYF_PARK_NAME).toString(); | String parkName = paramMap.get(CYFUtil.CYF_PARK_NAME).toString(); | ||||
| String synId = paramMap.get(CYFUtil.CYF_SYN_ID).toString(); | String synId = paramMap.get(CYFUtil.CYF_SYN_ID).toString(); | ||||
| @@ -57,8 +57,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -57,8 +57,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: service@iformall.com | |||||
| password: jGvApygXN7wc5SzN # 授权密码 | |||||
| username: sysadministor@iformall.com # 登陆密码sysAdmin1231 | |||||
| password: SWqPekCEmhUYuYCd # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||