From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库:施工:项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java
index d9dfb18..9d9ae77 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -8,6 +9,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.data.annotation.Id;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -30,6 +32,7 @@
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
@TableField("\"guid\"")
+ @TableId("\"guid\"")
private String guid;
/**
@@ -73,18 +76,37 @@
@ApiModelProperty(value = "站点详细地点")
@TableField("\"station_location\"")
private String stationLocation;
+
/**
* 站点经度
*/
@ApiModelProperty(value = "站点经度")
@TableField("\"station_longitude\"")
private String stationLongitude;
+
/**
* 站点纬度
*/
@ApiModelProperty(value = "站点纬度")
@TableField("\"station_latitude\"")
private String stationLatitude;
+
+ /**
+ * 站点经度
+ */
+ @ApiModelProperty(value = "水库经度")
+// @TableField("\"center_long\"")
+ @TableField(exist = false)
+ private String centerLong;
+
+ /**
+ * 站点纬度
+ */
+ @ApiModelProperty(value = "水库纬度")
+// @TableField("\"center_lat\"")
+ @TableField(exist = false)
+ private String centerLat;
+
/**
* 基面名称
*/
@@ -265,18 +287,30 @@
@TableField("\"sys_resource\"")
private String sysResource;
+ @ApiModelProperty(value = "范围(公里)")
+ @TableField(exist = false)
+ private String radius;
+ /**
+ * 设备状态
+ */
+ @ApiModelProperty(value = "设备状态(0:弃用、1:使用中、2:维修中)")
+ @TableField("\"device_status\"")
+ private String deviceStatus;
+ /**
+ * 设备状态说明
+ */
+ @ApiModelProperty(value = "设备状态说明")
+ @TableField("\"device_status_note\"")
+ private String deviceStatusNote;
-
-
-
-
-
-
-
-
-
+ /**
+ * 应报数
+ */
+ @ApiModelProperty(value = "应报数")
+ @TableField("\"should_report\"")
+ private String shouldReport;
}
--
Gitblit v1.9.3