From 3f35d0cb71fa046e4f20aa312351b7fc3946e0c6 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Tue, 30 May 2023 15:33:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=85=E5=A7=94?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../temp/shenjian/poi/CommitteeLatLng.groovy | 4 ++-- .../temp/shenjian/util/GaoDeUtils.groovy | 22 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy index c1a7d36eb..db1f5a13d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy @@ -24,7 +24,7 @@ class CommitteeLatLng { static ExecutorService executorService = Executors.newFixedThreadPool(10) static void main(String[] args) { - dealPoi(new BasicDBObject("status_location", new BasicDBObject('$ne', 0)).append("year", 2021)) + dealPoi(new BasicDBObject("location", "").append("year", 2022)) //dealLocation() executorService.shutdown() } @@ -71,7 +71,7 @@ class CommitteeLatLng { if (amapPoi && amapPoi.size() > 0) { def poi = amapPoi[0] double similarity = CosineSimilarAlgorithm.getSimilarity(poi.name, name) - if (similarity <= 0.8) { + if (similarity <= 0.8 && !String.valueOf(poi.name).contains(name)) { amapPoi = GaoDeUtils.searchPoi(city, address, area, "") } poi = amapPoi[0] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy index 2a34dd4b3..30b2e3a65 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy @@ -55,13 +55,17 @@ class GaoDeUtils { * @return */ static String getGaodeKey(String type) { - Map params = new HashMap<>(); - params.put("type", type) - JSONObject json = HttpRequestUtil.getJsonContent("http://192.168.0.100:38080/FangJiaDataService/getAmapKey", params) - if (json.status == 0 && json.result != null) { - return json.result - } - System.exit(1); +// Map params = new HashMap<>(); +// params.put("type", type) +// JSONObject json = HttpRequestUtil.getJsonContent("http://192.168.0.100:38080/FangJiaDataService/getAmapKey", params) +// if (json.status == 0 && json.result != null) { +// return json.result +// } +// System.exit(1); + return "8796b9dfb3889b57c38e2fff1b7e51bd"; +// 'eb69e4ad2a9cdd31f163a0ed32effe6e', '60f764d228d64addf390e28d68a01a35', '66e6771767ab293ace441553c36621c1', +// 'a63254b4a1b2e6f4bb11058e0b5d9fa2', '743ad872ad39f0a10665b28fa968af0b', '3b7c1d201c403bb416b63535ed3d0e98', +// 'a34894d151fffff94f9a33bae3d5565c', '389e0a3a155e8d28728c3faede4ebd4f' } /** @@ -330,10 +334,10 @@ class GaoDeUtils { params.page = "${page}".toString() page++ params.key = this.getGaodeKey("v5/place/text") - JSONObject json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v5/place/text", params); + JSONObject json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v3/place/text", params); if (json == null) { params.key = this.getGaodeKey("v5/place/text") - json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v5/place/text", params); + json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v3/place/text", params); } if (json && json.info && json.info == "OK") { count = json.getString("count").toInteger() From 71ab29cee7925885b2013f2be3e7a93a3b41a73d Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Thu, 6 Jul 2023 13:41:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A5=BC=E6=A0=8B?= =?UTF-8?q?=E7=B3=BB=E6=95=B0=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/BuildingRatioController.java | 160 ++++++++++++++++++ .../bkoff/model/BuildingRatioModel.java | 125 ++++++++++++++ .../src/main/webapp/buildingRatio/add.ftl | 73 ++++++++ .../src/main/webapp/buildingRatio/edit.ftl | 74 ++++++++ .../src/main/webapp/buildingRatio/list.ftl | 108 ++++++++++++ .../src/main/webapp/layout/menu.ftl | 1 + .../dal/mongo/dao/bkoff/BuildingRatioDao.java | 12 ++ .../mongo/dao/bkoff/BuildingRatioDaoImpl.java | 12 ++ .../dal/mongo/model/bkoff/BuildingRatio.java | 95 +++++++++++ .../fangjia/service/bo/BuildingRatioBo.java | 85 ++++++++++ .../mongo/bkoff/BuildingRatioService.java | 18 ++ .../mongo/bkoff/BuildingRatioServiceImpl.java | 78 +++++++++ 12 files changed, 841 insertions(+) create mode 100644 projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java create mode 100644 projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java create mode 100644 projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl create mode 100644 projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl create mode 100644 projects/fangjia-bkoff/src/main/webapp/buildingRatio/list.ftl create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDao.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDaoImpl.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BuildingRatio.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/bo/BuildingRatioBo.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioServiceImpl.java diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java new file mode 100644 index 000000000..ad1eae98b --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java @@ -0,0 +1,160 @@ +package com.fangjia.bkoff.controllers; + +import com.fangjia.bkoff.model.BuildingRatioModel; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; +import com.fangjia.service.bo.BuildingRatioBo; +import com.fangjia.service.mongo.bkoff.BuildingRatioService; +import org.apache.commons.lang.StringUtils; + +import java.net.URLEncoder; +import java.util.*; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioController { + + private BuildingRatioService buildingRatioService; + + /** + * н¨¥¶°ϵÊýÐÅϢ + * + * @param model + * @return + */ + public Object doAddAction(BuildingRatioModel model) throws Exception { + if (StringUtils.isBlank(model.getCity_name()) || StringUtils.isBlank(model.getRegion()) + || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getBuilding_name()) + || model.getRatio() == null) { + model.setMsg("³ÇÊÐ,ÇøÓò,СÇø,¥¶°Ãû³Æ,¥¶°ϵÊý²»ÄÜΪ¿Õ"); + model.forward("/buildingRatio/add"); + return model; + } + try { + Date date = new Date(); + BuildingRatio buildingRatio = new BuildingRatio(); + buildingRatio.setCity(model.getCity_name()); + buildingRatio.setRegion(model.getRegion()); + buildingRatio.setDistrict(model.getDistrict()); + buildingRatio.setBuilding_name(model.getBuilding_name()); + buildingRatio.setRatio(model.getRatio()); + buildingRatio.setC_date(date); + buildingRatio.setM_date(date); + this.buildingRatioService.save(buildingRatio); + + model.setMsg("н¨³ɹ¦!"); + } catch (Exception e) { + e.printStackTrace(); + model.setMsg("н¨ʧ°Ü!"); + } + model.redirect("/buildingRatio/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); + return model; + } + + public Object doDeleteAction(BuildingRatioModel model){ + if(StringUtils.isNotBlank(model.getId())){ + this.buildingRatioService.deleteById(model.getId()); + } + model.setViewType("redirect"); + model.setViewParam("location","/buildingRatio/list"); + return model; + } + + /** + * Ð޸Ä¥¶°ϵÊýÐÅϢ + * + * @param model + * @return + */ + public Object updateAction(BuildingRatioModel model){ + String id = model.getId(); + if (StringUtils.isBlank(model.getCity_name()) || + StringUtils.isBlank(model.getRegion()) || + StringUtils.isBlank(model.getDistrict()) || + StringUtils.isBlank(model.getBuilding_name()) || + model.getRatio() == null) { + model.setMsg("³ÇÊÐ,ÇøÓò,СÇø,¥¶°Ãû³Æ,¥¶°ϵÊý²»ÄÜΪ¿Õ"); + model.forward("/buildingRatio/edit"); + return model; + } + + Map data_buildingRatio = new HashMap(); + + data_buildingRatio.put("id", model.getId()); + data_buildingRatio.put("city", model.getCity_name()); + data_buildingRatio.put("region", model.getRegion()); + data_buildingRatio.put("district", model.getDistrict()); + data_buildingRatio.put("building_name", model.getBuilding_name()); + data_buildingRatio.put("ratio", model.getRatio()); + data_buildingRatio.put("m_date", new Date()); + + this.buildingRatioService.saveOrUpdateByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name(), data_buildingRatio); + + model.setViewType("redirect"); + model.setViewParam("location", "/buildingRatio/list"); + + return model; + } + + public Object listAction(BuildingRatioModel model) { + + List buildingRatioList = this.buildingRatioService.findAllByDistrict(model.getCity_name(),model.getRegion(),model.getDistrict()); + + List buildingRatioBoList = new ArrayList(); + + for (BuildingRatio buildingRatio : buildingRatioList) { + BuildingRatioBo bo = new BuildingRatioBo(); + + bo.setId(buildingRatio.getId()); + bo.setCity_name(buildingRatio.getCity()); + bo.setRegion(buildingRatio.getRegion()); + bo.setDistrict(buildingRatio.getDistrict()); + bo.setBuilding_name(buildingRatio.getBuilding_name()); + bo.setRatio(buildingRatio.getRatio()); + bo.setC_date(buildingRatio.getC_date()); + bo.setM_date(buildingRatio.getM_date()); + + buildingRatioBoList.add(bo); + } + + model.setBuildingRatioBoList(buildingRatioBoList); + return model; + } + + public Object addAction(BuildingRatioModel model) { + return model; + } + + /** + * ±༭apiÓû§ÐÅϢ + * + * @param model + * @return + */ + public Object editAction(BuildingRatioModel model) { + BuildingRatio buildingRatio = this.buildingRatioService.findBuildingRatioById(model.getId()); + + BuildingRatioBo bo = new BuildingRatioBo(); + bo.setId(buildingRatio.getId()); + bo.setCity_name(buildingRatio.getCity()); + bo.setRegion(buildingRatio.getRegion()); + bo.setDistrict(buildingRatio.getDistrict()); + bo.setBuilding_name(buildingRatio.getBuilding_name()); + bo.setRatio(buildingRatio.getRatio()); + + model.setBuildingRatioBo(bo); + if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { + model.setMsg("¸üгɹ¦£¡"); + } + return model; + } + + public BuildingRatioService getBuildingRatioService() { + return buildingRatioService; + } + + public void setBuildingRatioService(BuildingRatioService buildingRatioService) { + this.buildingRatioService = buildingRatioService; + } +} diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java new file mode 100644 index 000000000..ec8ed47b2 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java @@ -0,0 +1,125 @@ +package com.fangjia.bkoff.model; + +import com.fangjia.service.bo.BuildingRatioBo; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioModel extends BaseModel{ + + private String id; + private String city_name; + private String region; + private String district; + private String building_name; + private String building_id; + private Double ratio; + private String msg; + private List buildingRatioBoList; + private BuildingRatioBo buildingRatioBo; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date c_date; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date m_date; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCity_name() { + return city_name; + } + + public void setCity_name(String city_name) { + this.city_name = city_name; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district_name) { + this.district = district_name; + } + + public String getBuilding_name() { + return building_name; + } + + public void setBuilding_name(String building_name) { + this.building_name = building_name; + } + + public String getBuilding_id() { + return building_id; + } + + public void setBuilding_id(String building_id) { + this.building_id = building_id; + } + + public Double getRatio() { + return ratio; + } + + public void setRatio(Double ratio) { + this.ratio = ratio; + } + + public Date getC_date() { + return c_date; + } + + public void setC_date(Date c_date) { + this.c_date = c_date; + } + + public Date getM_date() { + return m_date; + } + + public void setM_date(Date m_date) { + this.m_date = m_date; + } + + public List getBuildingRatioBoList() { + return buildingRatioBoList; + } + + public void setBuildingRatioBoList(List buildingRatioBoList) { + this.buildingRatioBoList = buildingRatioBoList; + } + + public BuildingRatioBo getBuildingRatioBo() { + return buildingRatioBo; + } + + public void setBuildingRatioBo(BuildingRatioBo buildingRatioBo) { + this.buildingRatioBo = buildingRatioBo; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } +} diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl new file mode 100644 index 000000000..8b74961e8 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl @@ -0,0 +1,73 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 楼栋系数新增 + + <#include "/common_js.ftl" /> + + + + <#include "/layout/header.ftl" /> +
+${msg!''} + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 栏位 + + 值 +
城市
区域
小区名称
楼栋名称
楼栋系数
+
+
+ + + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl new file mode 100644 index 000000000..a6f8f264c --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl @@ -0,0 +1,74 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 楼栋系数信息修改 + + + <#include "/common_js.ftl" /> + + + + + + <#include "/layout/header.ftl" /> +
+ ${msg!''} + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 栏位 + + 值 +
城市
区域
小区名称
楼栋名称
楼栋系数
+
+
+ + + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/list.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/list.ftl new file mode 100644 index 000000000..d6560fbaf --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/list.ftl @@ -0,0 +1,108 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 均价管理-楼栋系数管理 + + <#include "/common_js.ftl" /> + + + <#include "/layout/header.ftl" /> + +
+
+ 城市: + 区域: + 小区: + +
+
+ +
+ ${msg!''} + +
+
+
+ 共有楼栋系数${buildingRatioBoList?size}个 +
+ + + + + + + + + + + + + + + <#if (buildingRatioBoList??&&buildingRatioBoList?size>0)> + <#list buildingRatioBoList as bo> + + + + + + + + + + + + + +
+ ID + + 城市 + + 区域 + + 小区名称 + + 楼栋名称 + + 楼栋系数 + + 创建日期 + + 修改日期 + + 操作 +
+ ${bo.id!} + + ${bo.city_name!} + + ${bo.region!} + + ${bo.district!} + + ${bo.building_name!} + + ${bo.ratio!} + + <#if bo.c_date??> + ${bo.c_date?string("yyyy年MM月dd日 HH:mm:ss")} + + + <#if bo.m_date??> + ${bo.m_date?string("yyyy年MM月dd日 HH:mm:ss")} + + + 编辑 + 删除 +
+
+
+ + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl b/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl index 719e92e83..d44922973 100644 --- a/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl @@ -90,6 +90,7 @@
    <@menuitem uri='/avgPriceUpdate/doCreatTask' text="住宅均价管理" /> <@menuitem uri='/averagerConfig/list' text="住宅系数管理" /> + <@menuitem uri='/buildingRatio/list' text="楼栋系数管理" /> <@menuitem uri='/avgPriceUpdate/listQR' text="价格质量跟踪" /> <@menuitem uri='/avgPriceUpdate/listSQR' text="样本质量跟踪" /> <@menuitem uri='/comparePrice/listQR' text="调查数据跟踪" /> diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDao.java new file mode 100644 index 000000000..f530cfff3 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDao.java @@ -0,0 +1,12 @@ +package com.fangjia.dal.mongo.dao.bkoff; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.bkoff.AveragerConfig; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public interface BuildingRatioDao extends MongoDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDaoImpl.java new file mode 100644 index 000000000..192ad0456 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDaoImpl.java @@ -0,0 +1,12 @@ +package com.fangjia.dal.mongo.dao.bkoff; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.bkoff.AveragerConfig; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioDaoImpl extends MongoDaoImpl implements BuildingRatioDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BuildingRatio.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BuildingRatio.java new file mode 100644 index 000000000..70d186d25 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BuildingRatio.java @@ -0,0 +1,95 @@ +package com.fangjia.dal.mongo.model.bkoff; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +@Entity +@Table(name = "business.building_ratio") +public class BuildingRatio implements MongoEntity { + + private String id; + private String city; + private String region; + private String district; + private String building_name; + + private Double ratio; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date c_date; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date m_date; + + @Id + @GeneratedValue + @Column(name = "_id") + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + @Column(name = "city") + public String getCity() { + return city; + } + public void setCity(String city) { + this.city = city; + } + @Column(name = "region") + public String getRegion() { + return region; + } + public void setRegion(String region) { + this.region = region; + } + @Column(name = "district") + public String getDistrict() { + return district; + } + public void setDistrict(String district) { + this.district = district; + } + @Column(name = "building_name") + public String getBuilding_name() { + return building_name; + } + public void setBuilding_name(String building_name) { + this.building_name = building_name; + } + @Column(name = "ratio") + public Double getRatio() { + return ratio; + } + public void setRatio(Double ratio) { + this.ratio = ratio; + } + @Column(name = "c_date") + public Date getC_date() { + return c_date; + } + public void setC_date(Date c_date) { + this.c_date = c_date; + } + @Column(name = "m_date") + public Date getM_date() { + return m_date; + } + public void setM_date(Date m_date) { + this.m_date = m_date; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/bo/BuildingRatioBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/BuildingRatioBo.java new file mode 100644 index 000000000..2dbb9d257 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/BuildingRatioBo.java @@ -0,0 +1,85 @@ +package com.fangjia.service.bo; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioBo implements Serializable { + + private static final long serialVersionUID = 1L; + private String id; + private String city_name; + private String region; + private String district; + private String building_name; + private Double ratio; + private Date c_date; + private Date m_date; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCity_name() { + return city_name; + } + + public void setCity_name(String city_name) { + this.city_name = city_name; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getBuilding_name() { + return building_name; + } + + public void setBuilding_name(String building_name) { + this.building_name = building_name; + } + + public Double getRatio() { + return ratio; + } + + public void setRatio(Double ratio) { + this.ratio = ratio; + } + + public Date getC_date() { + return c_date; + } + + public void setC_date(Date c_date) { + this.c_date = c_date; + } + + public Date getM_date() { + return m_date; + } + + public void setM_date(Date m_date) { + this.m_date = m_date; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioService.java new file mode 100644 index 000000000..422a90a41 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioService.java @@ -0,0 +1,18 @@ +package com.fangjia.service.mongo.bkoff; + +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; + +import java.util.List; +import java.util.Map; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public interface BuildingRatioService { + public void save(BuildingRatio buildingRatio); + public void deleteById(String id); + public void saveOrUpdateByBuildingName(String city, String region, String district, String building_name, Map data); + public BuildingRatio findBuildingRatioById(String id); + public List findAllByDistrict(String city, String region, String district); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioServiceImpl.java new file mode 100644 index 000000000..6ab6e1fd3 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioServiceImpl.java @@ -0,0 +1,78 @@ +package com.fangjia.service.mongo.bkoff; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.dao.bkoff.BuildingRatioDao; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; +import com.fangjia.dal.sql.model.FjtUsers; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioServiceImpl implements BuildingRatioService{ + + private BuildingRatioDao buildingRatioDao; + + @Override + public void save(BuildingRatio buildingRatio) { + + this.buildingRatioDao.save(buildingRatio); + } + + @Override + public void deleteById(String id) { + this.buildingRatioDao.deleteById(id); + } + @Override + public void saveOrUpdateByBuildingName(String city, String region, String district, String building_name, Map data) { + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("region", region)); + params.add(new QueryParam("district", district)); + params.add(new QueryParam("building_name", building_name)); + data.put("city", city); + data.put("region", region); + data.put("district", district); + data.put("building_name", building_name); + this.buildingRatioDao.updateByParams(data, params, true); + } + + @Override + public BuildingRatio findBuildingRatioById(String id) { + + return this.buildingRatioDao.findById(id); + } + + @Override + public List findAllByDistrict(String city, String region, String district) { + List params = new ArrayList(); + if(StringUtils.isNotBlank(city)){ + params.add(new QueryParam("city", city)); + } + if(StringUtils.isNotBlank(region)){ + params.add(new QueryParam("region", region)); + } + if(StringUtils.isNotBlank(district)){ + params.add(new QueryParam("district", district)); + } + + List sortParams = new ArrayList(); + sortParams.add(new SortParam("m_date", false)); + + return this.buildingRatioDao.findAllByParams(params, sortParams); + } + + public BuildingRatioDao getBuildingRatioDao() { + return buildingRatioDao; + } + + public void setBuildingRatioDao(BuildingRatioDao buildingRatioDao) { + this.buildingRatioDao = buildingRatioDao; + } +}