server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: pro active: dev application: name: system_gateway # 安全配置 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -2,6 +2,7 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.model.ApiResponse; import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest; import com.doumee.core.tms.model.request.TmsOrderInfoRequest; import com.doumee.core.tms.model.request.TmsOrderListRequest; @@ -50,15 +51,16 @@ @ApiOperation("【TMS】合同列表接口") @LoginNoRequired @PostMapping("/orderList") public TmsBaseResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) { public ApiResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) { return tmsService.orderList(request); return ApiResponse.success(tmsService.orderList(request)); } @ApiOperation("【TMS】合同详情接口") @LoginNoRequired @PostMapping("/orderInfo") public TmsBaseResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) { return tmsService.orderInfo(request); public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) { return ApiResponse.success(tmsService.orderInfo(request)); }
@@ -2,6 +2,7 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.model.ApiResponse; import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest; import com.doumee.core.tms.model.request.TmsOrderInfoRequest; import com.doumee.core.tms.model.request.TmsOrderListRequest; @@ -86,20 +87,6 @@ @PostMapping("/tms/lockStatusQuery") public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request ) { return tmsService.lockStatusQuery(request); } @ApiOperation("【TMS】合同列表接口") @LoginNoRequired @PostMapping("/tms/orderList") public TmsBaseResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) { return tmsService.orderList(request); } @ApiOperation("【TMS】合同详情接口") @LoginNoRequired @PostMapping("/tms/orderInfo") public TmsBaseResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) { return tmsService.orderInfo(request); } public static void doPringParam(HttpServletRequest request,String name) { server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
@@ -75,7 +75,7 @@ @ExcelColumn(name="调用结果 0成功 1失败") private Integer success; @ApiModelProperty(value = "平台 0海康安防平台 1ERP系统", example = "1") @ApiModelProperty(value = "平台 0WMS 1TMS", example = "1") @ExcelColumn(name="平台 0海康安防平台 1ERP系统") private Integer plat;
@@ -86,15 +86,22 @@ * @return TmsBaseResponse */ @Override public TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){ public List<TmsOrderListResponse> orderList(TmsOrderListRequest param){ if(StringUtils.isBlank(param.getPhoneNumber())){ param.setPhoneNumber("00000000000");//手机号必填 } if(param.getContractNumbers()==null || param.getContractNumbers().size()==0){ param.setContractNumbers(null); } String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode() +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_LIST_URL).getCode(); TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"合同列表接口",JSONObject.toJSONString(param) TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"【TMS】合同列表接口",JSONObject.toJSONString(param) ,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){}); return response; if(response ==null){ return new ArrayList<>(); }else{ return response.getData()==null?new ArrayList<>():response.getData(); } } /** * 合同详情接口 @@ -102,12 +109,16 @@ * @return TmsBaseResponse */ @Override public TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param){ public TmsOrderInfoResponse orderInfo(TmsOrderInfoRequest param){ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode() +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_DETAIL_URL).getCode(); TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,"合同详情接口",JSONObject.toJSONString(param) TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,"【TMS】合同详情接口",JSONObject.toJSONString(param) ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){}); return response; if(response ==null){ return new TmsOrderInfoResponse(); }else{ return response.getData()==null?new TmsOrderInfoResponse():response.getData(); } } /** @@ -139,15 +150,35 @@ success = 1; log.error("【"+name+"】================失败===="+ JSONObject.toJSONString(param)); }finally { saveInterfaceLog(url,name,param,success,res,Constants.ZERO); } } return null; } @Override public void saveInterfaceLog(String url,String name,String param,Integer success,String respone,int type){ if(wmsInterfaceLogMapper ==null){ return; } WmsInterfaceLog log = new WmsInterfaceLog(); log.setCreateDate(new Date()); log.setUrl(url); log.setEditDate(log.getCreateDate()); log.setPlat(Constants.ONE); log.setName(name); log.setIsdeleted(Constants.ZERO); log.setRequest(param); log.setType(type); log.setSuccess(success); log.setRepose(respone); wmsInterfaceLogMapper.insert(log); } private static void logResult(TmsBaseResponse res,String name) { if(StringUtils.equals(res.getCode(), TmsBaseResponse.CODE_SUCCESS)){ log.info("【TMS接口："+name+"】================成功====\n"+res); log.info("【TMS接口："+name+"】================成功====\n"+ JSONObject.toJSONString(res)); }else{ log.error("【TMS接口："+name+"】================失败====：\n"+ res); log.error("【TMS接口："+name+"】================失败====：\n"+ JSONObject.toJSONString(res)); } }
@@ -219,9 +219,9 @@ } private static void logResult(WmsBaseResponse<WmsBaseDataResponse> res,String name) { if(StringUtils.equals(res.getData().get(0).getSuccess(), WmsBaseResponse.CODE_SUCCESS)){ log.info("【WMS接口："+name+"】================成功====\n"+res); log.info("【WMS接口："+name+"】================成功====\n"+ JSONObject.toJSONString(res)); }else{ log.error("【WMS接口："+name+"】================失败====：\n"+ res); log.error("【WMS接口："+name+"】================失败====：\n"+ JSONObject.toJSONString(res)); } } /** server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -39,14 +39,14 @@ * @param param 参数 * @return TmsBaseResponse */ TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param); List<TmsOrderListResponse> orderList(TmsOrderListRequest param); /** * 合同详情接口 * @param param 参数 * @return TmsBaseResponse */ TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param); TmsOrderInfoResponse orderInfo(TmsOrderInfoRequest param); void saveInterfaceLog(String url,String name,String param,Integer success,String respone,int type); }
