| @@ -213,28 +213,28 @@ public class JinMaoController extends BaseController { | |||
| */ | |||
| @RequestMapping(value = "/dfh/heartBeat") | |||
| public void heartBeat(HttpServletRequest request,HttpServletResponse response) throws Exception { | |||
| long currentTime = System.currentTimeMillis(); | |||
| InputStream inputStream = null; | |||
| try { | |||
| inputStream = request.getInputStream(); | |||
| String paramStr = IOUtils.toString(inputStream, "utf-8"); | |||
| logger.info("dfh heartBeat: {}",paramStr); | |||
| if (StringUtils.isBlank(paramStr)) { | |||
| generateHeartBeatResult(response,"unvalid param", "参数不能为空paramStr"); | |||
| generateHeartBeatResult(response,"unvalid param", "参数不能为空paramStr",currentTime); | |||
| return ; | |||
| } | |||
| Map param = JSON.parseObject(paramStr, Map.class); | |||
| String keyStr = param.get("Key")==null?"":param.get("Key").toString(); | |||
| if (StringUtils.isBlank(keyStr)) { | |||
| generateHeartBeatResult(response,"unvalid param", "参数非法Key"+keyStr); | |||
| generateHeartBeatResult(response,"unvalid param", "参数非法Key"+keyStr,currentTime); | |||
| return ; | |||
| } | |||
| generateHeartBeatResult(response,keyStr, null); | |||
| generateHeartBeatResult(response,keyStr, null,currentTime); | |||
| }catch(Exception e){ | |||
| logger.error("JinMaoController --heartBeat",e); | |||
| generateHeartBeatResult(response,"error", "心跳错误"+e.getMessage()); | |||
| generateHeartBeatResult(response,"error", "心跳错误"+e.getMessage(),currentTime); | |||
| return ; | |||
| }finally { | |||
| if (null != inputStream ) { | |||
| @@ -243,14 +243,12 @@ public class JinMaoController extends BaseController { | |||
| } | |||
| } | |||
| private void generateHeartBeatResult(HttpServletResponse response,String key,String msg) { | |||
| private void generateHeartBeatResult(HttpServletResponse response,String key,String msg,long startSeconds) { | |||
| PrintWriter out; | |||
| try { | |||
| Map retMap = new HashMap(); | |||
| retMap.put("Key",key); | |||
| if (null != msg) { | |||
| retMap.put("Note",msg); | |||
| } | |||
| retMap.put("Note","timecost:"+(System.currentTimeMillis()-startSeconds)+"; msg:"+msg); | |||
| response.setContentType("application/json"); | |||
| response.setCharacterEncoding("GB2312"); | |||
| out = response.getWriter(); | |||
| @@ -312,6 +310,7 @@ public class JinMaoController extends BaseController { | |||
| @RequestMapping(value = "/dfh/verify") | |||
| public void dfhVerify(HttpServletRequest request,HttpServletResponse response) throws Exception { | |||
| long currentTime = System.currentTimeMillis(); | |||
| InputStream inputStream = null; | |||
| try { | |||
| inputStream = request.getInputStream(); | |||
| @@ -359,7 +358,7 @@ public class JinMaoController extends BaseController { | |||
| } | |||
| try { | |||
| long currentTime = System.currentTimeMillis(); | |||
| WxCouponOrder couponOrder = wxCouponOrderService.verifyByEquiment(couponOrderId, "789", "null", "闸机扫码核销[Serial:"+serial+",MAC:"+mac+"]"); | |||
| generateResult(response,false,true, couponOrder.getCouponName(), "核销成功:"+(System.currentTimeMillis()-currentTime), String.valueOf(couponOrder.getId()), "核销成功"); | |||
| return ; | |||
| @@ -396,7 +395,7 @@ public class JinMaoController extends BaseController { | |||
| return new String(Base64Util.decode(secureUrlBase64)); | |||
| } | |||
| private void generateResult(HttpServletResponse response,boolean alerm,boolean open,String name, String msg,String card,String voice) { | |||
| private void generateResult(HttpServletResponse response,boolean alerm,boolean open,String name, String msg,String card,String voice,long startTime) { | |||
| Map<String,String> retMap = new HashMap<String,String>(); | |||
| if (alerm) { | |||
| //报警 | |||
| @@ -422,9 +421,11 @@ public class JinMaoController extends BaseController { | |||
| } | |||
| if (null != msg) { | |||
| try { | |||
| retMap.put("Note", new String(msg.getBytes(),"utf-8")); | |||
| retMap.put("Note", "costtimes:"+(System.currentTimeMillis()-startTime)+";msg:"+new String(msg.getBytes(),"utf-8")); | |||
| } catch (UnsupportedEncodingException e) { | |||
| } | |||
| }else { | |||
| retMap.put("Note", "costtimes:"+(System.currentTimeMillis()-startTime)); | |||
| } | |||
| if (null != card) { | |||
| retMap.put("Card", card); | |||