Browse Source

fix

release_toaliyun_real
lin 2 years ago
parent
commit
e1f3e8233c
3 changed files with 117 additions and 2 deletions
  1. +111
    -0
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java

+ 111
- 0
mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java View File

@@ -0,0 +1,111 @@
package com.iformall.controller.callback.car.dahua;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.controller.base.BaseController;
import com.iformall.controller.callback.car.WxParkCallBackBaseController;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCarCYFVo;
import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumPayWay;
import com.iformall.service.*;
import com.iformall.service.park.impl.cyf.CYFUtil;
import com.iformall.service.park.impl.tjd.TJDUtil;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* @author: furunxin
* @Date: 2020/7/6 15:29
* @Description: 车易付回调接口
*/

@Slf4j
@RestController
@RequestMapping("/keTuoCarCallback")
public class WxCarDaHuaCallBackController extends WxParkCallBackBaseController {

@Autowired
WxParkService wxParkService;

@Autowired
WxCarCmdLogService wxCarCmdLogService;

@Autowired
WxCUserService wxCUserService;

@Autowired
WxCUserCarService wxCUserCarService;

@Autowired
WxCouponSendService wxCouponSendService;

@Autowired
WxCarPayRecordService wxCarPayRecordService;

@Autowired
WxCUserBasicInfoService wxCUserBasicInfoService;

/**
* @description 科拓 车辆入场通知
* {dataItems=[{"inTime":"2020-12-09 11:21:15","carNumber":"浙-AF81797","inCarPhoto":"p201127315/NISSP_IMG_PARK_IN/20201209/a9f1130651b9493f8eab64f14afbdd47","isReal":0,"itemId":"a9f1130651b9493f8eab64f14afbdd47","inOperator":"超级管理员","equipName":"东门入口","parkName":"杭州东站西子国际","vehicleInfo":"{\"plateNo\":\"浙-AF81797\",\"plateColor\":\"GREEN\",\"plateBackColor\":0,\"plateWordColor\":0,\"vehicleColor\":null,\"vehicleLogo\":null,\"vehicleModel\":null,\"mainModel\":0,\"subModel\":0,\"vehicleModelTrust\":0,\"mainModelTrust\":0,\"subModelTrust\":0,\"plateNoTrust\":1,\"vehicleLogoTrust\":0,\"vehicleColorTrust\":0}","equipCode":"208202496","parkCode":"p201127315"}], pno=dzxzgj, sn=6C958D99D2769AA16F3A3F06E962263F, tn=-2, ts=20201209112118886, ve=1.0}
*
*
*
* @Params [paramMap]
* @return com.iformall.common.Result
* @Author furunxin
* @Date 2020/7/8 上午8:27
**/
@PostMapping(value = "/PostCarInInfo")
public Result parkInCallback(@RequestBody Map<String, Object> paramMap) {
log.info("["+getIpAddr()+"] keTuoCarCallback parkIn: " + paramMap.toString());
//解析车易付参数
return super.parkInCallBack(EnumCarVendor.CAR_KETUO, EnumCarCmd.CAR_KETUO_CALLBACK_PARK_IN, paramMap);
}


/**
* @description 车易付 车辆离场通知
* @Params [param]
* @return java.util.Map
* @Author furunxin
* @Date 2020/7/12 上午9:00
**/
@PostMapping(value = "/PostCarOutInfo")
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);
}
@PostMapping(value = "/unbind")
public Result unbindCallback(@RequestBody Map<String, Object> paramMap) {
log.info("["+getIpAddr()+"] keTuoCarCallback unbind: " + paramMap.toString());
//解析车易付参数
return super.unbindCarCallBack(EnumCarVendor.CAR_KETUO, EnumCarCmd.CAR_KETUO_CALLBACK_UNBIND, paramMap);
}
@PostMapping(value = "/PostPayFeeInfo")
public Result paidCallback(@RequestBody Map<String, Object> paramMap) {
log.info("["+getIpAddr()+"] keTuoCarCallback paid: " + paramMap.toString());
//解析车易付参数
return super.paidCallback(EnumCarVendor.CAR_KETUO, EnumCarCmd.CAR_KETUO_CALLBACK_PAID, paramMap);
}
}

+ 4
- 0
mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java View File

@@ -12,6 +12,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.service.park.impl.bolink.BoLinkParkService;
import com.iformall.service.park.impl.cyf.CYFParkCallbackService;
import com.iformall.service.park.impl.cyf.CYFParkService;
import com.iformall.service.park.impl.dahua.DaHuaParkCallbackService;
import com.iformall.service.park.impl.dahua.DaHuaParkService;
import com.iformall.service.park.impl.fute.FuteParkCallbackService;
import com.iformall.service.park.impl.fute.FuteParkService;
@@ -61,6 +62,8 @@ public class ParkFactory {
@Autowired
JieShunV2ParkCallbackService jieshunV2CallBackService;
@Autowired
DaHuaParkCallbackService dahuaCallbackService;
@Autowired
HaiKangWeiShiParkCallbackService haikangWeishiCallBackService;
@Autowired
FuteParkCallbackService futeParkCallbackService;
@@ -127,6 +130,7 @@ public class ParkFactory {
batchCallBackServiceMap.put(EnumCarVendor.CAR_JIESHUN.getCode(), jieshunCallBackService);
batchCallBackServiceMap.put(EnumCarVendor.CAR_JIESHUN_V2.getCode(), jieshunV2CallBackService);
batchCallBackServiceMap.put(EnumCarVendor.CAR_HAIKANGWEISHI.getCode(), haikangWeishiCallBackService);
batchCallBackServiceMap.put(EnumCarVendor.CAR_DAHUA.getCode(), dahuaCallbackService);
return batchCallBackServiceMap;
}


mallinkService/src/main/java/com/iformall/service/park/impl/dahua/JieShunV2ParkCallbackService.java → mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java View File

@@ -31,11 +31,11 @@ import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
public class JieShunV2ParkCallbackService extends BaseParkService implements ParkBatchCallBackAdapterService {
public class DaHuaParkCallbackService extends BaseParkService implements ParkBatchCallBackAdapterService {
@Autowired
DaHuaParkService jieshunParkService;
DaHuaParkService dahuaParkService;
@Autowired
WxParkService wxParkService;

Loading…
Cancel
Save