Showing
3 changed files
with
11 additions
and
24 deletions
No preview for this file type
| ... | @@ -2,6 +2,7 @@ package com.erry.iclear.dateInterface.api; | ... | @@ -2,6 +2,7 @@ package com.erry.iclear.dateInterface.api; |
| 2 | 2 | ||
| 3 | import com.erry.iclear.dateInterface.api.request.HsCodeParam; | 3 | import com.erry.iclear.dateInterface.api.request.HsCodeParam; |
| 4 | import com.erry.iclear.dateInterface.api.response.ResultHsCode; | 4 | import com.erry.iclear.dateInterface.api.response.ResultHsCode; |
| 5 | +import com.erry.iclear.dateInterface.api.response.StampResult; | ||
| 5 | import com.erry.iclear.dateInterface.entity.IClearApiHsCodeLog; | 6 | import com.erry.iclear.dateInterface.entity.IClearApiHsCodeLog; |
| 6 | import com.erry.iclear.dateInterface.enums.ErrorCodeEnum; | 7 | import com.erry.iclear.dateInterface.enums.ErrorCodeEnum; |
| 7 | import com.erry.iclear.dateInterface.service.HsCodeService; | 8 | import com.erry.iclear.dateInterface.service.HsCodeService; |
| ... | @@ -33,47 +34,31 @@ public class IKnowUInterface { | ... | @@ -33,47 +34,31 @@ public class IKnowUInterface { |
| 33 | @ApiOperation(value = "抠图后的公章查询", httpMethod = "POST", notes = "ex: http://192.168.1.71:8080/iknowU/stampQuery") | 34 | @ApiOperation(value = "抠图后的公章查询", httpMethod = "POST", notes = "ex: http://192.168.1.71:8080/iknowU/stampQuery") |
| 34 | @PostMapping("/stampQuery") | 35 | @PostMapping("/stampQuery") |
| 35 | @ResponseBody | 36 | @ResponseBody |
| 36 | - public ResultHsCode stampQuery(HttpServletRequest request | 37 | + public StampResult stampQuery(HttpServletRequest request |
| 37 | , @RequestBody String consignmentCode) { | 38 | , @RequestBody String consignmentCode) { |
| 38 | - log.info("接收到请求数据hscode:【"+consignmentCode+"】"); | 39 | + log.info("接收到请求数据consignmentCode:【"+consignmentCode+"】"); |
| 39 | String appId = (String) request.getHeader("Appid"); | 40 | String appId = (String) request.getHeader("Appid"); |
| 40 | String appkey = (String) request.getHeader("Appkey"); | 41 | String appkey = (String) request.getHeader("Appkey"); |
| 41 | IClearApiHsCodeLog iclearApiHsCodeLog = new IClearApiHsCodeLog(); | 42 | IClearApiHsCodeLog iclearApiHsCodeLog = new IClearApiHsCodeLog(); |
| 42 | - ResultHsCode resultHsCode = null; | 43 | + StampResult stampResult = null; |
| 43 | long begin = System.currentTimeMillis(); | 44 | long begin = System.currentTimeMillis(); |
| 44 | try { | 45 | try { |
| 45 | iclearApiHsCodeLog.setAppId(appId); | 46 | iclearApiHsCodeLog.setAppId(appId); |
| 46 | iclearApiHsCodeLog.setAppKey(appkey); | 47 | iclearApiHsCodeLog.setAppKey(appkey); |
| 47 | iclearApiHsCodeLog.setCreateTime(new Date()); | 48 | iclearApiHsCodeLog.setCreateTime(new Date()); |
| 48 | iclearApiHsCodeLog.setCode(consignmentCode); | 49 | iclearApiHsCodeLog.setCode(consignmentCode); |
| 49 | - if (!StringUtil.isEmpty(consignmentCode)) { | ||
| 50 | - resultHsCode = hsCodeService.findHsCodeListByCode(consignmentCode); | ||
| 51 | - return resultHsCode; | ||
| 52 | - } else { | ||
| 53 | - //如果没有传hscode需要限制10分钟只能查询一次 | ||
| 54 | - boolean rs = iClearApiHsCodeLogService.findIClearApiHsCodeLog(appId); | ||
| 55 | - if(rs == true){ | ||
| 56 | - resultHsCode = new ResultHsCode(Boolean.FALSE, ErrorCodeEnum.ERROR_10019.getCode(),ErrorCodeEnum.ERROR_10019.getName(),null); | ||
| 57 | - }else{ | ||
| 58 | - resultHsCode = hsCodeService.findAllHsCodeList(); | ||
| 59 | - } | ||
| 60 | - return resultHsCode; | ||
| 61 | - } | ||
| 62 | }catch(Exception ex){ | 50 | }catch(Exception ex){ |
| 63 | log.error(ex.getMessage(),ex); | 51 | log.error(ex.getMessage(),ex); |
| 64 | - resultHsCode = new ResultHsCode(Boolean.FALSE,ErrorCodeEnum.ERROR_30101.getCode(),ErrorCodeEnum.ERROR_30101.getName(),null); | 52 | + stampResult = new StampResult(Boolean.FALSE,ErrorCodeEnum.ERROR_30101.getCode(),ErrorCodeEnum.ERROR_30101.getName(),null); |
| 65 | - return resultHsCode; | 53 | + return stampResult; |
| 66 | }finally { | 54 | }finally { |
| 67 | - iclearApiHsCodeLog.setReceiveResult(resultHsCode.getMsg()); | 55 | + iclearApiHsCodeLog.setReceiveResult(stampResult.getMsg()); |
| 68 | - iclearApiHsCodeLog.setErrorCode(resultHsCode.getCode()); | 56 | + iclearApiHsCodeLog.setErrorCode(stampResult.getCode()); |
| 69 | iclearApiHsCodeLog.setResponseTime(new Date()); | 57 | iclearApiHsCodeLog.setResponseTime(new Date()); |
| 70 | long end = System.currentTimeMillis(); | 58 | long end = System.currentTimeMillis(); |
| 71 | iclearApiHsCodeLog.setSpendTime(end-begin); | 59 | iclearApiHsCodeLog.setSpendTime(end-begin); |
| 72 | - //如果异常为hscode长度超过2000,将截取0到2000字符 | ||
| 73 | - if(resultHsCode.getCode().equals(ErrorCodeEnum.ERROR_30102.getCode())){ | ||
| 74 | - iclearApiHsCodeLog.setCode(consignmentCode.substring(0,2000)); | ||
| 75 | - } | ||
| 76 | iClearApiHsCodeLogService.saveIClearApiHsCodeLog(iclearApiHsCodeLog); | 60 | iClearApiHsCodeLogService.saveIClearApiHsCodeLog(iclearApiHsCodeLog); |
| 77 | } | 61 | } |
| 62 | + return stampResult; | ||
| 78 | } | 63 | } |
| 79 | } | 64 | } | ... | ... |
| ... | @@ -17,4 +17,6 @@ public class StampResult implements Serializable { | ... | @@ -17,4 +17,6 @@ public class StampResult implements Serializable { |
| 17 | private String code; | 17 | private String code; |
| 18 | //错误信息 | 18 | //错误信息 |
| 19 | private String msg; | 19 | private String msg; |
| 20 | + //公章图样base64位字符 | ||
| 21 | + private String base64Image; | ||
| 20 | } | 22 | } | ... | ... |
-
Please register or login to post a comment