From 31290bdc487e80c26b2e81d55e46ca27d80e385c Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期二, 28 十一月 2023 23:46:02 +0800
Subject: [PATCH] 设备安装单/维修单优化，一级联营商合伙人登录之后可以看到别人给他创建的安装单和他给别人创建的安装单20231128wmz
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Product.java | 222 ++++++++++++++++++++++++++++++------------------------
1 files changed, 123 insertions(+), 99 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Product.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Product.java
index 7a319b5..61c0656 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Product.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Product.java
@@ -7,52 +7,73 @@
/**
* 浜у搧瀵硅薄 iot_product
- *
+ *
* @author kerwincui
* @date 2021-12-16
*/
-public class Product extends BaseEntity
-{
+public class Product extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 浜у搧ID */
+ /**
+ * 浜у搧ID
+ */
private Long productId;
- /** 浜у搧鍚嶇О */
+ /**
+ * 浜у搧鍚嶇О
+ */
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- /** 浜у搧鍒嗙被ID */
+ /**
+ * 浜у搧鍒嗙被ID
+ */
@Excel(name = "浜у搧鍒嗙被ID")
private Long categoryId;
- /** 浜у搧鍒嗙被鍚嶇О */
+ /**
+ * 浜у搧鍒嗙被鍚嶇О
+ */
@Excel(name = "浜у搧鍒嗙被鍚嶇О")
private String categoryName;
- /** 绉熸埛ID */
+ /**
+ * 绉熸埛ID
+ */
@Excel(name = "绉熸埛ID")
private Long tenantId;
- /** 绉熸埛鍚嶇О */
+ /**
+ * 绉熸埛鍚嶇О
+ */
@Excel(name = "绉熸埛鍚嶇О")
private String tenantName;
- /** 鏄惁绯荤粺閫氱敤锛�0-鍚︼紝1-鏄級 */
+ /**
+ * 鏄惁绯荤粺閫氱敤锛�0-鍚︼紝1-鏄級
+ */
@Excel(name = "鏄惁绯荤粺閫氱敤", readConverterExp = "0=-鍚︼紝1-鏄�")
private Integer isSys;
- /** 鏄惁鍚敤鎺堟潈鐮侊紙0-鍚︼紝1-鏄級 */
+ /**
+ * 鏄惁鍚敤鎺堟潈鐮侊紙0-鍚︼紝1-鏄級
+ */
@Excel(name = "鏄惁鍚敤鎺堟潈鐮�", readConverterExp = "0=-鍚︼紝1-鏄�")
private Integer isAuthorize;
- /** mqtt璐﹀彿 */
+ /**
+ * mqtt璐﹀彿
+ */
private String mqttAccount;
- /** mqtt瀵嗙爜 */
+ /**
+ * mqtt瀵嗙爜
+ */
private String mqttPassword;
- /** 浜у搧绉橀挜 */
+ /**
+ * 浜у搧绉橀挜
+ */
private String mqttSecret;
public String getMqttSecret() {
@@ -63,29 +84,43 @@
this.mqttSecret = mqttSecret;
}
- /** 鐘舵�侊紙1-鏈彂甯冿紝2-宸插彂甯冿紝涓嶈兘淇敼锛� */
+ /**
+ * 鐘舵�侊紙1-鏈彂甯冿紝2-宸插彂甯冿紝涓嶈兘淇敼锛�
+ */
@Excel(name = "鐘舵��", readConverterExp = "1==鏈彂甯冿紝2=宸插彂甯冿紝涓嶈兘淇敼")
private Integer status;
- /** 璁惧绫诲瀷锛�1-鐩磋繛璁惧銆�2-缃戝叧瀛愯澶囥��3-缃戝叧璁惧锛� */
+ /**
+ * 璁惧绫诲瀷锛�1-鐩磋繛璁惧銆�2-缃戝叧瀛愯澶囥��3-缃戝叧璁惧锛�
+ */
@Excel(name = "璁惧绫诲瀷", readConverterExp = "1=鐩磋繛璁惧銆�2=缃戝叧瀛愯澶囥��3=缃戝叧璁惧")
private Integer deviceType;
- /** 鑱旂綉鏂瑰紡锛�1=-wifi銆�2-铚傜獫(2G/3G/4G/5G)銆�3-浠ュお缃戙��4-鍏朵粬锛� */
+ /**
+ * 鑱旂綉鏂瑰紡锛�1=-wifi銆�2-铚傜獫(2G/3G/4G/5G)銆�3-浠ュお缃戙��4-鍏朵粬锛�
+ */
@Excel(name = "鑱旂綉鏂瑰紡", readConverterExp = "1=-wifi銆�2=铚傜獫(2G/3G/4G/5G)銆�3=浠ュお缃戙��4=鍏朵粬")
private Integer networkMethod;
- /** 璁よ瘉鏂瑰紡锛�1-璐﹀彿瀵嗙爜銆�2-璇佷功銆�3-Http锛� */
+ /**
+ * 璁よ瘉鏂瑰紡锛�1-璐﹀彿瀵嗙爜銆�2-璇佷功銆�3-Http锛�
+ */
@Excel(name = "璁よ瘉鏂瑰紡", readConverterExp = "1=璐﹀彿瀵嗙爜銆�2=璇佷功銆�3=Http")
private Integer vertificateMethod;
- /** 鍥剧墖鍦板潃 */
+ /**
+ * 鍥剧墖鍦板潃
+ */
private String imgUrl;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
private String delFlag;
- /** 鐗╂ā鍨婮son **/
+ /**
+ * 鐗╂ā鍨婮son
+ **/
private String thingsModelsJson;
public String getThingsModelsJson() {
@@ -104,158 +139,147 @@
this.imgUrl = imgUrl;
}
- public void setProductId(Long productId)
- {
+ public void setProductId(Long productId) {
this.productId = productId;
}
- public Long getProductId()
- {
+ public Long getProductId() {
return productId;
}
- public void setProductName(String productName)
- {
+
+ public void setProductName(String productName) {
this.productName = productName;
}
- public String getProductName()
- {
+ public String getProductName() {
return productName;
}
- public void setCategoryId(Long categoryId)
- {
+
+ public void setCategoryId(Long categoryId) {
this.categoryId = categoryId;
}
- public Long getCategoryId()
- {
+ public Long getCategoryId() {
return categoryId;
}
- public void setCategoryName(String categoryName)
- {
+
+ public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
- public String getCategoryName()
- {
+ public String getCategoryName() {
return categoryName;
}
- public void setTenantId(Long tenantId)
- {
+
+ public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
- public Long getTenantId()
- {
+ public Long getTenantId() {
return tenantId;
}
- public void setTenantName(String tenantName)
- {
+ public void setTenantName(String tenantName) {
this.tenantName = tenantName;
}
- public String getTenantName()
- {
+
+ public String getTenantName() {
return tenantName;
}
- public void setIsSys(Integer isSys)
- {
+ public void setIsSys(Integer isSys) {
this.isSys = isSys;
}
- public Integer getIsSys()
- {
+
+ public Integer getIsSys() {
return isSys;
}
- public void setIsAuthorize(Integer isAuthorize) {this.isAuthorize = isAuthorize;}
- public Integer getIsAuthorize() {return isAuthorize;}
+ public void setIsAuthorize(Integer isAuthorize) {
+ this.isAuthorize = isAuthorize;
+ }
- public void setMqttAccount(String mqttAccount)
- {
+ public Integer getIsAuthorize() {
+ return isAuthorize;
+ }
+
+ public void setMqttAccount(String mqttAccount) {
this.mqttAccount = mqttAccount;
}
- public String getMqttAccount()
- {
+
+ public String getMqttAccount() {
return mqttAccount;
}
- public void setMqttPassword(String mqttPassword)
- {
+ public void setMqttPassword(String mqttPassword) {
this.mqttPassword = mqttPassword;
}
- public String getMqttPassword()
- {
+
+ public String getMqttPassword() {
return mqttPassword;
}
- public void setStatus(Integer status)
- {
+ public void setStatus(Integer status) {
this.status = status;
}
- public Integer getStatus()
- {
+ public Integer getStatus() {
return status;
}
- public void setDeviceType(Integer deviceType)
- {
+
+ public void setDeviceType(Integer deviceType) {
this.deviceType = deviceType;
}
- public Integer getDeviceType()
- {
+ public Integer getDeviceType() {
return deviceType;
}
- public void setNetworkMethod(Integer networkMethod)
- {
+
+ public void setNetworkMethod(Integer networkMethod) {
this.networkMethod = networkMethod;
}
- public Integer getNetworkMethod()
- {
+ public Integer getNetworkMethod() {
return networkMethod;
}
- public void setVertificateMethod(Integer vertificateMethod)
- {
+
+ public void setVertificateMethod(Integer vertificateMethod) {
this.vertificateMethod = vertificateMethod;
}
- public Integer getVertificateMethod()
- {
+ public Integer getVertificateMethod() {
return vertificateMethod;
}
- public void setDelFlag(String delFlag)
- {
+
+ public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
- public String getDelFlag()
- {
+ public String getDelFlag() {
return delFlag;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("productId", getProductId())
- .append("productName", getProductName())
- .append("categoryId", getCategoryId())
- .append("categoryName", getCategoryName())
- .append("tenantId", getTenantId())
- .append("tenantName", getTenantName())
- .append("isSys", getIsSys())
- .append("isAuthorize", getIsAuthorize())
- .append("status", getStatus())
- .append("deviceType", getDeviceType())
- .append("networkMethod", getNetworkMethod())
- .append("vertificateMethod", getVertificateMethod())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("productId", getProductId())
+ .append("productName", getProductName())
+ .append("categoryId", getCategoryId())
+ .append("categoryName", getCategoryName())
+ .append("tenantId", getTenantId())
+ .append("tenantName", getTenantName())
+ .append("isSys", getIsSys())
+ .append("isAuthorize", getIsAuthorize())
+ .append("status", getStatus())
+ .append("deviceType", getDeviceType())
+ .append("networkMethod", getNetworkMethod())
+ .append("vertificateMethod", getVertificateMethod())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
}
--
Gitblit v1.8.0