From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java |   85 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 68 insertions(+), 17 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java b/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
old mode 100644
new mode 100755
index 7390192..b4cf899
--- a/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
+++ b/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
@@ -1,19 +1,16 @@
 package com.java110.core.base.smo;
 
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.log.LoggerEngine;
-import com.java110.common.util.ProtocolUtil;
 import com.java110.core.base.AppBase;
 import com.java110.core.context.AppContext;
-import com.java110.core.context.BusinessServiceDataFlow;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.factory.DataFlowFactory;
-import com.java110.feign.base.IPrimaryKeyService;
-import org.apache.commons.lang3.math.NumberUtils;
+import com.java110.intf.code.IPrimaryKeyInnerServiceSMO;
+import com.java110.utils.util.ProtocolUtil;
+import com.java110.utils.util.StringUtil;
+import org.slf4j.Logger;
+import com.java110.core.log.LoggerFactory;
 
-import java.util.List;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -24,29 +21,31 @@
  */
 public class BaseServiceSMO extends AppBase {
 
+    private static final Logger logger = LoggerFactory.getLogger(BaseServiceSMO.class);
 
     /**
      * 涓婚敭鐢熸垚
+     *
      * @param iPrimaryKeyService 涓婚敭鐢熸垚鏈嶅姟瀵硅薄
-     * @param type 涓婚敭绫诲瀷 濡� OL_ID , CUST_ID
+     * @param type               涓婚敭绫诲瀷 濡� OL_ID , CUST_ID
      * @return
      * @throws Exception
      */
-    protected String queryPrimaryKey(IPrimaryKeyService iPrimaryKeyService,String type) throws Exception{
+    protected String queryPrimaryKey(IPrimaryKeyInnerServiceSMO iPrimaryKeyService, String type) throws Exception {
         JSONObject data = new JSONObject();
-        data.put("type",type);
+        data.put("type", type);
         //鐢熸垚鐨処D
         String targetId = "-1";
         //瑕佹眰鎺ュ彛杩斿洖 {"RESULT_CODE":"0000","RESULT_INFO":{"user_id":"7020170411000041"},"RESULT_MSG":"鎴愬姛"}
         String custIdJSONStr = iPrimaryKeyService.queryPrimaryKey(data.toJSONString());
         JSONObject custIdJSONTmp = JSONObject.parseObject(custIdJSONStr);
-        if(custIdJSONTmp.containsKey("RESULT_CODE")
+        if (custIdJSONTmp.containsKey("RESULT_CODE")
                 && ProtocolUtil.RETURN_MSG_SUCCESS.equals(custIdJSONTmp.getString("RESULT_CODE"))
-                && custIdJSONTmp.containsKey("RESULT_INFO")){
+                && custIdJSONTmp.containsKey("RESULT_INFO")) {
             //浠庢帴鍙g敓鎴恛lId
-            targetId =  custIdJSONTmp.getJSONObject("RESULT_INFO").getString(type);
+            targetId = custIdJSONTmp.getJSONObject("RESULT_INFO").getString(type);
         }
-        if("-1".equals(targetId)) {
+        if ("-1".equals(targetId)) {
             throw new RuntimeException("璋冪敤涓婚敭鐢熸垚鏈嶅姟鏈嶅姟澶辫触锛�" + custIdJSONStr);
         }
 
@@ -56,11 +55,63 @@
 
     /**
      * 鍒涘缓涓婁笅鏂囧璞�
+     *
      * @return
      */
-    protected AppContext createApplicationContext(){
+    protected AppContext createApplicationContext() {
         return AppContext.newInstance();
     }
 
 
+    /**
+     * map 鍙傛暟杞� url get 鍙傛暟 闈炵┖鍊艰浆涓篻et鍙傛暟 绌哄�煎拷鐣�
+     *
+     * @param info map鏁版嵁
+     * @return url get 鍙傛暟 甯︼紵
+     */
+    protected String mapToUrlParam(Map info) {
+        String urlParam = "";
+        if (info == null || info.isEmpty()) {
+            return urlParam;
+        }
+
+        urlParam += "?";
+
+        for (Object key : info.keySet()) {
+            if (StringUtil.isNullOrNone(info.get(key))) {
+                continue;
+            }
+
+            urlParam += (key + "=" + info.get(key) + "&");
+        }
+
+        urlParam = urlParam.endsWith("&") ? urlParam.substring(0, urlParam.length() - 1) : urlParam;
+
+        return urlParam;
+    }
+
+    /**
+     * @param urlparam 甯﹀垎闅旂殑url鍙傛暟
+     * @return
+     */
+    public static Map<String, String> urlToMap(String urlparam) {
+        if (urlparam.indexOf("?") < 0) {
+            return new HashMap<>();
+        }
+        urlparam = urlparam.substring(urlparam.indexOf("?")+1);
+        Map<String, String> map = new HashMap<String, String>();
+        String[] param = urlparam.split("&");
+        for (String keyvalue : param) {
+            String[] pair = keyvalue.split("=");
+            if (pair.length == 2) {
+                map.put(pair[0], pair[1]);
+            }
+        }
+        return map;
+    }
+
+    public static void main(String[] args) {
+        String url = "https://www.xx.com";
+        System.out.println(url.substring(0,url.indexOf("?")));
+    }
 }

--
Gitblit v1.8.0