From 9aa75d91eb3f854c9d2001b3e3ae1743a51dd476 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 12 十月 2024 16:27:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java | 49 ++++++++++++++++++++-----------------------------
1 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
index d458f70..4d1e4dd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
@@ -1,5 +1,7 @@
package com.doumee.dao.admin.response;
+import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.system.model.Notices;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,12 +22,11 @@
@ApiModelProperty(value = "浠婃棩鍦ㄥ洯浜烘暟")
private Long todayInParkUserNum;
- @ApiModelProperty(value = "浠婃棩鍏ュ洯浜烘暟")
+ @ApiModelProperty(value = "浠婃棩鍏ュ洯浜烘")
private Long todayInUserNum;
- @ApiModelProperty(value = "浠婃棩绂诲洯浜烘暟")
+ @ApiModelProperty(value = "浠婃棩绂诲洯浜烘")
private Long todayOutUserNum;
-
@ApiModelProperty(value = "鍦ㄥ洯璁垮浜烘暟")
private Long inParkVisitUserNum;
@@ -36,16 +37,14 @@
@ApiModelProperty(value = "绛剧浜烘")
private Long signLevelNum;
-
@ApiModelProperty(value = "鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�")
private Long inParkLwUserNum;
- @ApiModelProperty(value = "鍏ュ洯浜烘")
+ @ApiModelProperty(value = "鐩稿叧鏂瑰叆鍥汉娆�")
private Long lwUserInNum;
- @ApiModelProperty(value = "鍑哄洯浜烘")
+ @ApiModelProperty(value = "鐩稿叧鏂瑰嚭鍥汉娆�")
private Long lwUserOutNum;
-
@ApiModelProperty(value = "浠婃棩鍦ㄥ洯杞﹁締")
private Long todayInParkCarNum;
@@ -56,33 +55,25 @@
@ApiModelProperty(value = "鍑哄洯杞︽")
private Long todayOutCarNum;
- @ApiModelProperty(value = "鐩稿叧鏂规暟鎹�")
- private List<InterestedListVO> interestedListVOList;
+ @ApiModelProperty(value = "闀挎湡鐩稿叧鏂圭浉鍏虫柟鍒嗗竷 top 5")
+ private List<InterestedListVO> lwList;
+ @ApiModelProperty(value = "杩戜竷鏃ヨ瀹㈢粺璁�")
+ private List<InterestedListVO> weekVisitList;
+ @ApiModelProperty(value = "杩戜竷鏃ヨ溅杈嗙粺璁�")
+ private List<InterestedListVO> weekCarList;
- @ApiModelProperty(value = "璁垮浜哄憳")
- private Long visitorCount;
+ @ApiModelProperty(value = "寰呭姙浜嬮」鏁伴噺")
+ private Integer noticesNum;
- @ApiModelProperty(value = "鍔冲姟浜哄憳")
- private Long lwCount;
+ @ApiModelProperty(value = "寰呭姙浜嬮」")
+ private List<Notices> noticesList;
- @ApiModelProperty(value = "鍦ㄥ満杞﹁締")
- private Long presenceCarCount;
+ @ApiModelProperty(value = "瓒呮椂棰勮鏁伴噺")
+ private Integer timeOutVisitNum;
- @ApiModelProperty(value = "棰勭害杞﹁締")
- private Long visitorCarCount;
-
- @ApiModelProperty(value = "闀挎湡杞﹁締")
- private Long longCarCount;
-
- @ApiModelProperty(value = "渚涘簲鍟嗘暟閲�")
- private Long supplierCount;
-
- @ApiModelProperty(value = "鍔冲姟鍏徃浜哄憳鏁�")
- private List<Map<String,Object>> companyUsers;
-
- @ApiModelProperty(value = "婊炵暀浜哄憳鏁版嵁")
- private List<Map<String,Object>> retentionUsers;
+ @ApiModelProperty(value = "璁垮瓒呮椂鏁版嵁")
+ private List<Visits> timeOutVisitList;
}
--
Gitblit v1.9.3