|
@@ -72,9 +72,14 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
|
|
|
|
|
|
private String lonlat = "107.4628199,31.1925279"; //中心点坐标
|
|
|
private String radius = "15000"; //半径
|
|
|
+ //达钢老区经纬度
|
|
|
private String lat1 = "31.1925279";
|
|
|
private String lng1 = "107.4628199";
|
|
|
|
|
|
+ //新田港经纬度
|
|
|
+ private String lat_xtg = "30.66370628";
|
|
|
+ private String lng_xtg = "108.38972235";
|
|
|
+
|
|
|
/**
|
|
|
* 取消订阅方法
|
|
|
*/
|
|
@@ -353,7 +358,12 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- boolean s = ElectronicFenceUtils.isInRange(queueRadiusOld,new BigDecimal(latitude),new BigDecimal(longitude),new BigDecimal(lat1),new BigDecimal(lng1));
|
|
|
+ boolean s = ElectronicFenceUtils.isInRange(queueRadiusOld,new BigDecimal(latitude),new BigDecimal(longitude)
|
|
|
+ ,new BigDecimal(lat1),new BigDecimal(lng1));
|
|
|
+ if(!s){
|
|
|
+ s = ElectronicFenceUtils.isInRange(queueRadiusOld,new BigDecimal(latitude),new BigDecimal(longitude)
|
|
|
+ ,new BigDecimal(lat_xtg),new BigDecimal(lng_xtg));
|
|
|
+ }
|
|
|
if(s){
|
|
|
int i = addQueueResult(CapacityNo,"否");
|
|
|
System.out.println(i);
|