From dfcd049c9f5c0e51067b9f5ce0a460094ffc46d4 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 20 Feb 2024 13:44:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/WeiXinEvaluationController.java | 18 ++++++++++-------- .../main/webapp/district/districtDetail.ftl | 4 +--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index c89bc6f53..716c2156f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -1285,15 +1285,17 @@ public class WeiXinEvaluationController { Point point = null; if(district.getLng2()!=null){ point = new Point(district.getLng2()/10000000000.0, district.getLat2()/10000000000.0); + + //boolean flag = InsidePolygon.aboutZone(point, points); + //boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points); + boolean flag = InsidePolygon2.checkIsInPolygon(point, points); + if(flag){ + pbObj = pb; + System.out.println(district.getRegion()+" "+district.getName()+" "+pb.getName()); + break; + } } - //boolean flag = InsidePolygon.aboutZone(point, points); - //boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points); - boolean flag = InsidePolygon2.checkIsInPolygon(point, points); - if(flag){ - pbObj = pb; - System.out.println(district.getRegion()+" "+district.getName()+" "+pb.getName()); - break; - } + } Integer yearAge = getBuildYear(district.getFinishBuildingDate()); if(pbObj!=null){ diff --git a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl index e56336115..761d749d7 100644 --- a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl +++ b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl @@ -111,9 +111,7 @@

- <#if districtStatBo?? && districtStatBo.districtStat??> - 房产评估 - + 房产评估