From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 java110-bean/src/main/java/com/java110/entity/center/AppRoute.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/entity/center/AppRoute.java b/java110-bean/src/main/java/com/java110/entity/center/AppRoute.java
old mode 100644
new mode 100755
index a5902f1..d897246
--- a/java110-bean/src/main/java/com/java110/entity/center/AppRoute.java
+++ b/java110-bean/src/main/java/com/java110/entity/center/AppRoute.java
@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -22,6 +23,10 @@
     //涓�鍒嗛挓锛岃皟鐢ㄩ檺鍒舵鏁�
     private int limitTimes;
 
+    private String invokeModel;
+
+
+
     //鎺╃爜
     private String securityCode;
     //鐧藉悕鍗�
@@ -31,7 +36,8 @@
     private List<String> backListIp = new ArrayList<String>();
 
     //鏈嶅姟
-    private List<AppServiceStatus> appServices = new ArrayList<AppServiceStatus>();
+    //private List<AppServiceStatus> appServices = new ArrayList<AppServiceStatus>();
+    private AppService appService;
 
     private String remark;
 
@@ -95,12 +101,28 @@
         this.backListIp.add(backIp);
     }
 
-    public List<AppServiceStatus> getAppServices() {
+    public String getInvokeModel() {
+        return invokeModel;
+    }
+
+    public void setInvokeModel(String invokeModel) {
+        this.invokeModel = invokeModel;
+    }
+
+    /*public List<AppServiceStatus> getAppServices() {
         return appServices;
     }
 
     public void addAppServices(AppServiceStatus appServiceStatus) {
         this.appServices.add(appServiceStatus);
+    }*/
+
+    public AppService getAppService() {
+        return appService;
+    }
+
+    public void setAppService(AppService appService) {
+        this.appService = appService;
     }
 
     public String getRemark() {
@@ -123,12 +145,34 @@
      * 鏋勫缓鏁版嵁
      * @return
      */
-    public AppRoute builder(){
+    public AppRoute builder(Map appInfo){
+        String []listIps = null;
+        this.setAppId(appInfo.get("app_id").toString());
+        this.setLimitTimes(appInfo.get("invoke_limit_times") == null ? -1 : Integer.parseInt(appInfo.get("invoke_limit_times").toString()));
+        this.setName(appInfo.get("name").toString());
+        this.setOrderTypeCd(appInfo.get("order_type_cd").toString());
+        this.setSecurityCode(appInfo.get("security_code").toString());
+        this.setInvokeModel(appInfo.get("invoke_model").toString());
+        if(appInfo.get("while_list_ip") != null && !"".equals(appInfo.get("while_list_ip"))){
+            listIps = appInfo.get("while_list_ip").toString().split(";");
+            for(String whileIp : listIps )
+                this.addWhileListIp(whileIp);
+        }
+        if(appInfo.get("black_list_ip") != null && !"".equals(appInfo.get("black_list_ip"))){
+            listIps = appInfo.get("black_list_ip").toString().split(";");
+            for(String backIp : listIps )
+                this.addBackListIp(backIp);
+        }
+        this.setStatusCd("0");
+        this.setAppService(AppService.newInstance().builder(appInfo));
         return this;
     }
 
 
 
+    public static AppRoute newInstance(){
+        return new AppRoute();
+    }
 
 
 }

--
Gitblit v1.8.0