From 955873b451cadfbc71bf21f4f7f8717d8a10936a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 19:27:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 8063798..f733483 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.web.response.PlatformWorkVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -9,6 +12,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
@@ -21,7 +26,7 @@
@Data
@ApiModel("鏈堝彴淇℃伅琛�")
@TableName("`platform`")
-public class Platform {
+public class Platform extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -43,7 +48,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -61,10 +65,16 @@
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
+ @ApiModelProperty(value = "led绌洪棽鏂囨")
+ @ExcelColumn(name="led绌洪棽鏂囨")
+ private String ledContent;
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
+ @ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
+ private Integer status;
@ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1")
@ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬")
- private Integer status;
+ private Integer platformStatus;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
@@ -86,18 +96,16 @@
@ExcelColumn(name="鍚屾椂浣滀笟鏁伴噺")
private Integer workingNum;
-
@ApiModelProperty(value = "浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1")
@ExcelColumn(name="浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級")
- private Integer waitCallTime;
+ private Integer workTimeoutAlarmTime;
@ApiModelProperty(value = "鍋滅暀瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1")
@ExcelColumn(name="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(绉掞級")
- private Integer alermTime;
+ private Integer stayTimeoutAlarmTime;
@ApiModelProperty(value = "鏈�鍚庝簨浠舵帹閫佹椂闂�")
@ExcelColumn(name="鏈�鍚庝簨浠舵帹閫佹椂闂�")
-
private Date lastEventTime;
@ApiModelProperty(value = "鐩戞帶鐐瑰悕绉帮紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@@ -153,16 +161,16 @@
private String groupName;
@ApiModelProperty(value = "鍏宠仈LED缂栫爜闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
@TableField(exist = false)
- private String ledIds;
+ private List<Integer> ledIds;
@ApiModelProperty(value = "鍏宠仈骞挎挱缂栫爜闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
@TableField(exist = false)
- private String broadcaseIds;
+ private List<Integer> broadcastIds;
@ApiModelProperty(value = "鍏宠仈LED鍚嶇О闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
@TableField(exist = false)
private String ledNames;
@ApiModelProperty(value = "鍏宠仈骞挎挱缂栧悕绉伴泦鍚堬紝鑻辨枃閫楀彿闅斿紑", example = "1")
@TableField(exist = false)
- private String broadcaseNames;
+ private String broadcastNames;
@ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1")
@TableField(exist = false)
@@ -176,4 +184,45 @@
@TableField(exist = false)
private Boolean showConfig = false;
+ @ApiModelProperty(value = "浣滀笟鐘舵�侊細0=绌洪棽锛�1=浣滀笟涓�")
+ @TableField(exist = false)
+ private Integer workStatus;
+
+ @ApiModelProperty(value = "浣滀笟杞﹁締杞︾墝鐓�")
+ @TableField(exist = false)
+ private String workCarCode;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd", example = "1")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryDateStart;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd", example = "1")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryDateEnd;
+
+ @ApiModelProperty(value = "鍋滈潬娆℃暟", example = "1")
+ @TableField(exist = false)
+ private Integer stopCount;
+
+ @ApiModelProperty(value = "宸ヤ綔鏃堕暱 鍗曚綅h", example = "1")
+ @TableField(exist = false)
+ private BigDecimal workCountTime;
+
+ @ApiModelProperty(value = "鏈堝彴宸ヤ綔寮�鏀炬椂闀�" ,hidden = true)
+ @TableField(exist = false)
+ private BigDecimal openTime ;
+
+ @ApiModelProperty(value = "浣跨敤鐜�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal useRata;
+
+
+
+ @ApiModelProperty(value = "鏈堝彴浣滀笟鏁版嵁")
+ @TableField(exist = false)
+ private PlatformWorkVO platformWorkVO;
}
--
Gitblit v1.9.3