|
@@ -338,7 +338,16 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
|
|
|
|
|
|
@Override
|
|
|
public boolean isInCircle(String longitude, String latitude,String CapacityNo) {
|
|
|
- boolean s = ElectronicFenceUtils.isInRange(15000,new BigDecimal(latitude),new BigDecimal(longitude),new BigDecimal(lat1),new BigDecimal(lng1));
|
|
|
+ Integer queueRadiusOld = 15000;
|
|
|
+ try {
|
|
|
+ String queueRadius = qmsQueueResultMapper.getQueueRadius();
|
|
|
+ if(queueRadius != null) {
|
|
|
+ queueRadiusOld = Integer.parseInt(queueRadius);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ boolean s = ElectronicFenceUtils.isInRange(queueRadiusOld,new BigDecimal(latitude),new BigDecimal(longitude),new BigDecimal(lat1),new BigDecimal(lng1));
|
|
|
if(s){
|
|
|
int i = addQueueResult(CapacityNo,"否");
|
|
|
System.out.println(i);
|