luobang 1 سال پیش
والد
کامیت
f09f2f8ae4

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/QmsQueueResultMapper.java

@@ -218,4 +218,6 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
 
     int updateTotalResultStatusByResultId(BigDecimal resultId);
 
+    String getQueueRadius();
+
 }

+ 10 - 1
src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -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);

+ 5 - 0
src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -2530,6 +2530,7 @@
         and ASOM.SALE_DATE_OF_RECEIPT  > sysdate
         and ASOM.SALE_DATE_OF_RECEIPT - 1 &lt; sysdate)
     </select>
+
     <update id="updateTotalResultStatus" parameterType="java.math.BigDecimal">
         UPDATE TMSTRUCK_TOTAL_RESULT TTR
         SET TTR.ORDER_STATUS = '排队中',
@@ -2547,4 +2548,8 @@
         SET TTR.ORDER_STATUS = '已接单'
         WHERE TTR.RESULT_TOTAL_ID IN (SELECT QQR.RESULT_TOTAL_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_ID = #{resultId})
     </update>
+    <select id="getQueueRadius" resultType="java.lang.String">
+        SELECT DV.VERSION_VALUE FROM DIL_VERSION DV
+        where dv.VERSION_ID = 12
+    </select>
 </mapper>