From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-bean/src/main/java/com/java110/entity/center/Business.java | 70 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/entity/center/Business.java b/java110-bean/src/main/java/com/java110/entity/center/Business.java
old mode 100644
new mode 100755
index 7e42b08..ab8ff16
--- a/java110-bean/src/main/java/com/java110/entity/center/Business.java
+++ b/java110-bean/src/main/java/com/java110/entity/center/Business.java
@@ -7,18 +7,25 @@
* 涓氬姟鏁版嵁
* Created by wuxw on 2018/4/13.
*/
-public class Business implements Comparable{
+public class Business implements Comparable<Business>{
private String bId;
//涓氬姟缂栫爜
private String serviceCode;
+ private String businessTypeCd;
+
private String serviceName;
private String remark;
- private JSONArray datas;
+ private String isInstance;
+
+ private JSONObject datas;
+
+ //閫忎紶
+ private String transferData;
private JSONArray attrs;
//杩斿洖 缂栫爜
@@ -61,11 +68,11 @@
this.remark = remark;
}
- public JSONArray getDatas() {
+ public JSONObject getDatas() {
return datas;
}
- public void setDatas(JSONArray datas) {
+ public void setDatas(JSONObject datas) {
this.datas = datas;
}
@@ -101,6 +108,22 @@
this.seq = seq;
}
+ public String getIsInstance() {
+ return isInstance;
+ }
+
+ public void setIsInstance(String isInstance) {
+ this.isInstance = isInstance;
+ }
+
+ public String getTransferData() {
+ return transferData;
+ }
+
+ public void setTransferData(String transferData) {
+ this.transferData = transferData;
+ }
+
/**
* 鏋勫缓鎴愬璞�
* @return
@@ -110,11 +133,29 @@
try{
this.setbId(businessObj.getString("bId"));
- this.setServiceCode(businessObj.getString("serviceCode"));
- this.setServiceName(businessObj.getString("serviceName"));
- this.setRemark(businessObj.getString("remark"));
- this.setDatas(businessObj.getJSONArray("datas"));
- this.setAttrs(businessObj.getJSONArray("attrs"));
+ this.setBusinessTypeCd(businessObj.getString("businessTypeCd"));
+ if(businessObj.containsKey("serviceName")) {
+ this.setServiceName(businessObj.getString("serviceName"));
+ }
+ if(businessObj.containsKey("remark")) {
+ this.setRemark(businessObj.getString("remark"));
+ }
+
+ if(businessObj.containsKey("isInstance")){
+ this.setIsInstance(businessObj.getString("isInstance"));
+ }
+ if(businessObj.containsKey("datas")) {
+ this.setDatas(businessObj.getJSONObject("datas"));
+ }
+
+ if(businessObj.containsKey("attrs")){
+ this.setAttrs(businessObj.getJSONArray("attrs"));
+ }
+
+ if(businessObj.containsKey("transferData")){
+ this.setTransferData(businessObj.getString("transferData"));
+ }
+
if(businessObj.containsKey("response")){
this.setCode(businessObj.getJSONObject("response").getString("code"));
this.setMessage(businessObj.getJSONObject("response").getString("message"));
@@ -126,11 +167,18 @@
}
@Override
- public int compareTo(Object o) {
- Business otherBusiness = (Business)o;
+ public int compareTo(Business otherBusiness) {
if(this.getSeq() > otherBusiness.getSeq()) {
return -1;
}
return 0;
}
+
+ public String getBusinessTypeCd() {
+ return businessTypeCd;
+ }
+
+ public void setBusinessTypeCd(String businessTypeCd) {
+ this.businessTypeCd = businessTypeCd;
+ }
}
--
Gitblit v1.8.0