From 875de0a84270cda66d3d8732ff5471354c0d5b0e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Jun 2023 17:36:27 +0800
Subject: [PATCH] 全景模块

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java |   51 +++++++++++++++------------------------------------
 1 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java
index 8385d51..8b2c1c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java
@@ -1,12 +1,15 @@
 package cn.gistack.sm.jcsb.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -14,9 +17,9 @@
 import java.util.Date;
 
 @Data
-@TableName("JCSB_DEVICE_REPORT")
+@TableName(value = "SM_DEVICE_REPORT",autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
-public class DeviceReport extends TenantEntity{
+public class DeviceReport extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
@@ -38,45 +41,21 @@
 	private String deviceType;
 
 	/**
-	 * 雨量
+	 * 水库id
 	 */
-	@ApiModelProperty("雨量")
-	private String rainfall;
+	@ApiModelProperty("水库id")
+	private String resGuid;
 
 	/**
-	 * 水位
+	 * 水库名称
 	 */
-	@ApiModelProperty("水位")
-	private String waterLevel;
+	@ApiModelProperty("水库名称")
+	private String resName;
 
 	/**
-	 * 流量
+	 * 巡查现场图片
 	 */
-	@ApiModelProperty("流量")
-	private String flow;
-
-	/**
-	 * 蓄水量
-	 */
-	@ApiModelProperty("蓄水量")
-	private String waterStorage;
-
-	/**
-	 * 比讯限
-	 */
-	@ApiModelProperty("比讯限")
-	private String specificFloodLimit;
-
-	/**
-	 * 时段雨量
-	 */
-	@ApiModelProperty("时段雨量")
-	private String temporalRainfall;
-
-	/**
-	 * 记录时间
-	 */
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date recordTime;
+	@ApiModelProperty("图片")
+	@TableField(value = "images",typeHandler = FastjsonTypeHandler.class)
+	private Object[] images;
 }

--
Gitblit v1.9.3