From 23b57fc7eab3defc741a0e54e3dac939ad49f13f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 五月 2026 19:14:04 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java | 199 ++++++++++++++++++++++++++++---------------------
1 files changed, 113 insertions(+), 86 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java
index fe2abd3..45621e9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java
@@ -1,8 +1,8 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,110 +10,137 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
-import java.math.BigDecimal;
import java.util.Date;
-
+import java.math.BigDecimal;
/**
- * 鐢佃〃璁惧淇℃伅
- * @author renkang
- * @date 2026/04/03
+ * 鐢佃〃璁惧淇℃伅Model瀹氫箟
+ * @author doumee
+ * @date 2026-05-21 11:10:04
*/
@Data
-@ApiModel("鐢佃〃璁惧淇℃伅")
-@TableName("`yw_electrical`")
-public class YwElectrical extends LoginUserModel {
+@TableName("yw_electrical")
+@ApiModel(value = "鐢佃〃璁惧淇℃伅瀹炰綋绫�")
+public class YwElectrical extends LoginUserModel {
+ @ApiModelProperty("涓婚敭")
+ @ExcelColumn(name="涓婚敭",index=1 ,width=10)
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name = "涓婚敭")
private Integer id;
-
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name = "鍒涘缓浜虹紪鐮�")
+ @ApiModelProperty("鍒涘缓浜虹紪鐮�")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�",index=2 ,width=10)
private Integer creator;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name = "鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index=3 ,width=10)
private Date createDate;
-
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name = "鏇存柊浜虹紪鐮�")
- private Integer editor;
-
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鏇存柊浜虹紪鐮�")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�",index=4 ,width=10)
+ private Integer edirot;
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿",index=5 ,width=10)
private Date editDate;
-
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "0")
- @ExcelColumn(name = "鏄惁鍒犻櫎0鍚� 1鏄�")
+ @ApiModelProperty("鏄惁鍒犻櫎0鍚� 1鏄�")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�",index=6 ,width=10)
private Integer isdeleted;
-
- @ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name = "澶囨敞")
+ @ApiModelProperty("澶囨敞")
+ @ExcelColumn(name="澶囨敞",index=7 ,width=10)
private String remark;
-
- @ApiModelProperty(value = "閲囬泦鍣ㄥ彿")
- @ExcelColumn(name = "閲囬泦鍣ㄥ彿")
- private String collectorNo;
-
- @ApiModelProperty(value = "琛ㄥ彿")
- @ExcelColumn(name = "琛ㄥ彿")
+ @ApiModelProperty("閲囬泦鍣ㄥ彿")
+ @ExcelColumn(name="閲囬泦鍣ㄥ彿",index=8 ,width=10)
+ private String collectorId;
+ @ApiModelProperty("琛ㄥ彿")
+ @ExcelColumn(name="琛ㄥ彿",index=9 ,width=10)
private String code;
-
- @ApiModelProperty(value = "琛ㄥ湴鍧�(閫氳鍦板潃)")
- @ExcelColumn(name = "琛ㄥ湴鍧�(閫氳鍦板潃)")
- private String electricAddress;
-
- @ApiModelProperty(value = "鐢佃〃绫诲瀷")
- @ExcelColumn(name = "鐢佃〃绫诲瀷")
- private String electricType;
-
- @ApiModelProperty(value = "鍊嶇巼", example = "1")
- @ExcelColumn(name = "鍊嶇巼")
- private Integer magnification;
-
- @ApiModelProperty(value = "浠樿垂绫诲瀷", example = "0")
- @ExcelColumn(name = "浠樿垂绫诲瀷")
+ @ApiModelProperty("琛ㄥ湴鍧�(閫氳鍦板潃)")
+ @ExcelColumn(name="琛ㄥ湴鍧�(閫氳鍦板潃)",index=10 ,width=10)
+ private String address;
+ @ApiModelProperty("璁惧绫诲瀷 0 琛ㄧず鐢佃〃 锛� 1 琛ㄧず姘磋〃")
+ @ExcelColumn(name="璁惧绫诲瀷 0 琛ㄧず鐢佃〃 锛� 1 琛ㄧず姘磋〃",index=11 ,width=10)
+ private String deviceType;
+ @ApiModelProperty("鍊嶇巼")
+ @ExcelColumn(name="鍊嶇巼",index=12 ,width=10)
+ private BigDecimal rate;
+ @ApiModelProperty("浠樿垂绫诲瀷")
+ @ExcelColumn(name="浠樿垂绫诲瀷",index=13 ,width=10)
private Integer payType;
-
- @ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name = "鍚嶇О")
+ @ApiModelProperty("鍚嶇О")
+ @ExcelColumn(name="鍚嶇О",index=14 ,width=10)
private String name;
-
- @ApiModelProperty(value = "缃戝叧涓婚敭", example = "1")
- @ExcelColumn(name = "缃戝叧涓婚敭")
+ @ApiModelProperty("缃戝叧涓婚敭")
+ @ExcelColumn(name="缃戝叧涓婚敭",index=15 ,width=10)
private Integer gatewayId;
-
- @ApiModelProperty(value = "缃戝叧閫氫俊绔彛")
- @ExcelColumn(name = "缃戝叧閫氫俊绔彛")
+ @ApiModelProperty("缃戝叧閫氫俊绔彛")
+ @ExcelColumn(name="缃戝叧閫氫俊绔彛",index=16 ,width=10)
private String gatewayPort;
-
- @ApiModelProperty(value = "涓婃蹇冭烦鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelColumn(name = "涓婃蹇冭烦鏃堕棿")
+ @ApiModelProperty("涓婃蹇冭烦鏃堕棿")
+ @ExcelColumn(name="涓婃蹇冭烦鏃堕棿",index=17 ,width=10)
private Date lastHeartbeatDate;
-
- @ApiModelProperty(value = "鐢佃〃浣欓")
- @ExcelColumn(name = "鐢佃〃浣欓")
+ @ApiModelProperty("鐢佃〃浣欓锛堝厓锛�")
+ @ExcelColumn(name="鐢佃〃浣欓锛堝厓锛�",index=18 ,width=10)
private BigDecimal balance;
-
- @ApiModelProperty(value = "杩愯鐘舵�侊細0=鏈紑鎴凤紱1=鎷夐椄锛�2=鍚堥椄锛�3=鍏朵粬", example = "0")
- @ExcelColumn(name = "杩愯鐘舵��")
- private Integer runStatus;
-
- @ApiModelProperty(value = "涓婃寮�鎴锋椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelColumn(name = "涓婃寮�鎴锋椂闂�")
+ @ApiModelProperty("缁х數鍣ㄧ姸鎬侊細0=鎷夐椄锛�1=鍚堥椄锛�2=鍏朵粬")
+ @ExcelColumn(name="缁х數鍣ㄧ姸鎬侊細0=鎷夐椄锛�1=鍚堥椄锛�2=鍏朵粬",index=19 ,width=10)
+ private String relayStatus;
+ @ApiModelProperty("涓婃寮�鎴锋椂闂�")
+ @ExcelColumn(name="涓婃寮�鎴锋椂闂�",index=20 ,width=10)
private Date lastOpenDate;
-
- @ApiModelProperty(value = "涓婃娓呴浂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelColumn(name = "涓婃娓呴浂鏃堕棿")
+ @ApiModelProperty("涓婃娓呴浂鏃堕棿")
+ @ExcelColumn(name="涓婃娓呴浂鏃堕棿",index=21 ,width=10)
private Date lastCleanDate;
-
- @ApiModelProperty(value = "缃戝叧鍚嶇О")
+ @ApiModelProperty("鍦ㄧ嚎鐘舵�侊細0=绂荤嚎 1=鍦ㄧ嚎")
+ @ExcelColumn(name="鍦ㄧ嚎鐘舵�侊細0=绂荤嚎 1=鍦ㄧ嚎",index=22 ,width=10)
+ private Integer online;
+ @ApiModelProperty("鏄惁寮�鎴凤細0=鏈紑鎴凤紱1=宸插紑鎴�")
+ @ExcelColumn(name="鏄惁寮�鎴凤細0=鏈紑鎴凤紱1=宸插紑鎴�",index=23 ,width=10)
+ private Integer accountStatus;
+ @ApiModelProperty("鐘舵�侊細0=姝ｅ父锛�1=绂佺敤")
+ @ExcelColumn(name="鐘舵�侊細0=姝ｅ父锛�1=绂佺敤",index=24 ,width=10)
+ private Integer status;
+ @ApiModelProperty("棰勮鐘跺喌缂栫爜")
+ @ExcelColumn(name="棰勮鐘跺喌缂栫爜",index=25 ,width=10)
+ private String warnType;
+ @ApiModelProperty("璁惧鍨嬪彿")
+ @ExcelColumn(name="璁惧鍨嬪彿",index=26 ,width=10)
+ private String type;
+ @ApiModelProperty("璁惧妗ｆID")
+ @ExcelColumn(name="璁惧妗ｆID",index=27 ,width=10)
+ private String dId;
+ @ApiModelProperty("閲囬泦鍣ㄦ。妗圛D")
+ @ExcelColumn(name="閲囬泦鍣ㄦ。妗圛D",index=28 ,width=10)
+ private String cId;
+ @ApiModelProperty("澶囨敞")
+ @ExcelColumn(name="澶囨敞",index=29 ,width=10)
+ private String description;
+ @ApiModelProperty("淇″彿鍊�,1-31 銆� 20浠ヤ笂绠椾俊鍙风ǔ瀹�")
+ @ExcelColumn(name="淇″彿鍊�,1-31 銆� 20浠ヤ笂绠椾俊鍙风ǔ瀹�",index=30 ,width=10)
+ private BigDecimal csq;
+ @ApiModelProperty("涓婃鎺夌嚎鏃堕棿 online = false 鏃跺瓨鍦�")
+ @ExcelColumn(name="涓婃鎺夌嚎鏃堕棿 online = false 鏃跺瓨鍦�",index=31 ,width=10)
+ private Date disconnectTime;
+ @ApiModelProperty("涓婃涓婄嚎鏃堕棿 online = true 鏃跺瓨鍦�")
+ @ExcelColumn(name="涓婃涓婄嚎鏃堕棿 online = true 鏃跺瓨鍦�",index=32 ,width=10)
+ private Date connectTime;
+ @ApiModelProperty("褰撳墠鍓╀綑鎬荤數閲忥紙KW锛�")
+ @ExcelColumn(name="褰撳墠鍓╀綑鎬荤數閲忥紙KW锛�",index=33 ,width=10)
+ private String balanceBattery;
+ @ApiModelProperty("鏈�杩戞妱琛ㄦ椂闂�")
+ @ExcelColumn(name="鏈�杩戞妱琛ㄦ椂闂�",index=34 ,width=10)
+ private Date balanceTime;
+ @ApiModelProperty("鎴峰彿 鍏宠仈鐢ㄦ埛妗ｆID")
+ @ExcelColumn(name="鎴峰彿 鍏宠仈鐢ㄦ埛妗ｆID",index=35 ,width=10)
+ private String accountId;
+ @ApiModelProperty("鍏宠仈浠锋牸妗ｆID priceid鍜宲aram_id 姣忓潡琛ㄥ彧浼氱敤鍏朵腑涓�绉�")
+ @ExcelColumn(name="鍏宠仈浠锋牸妗ｆID priceid鍜宲aram_id 姣忓潡琛ㄥ彧浼氱敤鍏朵腑涓�绉�",index=37 ,width=10)
+ private String priceid;
+ @ApiModelProperty("鍏宠仈鍙傛暟妗ｆID priceid鍜宲aram_id 姣忓潡琛ㄥ彧浼氱敤鍏朵腑涓�绉�")
+ @ExcelColumn(name="鍏宠仈鍙傛暟妗ｆID priceid鍜宲aram_id 姣忓潡琛ㄥ彧浼氱敤鍏朵腑涓�绉�",index=36 ,width=10)
+ private String paramId;
+ @ApiModelProperty("缁戝畾鎴块棿鍚嶇О锛堝叧鑱攜w_electrical_room銆亂w_room锛�")
@TableField(exist = false)
- private String gatewayName;
+ private String roomNames;
+
+ @TableField(exist = false)
+ private String warnTypeName;
+
+ @TableField(exist = false)
+ private String meterKeyword;
}
--
Gitblit v1.9.3