diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy index e44d4424e..5cf2d132a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/RelatedTaiWanBatch.groovy @@ -7,6 +7,7 @@ import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.looplineinfo.InsidePolygon +import com.fangjia.script.looplineinfo.Point import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils @@ -17,7 +18,7 @@ import com.mongodb.DBCollection */ -@BatchOwner(Watcher.GaoJuan) +//@BatchOwner(Watcher.GaoJuan) class RelatedTaiWanBatch extends BaseBatch{ @@ -69,7 +70,9 @@ class RelatedTaiWanBatch extends BaseBatch{ if(r.lon && r.lat){ for(def m : zimaoqu_range_datas){ // def flag = InsidePolygon.isInArea(r.lon, r.lat, InsidePolygon.createPoint5(m.shape)) - def flag = InsidePolygon.isPtInPoly(r.lon, r.lat, InsidePolygon.createPoint5(m.shape)) + List> pointsList = InsidePolygon.createPoint4(m.shape) +// def flag = InsidePolygon.isPtInPoly(r.lon, r.lat, pointsList) + def flag = InsidePolygon.isInArea(r.lon, r.lat, pointsList) if(flag){ resKey = m.name break