From 8a0a8adfbe53db564df7aaaf561a60be7d4d8dd0 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 26 九月 2024 17:52:24 +0800
Subject: [PATCH] 1. 新增监管系统中用户模糊搜索功能 2. 新增监测设备和用户的匹配关系搜索功能
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
index 972d163..104ab39 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
@@ -2,43 +2,66 @@
import com.fasterxml.jackson.annotation.JsonFormat
import com.fasterxml.jackson.annotation.JsonInclude
+import io.swagger.annotations.ApiModel
+import io.swagger.annotations.ApiModelProperty
import java.time.LocalDateTime
/**
* 鍖哄煙鏉′欢
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-open class AreaVo{
- // 琛屾斂鍖哄垝
+@ApiModel("鍖哄煙鏉′欢")
+open class AreaVo {
+ @ApiModelProperty("鐪佷唤缂栫爜")
var provincecode: String? = null
+
+ @ApiModelProperty("鐪佷唤鍚嶇О")
var provincename: String? = null
+
+ @ApiModelProperty("鍩庡競缂栫爜")
var citycode: String? = null
+
+ @ApiModelProperty("鍩庡競鍚嶇О")
var cityname: String? = null
+
+ @ApiModelProperty("鍖哄幙缂栫爜")
var districtcode: String? = null
+
+ @ApiModelProperty("鍖哄幙鍚嶇О")
var districtname: String? = null
+
+ @ApiModelProperty("琛楅晣缂栫爜")
var towncode: String? = null
+
+ @ApiModelProperty("琛楅晣鍚嶇О")
var townname: String? = null
- // 鏃堕棿鑼冨洿,鏍煎紡yyyy-MM-dd HH:mm:ss
+ @ApiModelProperty("璧峰鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
var starttime: LocalDateTime? = null
+
+ @ApiModelProperty("缁撴潫鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
var endtime: LocalDateTime? = null
- // 鍦烘櫙id
+ @ApiModelProperty("鍦烘櫙涓婚敭id")
var sceneId: String? = null
- // 鍦烘櫙鍚嶇О
+
+ @ApiModelProperty("鍦烘櫙鍚嶇О")
var sceneName: String? = null
- // 鍦烘櫙绫诲瀷
+
+ @ApiModelProperty("鍦烘櫙绫诲瀷id")
var scensetypeid: String? = null
- // 鏄惁涓婄嚎
+ @ApiModelProperty("鏄惁涓婄嚎")
var online: Boolean? = null
- // 涓绘暟鎹簮锛�1锛氫互椋炵窘鐜绯荤粺涓殑鐢ㄦ埛涓轰富浣擄紱2锛氫互椋炵窘鐩戠绯荤粺涓殑鐢ㄦ埛涓轰富浣�
- var sourceType:Int = 1
+ @ApiModelProperty("涓绘暟鎹簮", allowableValues = "1锛氫互椋炵窘鐜绯荤粺涓殑鐢ㄦ埛涓轰富浣擄紱2锛氫互椋炵窘鐩戠绯荤粺涓殑鐢ㄦ埛涓轰富浣�")
+ var sourceType: Int = 1
- // 鏌ヨ鎺掑簭
- var sort:String? = "asc"
+ @ApiModelProperty("鏌ヨ鎺掑簭", allowableValues = "asc锛氭搴�, desc锛氬�掑簭")
+ var sort: String? = "asc"
+
+ @ApiModelProperty("鎺掑簭瀛楁", allowableValues = "pro: 鎸夌収闂鏁版帓搴忥紝changePer锛氭寜鐓ф暣鏀圭巼鎺掑簭")
var sortBy: String? = null
}
\ No newline at end of file
--
Gitblit v1.9.3