From ef30e3f2eebad385c8b26bd0ff931c028d46f3ce Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 21 四月 2025 10:39:00 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 264 ++++++++++++++++++++++++++++++----------------------
1 files changed, 153 insertions(+), 111 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
index c65a613..2ce5424 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
@@ -1,8 +1,12 @@
package com.ruoyi.web.controller.api;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
@@ -14,7 +18,6 @@
import com.ruoyi.system.service.impl.ScreenService;
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
@@ -30,6 +33,8 @@
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
+
+import static org.checkerframework.checker.units.qual.Prefix.one;
/**
* @author mitao
@@ -64,49 +69,29 @@
return R.ok(screenService.rentIncomeTrend());
}
+
@GetMapping("/getTenantCountTrend")
- @ApiModelProperty(value = "租户数量趋势统计")
+ @ApiOperation(value = "租户数量趋势统计")
public R<List<TenantCountTrendVO>> getTenantCountTrend() {
-
- Date currentDate = new Date();
- Date targetDate = DateUtils.addMonths(currentDate, -3 * 6);
- Map<String, Date> startQuarterDate = DateUtils.getQuarterDate(targetDate);
-
- Date targetDate2 = DateUtils.addMonths(currentDate, 0);
- Map<String, Date> endQuarterDate = DateUtils.getQuarterDate(targetDate2);
-
- List<TContract> contracts = contractService.list(new LambdaQueryWrapper<TContract>()
- .isNotNull(TContract::getSignTime)
- .between(TContract::getSignTime, startQuarterDate.get("first"), endQuarterDate.get("last"))
- .orderByAsc(TContract::getSignTime));
-
- // 创建季度格式化工具（示例：2025-Q1）
- DateTimeFormatter quarterFormatter = DateTimeFormatter.ofPattern("yyyy-'Q'Q");
-
- List<TenantCountTrendVO> trendData = contracts.stream()
- .collect(Collectors.groupingBy(contract -> {
- LocalDate date = contract.getSignTime().toLocalDate();
- int quarter = (date.getMonthValue() - 1) / 3 + 1;
- return YearQuarter.from(date.withMonth(quarter * 3 - 2));
- }, TreeMap::new, Collectors.counting()))
- .entrySet().stream()
- .map(entry -> new TenantCountTrendVO(
- entry.getKey().format(quarterFormatter),
- entry.getValue()))
- .collect(Collectors.toList());
-
- return R.ok(trendData);
+ return screenService.getTenantCountTrend();
}
+
/**
* 实时租赁数据
*/
@GetMapping("/getRealTimeRentData")
+ @ApiOperation("获取实时租赁数据")
public R<List<RealTimeRentDataVO>> getRealTimeRentData() {
// 随机获取十条房源
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
+ .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
.last("ORDER BY RAND() LIMIT 10"));
+ if (CollectionUtil.isEmpty(houses)){
+ return R.ok(new ArrayList<>());
+ }
// 提取streetIds
List<String> streetIds = houses.stream()
@@ -121,7 +106,7 @@
List<RealTimeRentDataVO> result = houses.stream().map(house -> {
RealTimeRentDataVO vo = new RealTimeRentDataVO();
vo.setStreetName(streetMap.getOrDefault(house.getStreetId(), "未知"));
- vo.setRoomName(house.getRoomNumber());
+ vo.setRoomName(house.getHouseName());
vo.setLeaseStatus(house.getLeaseStatus());
return vo;
}).collect(Collectors.toList());
@@ -129,103 +114,160 @@
return R.ok(result);
}
+
+ public static void main(String[] args) {
+ // 获取当前季度的开始和结束时间
+ // 获取当前季度的开始和结束时间的实现示例：
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDate now = LocalDate.now();
+ int month = now.getMonthValue();
+ int year = now.getYear();
+
+ // 计算季度起始月份（1,4,7,10）
+ int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
+ int quarterEndMonth = quarterStartMonth + 2;
+ // 构建季度起止日期
+ LocalDate quarterStart = YearMonth.of(year, quarterStartMonth).atDay(1);
+ LocalDate quarterEnd = YearMonth.of(year, quarterEndMonth).atEndOfMonth();
+
+ System.out.println("季度开始：" + quarterStart.format(formatter));
+ System.out.println("季度结束：" + quarterEnd.format(formatter));
+ }
+
/**
* 获取房屋地图分布
*/
@GetMapping("/getHouseMapDistribution")
+ @ApiOperation("获取房屋地图分布")
public R<List<HouseMapDistributionVO>> getHouseMapDistribution() {
+
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+
+ List<TContract> tContracts = contractService.list(new LambdaQueryWrapper<TContract>()
+ .eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getPayType, 2));
+ List<String> houseIds1 = tContracts.stream().map(TContract::getHouseId).collect(Collectors.toList());
+
+
// 获取所有房屋信息
- List<THouse> houses = houseService.list();
+ List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
+ .and(wrapper -> wrapper.in(!houseIds1.isEmpty(),THouse::getId, houseIds1)
+ .or(!houseIds1.isEmpty())
+ .eq(THouse::getLeaseStatus, "1")
+ )
+ .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
+ );
+
+ // 建议在循环外批量查询以下数据：
+// 1. 提前获取所有房屋对应的最新有效合同（按房屋ID分组）
+ Set<String> houseIds = houses.stream().map(THouse::getId).collect(Collectors.toSet());
+ Map<String, TContract> contractMap = contractService.list(new LambdaQueryWrapper<TContract>()
+ .eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getPayType, 2)
+ .gt(TContract::getEndTime, LocalDate.now())
+ .in(TContract::getHouseId, houseIds) // 批量查询
+ .eq(TContract::getStatus, 4)
+ .orderByDesc(TContract::getEndTime))
+ .stream()
+ .collect(Collectors.toMap(
+ TContract::getHouseId,
+ c -> c,
+ (existing, replacement) -> existing // 保留最新合同
+ ));
+
+ // 2. 提前批量查询所有合同对应的账单（按contractId分组）
+ Set<String> contractIds = contractMap.values().stream()
+ .map(TContract::getId)
+ .collect(Collectors.toSet());
+ Map<String, List<TBill>> billsMap = billService.list(new LambdaQueryWrapper<TBill>()
+ .eq(!"0".equals(businessDeptId), TBill::getBusinessDeptId, businessDeptId)
+ .in(!contractIds.isEmpty(), TBill::getContractId, contractIds)
+ .eq(TBill::getBillType, 1))
+ .stream()
+ .collect(Collectors.groupingBy(TBill::getContractId));
+
+
+ // 3. 季度时间计算提到循环外（所有房屋共用）
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDate now = LocalDate.now();
+ int month = now.getMonthValue();
+ int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
+ LocalDate quarterStart = YearMonth.of(now.getYear(), quarterStartMonth).atDay(1);
+ LocalDate quarterEnd = YearMonth.of(now.getYear(), quarterStartMonth + 2).atEndOfMonth();
+
List<HouseMapDistributionVO> result = new ArrayList<>();
for (THouse house : houses) {
HouseMapDistributionVO houseMapDistributionVO = new HouseMapDistributionVO();
houseMapDistributionVO.setHouseName(house.getHouseName());
houseMapDistributionVO.setHouseAddress(house.getHouseAddress());
houseMapDistributionVO.setHouseStatus(house.getLeaseStatus());
- TContract contract = contractService.getOne(new LambdaQueryWrapper<TContract>()
- .eq(TContract::getHouseId, house.getId()));
- TBill bill = billService.getOne(new LambdaQueryWrapper<TBill>()
- .eq(TBill::getContractId, contract.getId())
- .eq(TBill::getBillType, 1));
-
-
- houseMapDistributionVO.setTenant(contract.getPartyTwoName());
-
-
- LocalDateTime startTime = contract.getStartTime();
- LocalDateTime endTime = contract.getEndTime();
- BigDecimal monthRent = contract.getMonthRent();
- // 计算相差月份
- long monthsBetween = ChronoUnit.MONTHS.between(startTime, endTime);
- BigDecimal payableFeesMoney = monthRent.multiply(new BigDecimal(monthsBetween));
- BigDecimal remainingPayment = bill.getPayableFeesMoney();
- BigDecimal paidAlready = payableFeesMoney.subtract(remainingPayment);
- String rentStatus = String.format("%.2f/%.2f", paidAlready, payableFeesMoney);
- houseMapDistributionVO.setRentStatus(rentStatus);
-
- String payType = contract.getPayType();
- String rent = "";
- LocalDateTime payFeesTime = bill.getPayFeesTime();
- switch (payType) {
- case "1":
- if (isCurrentMonth(payFeesTime)) {
- rent = String.format("%.2f/%.2f", monthRent, monthRent);
- } else {
- rent = String.format("%.2f/%.2f", new BigDecimal("0"), monthRent);
- }
- break;
- case "2":
- // 季付价格
- BigDecimal quarterRent = monthRent.multiply(new BigDecimal(3));
- if (isCurrentQuarter(payFeesTime)) {
- rent = String.format("%.2f/%.2f", quarterRent, quarterRent);
- } else {
- rent = String.format("%.2f/%.2f", new BigDecimal("0"), quarterRent);
- }
- break;
- case "3":
- // 年付价格
- BigDecimal yearRent = monthRent.multiply(new BigDecimal(12));
- if (isCurrentYear(payFeesTime)) {
- rent = String.format("%.2f/%.2f", yearRent, yearRent);
- } else {
- rent = String.format("%.2f/%.2f", new BigDecimal("0"), yearRent);
- }
- break;
- }
- houseMapDistributionVO.setRent(rent);
houseMapDistributionVO.setLongitude(house.getLongitude());
houseMapDistributionVO.setLatitude(house.getLatitude());
+
+
+
+ TContract contract = contractMap.get(house.getId());
+
+
+ if (contract != null){
+
+
+ List<TBill> tBills = billsMap.getOrDefault(contract.getId(), Collections.emptyList());
+
+
+ houseMapDistributionVO.setTenant(contract.getPartyTwoName());
+
+ BigDecimal payFeesMoney = tBills.stream()
+ .map(TBill::getPayFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+
+ BigDecimal payableFeesMoney = tBills.stream()
+ .map(TBill::getPayableFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+ String rentStatus = String.format("%.2f/%.2f", payFeesMoney, payableFeesMoney);
+ houseMapDistributionVO.setRentStatus(rentStatus);
+
+ // 季度账单筛选
+ List<TBill> ones = tBills.stream()
+ .filter(b -> {
+ LocalDate billDate = b.getStartTime().toLocalDate();
+ return !billDate.isBefore(quarterStart) && !billDate.isAfter(quarterEnd);
+ })
+ .collect(Collectors.toList());
+ if (!ones.isEmpty()){
+
+ long count = ones.stream().filter(tBill -> "4".equals(tBill.getPayFeesStatus())).count();
+ if (count > 0){
+ houseMapDistributionVO.setHouseStatus("4");
+ }
+
+ BigDecimal payFeesMoney1 = ones.stream()
+ .map(TBill::getPayFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+
+ BigDecimal payableFeesMoney1 = ones.stream()
+ .map(TBill::getPayableFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+
+ String rent = String.format("%.2f/%.2f", payFeesMoney1, payableFeesMoney1);
+ houseMapDistributionVO.setRent(rent);
+ }else {
+ houseMapDistributionVO.setRent("欠费");
+ }
+
+ }else {
+ houseMapDistributionVO.setTenant("暂无");
+ houseMapDistributionVO.setRentStatus("待出租");
+ houseMapDistributionVO.setRent("暂无");
+ }
result.add(houseMapDistributionVO);
}
return R.ok(result);
}
-
- /**
- * 判断是否是当前月份
- * @param dateTime 日期时间
- * @return boolean
- */
- public static boolean isCurrentMonth(LocalDateTime dateTime) {
- YearMonth currentYearMonth = YearMonth.now();
- YearMonth targetYearMonth = YearMonth.from(dateTime);
- return currentYearMonth.equals(targetYearMonth);
- }
-
- public static boolean isCurrentQuarter(LocalDateTime dateTime) {
- int currentMonth = LocalDateTime.now().getMonthValue();
- int targetMonth = dateTime.getMonthValue();
-
- // 计算当前季度和目标时间所属季度
- int currentQuarter = (currentMonth - 1) / 3 + 1;
- int targetQuarter = (targetMonth - 1) / 3 + 1;
-
- return LocalDateTime.now().getYear() == dateTime.getYear() && currentQuarter == targetQuarter;
- }
-
- public static boolean isCurrentYear(LocalDateTime dateTime) {
- return LocalDateTime.now().getYear() == dateTime.getYear();
- }
}
--
Gitblit v1.7.1