From fd6e1e93f65bde3e1c8c15f36b2ff6324d071966 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 21 三月 2025 10:57:13 +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 | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 1c2654a..86431c2 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
@@ -5,20 +5,21 @@
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.service.TContractService;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.text.DateFormat;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -28,9 +29,24 @@
@Api(tags = {"大屏相关接口"})
@RestController
@RequestMapping("/screen")
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class ScreenController {
private final ScreenService screenService;
+ @GetMapping("/statics-data")
+ @ApiOperation(value = "获取顶部统计数据")
+ public R<ScreenTopStaticsDataVO> getTopStaticsData() {
+ return R.ok(screenService.getTopStaticsData());
+ }
+ @GetMapping("/rent-rank")
+ @ApiOperation("区域租金排名")
+ public R<List<ScreenRentRankVO>> rentRank() {
+ return R.ok(screenService.streetRentRank());
+ }
+ @GetMapping("/rent-income-trend")
+ @ApiOperation("租金收入趋势")
+ public R<ScreenRentIncomeTrendVO> rentIncomeTrend() {
+ return R.ok(screenService.rentIncomeTrend());
+ }
private final TContractService contractService;
--
Gitblit v1.7.1