From 021f085016565e81566bdb955d2296d9da6b0bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 20:10:52 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 171 ++++++++++++++++++++++++++++----------------------------
1 files changed, 85 insertions(+), 86 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..d188bfe 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
@@ -65,23 +70,25 @@
}
@GetMapping("/getTenantCountTrend")
- @ApiModelProperty(value = "租户数量趋势统计")
+ @ApiOperation(value = "租户数量趋势统计")
public R<List<TenantCountTrendVO>> getTenantCountTrend() {
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
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>()
+ .eq(!"0".equals(businessDeptId),TContract::getBusinessDeptId, businessDeptId)
.isNotNull(TContract::getSignTime)
.between(TContract::getSignTime, startQuarterDate.get("first"), endQuarterDate.get("last"))
.orderByAsc(TContract::getSignTime));
- // 创建季度格式化工具（示例：2025-Q1）
- DateTimeFormatter quarterFormatter = DateTimeFormatter.ofPattern("yyyy-'Q'Q");
+ DateTimeFormatter quarterFormatter = DateTimeFormatter.ofPattern("yyyy-MM");
List<TenantCountTrendVO> trendData = contracts.stream()
.collect(Collectors.groupingBy(contract -> {
@@ -98,15 +105,22 @@
return R.ok(trendData);
}
+
/**
* 实时租赁数据
*/
@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 +135,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());
@@ -133,99 +147,84 @@
* 获取房屋地图分布
*/
@GetMapping("/getHouseMapDistribution")
+ @ApiOperation("获取房屋地图分布")
public R<List<HouseMapDistributionVO>> getHouseMapDistribution() {
+
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
// 获取所有房屋信息
- List<THouse> houses = houseService.list();
+ List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
+ .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId));
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 = contractService.getOne(new LambdaQueryWrapper<TContract>()
+ .eq(!"0".equals(businessDeptId),TContract::getBusinessDeptId, businessDeptId)
+ .gt(TContract::getEndTime, LocalDate.now())
+ .eq(TContract::getHouseId, house.getId())
+ .eq(TContract::getStatus, 4)
+ .last("limit 1"));
+
+ if (contract != null){
+ List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
+ .eq(!"0".equals(businessDeptId),TBill::getBusinessDeptId, businessDeptId)
+ .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 paidAlready = tBills.stream()
+ .map(TBill::getPayableFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+ String rentStatus = String.format("%.2f/%.2f", paidAlready, payableFeesMoney);
+ houseMapDistributionVO.setRentStatus(rentStatus);
+
+
+// TBill one = billService.getOne(new LambdaQueryWrapper<TBill>()
+// .le(TBill::getStartTime, LocalDate.now())
+// .ge(TBill::getEndTime, LocalDate.now())
+// .eq(TBill::getBillType, 1)
+// .eq(TBill::getContractId, contract.getId()));
+
+ List<TBill> ones = billService.list(new LambdaQueryWrapper<TBill>()
+ .eq(!"0".equals(businessDeptId),TBill::getBusinessDeptId, businessDeptId)
+ .le(TBill::getStartTime, LocalDate.now())
+ .ge(TBill::getEndTime, LocalDate.now())
+ .eq(TBill::getBillType, 1)
+ .eq(TBill::getContractId, contract.getId()));
+ TBill one = null;
+ if (!ones.isEmpty()){
+ one = ones.get(0);
+ }
+
+ if (one != null){
+ if ("4".equals(one.getPayFeesStatus())){
+ houseMapDistributionVO.setHouseStatus("4");
+ }
+ BigDecimal payFeesMoney = one.getPayFeesMoney();
+ BigDecimal payableFeesMoney1 = one.getPayableFeesMoney();
+ String rent = String.format("%.2f/%.2f", payFeesMoney, 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