From a4fb6a1f15ffabfc13506a183ca5f69306e85e08 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 19 八月 2024 13:40:58 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 71 ++++++++++++++++++++++++++++++----- 1 files changed, 61 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 96da8e3..314f0df 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 @@ -1,6 +1,9 @@ package com.doumee.dao.business.model; +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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -10,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 鏈堝彴淇℃伅琛� @@ -19,7 +23,7 @@ @Data @ApiModel("鏈堝彴淇℃伅琛�") @TableName("`platform`") -public class Platform { +public class Platform extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -32,7 +36,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -41,24 +45,31 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; + @ApiModelProperty(value = "鍚嶇О") @ExcelColumn(name="鍚嶇О") private String name; + @ApiModelProperty(value = "缂栫爜") + @ExcelColumn(name="缂栫爜") + private String code; @ApiModelProperty(value = "澶囨敞") @ExcelColumn(name="澶囨敞") private String remark; - @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1") - @ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤") + @ApiModelProperty(value = "鐘舵�� 0姝e父 1绂佺敤", example = "1") + @ExcelColumn(name="鐘舵�� 0姝e父 1绂佺敤") private Integer status; + @ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1") + @ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬") + private Integer platformStatus; @ApiModelProperty(value = "鎺掑簭鐮�", example = "1") @ExcelColumn(name="鎺掑簭鐮�") @@ -80,17 +91,17 @@ @ExcelColumn(name="鍚屾椂浣滀笟鏁伴噺") private Integer workingNum; - @ApiModelProperty(value = "绛夊緟鏁欏ソ鏃堕棿(绉掞級", example = "1") - @ExcelColumn(name="绛夊緟鏁欏ソ鏃堕棿(绉掞級") - private Integer wariCallTime; + @ApiModelProperty(value = "浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1") + @ExcelColumn(name="浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級") + private Integer workTimeoutAlarmTime; @ApiModelProperty(value = "鍋滅暀瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1") @ExcelColumn(name="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(绉掞級") - private Integer alermTime; + private Integer stayTimeoutAlarmTime; @ApiModelProperty(value = "鏈�鍚庝簨浠舵帹閫佹椂闂�") @ExcelColumn(name="鏈�鍚庝簨浠舵帹閫佹椂闂�") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date lastEventTime; @ApiModelProperty(value = "鐩戞帶鐐瑰悕绉帮紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑") @@ -104,6 +115,9 @@ @ApiModelProperty(value = "娴峰悍鏍囪瘑") @ExcelColumn(name="娴峰悍鏍囪瘑") private String hkId; + @ApiModelProperty(value = "娴峰悍鏍囪瘑鍚屾鏃堕棿") + @ExcelColumn(name="娴峰悍鏍囪瘑鍚屾鏃堕棿") + private Date hkDate; @ApiModelProperty(value = "鍏宠仈鎵跨鍏徃") @ExcelColumn(name="鍏宠仈鎵跨鍏徃") @@ -128,5 +142,42 @@ @ApiModelProperty(value = "瑙掑害", example = "1") @ExcelColumn(name="瑙掑害") private BigDecimal angle; + @ApiModelProperty(value = "鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�", example = "1") + @ExcelColumn(name="鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�") + private BigDecimal workRate; + + @ApiModelProperty(value = "骞挎挱鍚嶇О", example = "1") + @TableField(exist = false) + private String broadcastName; + @ApiModelProperty(value = "led鍚嶇О", example = "1") + @TableField(exist = false) + private String ledName; + @ApiModelProperty(value = "鍒嗙粍鍚嶇О", example = "1") + @TableField(exist = false) + private String groupName; + @ApiModelProperty(value = "鍏宠仈LED缂栫爜闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1") + @TableField(exist = false) + private String ledIds; + @ApiModelProperty(value = "鍏宠仈骞挎挱缂栫爜闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1") + @TableField(exist = false) + private String broadcastIds; + @ApiModelProperty(value = "鍏宠仈LED鍚嶇О闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1") + @TableField(exist = false) + private String ledNames; + @ApiModelProperty(value = "鍏宠仈骞挎挱缂栧悕绉伴泦鍚堬紝鑻辨枃閫楀彿闅斿紑", example = "1") + @TableField(exist = false) + private String broadcastNames; + + @ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1") + @TableField(exist = false) + private List<PlatformJob> workJobList; + + @ApiModelProperty(value = "宸茬鍒版帓闃熻溅杈�", example = "1") + @TableField(exist = false) + private List<PlatformJob> signJobList; + + @ApiModelProperty(value = "閰嶇疆鏄剧ず") + @TableField(exist = false) + private Boolean showConfig = false; } -- Gitblit v1.9.3