From 13595459a52a8e7ecd042e8290dce75e7e2bf057 Mon Sep 17 00:00:00 2001 From: Fibonacci998 <30697927+tuansu2021998@users.noreply.github.com> Date: Fri, 24 Apr 2020 16:31:36 +0700 Subject: [PATCH] done update coordinate --- .../bean/ContributeNewRealEstateBean.java | 32 +++++---- ...nageCrawlRealEstateSetRoadSegmentBean.java | 24 +++++-- .../common/entity/District.java | 4 -- .../common/entity/Province.java | 2 - .../common/entity/SegmentOfStreet.java | 3 - .../common/entity/Street.java | 5 -- src/main/webapp/admin/listuser.xhtml | 68 +++++++++++-------- .../webapp/admin/managecrawlrealestate.xhtml | 28 ++++++-- src/main/webapp/resources/css/color.css | 12 ++++ .../resources/css/contributenewrealestate.css | 16 +++-- .../webapp/resources/css/viewmyprofile.css | 41 ++++++----- .../resources/js/contributenewrealestate.js | 8 +-- .../webapp/user/contributenewrealestate.xhtml | 15 ++-- .../user/updatecontributerealestate.xhtml | 8 +-- 14 files changed, 153 insertions(+), 113 deletions(-) create mode 100644 src/main/webapp/resources/css/color.css diff --git a/src/main/java/capstone/lip/landinformationportal/business/bean/ContributeNewRealEstateBean.java b/src/main/java/capstone/lip/landinformationportal/business/bean/ContributeNewRealEstateBean.java index ededa5c2..5c243d76 100644 --- a/src/main/java/capstone/lip/landinformationportal/business/bean/ContributeNewRealEstateBean.java +++ b/src/main/java/capstone/lip/landinformationportal/business/bean/ContributeNewRealEstateBean.java @@ -20,6 +20,8 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import com.google.gson.Gson; + import capstone.lip.landinformationportal.business.service.Interface.IHouseService; import capstone.lip.landinformationportal.business.service.Interface.IHousesDetailService; import capstone.lip.landinformationportal.business.service.Interface.IHousesFeatureService; @@ -37,6 +39,7 @@ import capstone.lip.landinformationportal.common.dto.HouseFeatureValue; import capstone.lip.landinformationportal.common.dto.LandFeatureValue; import capstone.lip.landinformationportal.common.entity.District; +import capstone.lip.landinformationportal.common.entity.FormedCoordinate; import capstone.lip.landinformationportal.common.entity.House; import capstone.lip.landinformationportal.common.entity.HousesDetail; import capstone.lip.landinformationportal.common.entity.HousesFeature; @@ -112,7 +115,6 @@ public class ContributeNewRealEstateBean implements Serializable { private String lngSingleCoordinate; private String latSingleCoordinate; private List listCoordinate; - private String jsonMultipleCoordinate; private String landFeatureIdSelected = ""; private String houseFeatureIdSelected = ""; @@ -617,7 +619,7 @@ public void provinceChange() { segmentStreetIdSelected = ""; nameInput = selectedProvince.getProvinceName(); - PrimeFaces.current().executeScript("focusMap(" + selectedProvince.getProvinceLat() + ", " + selectedProvince.getProvinceLng() + ");"); + PrimeFaces.current().executeScript("focusMap(" + selectedProvince.getProvinceLat() + ", " + selectedProvince.getProvinceLng() + ", 15);"); } else { listDistrict = new ArrayList<>(); listStreet = new ArrayList<>(); @@ -635,7 +637,7 @@ public void districtChange() { segmentStreetIdSelected = ""; selectedDistrict = listDistrict.stream().filter(x -> x.getDistrictId().equals(Long.parseLong(districtIdSelected))).collect(Collectors.toList()).get(0); - PrimeFaces.current().executeScript("focusMap(" + selectedDistrict.getDistrictLat() + ", " + selectedDistrict.getDistrictLng() + ");"); + PrimeFaces.current().executeScript("focusMap(" + selectedDistrict.getDistrictLat() + ", " + selectedDistrict.getDistrictLng() + ", 17);"); PrimeFaces.current().executeScript("changeInfo(\"" + selectedDistrict.getDistrictName() + "\", " + selectedDistrict.getDistrictLng() + ", " + selectedDistrict.getDistrictLat() + ")"); listSegmentOfStreet = selectedDistrict.getListSegmentOfStreet(); @@ -657,7 +659,7 @@ public void streetChange() { segmentStreetIdSelected = ""; selectedStreet = listStreet.stream().filter(x -> x.getStreetId().equals((Long.parseLong(streetIdSelected)))).collect(Collectors.toList()).get(0); - PrimeFaces.current().executeScript("focusMap(" + selectedStreet.getStreetLat() + ", " + selectedStreet.getStreetLng() + ");"); + PrimeFaces.current().executeScript("focusMap(" + selectedStreet.getStreetLat() + ", " + selectedStreet.getStreetLng() + ", 19);"); PrimeFaces.current().executeScript("changeInfo(\"" + selectedStreet.getStreetName() + "\", " + selectedStreet.getStreetLat() + ", " + selectedStreet.getStreetLng() + ")"); @@ -675,11 +677,23 @@ public void segmentStreetChange() { if (segmentStreetIdSelected != null && !segmentStreetIdSelected.equals("")) { processType = "4"; segmentOfStreet = listSegmentOfStreet.stream().filter(x -> x.getSegmentId().equals(Long.parseLong(segmentStreetIdSelected))).collect(Collectors.toList()).get(0); - PrimeFaces.current().executeScript("focusMap(" + segmentOfStreet.getSegmentLat() + ", " + segmentOfStreet.getSegmentLng() + ");"); + PrimeFaces.current().executeScript("clearDataMap()"); + PrimeFaces.current().executeScript("focusMap(" + segmentOfStreet.getSegmentLat() + ", " + segmentOfStreet.getSegmentLng() + ", 19);"); PrimeFaces.current().executeScript("changeInfo(\"" + segmentOfStreet.getSegmentName() + "\", " + segmentOfStreet.getSegmentLat() + ", " + segmentOfStreet.getSegmentLng() + ")"); PrimeFaces.current().executeScript("updateDeleteOld()"); + List listFormedCoordinate = segmentOfStreet.getListFormedCoordinate(); + List listCoordinate = listFormedCoordinate.stream() + .map(x->{ + Coordinate coor = new Coordinate(x.getFormedLng(), x.getFormedLat()); + return coor; + }).collect(Collectors.toList()); + Gson gson = new Gson(); + String jsonMultipleCoordinate = gson.toJson(listCoordinate); + + PrimeFaces.current().executeScript("drawPath('"+jsonMultipleCoordinate+"')"); + } else { segmentStreetIdSelected = ""; segmentOfStreet = null; @@ -872,14 +886,6 @@ public void setListCoordinate(List listCoordinate) { this.listCoordinate = listCoordinate; } - public String getJsonMultipleCoordinate() { - return jsonMultipleCoordinate; - } - - public void setJsonMultipleCoordinate(String jsonMultipleCoordinate) { - this.jsonMultipleCoordinate = jsonMultipleCoordinate; - } - public Province getSelectedProvince() { return selectedProvince; } diff --git a/src/main/java/capstone/lip/landinformationportal/business/bean/ManageCrawlRealEstateSetRoadSegmentBean.java b/src/main/java/capstone/lip/landinformationportal/business/bean/ManageCrawlRealEstateSetRoadSegmentBean.java index a91551cb..8bb30a74 100644 --- a/src/main/java/capstone/lip/landinformationportal/business/bean/ManageCrawlRealEstateSetRoadSegmentBean.java +++ b/src/main/java/capstone/lip/landinformationportal/business/bean/ManageCrawlRealEstateSetRoadSegmentBean.java @@ -69,15 +69,15 @@ public void showPopup(Long realEstateId) { listDistrict = null; listStreet = null; listSegment = null; - listAdjacentSegment = null; + listAdjacentSegment = realEstate.getListRealEstateAdjacentSegment(); provinceIdSelected = ""; districtIdSelected = ""; streetIdSelected = ""; roadSegmentIdSelected = ""; - singleLat = realEstate.getRealEstateLat().toString(); - singleLng = realEstate.getRealEstateLng().toString(); + singleLat = ""; + singleLng = ""; - if (realEstate.getListRealEstateAdjacentSegment() != null) { + if (realEstate.getListRealEstateAdjacentSegment() != null && !realEstate.getListRealEstateAdjacentSegment().isEmpty()) { segmentConfuse = false; }else { segmentConfuse = true; @@ -140,8 +140,14 @@ public void segmentStreetChange() { PrimeFaces.current().executeScript("drawPath('"+json+"')"); } public void saveSegmentToReo() { - - List listRealEstateByCoordinate = realEstateService.findByRealEstateLatAndRealEstateLng(realEstate.getRealEstateLat(), realEstate.getRealEstateLng()); + try { + Double.parseDouble(singleLat); + Double.parseDouble(singleLng); + }catch (Exception e) { + setMessage(FacesMessage.SEVERITY_ERROR, "Tọa độ không hợp lệ"); + return; + } + List listRealEstateByCoordinate = realEstateService.findByRealEstateLatAndRealEstateLng(Double.parseDouble(singleLat), Double.parseDouble(singleLng)); if (listRealEstateByCoordinate == null || (listRealEstateByCoordinate!=null && listRealEstateByCoordinate.isEmpty())) { coordinateConfuse = false; }else { @@ -155,15 +161,21 @@ public void saveSegmentToReo() { } + if (listAdjacentSegment == null || listAdjacentSegment.isEmpty()) { setMessage(FacesMessage.SEVERITY_ERROR, "Chưa chọn đoạn đường"); return; } realEstateAdjacentSegmentService.save(listAdjacentSegment); + + realEstate = realEstateService.findById(realEstate.getRealEstateId()); + realEstate.setRealEstateLng(Double.parseDouble(singleLng)); + realEstate.setRealEstateLat(Double.parseDouble(singleLat)); realEstate.setRealEstateStatus(String.valueOf(StatusRealEstateConstant.VERIFIED)); realEstateService.save(realEstate); setMessage(FacesMessage.SEVERITY_INFO, "Chỉnh sửa thành công"); + PrimeFaces.current().executeScript("PF('alert').renderMessage({\"summary\":\"Thành công\",\"detail\":\"Chỉnh sửa thành công\",\"severity\":\"info\"})"); showPopup = false; } diff --git a/src/main/java/capstone/lip/landinformationportal/common/entity/District.java b/src/main/java/capstone/lip/landinformationportal/common/entity/District.java index 7f012d6b..1709e09e 100644 --- a/src/main/java/capstone/lip/landinformationportal/common/entity/District.java +++ b/src/main/java/capstone/lip/landinformationportal/common/entity/District.java @@ -13,14 +13,10 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; - import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; - import capstone.lip.landinformationportal.common.entity.audit.AuditAbstract; @Entity diff --git a/src/main/java/capstone/lip/landinformationportal/common/entity/Province.java b/src/main/java/capstone/lip/landinformationportal/common/entity/Province.java index 038afb69..95eaa707 100644 --- a/src/main/java/capstone/lip/landinformationportal/common/entity/Province.java +++ b/src/main/java/capstone/lip/landinformationportal/common/entity/Province.java @@ -14,8 +14,6 @@ import org.hibernate.annotations.LazyToOneOption; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; import capstone.lip.landinformationportal.common.entity.audit.AuditAbstract; diff --git a/src/main/java/capstone/lip/landinformationportal/common/entity/SegmentOfStreet.java b/src/main/java/capstone/lip/landinformationportal/common/entity/SegmentOfStreet.java index 75bcb0ac..82d22981 100644 --- a/src/main/java/capstone/lip/landinformationportal/common/entity/SegmentOfStreet.java +++ b/src/main/java/capstone/lip/landinformationportal/common/entity/SegmentOfStreet.java @@ -2,7 +2,6 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -17,8 +16,6 @@ import org.hibernate.annotations.LazyToOneOption; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; import capstone.lip.landinformationportal.common.entity.audit.AuditAbstract; diff --git a/src/main/java/capstone/lip/landinformationportal/common/entity/Street.java b/src/main/java/capstone/lip/landinformationportal/common/entity/Street.java index 5457bd12..d4bb047a 100644 --- a/src/main/java/capstone/lip/landinformationportal/common/entity/Street.java +++ b/src/main/java/capstone/lip/landinformationportal/common/entity/Street.java @@ -2,8 +2,6 @@ import java.io.Serializable; import java.util.List; - -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -12,13 +10,10 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; - import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; import capstone.lip.landinformationportal.common.entity.audit.AuditAbstract; @Entity diff --git a/src/main/webapp/admin/listuser.xhtml b/src/main/webapp/admin/listuser.xhtml index d740149d..f621de08 100644 --- a/src/main/webapp/admin/listuser.xhtml +++ b/src/main/webapp/admin/listuser.xhtml @@ -10,39 +10,47 @@ - - - + + + + - - - - - - - - - - - - - - - - - +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
- +
- - + + Tọa độ bị trùng + + + Chưa cập nhật đoạn đường + + #{beanPopup.coordinateConfuse} + #{beanPopup.segmentConfuse}
-
-
- Địa chỉ: #{beanPopup.realEstate.realEstateAddress} +
+
+
+ Địa chỉ: #{beanPopup.realEstate.realEstateAddress} +
+
+
+
+ Source Link +
@@ -186,7 +199,7 @@
- + @@ -199,6 +212,7 @@
+
diff --git a/src/main/webapp/resources/css/color.css b/src/main/webapp/resources/css/color.css new file mode 100644 index 00000000..40fe7cb3 --- /dev/null +++ b/src/main/webapp/resources/css/color.css @@ -0,0 +1,12 @@ +.bg-deep-orange { + background-color: #FF5722 !important; + color: #fff; +} +.bg-indigo { + background-color: #3F51B5 !important; + color: #fff; +} +.bg-blue-grey { + background-color: #607D8B !important; + color: #fff; +} \ No newline at end of file diff --git a/src/main/webapp/resources/css/contributenewrealestate.css b/src/main/webapp/resources/css/contributenewrealestate.css index 3888e6f9..0adce8b1 100644 --- a/src/main/webapp/resources/css/contributenewrealestate.css +++ b/src/main/webapp/resources/css/contributenewrealestate.css @@ -55,7 +55,7 @@ and open the template in the editor. height: 180px; } -/* Đoạn này test Multi Form +/* Ä�oạn này test Multi Form html { height: 100%; Image only BG fallback @@ -65,9 +65,7 @@ html { linear-gradient(rgba(196, 102, 0, 0.6), rgba(155, 89, 182, 0.6)); }*/ -body { - font-family: montserrat, arial, verdana; -} + /*form styles*/ #msform { width: 100%; @@ -107,12 +105,16 @@ body { .landbox , .housebox { border-radius: 3px; - box-shadow: 0 0 15px 1px rgba(0, 0, 0, 0.4); + box-shadow: 0 0 20px 5px rgba(0, 0, 0, 0.4); box-sizing: border-box; margin-top: 25px; - margin-left: 25px; } - +.landbox{ + margin-right: 5px; +} +.housebox{ + margin-left: 5px; +} .landboxTotal , .houseboxTotal { border-radius: 3px; box-shadow: 0 0 15px 1px rgba(0, 0, 0, 0.4); diff --git a/src/main/webapp/resources/css/viewmyprofile.css b/src/main/webapp/resources/css/viewmyprofile.css index 769c8483..532b8f34 100644 --- a/src/main/webapp/resources/css/viewmyprofile.css +++ b/src/main/webapp/resources/css/viewmyprofile.css @@ -35,7 +35,7 @@ h1, h2, h3, h4, h5, h6 { right: 15px; bottom: 15px; background: #149ddd; - color: #fff; + transition: display 0.5s ease-in-out; z-index: 99999; text-align: center; @@ -44,7 +44,7 @@ h1, h2, h3, h4, h5, h6 { .back-to-top:hover { - color: #fff; + background: #2eafec; transition: background 0.2s ease-in-out; } @@ -56,7 +56,7 @@ h1, h2, h3, h4, h5, h6 { /*margin-top:70px;*/ position: fixed; padding-top: 25px; - top: 0px; + top: 100px; left: 0; bottom: 0; width: 300px; @@ -64,7 +64,6 @@ h1, h2, h3, h4, h5, h6 { z-index: 9999; transition: all 0.5s; padding: 0 15px; - background: #040b14; overflow-y: auto; } .passrow { @@ -90,7 +89,7 @@ h1, h2, h3, h4, h5, h6 { } #header .profile h1 a, #header .profile h1 a:hover { - color: #fff; + text-decoration: none; } @@ -98,7 +97,7 @@ h1, h2, h3, h4, h5, h6 { font-size: 18px; display: inline-block; background: #212431; - color: #fff; + line-height: 1; padding: 8px 0; margin-right: 4px; @@ -111,7 +110,7 @@ h1, h2, h3, h4, h5, h6 { #header .profile .social-links a:hover { background: #149ddd; - color: #fff; + text-decoration: none; } @@ -166,7 +165,7 @@ h1, h2, h3, h4, h5, h6 { .nav-menu a:hover, .nav-menu .active > a, .nav-menu li:hover > a { text-decoration: none; - color: #fff; + } .nav-menu a:hover i, .nav-menu .active > a i, .nav-menu li:hover > a i { @@ -221,7 +220,7 @@ h1, h2, h3, h4, h5, h6 { } .mobile-nav-active .mobile-nav-toggle i { - color: #fff; + } /*-------------------------------------------------------------- @@ -256,7 +255,7 @@ h1, h2, h3, h4, h5, h6 { font-size: 64px; font-weight: 700; line-height: 56px; - color: #fff; + } .action-button { @@ -272,14 +271,14 @@ h1, h2, h3, h4, h5, h6 { float: left; } #hero p { - color: #fff; + margin-bottom: 50px; font-size: 26px; font-family: "Poppins", sans-serif; } #hero p span { - color: #fff; + padding-bottom: 4px; letter-spacing: 1px; border-bottom: 3px solid #149ddd; @@ -403,7 +402,7 @@ section { .contact .info { padding: 30px; - background: #fff; + width: 100%; box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.12); } @@ -451,7 +450,7 @@ section { font-size: 18px; display: inline-block; background: #333; - color: #fff; + line-height: 1; padding: 8px 0; border-radius: 50%; @@ -464,18 +463,18 @@ section { .contact .info .social-links a:hover { background: #149ddd; - color: #fff; + } .contact .info .email:hover i, .contact .info .address:hover i, .contact .info .phone:hover i { background: #149ddd; - color: #fff; + } .contact .php-email-form { width: 100%; padding: 30px; - background: #fff; + box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.12); } @@ -494,7 +493,7 @@ section { .contact .php-email-form .error-message { display: none; - color: #fff; + background: #ed3c0d; text-align: center; padding: 15px; @@ -503,7 +502,7 @@ section { .contact .php-email-form .sent-message { display: none; - color: #fff; + background: #18d26e; text-align: center; padding: 15px; @@ -512,7 +511,7 @@ section { .contact .php-email-form .loading { display: none; - background: #fff; + text-align: center; padding: 15px; } @@ -548,7 +547,7 @@ section { background: #149ddd; border: 0; padding: 10px 24px; - color: #fff; + transition: 0.4s; border-radius: 4px; } diff --git a/src/main/webapp/resources/js/contributenewrealestate.js b/src/main/webapp/resources/js/contributenewrealestate.js index eb384392..990a6465 100644 --- a/src/main/webapp/resources/js/contributenewrealestate.js +++ b/src/main/webapp/resources/js/contributenewrealestate.js @@ -160,8 +160,8 @@ $("#table-coordinate").on("click", ".ibtnDel", function (event) { -function drawPath() { - let fromJson = JSON.parse($('#form\\:txtInput_multipleCoordinate').val()); +function drawPath(jsonText) { + let fromJson = JSON.parse(jsonText); let line = fromJson.map(x => { let o = {}; o.lat = x.latitude; @@ -179,9 +179,9 @@ function drawPath() { path.push(element); } -function focusMap(latitude, longitude) { +function focusMap(latitude, longitude, zoom) { map.setCenter(new google.maps.LatLng(latitude, longitude)); - map.setZoom(15); + map.setZoom(zoom); } function changeInfo(name, longitude, latitude) { $('#form\\:txtinput-Name').val(name); diff --git a/src/main/webapp/user/contributenewrealestate.xhtml b/src/main/webapp/user/contributenewrealestate.xhtml index 491a2607..60d37819 100644 --- a/src/main/webapp/user/contributenewrealestate.xhtml +++ b/src/main/webapp/user/contributenewrealestate.xhtml @@ -29,7 +29,7 @@
- +
@@ -40,7 +40,7 @@
- +
- +
- + @@ -67,9 +67,10 @@
- + + onstart="clearDataMap()"> @@ -270,7 +271,7 @@
-
+
diff --git a/src/main/webapp/user/updatecontributerealestate.xhtml b/src/main/webapp/user/updatecontributerealestate.xhtml index cb3ff531..a2e976e2 100644 --- a/src/main/webapp/user/updatecontributerealestate.xhtml +++ b/src/main/webapp/user/updatecontributerealestate.xhtml @@ -37,7 +37,7 @@
- +
- +
- + @@ -64,7 +64,7 @@
- +
Tên phần Đất