|
@@ -273,7 +273,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping(value = "/addTmstruckReceiptResult" )
|
|
@PostMapping(value = "/addTmstruckReceiptResult" )
|
|
- public synchronized RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object> value, String orderNumber, String resultArrivalAddress) throws Exception {
|
|
|
|
|
|
+ public RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object> value, String orderNumber, String resultArrivalAddress) throws Exception {
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
map.put("orderNumber",orderNumber);
|
|
map.put("orderNumber",orderNumber);
|
|
map.put("resultArrivalAddress",resultArrivalAddress);
|
|
map.put("resultArrivalAddress",resultArrivalAddress);
|
|
@@ -364,7 +364,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
//入网验证
|
|
//入网验证
|
|
String netValidationResult = zhongJiaoXingLu.netValidation(capacityNumber);
|
|
String netValidationResult = zhongJiaoXingLu.netValidation(capacityNumber);
|
|
Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
|
|
Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
|
|
- if (Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
|
|
|
|
|
|
+ if (netValidationMap!=null && Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
|
|
String searchPointJson = HTTPRequestUtils.sendGet("https://restapi.amap.com/v3/geocode/geo", "address="+ URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key="+gaodeTonken);
|
|
String searchPointJson = HTTPRequestUtils.sendGet("https://restapi.amap.com/v3/geocode/geo", "address="+ URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key="+gaodeTonken);
|
|
SearchPoint2 searchPoint= JSON.parseObject(searchPointJson, SearchPoint2.class);
|
|
SearchPoint2 searchPoint= JSON.parseObject(searchPointJson, SearchPoint2.class);
|
|
String searchPointJson2 = HTTPRequestUtils.sendGet("https://restapi.amap.com/v3/geocode/geo", "address="+URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key="+gaodeTonken);
|
|
String searchPointJson2 = HTTPRequestUtils.sendGet("https://restapi.amap.com/v3/geocode/geo", "address="+URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key="+gaodeTonken);
|