From c9dc82f885dfb0e639865cfc4c7aa62758c35bbf Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 8 Jun 2018 17:48:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=82=E5=B8=B8=E5=86=85?= =?UTF-8?q?=E8=A7=A3=E6=9E=90json=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E6=8D=95=E6=8D=89=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=B9=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=AD=97=E6=AE=B5=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/RestfulResult.java | 34 +++++++++++-------- .../nis/exceptions/MaatConvertException.java | 10 +++--- .../java/com/nis/util/ConfigServiceUtil.java | 2 +- .../service/configuration/IpCfgService.java | 25 -------------- 4 files changed, 27 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/nis/domain/RestfulResult.java b/src/main/java/com/nis/domain/RestfulResult.java index 1f3ed8497..46082bd74 100644 --- a/src/main/java/com/nis/domain/RestfulResult.java +++ b/src/main/java/com/nis/domain/RestfulResult.java @@ -8,7 +8,7 @@ */ package com.nis.domain; -import com.google.gson.JsonObject; +import org.apache.commons.lang.StringUtils; import net.sf.json.JSONObject; @@ -20,23 +20,29 @@ import net.sf.json.JSONObject; * @version V1.0 */ public class RestfulResult { - private Integer status; - private Integer businessCode; - private String reason; - private String msg; - private String traceCode; - private String fromuri; + private Integer status=0; + private Integer businessCode=0; + private String reason=""; + private String msg=""; + private String traceCode=""; + private String fromuri=""; public RestfulResult(){ } public RestfulResult(String content){ - JSONObject resObject = JSONObject.fromObject(content) ; - this.status=resObject.getInt("status"); - this.businessCode=resObject.getInt("businessCode"); - this.reason=resObject.getString("reason"); - this.msg=resObject.getString("msg"); - this.traceCode=resObject.getString("traceCode"); - this.fromuri=resObject.getString("fromuri"); + try{ + if(StringUtils.isNotBlank(content)){ + JSONObject resObject = JSONObject.fromObject(content) ; + this.status=resObject.getInt("status"); + this.businessCode=resObject.getInt("businessCode"); + this.reason=resObject.getString("reason"); + this.msg=resObject.getString("msg"); + this.traceCode=resObject.getString("traceCode"); + this.fromuri=resObject.getString("fromuri"); + } + }catch (Exception e) { + // TODO: handle exception + } } /** * status diff --git a/src/main/java/com/nis/exceptions/MaatConvertException.java b/src/main/java/com/nis/exceptions/MaatConvertException.java index e87494ffd..e00021329 100644 --- a/src/main/java/com/nis/exceptions/MaatConvertException.java +++ b/src/main/java/com/nis/exceptions/MaatConvertException.java @@ -2,17 +2,19 @@ package com.nis.exceptions; import com.nis.domain.RestfulResult; + public class MaatConvertException extends RuntimeException { private static final long serialVersionUID = 1L; - private static final String prefix=""; + private static final String prefix=":"; private RestfulResult result; public MaatConvertException(String message) { super(message); if(message.startsWith(prefix)){ - result=new RestfulResult(message.replaceFirst(prefix, "")); + String returnValue=message.replaceFirst(prefix, ""); + result=new RestfulResult(returnValue); }else{ - result=new RestfulResult(message); + result=new RestfulResult(); } } @@ -21,7 +23,7 @@ public class MaatConvertException extends RuntimeException { if(message.startsWith(prefix)){ result=new RestfulResult(message.replaceFirst(prefix, "")); }else{ - result=new RestfulResult(message); + result=new RestfulResult(); } } diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index c7860f107..a47d958f4 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -150,7 +150,7 @@ public class ConfigServiceUtil { JSONObject resObject = JSONObject.fromObject(result,config); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(""+response.readEntity(String.class)); + throw new MaatConvertException(":"+response.readEntity(String.class)); } return bean; } diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 89964a002..478a4b6a5 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -84,31 +84,6 @@ public class IpCfgService extends CrudService { throw new MaatConvertException(""); } - } - @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void addIpCfg(BaseIpCfg baseIpCfg,List areaIpCfgs){ -// if(areaIpCfgs!=null&&areaIpCfgs.size()>0){ -// this.saveIpBatch(areaIpCfgs); -// } -// //调用服务接口获取compileId -// Integer compileId = 0; -// try { -// List compileIds = ConfigServiceUtil.getId(1,1); -// if(!StringUtil.isEmpty(compileIds)){ -// compileId = compileIds.get(0); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// logger.info("获取编译ID出错"); -// throw new MaatConvertException(":"+e.getMessage()); -// } -// if(compileId!=0){ -// baseIpCfg.setCompileId(compileId); -// return ipCfgDao.insert(baseIpCfg); -// }else{ -// throw new MaatConvertException(""); -// } - } /** *