diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 3f67b111c..6e85874c7 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -133,7 +133,9 @@ public class ApiUserController { bo.setDeadTime(apiUser.getDeadTime()); bo.setManager(apiUser.getManager()); bo.setIsMonitor(apiUser.getIsMonitor()); - + bo.setIsMonitorStatistic(apiUser.getIsMonitorStatistic()); + bo.setIsMonitorUsed(apiUser.getIsMonitorUsed()); + bo.setIsWarnExpired(apiUser.getIsWarnExpired()); apiUserBoList.add(bo); } @@ -217,6 +219,9 @@ public class ApiUserController { apiUser.setIsMonitor(model.getIsMonitor()); apiUser.setContact(model.getContact()); apiUser.setPhone(model.getPhone()); + apiUser.setIsMonitorStatistic(model.getIsMonitorStatistic()); + apiUser.setIsMonitorUsed(model.getIsMonitorUsed()); + apiUser.setIsWarnExpired(model.getIsWarnExpired()); this.apiUserService.save(apiUser); // 新增用户,默认挂牌价改为默认评估价 model.setPriceType("evaluate"); @@ -253,6 +258,9 @@ public class ApiUserController { bo.setDisplayName(user.getDisplayName()); bo.setIsTest(apiUser.getIsTest()); bo.setPurpose(apiUser.getPurpose()); + bo.setIsMonitorStatistic(apiUser.getIsMonitorStatistic()); + bo.setIsMonitorUsed(apiUser.getIsMonitorUsed()); + bo.setIsWarnExpired(apiUser.getIsWarnExpired()); bo.setSiteName(apiUser.getSiteName()); bo.setIp(apiUser.getIp()); bo.setCompany(apiUser.getCompany()); @@ -317,6 +325,9 @@ public class ApiUserController { dataApiUser.put("isMonitor", model.getIsMonitor()); dataApiUser.put("contact", model.getContact()); dataApiUser.put("phone", model.getPhone()); + dataApiUser.put("isMonitorStatistic",model.getIsMonitorStatistic()); + dataApiUser.put("isMonitorUsed",model.getIsMonitorUsed()); + dataApiUser.put("isWarnExpired",model.getIsWarnExpired()); this.apiUserService.update(dataApiUser, userId); // 更改用户密码 // this.userService.updateById(user,userId); @@ -647,7 +658,6 @@ public class ApiUserController { AuthorityBo bo = new AuthorityBo(); BeanUtils.copyProperties(openResource, bo); if (authority != null) { - bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); model.setSupportLatLng(authority.isSupportLatLng()); bo.setLimitCountMap(authority.getLimitCountMap()); @@ -761,6 +771,9 @@ public class ApiUserController { } } totalCountMap.put(model.getUri(), count); + if (count == 0) { + totalCountMap.remove(model.getUri()); + } authority.setTotalCountMap(totalCountMap); } if (model.getIsCheckCount() != null) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index 4b04e0c41..036ffc89d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -3,9 +3,11 @@ package com.fangjia.bkoff.controllers; import com.fangjia.bkoff.model.DevelopmentZoneModel; import com.fangjia.bkoff.model.JsonModel; import com.fangjia.bkoff.model.LatlngPolygonModel; +import com.fangjia.bkoff.util.ExcelUtils; import com.fangjia.core.util.GeoUtils; import com.fangjia.core.util.ThreadLocalData; import com.fangjia.core.util.ThreadLocalKey; +import com.fangjia.dal.QueryParam; import com.fangjia.dal.mongo.model.DevelopmentZone; import com.fangjia.dal.mongo.model.LatlngPolygon; import com.fangjia.dal.mongo.model.StatsIndex; @@ -13,9 +15,19 @@ import com.fangjia.dal.mongo.model.bkoff.BkoffUsers; import com.fangjia.service.mongo.bkoff.BkoffUsersService; import com.fangjia.service.mongo.fangjia.DevelopmentZoneService; import com.fangjia.service.mongo.fangjia.LatlngPolygonService; +import com.mashape.unirest.http.HttpResponse; +import com.mashape.unirest.http.Unirest; +import com.mashape.unirest.http.exceptions.UnirestException; import org.apache.commons.lang.StringUtils; +import org.json.JSONException; +import org.json.JSONObject; import org.sothis.core.util.Pager; +import org.sothis.web.mvc.ActionContext; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.util.*; import static com.fangjia.core.util.GeoUtils.LAT; @@ -33,9 +45,9 @@ public class DevelopmentZoneController { if (pager.getCurrentPage() > 100) { pager.setCurrentPage(1); } - long countDev = developmentZoneService.countDev(model.getProvince(),model.getCityName1(), model.getName(), model.getLevel()); + long countDev = developmentZoneService.countDev(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), model.getOperateResult()); pager.setTotalRows((int) countDev); - List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(),model.getCityName1(), model.getName(), model.getLevel(), pager); + List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), model.getOperateResult(), pager); model.setDevelopmentZoneList(developmentZones); model.setPager(pager); return model; @@ -59,6 +71,15 @@ public class DevelopmentZoneController { return model; } + public Object editFenceAction(DevelopmentZoneModel model) { + if (model.getId() == null) { + return model; + } + + model.setDevelopmentZone(developmentZoneService.findDevelopmentZone(model.getId())); + return model; + } + public Object deleteAction(LatlngPolygonModel model) { JsonModel ret = new JsonModel(); if (model.getId() == null) { @@ -110,6 +131,7 @@ public class DevelopmentZoneController { Object coordinates = convertGeoList(model.getBdShape()); shape.put("coordinates", coordinates); entity.setShape(shape); + entity.setOperateResult("已处理"); } entity.setLevel(model.getLevel()); @@ -127,6 +149,8 @@ public class DevelopmentZoneController { entity.setUrl(StringUtils.isBlank(model.getUrl()) ? "" : model.getUrl()); entity.setCityName1(StringUtils.isBlank(model.getCityName1()) ? "" : model.getCityName1()); entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict()); + entity.setImgUrl(StringUtils.isBlank(model.getImgUrl()) ? "" : model.getImgUrl()); + entity.setOperateResult(StringUtils.isBlank(model.getOperateResult()) ? "" : model.getOperateResult()); //记录操作人员 entity.setOperator(user.getRealName()); developmentZoneService.saveDevelopmentZone(entity); @@ -168,6 +192,7 @@ public class DevelopmentZoneController { Object coordinates = convertGeoList(model.getBdShape()); shape.put("coordinates", coordinates); udata.put("shape", shape); + udata.put("operateResult", "已处理"); } if (StringUtils.isNotBlank(model.getAlias())) { String aliasString = model.getAlias().replaceAll(",", ","); @@ -201,9 +226,15 @@ public class DevelopmentZoneController { if (StringUtils.isNotBlank(model.getCityName1())) { udata.put("cityName1", model.getCityName1()); } - if (StringUtils.isNotBlank(model.getDistrict())){ + if (StringUtils.isNotBlank(model.getDistrict())) { udata.put("district", model.getDistrict()); } + if (StringUtils.isNotBlank(model.getImgUrl())) { + udata.put("imgUrl", model.getImgUrl()); + } + if (StringUtils.isNotBlank(model.getOperateResult())){ + udata.put("operateResult", model.getOperateResult()); + } udata.put("createTime", new Date()); //记录操作人员 udata.put("operator", user.getRealName()); @@ -259,5 +290,22 @@ public class DevelopmentZoneController { return gdLocationList; } + public Object uploadAction(DevelopmentZoneModel model) throws IOException, UnirestException, JSONException { + JsonModel ret = new JsonModel(); + Map data = new HashMap(); + File file = model.getFile(); + HttpResponse response = Unirest.post("http://open.fangjia.com/files/uploadGridFs") + .field("file", file) + .field("token", "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB") + .asString(); + // 获取返回的链接 + JSONObject jsonResponse = new JSONObject(response.getBody()); + String link = jsonResponse.getJSONObject("result").getString("link"); + data.put("imgUrl", link); + data.put("msg", "图片上传成功"); + ret.setJsonModel(data); + return ret; + } + } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 080f08f51..e58c94365 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -1178,7 +1178,7 @@ public class DistrictController { JsonModel model = new JsonModel(); - List districts = districtService.findByKey(city, region, name, cat); + List districts = districtService.findAllByNameAndCat(city, region, name, cat); boolean exist = false; if (StringUtils.isNotBlank(id)) { for (District district2 : districts) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java index 3c555754b..394b7b033 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/IndexStatsController.java @@ -34,13 +34,13 @@ public class IndexStatsController { SimpleDateFormat sdf=new SimpleDateFormat("yyyyMM"); yearmonth=sdf.format(date); } - List statsIndexs=statsIndexService.findAllStatsNocat(yearmonth,"district",model.getSource()); + List statsIndexs=statsIndexService.findAllStatsNocat(Integer.valueOf(yearmonth),"district",model.getSource()); Integer earliestMonth = statsIndexService.findEarliestMonth(null, null, model.getSource()); model.setEarliestMonth(earliestMonth.toString().substring(0, 4) + "-" + earliestMonth.toString().substring(4)); List newStats=new ArrayList(); List oldStats=new ArrayList(); - List shopStats=statsIndexService.findAllStatsNocat(yearmonth,"shop",model.getSource()); - List officeStats=statsIndexService.findAllStatsNocat(yearmonth,"office",model.getSource()); + List shopStats=statsIndexService.findAllStatsNocat(Integer.valueOf(yearmonth),"shop",model.getSource()); + List officeStats=statsIndexService.findAllStatsNocat(Integer.valueOf(yearmonth),"office",model.getSource()); if(statsIndexs!=null && statsIndexs.size()>0){ for(StatsIndex stat:statsIndexs){ StatsIndex newstat=new StatsIndex(); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java index f77689d9e..353a79d8c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java @@ -44,6 +44,12 @@ public class ApiUserModel extends BaseModel { private String phone; + private Integer isMonitorStatistic; + + private Integer isMonitorUsed; + + private Integer isWarnExpired; + public String getPriceType() { return priceType; } @@ -635,4 +641,28 @@ public class ApiUserModel extends BaseModel { public void setPhone(String phone) { this.phone = phone; } + + public Integer getIsMonitorStatistic() { + return isMonitorStatistic; + } + + public void setIsMonitorStatistic(Integer isMonitorStatistic) { + this.isMonitorStatistic = isMonitorStatistic; + } + + public Integer getIsMonitorUsed() { + return isMonitorUsed; + } + + public void setIsMonitorUsed(Integer isMonitorUsed) { + this.isMonitorUsed = isMonitorUsed; + } + + public Integer getIsWarnExpired() { + return isWarnExpired; + } + + public void setIsWarnExpired(Integer isWarnExpired) { + this.isWarnExpired = isWarnExpired; + } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java index 54f85ab42..89565d57a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java @@ -3,6 +3,7 @@ package com.fangjia.bkoff.model; import com.fangjia.dal.mongo.model.DevelopmentZone; import com.fangjia.dal.mongo.model.LatlngPolygon; +import java.io.File; import java.util.Date; import java.util.List; import java.util.Map; @@ -35,6 +36,12 @@ public class DevelopmentZoneModel extends BaseModel { private String cityName1; + private String imgUrl; + + private File file; + + private String operateResult; + public String getAlias() { return alias; } @@ -194,4 +201,29 @@ public class DevelopmentZoneModel extends BaseModel { public void setCityName1(String cityName1) { this.cityName1 = cityName1; } + + public String getImgUrl() { + return imgUrl; + } + + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } + + public File getFile() { + return file; + } + + public void setFile(File file) { + this.file = file; + } + + + public String getOperateResult() { + return operateResult; + } + + public void setOperateResult(String operateResult) { + this.operateResult = operateResult; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 0681d3bfe..01b6b9d82 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -69,8 +69,29 @@ 鏄惁鐩戞帶 - 涓嶇洃鎺� - 鐩戞帶 + 涓嶇洃鎺� + 鐩戞帶 + + + + 鏄惁闇�瑕丄PI缁熻閲� + + 涓嶉渶瑕� + 闇�瑕� + + + + 鏄惁闇�瑕丄PI璐圭敤浣跨敤閲� + + 涓嶉渶瑕� + 闇�瑕� + + + + 鏄惁鎻愰啋鍗冲皢鍒版湡 + + 涓嶆彁閱� + 鎻愰啋 diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index cc656fb8e..bf62526e0 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -95,6 +95,27 @@ checked="checked" name="isMonitor" value="1" style="margin-left: 15px;"/>鐩戞帶 + + 鏄惁闇�瑕丄PI缁熻閲� + + checked="checked" name="isMonitorStatistic" value="0" />涓嶉渶瑕� + checked="checked" name="isMonitorStatistic" value="1" style="margin-left: 15px;"/>闇�瑕� + + + + 鏄惁闇�瑕丄PI璐圭敤浣跨敤閲� + + checked="checked" name="isMonitorUsed" value="0" />涓嶉渶瑕� + checked="checked" name="isMonitorUsed" value="1" style="margin-left: 15px;"/>闇�瑕� + + + + 鏄惁鎻愰啋鍗冲皢鍒版湡 + + checked="checked" name="isWarnExpired" value="0" />涓嶆彁閱� + checked="checked" name="isWarnExpired" value="1" style="margin-left: 15px;"/>鎻愰啋 + + Email diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index b64ba3bac..87f03a8be 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -1,320 +1,344 @@ <#ftl attributes={"content_type":"text/html; charset=UTF-8"}> <#compress> - - - - - 寮�鍙戝尯鍥存爮鍒楄〃 - - - - -<#include "/common_js.ftl" /> -<#include "/layout/header.ftl" /> -
- @@ -92,12 +105,56 @@ new BMap.Point(${latlng[0]?string("#.######")}, ${latlng[1]?string("#.######")})<#if latlng_index lt developmentZone.bdShape.coordinates?size>, ], {strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5}); - - - map.centerAndZoom(polygon.getBounds().getCenter(), 13); map.addOverlay(polygon); //澧炲姞澶氳竟褰� + // 澶勭悊coords鐨勬牸寮� + var coords = [ + <#list developmentZone.bdShape.coordinates as latlng> + { + lat: ${latlng[1]?string("#.######")}, + lng: ${latlng[0]?string("#.######")} + }<#if latlng_index lt developmentZone.bdShape.coordinates?size>, + + ]; + function haversine(lat1, lon1, lat2, lon2) { + const R = 6371; // 鍦扮悆鍗婂緞锛堝叕閲岋級 + const lat1Rad = lat1 * (Math.PI / 180); + const lat2Rad = lat2 * (Math.PI / 180); + const deltaLat = (lat2 - lat1) * (Math.PI / 180); + const deltaLon = (lon2 - lon1) * (Math.PI / 180); + + const a = Math.sin(deltaLat / 2) ** 2 + + Math.cos(lat1Rad) * Math.cos(lat2Rad) * + Math.sin(deltaLon / 2) ** 2; + + const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); + return R * c; // 杩斿洖璺濈锛堝叕閲岋級 + } + + function calculateArea(coords) { + let area = 0; + const n = coords.length; + + for (let i = 0; i < n; i++) { + const j = (i + 1) % n; + area += coords[i].lng * coords[j].lat; + area -= coords[j].lng * coords[i].lat; + } + area = Math.abs(area) / 2; // 骞虫柟搴� + + // 杞崲涓哄钩鏂瑰叕閲� + const conversionFactor = 111.32; // 澶х害姣忓害缁忕含搴︾殑鍏噷鏁帮紙鑰冭檻鍒板湴鐞冪殑鏇茬巼锛� + return area * conversionFactor * conversionFactor; // 杩斿洖闈㈢Н锛堝钩鏂瑰叕閲岋級 + } + + const areaInDegrees = calculateArea(coords); + // const areaInSquareKilometers = areaInDegrees * 123.5; // 杞崲涓哄钩鏂瑰叕閲� + const areaInSquareKilometers = areaInDegrees; // 杞崲涓哄钩鏂瑰叕閲� + document.getElementById('areaInSquareKilometers').value = areaInSquareKilometers.toFixed(2); + document.getElementById('areaDisplay').innerText = areaInSquareKilometers.toFixed(2) + ' 骞虫柟鍏噷'; + + diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index 49795b1c1..8623963f8 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -643,7 +643,7 @@ - + <#----> - + + - + <#---->