From 3921d084538690d15769225c79ce70ec1a131dcc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 24 三月 2025 16:40:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 193 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 173 insertions(+), 20 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 86431c2..d12d728 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
@@ -2,13 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.model.TStreet;
+import com.ruoyi.system.service.ITStreetService;
+import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.service.TContractService;
+import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.service.impl.ScreenService;
-import com.ruoyi.system.vo.ScreenRentIncomeTrendVO;
-import com.ruoyi.system.vo.ScreenRentRankVO;
-import com.ruoyi.system.vo.ScreenTopStaticsDataVO;
-import com.ruoyi.system.vo.TenantCountTrendVO;
+import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
@@ -18,8 +22,13 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
-import java.util.List;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -32,6 +41,11 @@
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class ScreenController {
private final ScreenService screenService;
+ private final TContractService contractService;
+ private final THouseService houseService;
+ private final ITStreetService streetService;
+ private final TBillService billService;
+
@GetMapping("/statics-data")
@ApiOperation(value = "获取顶部统计数据")
public R<ScreenTopStaticsDataVO> getTopStaticsData() {
@@ -47,32 +61,171 @@
public R<ScreenRentIncomeTrendVO> rentIncomeTrend() {
return R.ok(screenService.rentIncomeTrend());
}
- private final TContractService contractService;
+
@GetMapping("/getTenantCountTrend")
@ApiModelProperty(value = "租户数量趋势统计")
- public R<?> getTenantCountTrend() {
- // 获取所有签约时间不为空的合同
- List<TContract> contracts = contractService.list(new LambdaQueryWrapper<TContract>()
- .isNotNull(TContract::getSignTime));
+ public R<List<TenantCountTrendVO>> getTenantCountTrend() {
- // 使用年-月格式化日期，并按此分组计算每个时间段的合同数量
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy-M");
+ 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 -> contract.getSignTime().toLocalDate()
- .withDayOfMonth(1) // 将日期调整为该月的第一天，以便正确分组
- .atStartOfDay()))
+ .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 -> {
- String period = entry.getKey().format(formatter);
- long count = entry.getValue().size();
- return new TenantCountTrendVO(period, count);
- })
+ .map(entry -> new TenantCountTrendVO(
+ entry.getKey().format(quarterFormatter),
+ entry.getValue()))
.collect(Collectors.toList());
return R.ok(trendData);
}
+ /**
+ * 实时租赁数据
+ */
+ @GetMapping("/getRealTimeRentData")
+ public R<List<RealTimeRentDataVO>> getRealTimeRentData() {
+ // 随机获取十条房源
+ List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
+ .last("ORDER BY RAND() LIMIT 10"));
+
+
+ // 提取streetIds
+ List<String> streetIds = houses.stream()
+ .map(THouse::getStreetId)
+ .collect(Collectors.toList());
+
+ // 获取街道信息
+ Map<String, String> streetMap = streetService.listByIds(streetIds).stream()
+ .collect(Collectors.toMap(TStreet::getId, TStreet::getStreetName));
+
+ // 转换为返回格式
+ List<RealTimeRentDataVO> result = houses.stream().map(house -> {
+ RealTimeRentDataVO vo = new RealTimeRentDataVO();
+ vo.setStreetName(streetMap.getOrDefault(house.getStreetId(), "未知"));
+ vo.setRoomName(house.getRoomNumber());
+ vo.setLeaseStatus(house.getLeaseStatus());
+ return vo;
+ }).collect(Collectors.toList());
+
+ return R.ok(result);
+ }
+
+ /**
+ * 获取房屋地图分布
+ */
+ @GetMapping("/getHouseMapDistribution")
+ public R<List<HouseMapDistributionVO>> getHouseMapDistribution() {
+ // 获取所有房屋信息
+ List<THouse> houses = houseService.list();
+ 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());
+ 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