From 57a78e5c8661a20b50cadb754ba0d7cae6f4dc10 Mon Sep 17 00:00:00 2001 From: purple Date: Tue, 11 Aug 2020 15:03:45 +0800 Subject: [PATCH] =?UTF-8?q?feature(=E4=BC=98=E5=8C=96=E4=BD=9C=E4=BB=B7?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0)=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 接入es提升查询效率 2. 配置一套module，查询买卖成交案例 3. 配置住宅租赁汇总案例module 3. 新增菜单icon --- .../src/views/data/cases/UVClosingCase.vue | 51 +++++++-------- .../cases/controller/CasesController.java | 53 +++++++++++++++ ...e.java => AggregateResidenceRentCase.java} | 65 ++++++++++++++++++- .../AggregateResidenceRentCaseMapper.java | 48 ++++++++++++++ .../ResidenceRentAggregationCaseMapper.java | 27 -------- .../sync/SyncResidenceRentCaseMapper.java | 12 ++-- .../IAggregateResidenceRentCaseService.java | 38 +++++++++++ .../service/IOriginalNewHouseCaseService.java | 8 +++ ...AggregateResidenceRentCaseServiceImpl.java | 55 ++++++++++++++++ .../impl/OriginalNewHouseCaseServiceImpl.java | 6 ++ ...alResidenceRentClosingCaseServiceImpl.java | 17 ++--- .../ComputeResidenceRentPriceMapper.java | 3 + ...tificialResidenceRentPriceServiceImpl.java | 4 -- ...l => AggregateResidenceRentCaseMapper.xml} | 50 ++++++++++++-- ...OriginalResidenceRentClosingCaseMapper.xml | 2 +- .../data/SyncResidenceRentCaseMapper.xml | 2 +- .../mybatis/data/UvClosingCaseMapper.xml | 6 ++ 17 files changed, 364 insertions(+), 83 deletions(-) rename ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/{CleanResidenceRentAggregationCase.java => AggregateResidenceRentCase.java} (86%) create mode 100644 ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/AggregateResidenceRentCaseMapper.java delete mode 100644 ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/ResidenceRentAggregationCaseMapper.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IAggregateResidenceRentCaseService.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/AggregateResidenceRentCaseServiceImpl.java rename ruoyi/src/main/resources/mybatis/data/{ResidenceRentAggregationCaseMapper.xml => AggregateResidenceRentCaseMapper.xml} (77%) diff --git a/ruoyi-ui/src/views/data/cases/UVClosingCase.vue b/ruoyi-ui/src/views/data/cases/UVClosingCase.vue index 37796b02d..c991d503d 100644 --- a/ruoyi-ui/src/views/data/cases/UVClosingCase.vue +++ b/ruoyi-ui/src/views/data/cases/UVClosingCase.vue @@ -53,38 +53,25 @@ - - - - - - - - + + + + + + + + - - - - - + + + + { - this.dataList = response.rows; + var arr = []; + for (var i = 0; i < response.rows.length; i++) { + var v = response.rows[i]; + v["location"] = + v["caseDistrict"] + "/" + v["caseBlock"] + "/" + v["caseLoop"]; + arr.push(v); + } + console.log(arr); + this.dataList = arr; this.total = response.total; this.loading = false; }); @@ -145,6 +140,8 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.dealIdList = []; + this.address = undefined; this.handleQuery(); }, dealIdChange(val) { diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java index 09885ddc8..13923ff4a 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java @@ -1,11 +1,19 @@ package com.ruoyi.project.data.cases.controller; import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.framework.aspectj.lang.annotation.Log; +import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.framework.web.page.TableSupport; +import com.ruoyi.project.common.VueSelectModel; +import com.ruoyi.project.data.cases.domain.AggregateResidenceRentCase; import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase; +import com.ruoyi.project.data.cases.service.IAggregateResidenceRentCaseService; import com.ruoyi.project.data.cases.service.IOriginalNewHouseCaseService; +import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice; import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -26,6 +34,8 @@ public class CasesController extends BaseController { @Autowired private IOriginalNewHouseCaseService originalNewHouseCaseService; + @Autowired + private IAggregateResidenceRentCaseService aggregateResidenceRentCaseService; /** * 一手房成交案例 @@ -38,4 +48,47 @@ public class CasesController extends BaseController { originalNewHouseCaseService.selectList(originalNewHouseCase); return getDataTable(list, total); } + + /** + * 住宅租赁案例汇总 + * + * @param queryModel + * @return + */ + @PreAuthorize("@ss.hasPermi('cases:aggregateResidenceRentCase:list')") + @GetMapping("/residence/aggregate-rent-case/list") + public TableDataInfo aggregateResidenceRentCaseList(AggregateResidenceRentCase queryModel) { + int pageIndex = ServletUtils.getParameterToInt("pageIndex"); + int pageSize = ServletUtils.getParameterToInt(TableSupport.PAGE_SIZE); + queryModel.setOffset(pageIndex <= 1 ? 0 : (pageIndex - 1) * pageSize); + queryModel.setLimit(pageSize); + + int total = aggregateResidenceRentCaseService.pageCount(queryModel); + List list = + aggregateResidenceRentCaseService.pageList(queryModel); + return getDataTable(list, total); + } + + @PreAuthorize("@ss.hasPermi('cases:aggregateResidenceRentCase:list')") + @GetMapping("/residence/aggregate-rent-case/yearmonth") + public AjaxResult yearMonthList() { + List list = aggregateResidenceRentCaseService.yearMonthList(); + return AjaxResult.success(list); + } + + /** + * 导出 住宅租赁基价列表 + */ + @PreAuthorize("@ss.hasPermi('cases:aggregateResidenceRentCase:export')") + @Log(title = "住宅租赁汇总案例", businessType = BusinessType.EXPORT) + @GetMapping("/residence/aggregate-rent-case/export") + public AjaxResult export(AggregateResidenceRentCase queryModel) { + int total = aggregateResidenceRentCaseService.pageCount(queryModel); + queryModel.setOffset(0); + queryModel.setLimit(total); + List list = + aggregateResidenceRentCaseService.pageList(queryModel); + ExcelUtil util = new ExcelUtil<>(AggregateResidenceRentCase.class); + return util.exportExcel(list, "住宅租赁汇总案例" + queryModel.getYearMonth()); + } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/CleanResidenceRentAggregationCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/AggregateResidenceRentCase.java similarity index 86% rename from ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/CleanResidenceRentAggregationCase.java rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/AggregateResidenceRentCase.java index 163fe750e..21c829d96 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/CleanResidenceRentAggregationCase.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/AggregateResidenceRentCase.java @@ -1,234 +1,293 @@ package com.ruoyi.project.data.cases.domain; +import com.ruoyi.framework.aspectj.lang.annotation.Excel; +import com.ruoyi.framework.web.domain.BaseEntity; + import java.math.BigDecimal; import java.util.Date; /** - * 租赁汇总案例 + * 住宅租赁汇总案例 + * + * @author lihe */ -public class CleanResidenceRentAggregationCase { +public class AggregateResidenceRentCase extends BaseEntity { private Integer yearMonth; /** * 案例单套ID */ + @Excel(name = "案例单套ID") private String householdsIdSRC; /** * 案例小区ID */ + @Excel(name = "案例小区ID") private String projectIdSRC; /** * 小区ID */ + @Excel(name = "小区ID") private String communityId; - + @Excel(name = "楼栋ID") private String buildingId; /** * WHEN A.RentType=1 THEN ''整租'' * WHEN A.RentType=2 THEN ''散租'' * WHEN A.RentType=3 THEN ''分租'' */ + @Excel(name = "1=整租,2=散租,3=分租") private Integer rentType; /** * 室 */ + @Excel(name = "室") private Integer roomNum; /** * 厅 */ + @Excel(name = "厅") private Integer hallNum; /** * 卫 */ + @Excel(name = "卫") private Integer bashRoomNum; /** * 面积 */ + @Excel(name = "面积") private BigDecimal area; /** * 朝向 */ + @Excel(name = "朝向") private String toward; /** * UpperFloorSum 总层数 */ + @Excel(name = "总层数") private String totalFloor; /** * UpperFloorNum 所在层 */ + @Excel(name = "所在层") private String currentFloor; /** * 有无电梯 */ + @Excel(name = "有无电梯") private Boolean elevator; /** * 装修类型 */ + @Excel(name = "装修类型") private String decoration; /** * 建成年代 */ + @Excel(name = "建成年代") private Integer year; /** * 房屋面积系数 */ + @Excel(name = "房屋面积系数") private BigDecimal areaCoefficient; /** * 朝向系数 */ + @Excel(name = "朝向系数") private BigDecimal towardCoefficient; /** * 楼层系数 */ + @Excel(name = "楼层系数") private BigDecimal floorCoefficient; /** * 装修系数 */ + @Excel(name = "装修系数") private Integer decorationCoefficient; /** * 建成年代系数 */ + @Excel(name = "建成年代系数") private BigDecimal yearCoefficient; /** * 楼栋系数 */ + @Excel(name = "楼栋系数") private BigDecimal buildingCoefficient; /** * 室厅修正系数 */ + @Excel(name = "室厅修正系数") private BigDecimal roomTypeCoefficient; /** * 总价（元） */ + @Excel(name = "总价(元)") private BigDecimal totalPrice; /** * 单价（元每平方米） */ + @Excel(name = "单价(元/㎡)") private BigDecimal unitPrice; /** * 散租单价 */ + @Excel(name = "散租单价") private BigDecimal priceScatterRent; /** * 整租单价 */ + @Excel(name = "整租单价") private BigDecimal priceEntireRent; /** * 合租单间价 */ + @Excel(name = "合租单间价") private BigDecimal priceShareRent0; /** * 合租折算价 */ + @Excel(name = "合租折算价") private BigDecimal priceShareRent; /** * 带看总次数 */ + @Excel(name = "带看总次数") private Integer visitedNum; /** * 首次带看时间 */ + @Excel(name = "首次带看时间") private Date firstVisitedDate; /** * 15天内带看总次数 */ + @Excel(name = "15天内带看总次数") private Integer visitedNum15; /** * 30天内带看总次数 */ + @Excel(name = "30天内带看总次数") private Integer visitedNum30; /** * 案例状态 */ + @Excel(name = "案例状态") private Integer status; /** * 最近一次挂牌总价调整幅度 */ + @Excel(name = "最近一次挂牌总价调整幅度") private BigDecimal adjustedValue; /** * 最近一次挂牌总价调整比例 */ + @Excel(name = "最近一次挂牌总价调整比例") private BigDecimal adjustedPst; /** * 累计挂牌总价调整幅度 */ + @Excel(name = "累计挂牌总价调整幅度") private BigDecimal adjustedCumValue; /** * 累计挂牌总价调整比例 */ + @Excel(name = "累计挂牌总价调整比例") private BigDecimal adjustedCumPst; /** * 累计挂牌总价绝对调整幅度 */ + @Excel(name = "累计挂牌总价绝对调整幅度") private BigDecimal adjustedCumValueAbs; /** * 累计挂牌总价绝对调整比例 */ + @Excel(name = "累计挂牌总价绝对调整比例") private BigDecimal adjustedCumPstAbs; /** * 累计挂牌总价调价次数 */ + @Excel(name = "累计挂牌总价调价次数") private BigDecimal adjustedCumNum; /** * 首次挂牌总价 */ + @Excel(name = "首次挂牌总价(元)") private BigDecimal priceTotalIn; /** * 下架时挂牌总价 */ + @Excel(name = "下架时挂牌总价(元)") private BigDecimal priceTotalOut; /** * 首次挂牌日期 */ + @Excel(name = "首次挂牌日期") private Date priceDateIn; /** * 下架日期 */ + @Excel(name = "下架日期") private Date priceDateOut; /** * 案例来源 */ + @Excel(name = "案例来源") private String origin; /** * 案例URL */ + @Excel(name = "案例URL") private String urlHouseholds; /** * 案例小区URL */ + @Excel(name = "案例小区URL") private String urlProjects; /** * 案例名称 */ + @Excel(name = "案例名称") private String caseName; /** * 0=成交 * 1=挂牌 */ + @Excel(name = "0=成交,1=挂牌") private Integer caseType; /** * 平均租金（上周期） */ + @Excel(name = "平均租金(上周期)") private BigDecimal rentPrice_1; /** * 案例涨跌幅 */ + @Excel(name = "案例涨跌幅") private BigDecimal range; /** * 涨跌类型 */ + @Excel(name = "涨跌类型") private Integer rangeFlag; /** * 平均租金 */ + @Excel(name = "平均租金") private BigDecimal rentPrice; /** * 整租比 */ + @Excel(name = "整租比") private BigDecimal entireRentRatio; /** * 分租比 */ + @Excel(name = "分租比") private BigDecimal shareRentRatio; public Integer getYearMonth() { diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/AggregateResidenceRentCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/AggregateResidenceRentCaseMapper.java new file mode 100644 index 000000000..e1fec27f8 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/AggregateResidenceRentCaseMapper.java @@ -0,0 +1,48 @@ +package com.ruoyi.project.data.cases.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.ruoyi.project.common.VueSelectModel; +import com.ruoyi.project.data.cases.domain.AggregateResidenceRentCase; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 汇总案例查询 + * + * @author lihe + */ +@DS("compute") +public interface AggregateResidenceRentCaseMapper { + + /** + * 获取每月汇总案例列表 + * + * @param yearMonth + * @return + */ + List getMonthly(@Param("yearMonth") Integer yearMonth); + + /** + * 分页总数 + * + * @param aggregateResidenceRentCase + * @return + */ + int selectPageCount(AggregateResidenceRentCase aggregateResidenceRentCase); + + /** + * 分页列表 + * + * @param aggregateResidenceRentCase + * @return + */ + List selectPageList(AggregateResidenceRentCase aggregateResidenceRentCase); + + /** + * 表名 + * + * @return + */ + List yearMonthList(); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/ResidenceRentAggregationCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/ResidenceRentAggregationCaseMapper.java deleted file mode 100644 index d870c6198..000000000 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/ResidenceRentAggregationCaseMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ruoyi.project.data.cases.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.ruoyi.project.data.cases.domain.CleanResidenceRentAggregationCase; -import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase; -import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 汇总案例查询 - * - * @author lihe - */ -@DS("compute") -public interface ResidenceRentAggregationCaseMapper { - - /** - * 获取每月汇总案例列表 - * - * @param yearMonth - * @return - */ - List getMonthly(@Param("yearMonth") Integer yearMonth); - -} diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncResidenceRentCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncResidenceRentCaseMapper.java index 73c62730e..5fb3fad87 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncResidenceRentCaseMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncResidenceRentCaseMapper.java @@ -1,12 +1,12 @@ package com.ruoyi.project.data.cases.mapper.sync; import com.baomidou.dynamic.datasource.annotation.DS; -import com.ruoyi.project.data.cases.domain.CleanResidenceRentAggregationCase; -import com.ruoyi.project.data.cases.domain.OriginalResidenceRentOpeningCase; -import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice; +import com.ruoyi.project.data.cases.domain.AggregateResidenceRentCase; import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author lihe */ @@ -24,10 +24,12 @@ public interface SyncResidenceRentCaseMapper { /** * 插入案例汇总表 * - * @param cleanResidenceRentAggregationCase + * @param aggregateResidenceRentCase * @return */ - int insertAggregationCaseTable(CleanResidenceRentAggregationCase cleanResidenceRentAggregationCase); + int insertAggregationCaseTable(AggregateResidenceRentCase aggregateResidenceRentCase); + + /** * 创建最终价格表 diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IAggregateResidenceRentCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IAggregateResidenceRentCaseService.java new file mode 100644 index 000000000..21e0fc09c --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IAggregateResidenceRentCaseService.java @@ -0,0 +1,38 @@ +package com.ruoyi.project.data.cases.service; + +import com.ruoyi.project.common.VueSelectModel; +import com.ruoyi.project.data.cases.domain.AggregateResidenceRentCase; + +import java.util.List; + +/** + * 住宅租赁汇总案例Service + * + * @author lihe + */ +public interface IAggregateResidenceRentCaseService { + + /** + * 分页总数 + * + * @param aggregateResidenceRentCase + * @return + */ + int pageCount(AggregateResidenceRentCase aggregateResidenceRentCase); + + /** + * 分页列表 + * + * @param aggregateResidenceRentCase + * @return + */ + List pageList(AggregateResidenceRentCase aggregateResidenceRentCase); + + /** + * 表名 + * + * @return + */ + List yearMonthList(); + +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java index 46f608f67..c1f46bbb2 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java @@ -1,5 +1,6 @@ package com.ruoyi.project.data.cases.service; +import com.ruoyi.project.common.VueSelectModel; import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase; import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice; @@ -26,4 +27,11 @@ public interface IOriginalNewHouseCaseService { */ int selectCount(OriginalNewHouseCase originalNewHouseCase); + /** + * 表名 + * + * @return + */ + List selectYearMonth(); + } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/AggregateResidenceRentCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/AggregateResidenceRentCaseServiceImpl.java new file mode 100644 index 000000000..b86acc9cc --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/AggregateResidenceRentCaseServiceImpl.java @@ -0,0 +1,55 @@ +package com.ruoyi.project.data.cases.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.LoadUtil; +import com.ruoyi.project.common.VueSelectModel; +import com.ruoyi.project.data.cases.domain.AggregateResidenceRentCase; +import com.ruoyi.project.data.cases.domain.OriginalResidenceRentClosingCase; +import com.ruoyi.project.data.cases.domain.OtherResidenceRentClosingCase; +import com.ruoyi.project.data.cases.mapper.AggregateResidenceRentCaseMapper; +import com.ruoyi.project.data.cases.mapper.OriginalResidenceRentClosingCaseMapper; +import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceRentClosingCaseMapper; +import com.ruoyi.project.data.cases.mapper.sync.DownloadOtherResidenceRentClosingCaseMapper; +import com.ruoyi.project.data.cases.mapper.sync.SyncResidenceRentCaseMapper; +import com.ruoyi.project.data.cases.service.IAggregateResidenceRentCaseService; +import com.ruoyi.project.data.cases.service.IOriginalResidenceRentClosingCaseService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.jdbc.core.namedparam.SqlParameterSource; +import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 住宅租赁汇总案例Service + * + * @author lihe + */ +@Service +@DS("compute") +public class AggregateResidenceRentCaseServiceImpl implements IAggregateResidenceRentCaseService { + + @Autowired + private AggregateResidenceRentCaseMapper aggregateResidenceRentCaseMapper; + + @Override + public int pageCount(AggregateResidenceRentCase aggregateResidenceRentCase) { + return aggregateResidenceRentCaseMapper.selectPageCount(aggregateResidenceRentCase); + } + + @Override + public List pageList(AggregateResidenceRentCase aggregateResidenceRentCase) { + return aggregateResidenceRentCaseMapper.selectPageList(aggregateResidenceRentCase); + } + + @Override + public List yearMonthList() { + return aggregateResidenceRentCaseMapper.yearMonthList(); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java index aa7702426..2095b9e19 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.project.data.cases.service.impl; import com.ruoyi.common.constant.LabelConstants; +import com.ruoyi.project.common.VueSelectModel; import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase; import com.ruoyi.project.data.cases.mapper.OriginalNewHouseCaseMapper; import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalNewHouseCaseMapper; @@ -35,4 +36,9 @@ public class OriginalNewHouseCaseServiceImpl implements IOriginalNewHouseCaseSer public int selectCount(OriginalNewHouseCase originalNewHouseCase) { return originalNewHouseCaseMapper.pageCount(originalNewHouseCase); } + + @Override + public List selectYearMonth() { + return null; + } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java index f4d09c59b..f22b8b317 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java @@ -3,11 +3,11 @@ package com.ruoyi.project.data.cases.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.LoadUtil; -import com.ruoyi.project.data.cases.domain.CleanResidenceRentAggregationCase; +import com.ruoyi.project.data.cases.domain.AggregateResidenceRentCase; import com.ruoyi.project.data.cases.domain.OriginalResidenceRentClosingCase; import com.ruoyi.project.data.cases.domain.OtherResidenceRentClosingCase; import com.ruoyi.project.data.cases.mapper.OriginalResidenceRentClosingCaseMapper; -import com.ruoyi.project.data.cases.mapper.ResidenceRentAggregationCaseMapper; +import com.ruoyi.project.data.cases.mapper.AggregateResidenceRentCaseMapper; import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceRentClosingCaseMapper; import com.ruoyi.project.data.cases.mapper.sync.DownloadOtherResidenceRentClosingCaseMapper; import com.ruoyi.project.data.cases.mapper.sync.SyncResidenceRentCaseMapper; @@ -20,11 +20,8 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import java.util.Calendar; -import java.util.Date; import java.util.List; @Service @@ -46,7 +43,7 @@ public class OriginalResidenceRentClosingCaseServiceImpl implements IOriginalRes @Autowired private SyncResidenceRentCaseMapper syncResidenceRentCaseMapper; @Autowired - private ResidenceRentAggregationCaseMapper residenceRentAggregationCaseMapper; + private AggregateResidenceRentCaseMapper aggregateResidenceRentCaseMapper; /** * @@ -145,10 +142,10 @@ public class OriginalResidenceRentClosingCaseServiceImpl implements IOriginalRes public void pushAggregateCase(Integer yearMonth, Integer currentPriceTableRoute) { // 案例同步 syncResidenceRentCaseMapper.createAggregationCaseTable(currentPriceTableRoute); - List list = residenceRentAggregationCaseMapper.getMonthly(yearMonth); - list.parallelStream().forEach(cleanResidenceRentAggregationCase -> { - cleanResidenceRentAggregationCase.setYearMonth(currentPriceTableRoute); - syncResidenceRentCaseMapper.insertAggregationCaseTable(cleanResidenceRentAggregationCase); + List list = aggregateResidenceRentCaseMapper.getMonthly(yearMonth); + list.parallelStream().forEach(aggregateResidenceRentCase -> { + aggregateResidenceRentCase.setYearMonth(currentPriceTableRoute); + syncResidenceRentCaseMapper.insertAggregationCaseTable(aggregateResidenceRentCase); }); logger.info("推送案例汇总数据完成"); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceRentPriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceRentPriceMapper.java index 7c26e84b9..5f34cbe25 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceRentPriceMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceRentPriceMapper.java @@ -18,6 +18,7 @@ public interface ComputeResidenceRentPriceMapper { /** * 查询列表 + * * @param ComputeResidenceRentBasePrice * @return */ @@ -40,6 +41,8 @@ public interface ComputeResidenceRentPriceMapper { int updateComputeResidenceRentBasePrice(ComputeResidenceRentBasePrice ComputeResidenceRentBasePrice); /** + * 表名 + * * @return */ List yearMonthList(); diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java index 33dac4a19..39518d1d4 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java @@ -6,13 +6,9 @@ import com.microsoft.sqlserver.jdbc.SQLServerDataTable; import com.microsoft.sqlserver.jdbc.SQLServerException; import com.ruoyi.common.utils.LoadUtil; import com.ruoyi.project.common.VueSelectModel; -import com.ruoyi.project.data.cases.domain.CleanResidenceRentAggregationCase; -import com.ruoyi.project.data.cases.domain.OfficeAggregationCase; -import com.ruoyi.project.data.cases.mapper.ResidenceRentAggregationCaseMapper; import com.ruoyi.project.data.cases.mapper.sync.SyncResidenceRentCaseMapper; import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice; import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice; -import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice; import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice; import com.ruoyi.project.data.price.mapper.ArtificialResidenceRentPriceMapper; import com.ruoyi.project.data.price.mapper.UltimateResidenceRentPriceMapper; diff --git a/ruoyi/src/main/resources/mybatis/data/ResidenceRentAggregationCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/AggregateResidenceRentCaseMapper.xml similarity index 77% rename from ruoyi/src/main/resources/mybatis/data/ResidenceRentAggregationCaseMapper.xml rename to ruoyi/src/main/resources/mybatis/data/AggregateResidenceRentCaseMapper.xml index 1c8fee292..974db9acc 100644 --- a/ruoyi/src/main/resources/mybatis/data/ResidenceRentAggregationCaseMapper.xml +++ b/ruoyi/src/main/resources/mybatis/data/AggregateResidenceRentCaseMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -61,9 +61,8 @@ - - + + + + + + + + \ No newline at end of file diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml index 66258ecb4..58aa06105 100644 --- a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml +++ b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml @@ -111,7 +111,7 @@ CREATE TABLE ${targetTableName} ( - ID int NOT NULL IDENTITY(1, 1), + ID int NOT NULL IDENTITY(1, 1) primary key, HouseholdsID_SRC nvarchar (64) NOT NULL, ProjectID_SRC nvarchar (64) NOT NULL, ProjectID nvarchar (32) NULL, diff --git a/ruoyi/src/main/resources/mybatis/data/SyncResidenceRentCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/SyncResidenceRentCaseMapper.xml index 99acfdd91..7fe99c750 100644 --- a/ruoyi/src/main/resources/mybatis/data/SyncResidenceRentCaseMapper.xml +++ b/ruoyi/src/main/resources/mybatis/data/SyncResidenceRentCaseMapper.xml @@ -68,7 +68,7 @@ ) - + insert into dbo.DW_HOUSINGCASE_RENT_COMM_${yearMonth} ( HouseholdsID_SRC diff --git a/ruoyi/src/main/resources/mybatis/data/UvClosingCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/UvClosingCaseMapper.xml index 9ae756080..373f0aa32 100644 --- a/ruoyi/src/main/resources/mybatis/data/UvClosingCaseMapper.xml +++ b/ruoyi/src/main/resources/mybatis/data/UvClosingCaseMapper.xml @@ -35,6 +35,9 @@ ITEM_DEALID=#{dealId} + + AND ITEM_RANAME like concat('%',#{caseCommunityName},'%') + order by ITEM_DEALID ASC offset #{offset} rows fetch next #{limit} rows only @@ -46,6 +49,9 @@ ITEM_DEALID=#{dealId} + + AND ITEM_RANAME like concat('%',#{caseCommunityName},'%') + \ No newline at end of file