java/xizang.git

			@@ -1,10 +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;
			@@ -31,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,38 +69,11 @@
			return R.ok(screenService.rentIncomeTrend());
			}


			@GetMapping("/getTenantCountTrend")
			@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();
			}


			@@ -107,9 +84,14 @@
			@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()
			@@ -124,12 +106,32 @@
			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());

			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));
			}

			/**
			@@ -138,8 +140,61 @@
			@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();
			@@ -148,56 +203,71 @@
			houseMapDistributionVO.setHouseStatus(house.getLeaseStatus());
			houseMapDistributionVO.setLongitude(house.getLongitude());
			houseMapDistributionVO.setLatitude(house.getLatitude());
			TContract contract = contractService.getOne(new LambdaQueryWrapper<TContract>()
			.gt(TContract::getEndTime, LocalDate.now())
			.eq(TContract::getHouseId, house.getId())
			.eq(TContract::getStatus, 4)
			.last("limit 1"));



			TContract contract = contractMap.get(house.getId());


			if (contract != null){
			List<TBill> tBills = billService.list(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 paidAlready = tBills.stream()

			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", paidAlready, payableFeesMoney);
			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()){

			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()));
			long count = ones.stream().filter(tBill -> "4".equals(tBill.getPayFeesStatus())).count();
			if (count > 0){
			houseMapDistributionVO.setHouseStatus("4");
			}

			if (one != null && "4".equals(one.getPayFeesStatus())){
			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("欠费");
			}



			BigDecimal payFeesMoney = one.getPayFeesMoney();
			BigDecimal payableFeesMoney1 = one.getPayableFeesMoney();
			String rent = String.format("%.2f/%.2f", payFeesMoney, payableFeesMoney1);

			houseMapDistributionVO.setRent(rent);
			}else {
			houseMapDistributionVO.setTenant("暂无");
			houseMapDistributionVO.setRentStatus("暂无");
			houseMapDistributionVO.setRentStatus("待出租");
			houseMapDistributionVO.setRent("暂无");
			}
			result.add(houseMapDistributionVO);
			}
			return R.ok(result);
			}


			}