From 2e5a1437d53bd2e3ef29dd033eca4658ea83caa8 Mon Sep 17 00:00:00 2001 From: chengzhichao <17853123033> Date: Tue, 14 Feb 2023 08:43:04 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B42=E6=9C=8814=E6=97=A508:42:00=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96,sql=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20230213.sql | 4 + .../upstreamAPI/PublicApiService.java | 2 +- .../apiCommon/utils/ApiUtil_NoStatic.java | 564 +++++++++++++----- 3 files changed, 426 insertions(+), 144 deletions(-) create mode 100644 sql/20230213.sql diff --git a/sql/20230213.sql b/sql/20230213.sql new file mode 100644 index 0000000..7abf2e0 --- /dev/null +++ b/sql/20230213.sql @@ -0,0 +1,4 @@ +INSERT INTO`iotdb`.`sys_dict_data`(`dict_code`,`dict_sort`,`dict_label`,`dict_value`,`dict_type`,`css_class`,`list_class`,`is_default`,`status`,`create_by`,`create_time`,`update_by`,`update_time`,`remark`)VALUES(859,21,'中国电信5G','DianXin_CMP_5G','channel_code',NULL,NULL,'N','0','admin','2022-05-31 15:35:00','',NULL,'中国电信5G平台'); +INSERT INTO`iotdb`.`sy_dict_data`(`dict_code`,`dict_sort`,`dict_label`,`dict_value`,`dict_type`,`css_class`,`list_class`,`is_default`,`status`,`create_by`,`create_time`,`update_by`,`update_time`,`remark`)VALUES(209,9,'硕朗系统','ShuoLang','channel_code',NULL,NULL,'N','0','admin','2021-07-31 11:44:48','admin','2021-07-31 11:45:02','硕朗接口'); +INSERT INTO`iotdb`.`sys_dict_data`(`dict_code`,`dict_sort`,`dict_label`,`dict_value`,`dict_type`,`css_class`,`list_class`,`is_default`,`status`,`create_by`,`create_time`,`update_by`,`update_time`,`remark`)VALUES(201,8,'移动老系统','SDIOT','channel_code',NULL,NULL,'N','0','zf','2021-07-23 10:46:38','admin','2021-11-22 13:31:04','pboss'); +INSERT INTO`iotdb`.`sys_dict_data`(`dict_code`,`dict_sort`,`dict_label`,`dict_value`,`dict_type`,`css_class`,`list_class`,`is_default`,`status`,`create_by`,`create_time`,`update_by`,`update_time`,`remark`)VALUES(163,4,'中国联通','LianTong_CMP','channel_code',NULL,NULL,'N','0','admin','2021-06-19 14:48:27','',NULL,'中国联通 CMP'); \ No newline at end of file diff --git a/yunze-apiCommon/src/main/java/com/yunze/apiCommon/upstreamAPI/PublicApiService.java b/yunze-apiCommon/src/main/java/com/yunze/apiCommon/upstreamAPI/PublicApiService.java index 2d2011b..b6c4796 100644 --- a/yunze-apiCommon/src/main/java/com/yunze/apiCommon/upstreamAPI/PublicApiService.java +++ b/yunze-apiCommon/src/main/java/com/yunze/apiCommon/upstreamAPI/PublicApiService.java @@ -68,7 +68,7 @@ public class PublicApiService { } Rmap.put("code",code); Rmap.put("msg",msg); - Rmap.put("data",data); + Rmap.put("Data",data); return Rmap; } diff --git a/yunze-apiCommon/src/main/java/com/yunze/apiCommon/utils/ApiUtil_NoStatic.java b/yunze-apiCommon/src/main/java/com/yunze/apiCommon/utils/ApiUtil_NoStatic.java index e9df136..7f1195e 100644 --- a/yunze-apiCommon/src/main/java/com/yunze/apiCommon/utils/ApiUtil_NoStatic.java +++ b/yunze-apiCommon/src/main/java/com/yunze/apiCommon/utils/ApiUtil_NoStatic.java @@ -2,7 +2,6 @@ package com.yunze.apiCommon.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yunze.apiCommon.Vo.DxDetail; import com.yunze.apiCommon.upstreamAPI.PublicApiService; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Component; @@ -99,6 +98,10 @@ public class ApiUtil_NoStatic{ return queryOffering(map,null); } + public Map InternetDisconnection(Map map) { + return InternetDisconnection(map,null); + } + /** @@ -124,10 +127,10 @@ public class ApiUtil_NoStatic{ //返回数据解析 Rdata = publicApiService.insideApi(map, "queryFlow",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); Double Use = -1d;//使用量 MB - cd_code = data.get("cd_code").toString(); + cd_code = data.get("cd_code").toString(); try { if(cd_code.equals("IoTLink")){ //IoTLink 解析 @@ -191,12 +194,16 @@ public class ApiUtil_NoStatic{ Use = Double.parseDouble(Data.get("monthToDateUsage").toString()); //根据联通接口26账单日数据封装自然月 //Use = Use - queryHisFlowSys(iccid); - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map JsonData = JSON.parseObject(data.get("Data").toString()); try { rtMessage = JsonData.get("message").toString(); - codeOn = JsonData.get("status").toString(); + if(cd_code.equals("YiDong_EC_TengYu")){ + codeOn = JsonData.get("errorCode")!=null?JsonData.get("errorCode").toString():JsonData.get("status").toString(); + }else{ + codeOn = JsonData.get("status").toString(); + } }catch (Exception e){} Map Data = ((List>) JsonData.get("result")).get(0); double kb = 0.0; @@ -223,6 +230,31 @@ public class ApiUtil_NoStatic{ double kb = Double.parseDouble(Data.get("used").toString()); Use = Arith.formatToTwo(Arith.div(kb,1024));//KB 转 MB + }else if (cd_code.equals("YYWL")) { + //移远物联 解析 + Map JsonData = JSON.parseObject(data.get("Data").toString()); + try { + codeOn = JsonData.get("resultCode").toString(); + rtMessage = JsonData.get("errorMessage").toString(); + }catch (Exception e){} + Use = Double.parseDouble(JsonData.get("flow").toString()); + }else if (cd_code.equals("ShuoLang")) { + //硕朗 解析 + Map JsonData = JSON.parseObject(data.get("Data").toString()); + Map Data = JSON.parseObject(JsonData.get("data").toString()); + String code = JsonData.get("code").toString(); + try { + codeOn = code; + rtMessage = JsonData.get("msg").toString(); + }catch (Exception e){} + if(code.equals("0")){ + double kb = Double.parseDouble(Data.get("used").toString()); + if(kb>-1){ + Use = Arith.formatToTwo(Arith.div(kb,1024));//KB 转 MB + } + }else{ + data.put("Message",JsonData.get("msg")); + } }else if (cd_code.equals("YiDong_ECv2") || cd_code.equals("YiDong_ECv2_Combo")) { // 移动 EC V2 解析 Map Data = JSON.parseObject(data.get("Data").toString()); @@ -267,31 +299,6 @@ public class ApiUtil_NoStatic{ Use = Arith.formatToTwo(Arith.mul(Double.parseDouble(total_bytes_cnt),1024));//GB 转 MB } } - }else if (cd_code.equals("YYWL")) { - //移远物联 解析 - Map JsonData = JSON.parseObject(data.get("Data").toString()); - try { - codeOn = JsonData.get("resultCode").toString(); - rtMessage = JsonData.get("errorMessage").toString(); - }catch (Exception e){} - Use = Double.parseDouble(JsonData.get("flow").toString()); - }else if (cd_code.equals("ShuoLang")) { - //硕朗 解析 - Map JsonData = JSON.parseObject(data.get("Data").toString()); - Map Data = JSON.parseObject(JsonData.get("data").toString()); - String code = JsonData.get("code").toString(); - try { - codeOn = code; - rtMessage = JsonData.get("msg").toString(); - }catch (Exception e){} - if(code.equals("0")){ - double kb = Double.parseDouble(Data.get("used").toString()); - if(kb>-1){ - Use = Arith.formatToTwo(Arith.div(kb,1024));//KB 转 MB - } - }else{ - data.put("Message",JsonData.get("msg")); - } } try { @@ -327,15 +334,22 @@ public class ApiUtil_NoStatic{ if(synErrorBool){ boolean isSave = true; //过滤 一些 不需要存储的一些错误 比方说 接口超频 - if(cd_code.equals("DianXin_CMP")){ - if(codeOn.equals("101004")){//接口超过单企业调用限制，请稍后再试 + if(cd_code.equals("DianXin_CMP")){ + if(codeOn.equals("101004")){//接口超过单企业调用限制，请稍后再试 + isSave = false; + }else if(codeOn.equals("101006") ){//当前网络系统繁忙，请稍后再试 + isSave = false; + } + /* else if(codeOn.equals("-1") && rtMessage.equals("物联网卡还未产生用量")){//物联网卡还未产生用量 isSave = false; - } - }else if(cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("YiDong_ECv2") || cd_code.equals("YiDong_ECv2_Combo")){ - if(codeOn.equals("12021")){//TOKEN不存在或已过期，请重新获取 - isSave = false; - } - } + }*/ + }else if(cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW") || cd_code.equals("YiDong_ECv2") || cd_code.equals("YiDong_ECv2_Combo")){ + if(codeOn.equals("12021")){//TOKEN不存在或已过期，请重新获取 + isSave = false; + }else if(codeOn.equals("13000")){//系统忙，请稍后再试 + isSave = false; + } + } errorMap.put("iccid",iccid); errorMap.put("codeOn",codeOn); errorMap.put("message",rtMessage); @@ -368,7 +382,7 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "queryFlowHis",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); Double Use = -1d;//使用量 MB String cd_code = data.get("cd_code").toString(); @@ -384,7 +398,7 @@ public class ApiUtil_NoStatic{ //联通 CMP 解析 Map Data = (Map) data.get("Data"); Use = Double.parseDouble(Data.get("totalDataVolume").toString()); - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map JsonData = JSON.parseObject(data.get("Data").toString()); System.out.println(JsonData); @@ -426,11 +440,11 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "queryCardStatus",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 0; String statusMessage = null; String activateDate =null; - String cd_code = data.get("cd_code").toString(); + String cd_code = data.get("cd_code").toString(); try { if(cd_code.equals("IoTLink")){ @@ -481,7 +495,7 @@ public class ApiUtil_NoStatic{ statusCode = Integer.parseInt(LianTong_CMP_CardStatusMap.get("statusCode").toString()); statusMessage = LianTong_CMP_CardStatusMap.get("statusMessage").toString(); - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map JsonData = JSON.parseObject(data.get("Data").toString()); // System.out.println(JsonData); @@ -518,8 +532,26 @@ public class ApiUtil_NoStatic{ Map States = cardStatusReplacementUtil.getStates(message); statusCode = Integer.parseInt(States.get("statusCode").toString()); statusMessage = States.get("statusMessage").toString(); + }else if (cd_code.equals("DianXin_CMP_5G")) { + // DianXin_CMP_5G 解析 + System.out.println(data); + Map Data = (Map)data.get("Data"); + String result = Data.get("result").toString(); + if(result.equals("0")){ + List> productInfo = (List>) Data.get("productInfo"); + if(productInfo!=null && productInfo.size()>0){ + Map obj = productInfo.get(0); + String status = obj.get("productMainStatusCd").toString(); + Map CardStatusMap = cardStatusReplacementUtil.getDianXin_CMP_5G_CardStatus(status); + statusCode = Integer.parseInt(CardStatusMap.get("statusCode").toString()); + statusMessage = CardStatusMap.get("statusMessage").toString(); + } + } } + + + Outdata.put("Message", data.get("Message")); } catch (Exception e) { statusMessage = "内部接收消息，解析数据异常！"; @@ -551,7 +583,7 @@ public class ApiUtil_NoStatic{ //返回数据解析 Map Rdata = publicApiService.insideApi(map, "changeCardStatus",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 9999; String statusMessage = null; @@ -644,7 +676,7 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("resultDesc").toString(); } - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map Data = JSON.parseObject(data.get("Data").toString()); statusCode = Integer.parseInt(Data.get("status").toString()); @@ -659,22 +691,15 @@ public class ApiUtil_NoStatic{ System.out.println(data); Map Data = (Map)data.get("Data"); String result = Data.get("result").toString(); + String resultmsg = Data.get("resultmsg")!=null?Data.get("resultmsg").toString():null; if(result.equals("0")){ statusCode = 200; statusMessage = "操作成功！"; + }else if(result.equals("100008")){//这里需要判断 如 已经是 激活状态 变更成 激活 或 已停机变更成停机 给 成功 状态 + }else{ data.put("Message",Data.get("resultMsg")); } - }else if (cd_code.equals("MwFengZuShou")) { - //梦网-蜂助手 解析 - Map JsonData = JSON.parseObject(data.get("Data").toString()); - String cardretcode = JsonData.get("cardretcode").toString(); - if(cardretcode.equals("0")){ - statusCode = 200; - statusMessage = "操作成功！"; - }else{ - data.put("Message",JsonData.get("cardmsg")); - } } Outdata.put("Message",statusMessage); @@ -707,9 +732,9 @@ public class ApiUtil_NoStatic{ JSONObject Outdata = new JSONObject(); try { //返回数据解析 - Map Rdata = publicApiService.insideApi(map, "changeCardStatus",find_card_route_map); + Map Rdata = publicApiService.insideApi(map, "queryRealNameStatus",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 9999; String statusMessage = null; @@ -780,7 +805,7 @@ public class ApiUtil_NoStatic{ //返回数据解析 Map Rdata = publicApiService.insideApi(map, "queryAPNInfo",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 9999; String statusMessage = null; @@ -818,7 +843,7 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("resultDesc").toString(); } - }else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + }else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map Data = JSON.parseObject(data.get("Data").toString()); statusCode = Integer.parseInt(Data.get("status").toString()); @@ -862,31 +887,37 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "FunctionApnStatus",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 9999; String statusMessage = null; - int rspcode = 99; String cd_code = data.get("cd_code").toString(); try { if (cd_code.equals("DianXin_CMP")) { + String rspcode = ""; //电信 CMP 解析 Map Data = (Map) data.get("Data"); + String rspdesc = Data.get("rspdesc")!=null?Data.get("rspdesc").toString():null; + if (Data.get("result") != null) { statusCode = Integer.parseInt(Data.get("resultcode").toString()); }else { - rspcode = Integer.parseInt(Data.get("rspcode").toString()); + rspcode = Data.get("rspcode").toString(); } if (statusCode == 0 || Data.get("rspcode").toString().equals("0000")){ statusCode = 200; statusMessage = "操作成功！"; + }else if(rspcode.equals("-5") && rspdesc!=null){ + if(map.get("Is_Break").toString().equals("0") && rspdesc.indexOf("该号码未订购单独断网功能")!=-1){//开网 未订购 本来就是 开网状态 返回成功 + statusCode = 200; + statusMessage = "操作成功！"; + }else if(rspdesc.indexOf("已是该网络状态无需操作")!=-1){ + statusCode = 200; + statusMessage = "已是该网络状态无需操作！"; + } } else { statusMessage = Data.get("rspdesc").toString(); } - if(rspcode==-5){ - statusCode = 200; - statusMessage = "已是该网络状态无需操作！"; - } - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map Data = JSON.parseObject(data.get("Data").toString()); statusCode = Integer.parseInt(Data.get("status").toString()); @@ -901,16 +932,26 @@ public class ApiUtil_NoStatic{ // DianXin_CMP_5G 解析 System.out.println(data); Map Data = (Map)data.get("Data"); - String resultCode = Data.get("resultCode").toString(); - if(resultCode.equals("0000")){ + String rspcode = Data.get("rspcode").toString(); + String rspdesc = Data.get("rspdesc")!=null?Data.get("rspdesc").toString():null; + if(rspcode.equals("0000")){ statusCode = 200; statusMessage = "操作成功！"; + }else if(rspcode.equals("-9")){//重复订购或退订时 + if(rspdesc!=null){ + String Is_Break = map.get("Is_Break").toString() ;// 【断网复机】 是否 0 开机 1 停机 + if(Is_Break.equals("1") && rspdesc.indexOf("不能重复订购")!=-1){//订购时 执行断网 返回 【不能重复订购】 成功 + statusCode = 200; + statusMessage = "操作成功！"; + } else if (Is_Break.equals("0") && rspdesc.indexOf("功能产品实例标识不能为空或者0")!=-1 ) {//取消单独断网时 执行 返回 【功能产品实例标识不能为空或者0】 成功 + statusCode = 200; + statusMessage = "操作成功！"; + } + } }else{ data.put("Message",Data.get("resultMsg")); } } - - Outdata.put("Message", data.get("Message")); } catch (Exception e) { statusMessage = "内部接收消息，解析数据异常！"; @@ -936,7 +977,7 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "SpeedLimit",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 9999; String statusMessage = null; @@ -959,6 +1000,10 @@ public class ApiUtil_NoStatic{ return null; } JSONObject Data = JSONObject.parseObject(data.get("Data").toString()); + + //Map Data = (Map) data.get("Data"); + //System.out.println(Data); + //System.out.println(Data.containsKey("resultCode")); if(!Data.containsKey("resultCode")){ Outdata.put("code", Rdata.get("code")); Outdata.put("status", statusCode); @@ -985,7 +1030,7 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("resultDesc").toString(); } - }else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + }else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 //Map Data = JSON.parseObject(data.get("Data").toString()); statusCode = Integer.parseInt(Data.get("status").toString()); @@ -995,6 +1040,7 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("message").toString(); } + } Outdata.put("Message", data.get("Message")); @@ -1026,7 +1072,7 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "queryOnlineStatus",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int network_status = 99; String statusMessage = null; String codd = null; @@ -1089,7 +1135,7 @@ public class ApiUtil_NoStatic{ e.printStackTrace(); } - }else if(cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ){ + }else if(cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW") ){ try { Map JsonData = JSON.parseObject(data.get("Data").toString()); System.out.println(JsonData); @@ -1115,6 +1161,9 @@ public class ApiUtil_NoStatic{ //return Myerr(data.get("Data").toString()); } } + + + Outdata.put("Message", data.get("Message")); } catch (Exception e) { statusMessage = "内部接收消息，解析数据异常！"; @@ -1127,6 +1176,7 @@ public class ApiUtil_NoStatic{ Outdata.put("statusMessage", statusMessage); } catch (Exception e) { Outdata.put("statusMessage", "内部接收消息，解析数据异常！"); + //System.out.println(e); } return Outdata; } @@ -1146,7 +1196,7 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "queryCardActiveTime",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 500; String openDate = null,statusMessage = null; String activateDate =null; @@ -1173,7 +1223,7 @@ public class ApiUtil_NoStatic{ } } statusCode = 200; - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map Data = JSON.parseObject(data.get("Data").toString()); statusCode = Integer.parseInt(Data.get("status").toString()); @@ -1186,16 +1236,6 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("message").toString(); } - } else if (cd_code.equals("DianXin_DCP")) { - Object data1 = data.get("data"); - if (null != data1) { - DxDetail dxDetail = JSONObject.parseObject(JSON.toJSONString(data1), DxDetail.class); - statusCode = 200; - if (null != dxDetail.getFirstActivatedAt()) { - activateDate = DateUtil.getDate2Str(DateUtil.DATE_FULL_STR, dxDetail.getFirstActivatedAt()); - openDate = activateDate; - } - } }else if (cd_code.equals("YYWL")) { //移远物联 解析 Map Data = JSON.parseObject(data.get("Data").toString()); @@ -1241,7 +1281,7 @@ public class ApiUtil_NoStatic{ //返回数据解析 String statusCode = "500"; String Q_cd_code = find_card_route_map.get("cd_code").toString(); - if(Q_cd_code.equals("DianXin_CMP") || Q_cd_code.equals("DianXin_DCP") || Q_cd_code.equals("YKWL")){ + if(Q_cd_code.equals("DianXin_CMP") || Q_cd_code.equals("DianXin_DCP") ){ if(Q_cd_code.equals("DianXin_CMP")) { map.put("bind_type", null);//解绑时 电信CMP 赋值为空 @@ -1249,7 +1289,7 @@ public class ApiUtil_NoStatic{ Map Rdata = publicApiService.insideApi(map, "MachineCardBinding",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int network_status = 99; String statusMessage = null; String codd = null; @@ -1316,12 +1356,12 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "queryCardImei",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; Integer statusCode = 500; String cd_code = data.get("cd_code").toString(); try { - if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); if(Data_json.get("result")!=null){ statusCode = Integer.parseInt(Data_json.get("status").toString()); @@ -1382,7 +1422,7 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "realNameRemove",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; String cd_code = data.get("cd_code").toString(); String statusCode = "500"; @@ -1398,7 +1438,24 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("msg").toString(); } + }else if (cd_code.equals("DianXin_CMP")) { + //电信 CMP 解析 + Map Data = JSONObject.parseObject(data.get("Data").toString()); + if (Data.get("resultCode") != null) { + statusCode = Data.get("resultCode").toString(); + }else { + statusCode = Data.get("rspcode")!=null?Data.get("rspcode").toString():"500"; + } + statusMessage = Data.get("resultMsg")!=null?Data.get("resultMsg").toString():"操作成功！"; + if (statusCode.equals("0") || statusCode.equals("0000")){ + statusCode = "200"; + }else{ + System.out.println(JSON.toJSONString(Data)); + } } + + + } catch (Exception e) { statusMessage = "内部接收消息，解析数据异常！"; System.out.println(e); @@ -1432,12 +1489,12 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "simStopReason",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; Integer statusCode = 500; String cd_code = data.get("cd_code").toString(); try { - if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); if(Data_json.get("result")!=null){ statusCode = Integer.parseInt(Data_json.get("status").toString()); @@ -1527,12 +1584,12 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "onOffStatus",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; Integer statusCode = 500; String cd_code = data.get("cd_code").toString(); try { - if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); if(Data_json.get("result")!=null){ statusCode = Integer.parseInt(Data_json.get("status").toString()); @@ -1587,12 +1644,12 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "apnInfo",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; Integer statusCode = 500; String cd_code = data.get("cd_code").toString(); try { - if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); if(Data_json.get("result")!=null){ statusCode = Integer.parseInt(Data_json.get("status").toString()); @@ -1652,12 +1709,12 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "cardBindStatus",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; Integer statusCode = 500; String cd_code = data.get("cd_code").toString(); try { - if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); if(Data_json.get("result")!=null){ statusCode = Integer.parseInt(Data_json.get("status").toString()); @@ -1678,6 +1735,8 @@ public class ApiUtil_NoStatic{ statusMessage = Data_json.get("message").toString(); } } + + } catch (Exception e) { statusMessage = "内部接收消息，解析数据异常！"; System.out.println(e); @@ -1730,12 +1789,12 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "simChangeHistory",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; Integer statusCode = 500; String cd_code = data.get("cd_code").toString(); try { - if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); if(Data_json.get("result")!=null){ statusCode = Integer.parseInt(Data_json.get("status").toString()); @@ -1797,7 +1856,7 @@ public class ApiUtil_NoStatic{ //返回数据解析 Map Rdata = publicApiService.insideApi(map, "changeCardStatusFlexible",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 9999; String statusMessage = null; @@ -1880,7 +1939,7 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("resultDesc").toString(); } - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map Data = JSON.parseObject(data.get("Data").toString()); statusCode = Integer.parseInt(Data.get("status").toString()); @@ -1890,17 +1949,8 @@ public class ApiUtil_NoStatic{ } else { statusMessage = Data.get("message").toString(); } - }else if (cd_code.equals("LianTong_CMP")) { - //联通 CMP 解析 - Map Data = (Map) data.get("Data"); - String Rcode = Data.get("resultCode").toString(); - if (Rcode.equals("0000") || Rcode.equals("1193") ) { - statusCode = 200; - statusMessage = "操作成功！"; - } else { - statusMessage = Data.get("resultDesc").toString(); - } } + Outdata.put("Message",statusMessage); } catch (Exception e) { Outdata.put("code","500"); @@ -1935,7 +1985,7 @@ public class ApiUtil_NoStatic{ //返回数据解析 Map Rdata = publicApiService.insideApi(map, "simDataMargin",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); int statusCode = 9999; String statusMessage = null; @@ -1950,7 +2000,7 @@ public class ApiUtil_NoStatic{ } else if (cd_code.equals("LianTong_CMP")) { //联通 CMP 解析 - } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + } else if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { //移动 EC 解析 Map Data = JSON.parseObject(data.get("Data").toString()); statusCode = Integer.parseInt(Data.get("status").toString()); @@ -2002,20 +2052,20 @@ public class ApiUtil_NoStatic{ try { //返回数据解析 Map Rdata = publicApiService.insideApi(map, "queryOffering",find_card_route_map); - Map data = (Map) Rdata.get("data"); + Map data = (Map) Rdata.get("Data"); String statusMessage = null; Integer statusCode = 500; String cd_code = data.get("cd_code").toString(); try { - if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_Combo") ) { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); if(Data_json.get("result")!=null){ statusCode = Integer.parseInt(Data_json.get("status").toString()); if (statusCode == 0) { Map Data_1 = ((List>) Data_json.get("result")).get(0); if (Data_1 != null) { - setResult = (List>) Data_1.get("offeringInfoList"); + setResult = (List>) Data_1.get("offeringInfoList"); if (setResult != null) { statusCode = 200; } @@ -2062,9 +2112,205 @@ public class ApiUtil_NoStatic{ Outdata.put("offeringInfoList", setResult); System.out.println(e); } + return Outdata; + } + + /** + * 集团群组信息查询 + * @param map + * @param find_card_route_map + * @return + */ + public Map queryGroupInfo(Map map, Map find_card_route_map) { + JSONObject Outdata = new JSONObject(); + List> groupList = new ArrayList<>(); + Integer totalCount = 0; + try { + //返回数据解析 + Map Rdata = publicApiService.insideApi(map, "queryGroupInfo",find_card_route_map); + Map data = (Map) Rdata.get("Data"); + String statusMessage = null; + Integer statusCode = 500; + String cd_code = data.get("cd_code").toString(); + try { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { + JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); + if(Data_json.get("result")!=null){ + statusCode = Integer.parseInt(Data_json.get("status").toString()); + if (statusCode == 0) { + Map Data_1 = ((List>) Data_json.get("result")).get(0); + totalCount = Integer.parseInt(Data_1.get("totalCount").toString()); + + if (Data_1 != null) { + groupList = (List>) Data_1.get("groupList"); + if (groupList != null) { + statusCode = 200; + } + } + } else { + statusMessage = Data_json.get("message").toString(); + } + }else { + statusMessage = Data_json.get("message").toString(); + } + }else if (cd_code.equals("YiDong_ECv2") || cd_code.equals("YiDong_ECv2_Combo")) { + // 移动 EC V2 解析 + /* Map Data = JSON.parseObject(data.get("Data").toString()); + Map Obj = ((List>)Data.get("result")).get(0); + groupList = ((List>)Obj.get("prodinfos")); + System.out.println(groupList); + if (groupList != null) { + statusCode = 200; + }*/ + } + + } catch (Exception e) { + statusMessage = "内部接收消息，解析数据异常！"; + System.out.println(e.getMessage()); + } + Outdata.put("code", statusCode); + Outdata.put("cd_code", cd_code); + Outdata.put("Message", statusMessage); + Outdata.put("groupList", groupList); + Outdata.put("totalCount", totalCount); + } catch (Exception e) { + Outdata.put("code", "500"); + Outdata.put("Message", "内部接收消息，解析数据异常！"); + Outdata.put("groupList", groupList); + Outdata.put("totalCount", totalCount); + System.out.println(e.getMessage()); + } + return Outdata; + } + + + + + /** + * 集团群组信息成员查询 + * @param map + * @param find_card_route_map + * @return + */ + public Map queryGroupMember(Map map, Map find_card_route_map) { + JSONObject Outdata = new JSONObject(); + List> memberinfoList = new ArrayList<>(); + Integer totalCount = 0; + try { + //返回数据解析 + Map Rdata = publicApiService.insideApi(map, "queryGroupMember",find_card_route_map); + Map data = (Map) Rdata.get("Data"); + String statusMessage = null; + Integer statusCode = 500; + String cd_code = data.get("cd_code").toString(); + try { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { + JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); + if(Data_json.get("result")!=null){ + statusCode = Integer.parseInt(Data_json.get("status").toString()); + if (statusCode == 0) { + Map Data_1 = ((List>) Data_json.get("result")).get(0); + totalCount = Integer.parseInt(Data_1.get("totalCount").toString()); + + if (Data_1 != null) { + memberinfoList = (List>) Data_1.get("memberinfoList"); + if (memberinfoList != null) { + statusCode = 200; + } + } + } else { + statusMessage = Data_json.get("message").toString(); + } + }else { + statusMessage = Data_json.get("message").toString(); + } + } else if (cd_code.equals("DianXin_CMP") || cd_code.equals("DianXin_CMP_5G")) { + //电信 CMP 解析 + JSONObject Data = JSONObject.parseObject(data.get("Data").toString()); + if (Data.get("description") != null) { + Map description = (Map) Data.get("description"); + if(description.get("simList")!=null){ + List> simList = (List>) description.get("simList"); + if(simList!=null && simList.size()>0){ + statusCode = 200; + memberinfoList = simList; + } + } + } + } + } catch (Exception e) { + statusMessage = "内部接收消息，解析数据异常！"; + System.out.println(e.getMessage()); + } + Outdata.put("code", statusCode); + Outdata.put("cd_code", cd_code); + Outdata.put("Message", statusMessage); + Outdata.put("memberinfoList", memberinfoList); + Outdata.put("totalCount", totalCount); + } catch (Exception e) { + Outdata.put("code", "500"); + Outdata.put("Message", "内部接收消息，解析数据异常！"); + Outdata.put("memberinfoList", memberinfoList); + Outdata.put("totalCount", totalCount); + System.out.println(e.getMessage()); + } + return Outdata; + } + + + + + + + /** + * 查询卡详情 + * @param map + * @param find_card_route_map + * @return + */ + public Map queryCardInfo(Map map, Map find_card_route_map) { + JSONObject Outdata = new JSONObject(); + Map rMap = null; + try { + //返回数据解析 + Map Rdata = publicApiService.insideApi(map, "queryCardInfo",find_card_route_map); + Map data = (Map) Rdata.get("Data"); + String statusMessage = null; + Integer statusCode = 500; + String cd_code = data.get("cd_code").toString(); + try { + if (cd_code.equals("YiDong_EC") || cd_code.equals("YiDong_EC_TOKE_ShuoLang") || cd_code.equals("YiDong_EC_TengYu") || cd_code.equals("YiDong_EC_Combo") || cd_code.equals("ECV5_token_MW")) { + JSONObject Data_json = JSONObject.parseObject(data.get("Data").toString()); + //移动 EC 解析 + Map Data = JSON.parseObject(data.get("Data").toString()); + statusCode = Integer.parseInt(Data.get("status").toString()); + if (statusCode == 0) { + statusCode = 200; + statusMessage = "操作成功！"; + rMap = ((List>)Data.get("result")).get(0); + + } else { + statusMessage = Data.get("message").toString(); + } + } + + } catch (Exception e) { + statusMessage = "内部接收消息，解析数据异常！"; + System.out.println(e.getMessage()); + } + Outdata.put("code", statusCode); + Outdata.put("cd_code", cd_code); + Outdata.put("Message", statusMessage); + Outdata.put("rMap", rMap); + } catch (Exception e) { + Outdata.put("code", "500"); + Outdata.put("Message", "内部接收消息，解析数据异常！"); + Outdata.put("rMap", rMap); + System.out.println(e.getMessage()); + } return Outdata; } @@ -2074,30 +2320,61 @@ public class ApiUtil_NoStatic{ + /** + * 达量断网 + * @param map + * @return + */ + public Map InternetDisconnection(Map map, Map find_card_route_map) { + String Rstr = null; + JSONObject Outdata = new JSONObject(); + try { + //返回数据解析 + Map Rdata = publicApiService.insideApi(map, "InternetDisconnection",find_card_route_map); + Map data = (Map) Rdata.get("Data"); + int statusCode = 9999; + String statusMessage = null; + String cd_code = data.get("cd_code").toString(); + try { + if (cd_code.equals("DianXin_CMP")) { + String rspcode = ""; + //电信 CMP 解析 + Map Data = (Map) data.get("Data"); + if (Data.get("rspcode") != null) { + rspcode = Data.get("rspcode").toString(); + } + if (rspcode.equals("0000")){ + statusCode = 200; + statusMessage = "操作成功！"; + } else { + statusMessage = Data.get("rspdesc").toString(); + } - - - - - - - - - - - - - - - - - - - - - - - + } else if (cd_code.equals("DianXin_CMP_5G")) { + // DianXin_CMP_5G 解析 + System.out.println(data); + Map Data = (Map)data.get("Data"); + String rspcode = Data.get("rspcode").toString(); + String rspdesc = Data.get("rspdesc")!=null?Data.get("rspdesc").toString():null; + if(rspcode.equals("0000")){ + statusCode = 200; + statusMessage = "操作成功！"; + }else{ + data.put("Message",Data.get("resultMsg")); + } + } + Outdata.put("Message", data.get("Message")); + } catch (Exception e) { + statusMessage = "内部接收消息，解析数据异常！"; + System.out.println(e); + } + Outdata.put("code", statusCode); + Outdata.put("Message", statusMessage); + } catch (Exception e) { + System.out.println(e); + } + return Outdata; + } @@ -2117,8 +2394,9 @@ public class ApiUtil_NoStatic{ String result = null; + // result =queryRealNameStatus(map);//查询是否实名 - Parmap.put("iccid", "898603"); + Parmap.put("iccid", "8986031941208662579"); map.put("Param", Parmap); Map Rmap = api.queryFlow(map,null); System.out.println("result = " + Rmap);