|
@@ -80,6 +80,9 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
|
|
private String lat_xtg = "30.66370628";
|
|
private String lat_xtg = "30.66370628";
|
|
private String lng_xtg = "108.38972235";
|
|
private String lng_xtg = "108.38972235";
|
|
|
|
|
|
|
|
+ //蜀道智联
|
|
|
|
+ private String lat_sdzl = "31.06309269";
|
|
|
|
+ private String lng_sdzl = "107.71284494";
|
|
/**
|
|
/**
|
|
* 取消订阅方法
|
|
* 取消订阅方法
|
|
*/
|
|
*/
|
|
@@ -364,6 +367,10 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
|
|
s = ElectronicFenceUtils.isInRange(queueRadiusOld,new BigDecimal(latitude),new BigDecimal(longitude)
|
|
s = ElectronicFenceUtils.isInRange(queueRadiusOld,new BigDecimal(latitude),new BigDecimal(longitude)
|
|
,new BigDecimal(lat_xtg),new BigDecimal(lng_xtg));
|
|
,new BigDecimal(lat_xtg),new BigDecimal(lng_xtg));
|
|
}
|
|
}
|
|
|
|
+ if(!s){
|
|
|
|
+ s = ElectronicFenceUtils.isInRange(queueRadiusOld,new BigDecimal(latitude),new BigDecimal(longitude)
|
|
|
|
+ ,new BigDecimal(lat_sdzl),new BigDecimal(lng_sdzl));
|
|
|
|
+ }
|
|
if(s){
|
|
if(s){
|
|
int i = addQueueResult(CapacityNo,"否");
|
|
int i = addQueueResult(CapacityNo,"否");
|
|
System.out.println(i);
|
|
System.out.println(i);
|