From 0683b116ec62b4dff8570dba196b0ad749581a8a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 18 二月 2025 09:57:58 +0800 Subject: [PATCH] jtt808初始化 --- server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java index 422aa82..30c1208 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.math.BigDecimal; import java.util.Date; /** @@ -37,6 +40,9 @@ @ExcelColumn(name="缂栬緫鏃堕棿") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; + @ApiModelProperty(value = "鏈�杩戜綆鐢甸噺鎶ヨ鏃堕棿") + //@JsonFormat(pattern = "yyyy-MM-dd") + private Date lowVoltageAlarmTime; @ApiModelProperty(value = "缂栬緫浜�") @ExcelColumn(name="缂栬緫浜�") @@ -57,6 +63,12 @@ @ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)") @ExcelColumn(name="杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)") private String paramId; + @ApiModelProperty(value = "杞﹁締绫诲瀷") + @TableField(exist = false) + private String paramName; + @ApiModelProperty(value = "绔欑偣鍚嶇О") + @TableField(exist = false) + private String siteName; @ApiModelProperty(value = "缂栧彿") @ExcelColumn(name="缂栧彿") @@ -65,6 +77,9 @@ @ApiModelProperty(value = "鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ", example = "1") @ExcelColumn(name="鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ") private Integer status; + @ApiModelProperty(value = "鏄惁鏈夎溅 0鍏ㄩ儴 1鏃犺溅 2鏈夎溅 null涓哄叏閮�", example = "1") + @TableField(exist = false) + private Integer hasBike; @ApiModelProperty(value = "褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)") @ExcelColumn(name="褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)") @@ -72,16 +87,45 @@ @ApiModelProperty(value = "褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)") @ExcelColumn(name="褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)") - private String lockId; + private Integer lockId; @ApiModelProperty(value = "鏈�杩戠鍊熸椂闂�") @ExcelColumn(name="鏈�杩戠鍊熸椂闂�") //@JsonFormat(pattern = "yyyy-MM-dd") - private Date lastRentData; + private Date lastRentDate; + @ApiModelProperty(value = "鏈�杩戣繕杞︽椂闂�") + @ExcelColumn(name="鏈�杩戣繕杞︽椂闂�") + //@JsonFormat(pattern = "yyyy-MM-dd") + private Date lastBackDate; @ApiModelProperty(value = "鍑哄敭鏃堕棿") - @ExcelColumn(name="鍑哄敭鏃堕棿") + @ExcelColumn(name="") //@JsonFormat(pattern = "yyyy-MM-dd") private Date soldoutDate; + @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅") + @ExcelColumn(name="杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅") + private Integer type; + @ApiModelProperty(value = "鏈�杩戠含搴�") + @ExcelColumn(name="鏈�杩戠含搴�") + private BigDecimal latitude; + @ApiModelProperty(value = "鏈�杩戠粡搴�") + @ExcelColumn(name="鏈�杩戠粡搴�") + private BigDecimal longitude; + @ApiModelProperty(value = "鐢佃溅鎺у埗鍣⊿N鐮�") + @ExcelColumn(name="鐢佃溅鎺у埗鍣⊿N鐮�") + private String deviceSn; + @ApiModelProperty(value = "褰撳墠鐢靛帇鍊�") + @ExcelColumn(name="褰撳墠鐢靛帇鍊�") + private BigDecimal voltage; + @ApiModelProperty(value = "鏈�鍚庡績璺虫椂闂�") + @ExcelColumn(name="鏈�鍚庡績璺虫椂闂�") + private Date heartDate; + @ApiModelProperty(value = "缁堢閫氳鍦板潃") + @ExcelColumn(name="缁堢閫氳鍦板潃") + private String remoteAddress; + @ApiModelProperty(value = "鏈�杩戝畾浣嶅湴鍧�") + @ExcelColumn(name="鏈�杩戝畾浣嶅湴鍧�") + private String location; + } -- Gitblit v1.9.3