|
@@ -304,7 +304,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
redisTemplate.delete(prefixOrder+":"+orderNumber);
|
|
redisTemplate.delete(prefixOrder+":"+orderNumber);
|
|
redisTemplate.delete(prefixOrder+":"+orderNumber+suffix);
|
|
redisTemplate.delete(prefixOrder+":"+orderNumber+suffix);
|
|
//添加运输距离
|
|
//添加运输距离
|
|
- to= (ViewVisualization) DataConversionTool.jsonToBean(json,ViewVisualization.class);
|
|
|
|
|
|
+ to= (ViewVisualization) JSON.parseObject(json,ViewVisualization.class);
|
|
|
|
|
|
}else {
|
|
}else {
|
|
HashMap<String,Object> hashMap=new HashMap();
|
|
HashMap<String,Object> hashMap=new HashMap();
|
|
@@ -316,7 +316,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
|
|
|
|
|
|
|
|
if (json!=null&&!json.equals("")){
|
|
if (json!=null&&!json.equals("")){
|
|
- to= (ViewVisualization) DataConversionTool.jsonToBean(json,ViewVisualization.class);
|
|
|
|
|
|
+ to= (ViewVisualization) JSON.parseObject(json,ViewVisualization.class);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -363,9 +363,9 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
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 (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= (SearchPoint2) DataConversionTool.jsonToBean(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);
|
|
- SearchPoint2 searchPoint2= (SearchPoint2) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint2.class);
|
|
|
|
|
|
+ SearchPoint2 searchPoint2= JSON.parseObject(searchPointJson2, SearchPoint2.class);
|
|
//运单生成之后保存
|
|
//运单生成之后保存
|
|
HashMap<String,String> redisMap=new HashMap<>();
|
|
HashMap<String,String> redisMap=new HashMap<>();
|
|
String location = searchPoint.getGeocodes().get(0).getLocation();
|
|
String location = searchPoint.getGeocodes().get(0).getLocation();
|
|
@@ -436,7 +436,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
@PostMapping("/abnormalLineWarn")
|
|
@PostMapping("/abnormalLineWarn")
|
|
public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
|
|
public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
|
|
|
|
|
|
- ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
|
|
|
|
|
|
+ ResultWarn resultWarn= (ResultWarn) JSON.parseObject(data, ResultWarn.class);
|
|
Map<String, Object> map= DataConversionTool.objectToMap(resultWarn);
|
|
Map<String, Object> map= DataConversionTool.objectToMap(resultWarn);
|
|
int i= offSiteTransportationService.addTransportationAlarm(map);
|
|
int i= offSiteTransportationService.addTransportationAlarm(map);
|
|
return "success";
|
|
return "success";
|
|
@@ -444,7 +444,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
@PostMapping("/parkWarn")
|
|
@PostMapping("/parkWarn")
|
|
public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception {
|
|
public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception {
|
|
|
|
|
|
- ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
|
|
|
|
|
|
+ ResultWarn resultWarn= (ResultWarn) JSON.parseObject(data, ResultWarn.class);
|
|
Map<String, Object> map= DataConversionTool.objectToMap(resultWarn);
|
|
Map<String, Object> map= DataConversionTool.objectToMap(resultWarn);
|
|
int i=offSiteTransportationService.addTransportationAlarm(map);
|
|
int i=offSiteTransportationService.addTransportationAlarm(map);
|
|
|
|
|
|
@@ -453,7 +453,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
|
|
@PostMapping("/offLineWarn")
|
|
@PostMapping("/offLineWarn")
|
|
public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
|
|
public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
|
|
|
|
|
|
- ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
|
|
|
|
|
|
+ ResultWarn resultWarn= (ResultWarn) JSON.parseObject(data, ResultWarn.class);
|
|
Map<String, Object> map= DataConversionTool.objectToMap(resultWarn);
|
|
Map<String, Object> map= DataConversionTool.objectToMap(resultWarn);
|
|
int i=offSiteTransportationService.addTransportationAlarm(map);
|
|
int i=offSiteTransportationService.addTransportationAlarm(map);
|
|
return "success";
|
|
return "success";
|