From 61bdc844feb8cccc6653bda36eefdecd435da89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Sun, 15 Jan 2023 20:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=B7=A5=E6=8C=87?= =?UTF-8?q?=E5=AF=BC=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AverageStatisticsController.java | 17 +++--- .../bkoff/util/BaseAvgImportServlet.java | 58 ++++++++++++++++--- .../main/webapp/averageStatistics/base.ftl | 14 ++++- .../webapp/avgPriceUpdate/districtDetail.ftl | 14 ++++- .../dal/mongo/model/AverageStatistics.java | 11 ++++ .../com/fangjia/dal/mongo/model/AvgBase.java | 22 ++++++- .../com/fangjia/script/wenyan/Test4.groovy | 18 ++++++ .../fangjia/AverageStatisticsService.java | 2 + .../fangjia/AverageStatisticsServiceImpl.java | 10 +++- 9 files changed, 144 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java index 3b91e6583..71ff8fb02 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java @@ -968,9 +968,6 @@ public class AverageStatisticsController { */ public Object baseAction(AverageStatisticsModel model){ Pager pager = model.getPager(25); - if (StringUtils.isBlank(model.getCityDisplay())) { - return model; - } pager.setTotalRows(avgBaseDao.count(model.getCityDisplay(), model.getRegion(), model.getName(),null, model.getStartDate(), model.getEndDate())); model.setBaseList(avgBaseDao.findAll(model.getCityDisplay(), model.getRegion(), model.getName(),null, model.getStartDate(), model.getEndDate(), pager)); return model; @@ -987,6 +984,8 @@ public class AverageStatisticsController { list.add("是否加入指导价"); list.add("调查时间"); list.add("调查人"); + list.add("来源"); + list.add("来源小区名"); data.add(list); HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("导入模板"); @@ -994,10 +993,12 @@ public class AverageStatisticsController { HSSFCell cell0 = row.createCell(0); HSSFCell cell1 = row.createCell(1); HSSFCell cell2 = row.createCell(2); - HSSFCell cell3= row.createCell(3); - HSSFCell cell4= row.createCell(4); - HSSFCell cell5= row.createCell(5); - HSSFCell cell6= row.createCell(6); + HSSFCell cell3 = row.createCell(3); + HSSFCell cell4 = row.createCell(4); + HSSFCell cell5 = row.createCell(5); + HSSFCell cell6 = row.createCell(6); + HSSFCell cell7 = row.createCell(7); + HSSFCell cell8 = row.createCell(8); cell0.setCellValue("城市"); cell1.setCellValue("区域"); cell2.setCellValue("小区名"); @@ -1005,6 +1006,8 @@ public class AverageStatisticsController { cell4.setCellValue("是否加入指导价"); cell5.setCellValue("调查时间"); cell6.setCellValue("调查人"); + cell7.setCellValue("来源"); + cell8.setCellValue("来源小区名"); HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java index f4594ad70..080be8617 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java @@ -8,11 +8,13 @@ import com.fangjia.core.util.HttpRequestException; import com.fangjia.dal.QueryParam; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.dao.AvgBaseDao; +import com.fangjia.dal.mongo.model.AverageStatistics; import com.fangjia.dal.mongo.model.AvgBase; import com.fangjia.dal.mongo.model.bkoff.GuidingPrice; import com.fangjia.dal.seaweed.model.District; import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.mongo.bkoff.GuidingPriceService; +import com.fangjia.service.mongo.fangjia.AverageStatisticsService; import net.sf.json.JSONObject; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; @@ -47,12 +49,12 @@ import java.util.*; public class BaseAvgImportServlet extends HttpServlet { - private static final String[] columns = { "城市", "区域", "小区名", "价格", "是否加入指导价", "调查时间", "调查人" }; + private static final String[] columns = { "城市", "区域", "小区名", "价格", "是否加入指导价", "调查时间", "调查人" , "来源", "来源小区名"}; private AvgBaseDao avgBaseDao; private GuidingPriceService guidingPriceService; private DistrictService districtService; - + private AverageStatisticsService averageStatisticsService; @Override public void init(ServletConfig config) throws ServletException { @@ -62,6 +64,7 @@ public class BaseAvgImportServlet extends HttpServlet { avgBaseDao = (AvgBaseDao) context.getBean("avgBaseDao"); guidingPriceService = (GuidingPriceService) context.getBean("guidingPriceService"); districtService = (DistrictService) context.getBean("districtService"); + averageStatisticsService = (AverageStatisticsService) context.getBean("averageStatisticsService"); } catch (Exception e) { e.printStackTrace(); } @@ -385,17 +388,56 @@ public class BaseAvgImportServlet extends HttpServlet { Date applyDate = (DateUtil.parseDate(map.get(key), "yyyy-MM-dd")); avgBase.setCreationDate(applyDate == null ? curDate : applyDate); } else if (key.equals("调查人") && map.get(key) != null) { - avgBase.setUserName(map.get(key)); + } else if (key.equals("来源") && map.get(key) !=null){ + avgBase.setSource(map.get(key).replaceAll("\\s", "")); + } else if (key.equals("来源小区名") && map.get(key) != null){ + avgBase.setSourceCommName(map.get(key).replaceAll("\\s", "")); } avgBase.setCategory("district"); - } - if (avgBase.getIsGuidancePrice() == 1) { - + District dis = null; + if(StringUtils.isNotBlank(avgBase.getSourceCommName()) && !avgBase.getSourceCommName().equals(avgBase.getDistrictName())){ DistrictKey districtKey = new DistrictKey(avgBase.getCity(), avgBase.getRegion(), avgBase.getDistrictName()); - District dis = districtService.findOneByKey(districtKey, "district"); + dis = districtService.findOneByKey(districtKey, "district"); + if(dis.getAlias() == null){ + dis.setAlias(Collections.singletonList(avgBase.getSourceCommName())); + }else if(!dis.getAlias().contains(avgBase.getSourceCommName())){ + dis.getAlias().add(avgBase.getSourceCommName()); + } + if(dis.getMappingAlias() == null){ + dis.setMappingAlias(Collections.singletonList(avgBase.getSourceCommName())); + }else if(!dis.getMappingAlias().contains(avgBase.getSourceCommName())){ + dis.getMappingAlias().add(avgBase.getSourceCommName()); + } + districtService.save(dis); + } + if(StringUtils.isNotBlank(avgBase.getSource()) && avgBase.getSource().equalsIgnoreCase("GXD")){ + AverageStatistics averageStatistics = averageStatisticsService.findSecendAverageStatictics(avgBase.getCity(), avgBase.getRegion(), avgBase.getDistrictName(), "district"); + if(averageStatistics != null){ + averageStatistics.setGxdEsfPrice(avgBase.getPrice()); + }else{ + averageStatistics = new AverageStatistics(); + averageStatistics.setGxdEsfPrice(avgBase.getPrice()); + averageStatistics.setCategory("district"); + averageStatistics.setCity(avgBase.getCity()); + averageStatistics.setRegion(avgBase.getRegion()); + averageStatistics.setName(avgBase.getDistrictName()); + if(dis != null){ + averageStatistics.setMasterDistrictName(dis.getDistrictName()); + averageStatistics.setModificationDate(new Date()); + } + } + averageStatisticsService.save(averageStatistics); + } + + if (avgBase.getIsGuidancePrice() == 1) { + if(dis == null){ + DistrictKey districtKey = new DistrictKey(avgBase.getCity(), avgBase.getRegion(), + avgBase.getDistrictName()); + dis = districtService.findOneByKey(districtKey, "district"); + } GuidingPrice price = guidingPriceService.findByBizKey(avgBase.getCity(), avgBase.getRegion(), avgBase.getDistrictName(),avgBase.getCreationDate()); if (price != null) { @@ -414,7 +456,7 @@ public class BaseAvgImportServlet extends HttpServlet { price.setGuidingPerson(avgBase.getUserName()); price.setGuidingDate(avgBase.getCreationDate()); price.setGuidingValue(avgBase.getPrice()); - price.setEstateType(dis.getEstateType2().indexOf("别墅") > -1 ? "别墅" : "普通住宅"); + price.setEstateType(dis.getEstateType2().contains("别墅") ? "别墅" : "普通住宅"); price.setCat("district"); guidingPriceService.save(price); HttpRequest request = new HttpRequest(); diff --git a/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl b/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl index 417d20240..dd6935446 100644 --- a/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl @@ -66,6 +66,8 @@ 鏄惁鍔犲叆鎸囧浠� 璋冩煡鏃堕棿 璋冩煡浜� + 鏉ユ簮 + 鏉ユ簮灏忓尯鍚� @@ -94,7 +96,17 @@ <#if it.userName??> ${it.userName} - + + + <#if it.source??> + ${it.source} + + + + <#if it.sourceCommName??> + ${it.sourceCommName} + + diff --git a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl index a3cb6949e..b173ee86a 100644 --- a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl @@ -254,6 +254,9 @@ <#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??> 365鎴夸骇 + <#if (it.gxdNewPrice)?? || (it.gxdEsfPrice)??> + GXD + @@ -345,7 +348,10 @@ 鏂版埧 浜屾墜鎴� - + <#if (it.gxdNewPrice)?? || (it.gxdEsfPrice)??> + 鏂版埧 + 浜屾墜鎴� + @@ -430,7 +436,7 @@ <#if (it.ganjiNewPrice)?? || (it.ganjiEsfPrice)??> ${it.ganjiNewPrice!} ${it.ganjiEsfPrice!} - + <#if (it.yungujiaNewPrice)?? || (it.yungujiaEsfPrice)??> ${it.yungujiaNewPrice!} ${it.yungujiaEsfPrice!} @@ -443,6 +449,10 @@ ${it.tsfhouseNewPrice!} ${it.tsfhouseEsfPrice!} + <#if (it.gxdNewPrice)?? || (it.gxdEsfPrice)??> + ${it.gxdNewPrice!} + ${it.gxdEsfPrice!} + diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java index 7b2405df1..da498918c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java @@ -166,6 +166,8 @@ public class AverageStatistics implements MongoEntity { private Double tsfhouseEsfDiff; private Integer tsfhouseNewPrice; private Double tsfhouseNewDiff; + /**国信达*/ + private Integer gxdEsfPrice; private String level;//价格评级 private Integer lastAvgPrice;//最终价 @@ -1155,4 +1157,13 @@ public class AverageStatistics implements MongoEntity { public void setTsfhouseNewDiff(Double tsfhouseNewDiff) { this.tsfhouseNewDiff = tsfhouseNewDiff; } + + @Column(name = "gxd_esf_price") + public Integer getGxdEsfPrice() { + return gxdEsfPrice; + } + + public void setGxdEsfPrice(Integer gxdEsfPrice) { + this.gxdEsfPrice = gxdEsfPrice; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java index 394785d9d..4d1c1dfbf 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java @@ -30,9 +30,9 @@ public class AvgBase implements MongoEntity{ private String category; private Integer status; private String dateStr; - - private Integer isGuidancePrice; + private String source; + private String sourceCommName; @Id @GeneratedValue @@ -135,4 +135,22 @@ public class AvgBase implements MongoEntity{ public void setDateStr(String dateStr) { this.dateStr = dateStr; } + + @Column(name = "source") + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + @Column(name = "source_comm_name") + public String getSourceCommName() { + return sourceCommName; + } + + public void setSourceCommName(String sourceCommName) { + this.sourceCommName = sourceCommName; + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy index 09877e434..f13913aca 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy @@ -1 +1,19 @@ package com.fangjia.script.wenyan + +import com.fangjia.core.ProvinceData +import com.fangjia.core.util.DateUtil +import com.fangjia.core.util.Mongo3Utils +import com.fangjia.datastore.driver.DSCollection +import com.fangjia.datastore.driver.DataStore +import com.fangjia.script.util.CommonUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils +import com.mongodb.client.MongoCollection +import org.bson.Document + +MongoCollection documents = Mongo3Utils.getDbCollection("fangjia", "deal_price") + +ProvinceData.getAllCity("海南").each{def it-> + long c = documents.countDocuments(new Document("city", it).append("trade_date", new Document('$gt', DateUtil.add(new Date(), Calendar.YEAR, -3)))) + println("${it}\t${c}") +} \ No newline at end of file diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java index 25eb7040d..4fff15570 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java @@ -17,4 +17,6 @@ public interface AverageStatisticsService { AverageStatistics findSecendAverageStatictics(String city,String region,String name,String category); Map findFirstAverageStatictics(String city,String region,String name,String category, Date sDate); + + AverageStatistics save(AverageStatistics averageStatistics); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java index 772d5594c..fef0b66b5 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java @@ -198,8 +198,14 @@ public class AverageStatisticsServiceImpl implements AverageStatisticsService { } return dataMap; } - - + + @Override + public AverageStatistics save(AverageStatistics averageStatistics) { + averageStatisticsDao.save(averageStatistics); + return averageStatistics; + } + + private boolean isValid(Integer value) { if (value != null && value > 1000) { return true;