Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-QMS-API

src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -185,7 +185,7 @@ public class QmsQueueResultController extends BaseRESTfulController {
     }
 
     @PostMapping("isInCircle")
-    public RESTfulResult isInCircle(String longitude,
+    public synchronized RESTfulResult isInCircle(String longitude,
                                     String latitude,
                                     String capacityNo){
         return success(qmsQueueResultService.isInCircle(longitude,latitude,capacityNo));

src/main/java/com/steerinfo/dil/service/IQmsQueueResultService.java

@@ -36,8 +36,7 @@ public interface IQmsQueueResultService{
     //查询排队结束
     List<Map<String, Object>> getQueueEndResult(Map<String, Object> map);
 
-
-
+    boolean isInCircle(String longitude, String latitude, String CapacityNo);
 
 
     //通过实绩Id查询排队取消实绩

src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -245,6 +245,8 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return qmsQueueResultMapper.getQueueEndResult(map);
     }
 
+
+    @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));
         if(s){