From 897ec42ea0c02fb4ac903ae994c41a030a87fada Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期四, 21 九月 2023 11:26:56 +0800 Subject: [PATCH] webservice接口对象更改 --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDataVO.java | 43 ++++ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/result/xml/XMLResultClassfyVO.java | 2 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 130 +++++++++++++ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 27 ++ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/ApplyDataVO.java | 54 +++++ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZParamVO.java | 17 + Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ClassfyBZVO.java | 73 +++++++ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java | 72 ++++--- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDatasVO.java | 28 ++ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ProppertyBZVO.java | 56 +++++ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZVO.java | 55 +++++ 11 files changed, 518 insertions(+), 39 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/ApplyDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/ApplyDataVO.java index e30a4a2..0f86f0b 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/ApplyDataVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/ApplyDataVO.java @@ -11,13 +11,14 @@ */ @XStreamAlias("object") public class ApplyDataVO { + /*** * 杈撳叆涓婚敭 */ @XStreamAsAttribute private String id; /** - * 缂栫爜 + * 璧峰鎴栦慨璁㈢紪鍙� */ @XStreamAsAttribute private String code; @@ -42,6 +43,23 @@ */ @XStreamAsAttribute private String editor; + + /*** + * 鏄惁淇 + */ + private boolean amendmentFlag; + /*** + *鏄惁鏄郴鍒楁爣鍑� + */ + private boolean seriesStandardFlag; + /** + * 鏄惁缁х画缂栧彿 + */ + private boolean continueNumberFlag; + /*** + * 骞翠唬鍙� + */ + private String yearNumber; /*** * 鏁版嵁灞炴�у璞� */ @@ -104,7 +122,39 @@ this.prop = prop; } - @Override + public boolean isAmendmentFlag() { + return amendmentFlag; + } + + public void setAmendmentFlag(boolean amendmentFlag) { + this.amendmentFlag = amendmentFlag; + } + + public boolean isSeriesStandardFlag() { + return seriesStandardFlag; + } + + public void setSeriesStandardFlag(boolean seriesStandardFlag) { + this.seriesStandardFlag = seriesStandardFlag; + } + + public boolean isContinueNumberFlag() { + return continueNumberFlag; + } + + public void setContinueNumberFlag(boolean continueNumberFlag) { + this.continueNumberFlag = continueNumberFlag; + } + + public String getYearNumber() { + return yearNumber; + } + + public void setYearNumber(String yearNumber) { + this.yearNumber = yearNumber; + } + + @Override public String toString() { return "ApplyDataVO{" + "id='" + id + '\'' + diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDataVO.java new file mode 100644 index 0000000..1090c66 --- /dev/null +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDataVO.java @@ -0,0 +1,43 @@ +package com.vci.ubcs.code.vo.webserviceModel.applybz; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.thoughtworks.xstream.annotations.XStreamImplicit; +import com.vci.ubcs.code.vo.webserviceModel.apply.ProppertyVO; + +import java.util.List; + +@XStreamAlias("object") +public class ApplyBZDataVO { + /*** + * 杈撳叆涓婚敭 + */ + @XStreamAsAttribute + private String id; + /** + * 缂栫爜 + */ + @XStreamAsAttribute + private String code; + /** + * 鐘舵�� + */ + @XStreamAsAttribute + private String status; + /*** + * 鍒涘缓鑰� + */ + @XStreamAsAttribute + private String creator; + + /** + * 鏇存敼鑰� + */ + @XStreamAsAttribute + private String editor; + /*** + * 鏁版嵁灞炴�у璞� + */ + @XStreamImplicit + private List<ProppertyVO> prop; +} diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDatasVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDatasVO.java new file mode 100644 index 0000000..0aacbb3 --- /dev/null +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZDatasVO.java @@ -0,0 +1,28 @@ +package com.vci.ubcs.code.vo.webserviceModel.applybz; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamImplicit; +import com.vci.ubcs.code.vo.webserviceModel.apply.ApplyDataVO; + +import java.util.List; + +@XStreamAlias("objects") +public class ApplyBZDatasVO { + @XStreamImplicit + private List<ApplyBZDataVO> object; + + public List<ApplyBZDataVO> getObject() { + return object; + } + + public void setObject(List<ApplyBZDataVO> object) { + this.object = object; + } + + @Override + public String toString() { + return "ApplyDatasVO{" + + "object=" + object + + '}'; + } +} diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZParamVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZParamVO.java new file mode 100644 index 0000000..bfcf42c --- /dev/null +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZParamVO.java @@ -0,0 +1,17 @@ +package com.vci.ubcs.code.vo.webserviceModel.applybz; + +public class ApplyBZParamVO { + private ApplyBZVO data; + public ApplyBZVO getData() { + return data; + } + public void setData(ApplyBZVO data) { + this.data = data; + } + @Override + public String toString() { + return "InterParameterVO{" + + "data=" + data + + '}'; + } +} diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZVO.java new file mode 100644 index 0000000..f27a6fd --- /dev/null +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ApplyBZVO.java @@ -0,0 +1,55 @@ +package com.vci.ubcs.code.vo.webserviceModel.applybz; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.vci.ubcs.code.vo.webserviceModel.apply.UserVO; +/** + *鏁版嵁淇℃伅 + */ +@XStreamAlias("data") +public class ApplyBZVO { + /*** + * 闆嗘垚绯荤粺鏍囪瘑 + */ + @XStreamAsAttribute + private String systemId; + /** + * 鎿嶄綔鐢ㄦ埛淇℃伅 + */ + private UserVO user; + + private ClassfyBZVO classify; + + public String getSystemId() { + return systemId; + } + + public void setSystemId(String systemId) { + this.systemId = systemId; + } + + public UserVO getUser() { + return user; + } + + public void setUser(UserVO user) { + this.user = user; + } + + public ClassfyBZVO getClassify() { + return classify; + } + + public void setClassify(ClassfyBZVO classify) { + this.classify = classify; + } + + @Override + public String toString() { + return "ApplyBZVO{" + + "systemId='" + systemId + '\'' + + ", user=" + user + + ", classify=" + classify + + '}'; + } +} diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ClassfyBZVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ClassfyBZVO.java new file mode 100644 index 0000000..9319aac --- /dev/null +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ClassfyBZVO.java @@ -0,0 +1,73 @@ +package com.vci.ubcs.code.vo.webserviceModel.applybz; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.vci.ubcs.code.vo.webserviceModel.apply.ApplyDatasVO; + +/** + * 鍒嗙被淇℃伅 + */ +@XStreamAlias("classify") +public class ClassfyBZVO { + /** + * 鍒嗙被浠e彿 + */ + @XStreamAsAttribute + private String classCode; + /** + * 搴撲唬鍙� + */ + @XStreamAsAttribute + private String library; + /** + * 绫昏矾寰� + */ + @XStreamAsAttribute + private String fullclsfNamePath; + /** + * 鏁版嵁闆嗗悎 + */ + private ApplyDatasVO objects; + + public String getClassCode() { + return classCode; + } + + public void setClassCode(String classCode) { + this.classCode = classCode; + } + + public String getLibrary() { + return library; + } + + public void setLibrary(String library) { + this.library = library; + } + + public String getFullclsfNamePath() { + return fullclsfNamePath; + } + + public void setFullclsfNamePath(String fullclsfNamePath) { + this.fullclsfNamePath = fullclsfNamePath; + } + + public ApplyDatasVO getObjects() { + return objects; + } + + public void setObjects(ApplyDatasVO objects) { + this.objects = objects; + } + + @Override + public String toString() { + return "ClassfyBZVO{" + + "classCode='" + classCode + '\'' + + ", library='" + library + '\'' + + ", fullclsfNamePath='" + fullclsfNamePath + '\'' + + ", objects=" + objects + + '}'; + } +} diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ProppertyBZVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ProppertyBZVO.java new file mode 100644 index 0000000..bb3e0fa --- /dev/null +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/applybz/ProppertyBZVO.java @@ -0,0 +1,56 @@ +package com.vci.ubcs.code.vo.webserviceModel.applybz; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; + +@XStreamAlias("prop") +public class ProppertyBZVO { + /** + * 灞炴�у瓧娈� + */ + @XStreamAsAttribute + private String key; + /** + * 灞炴�ф樉绀哄悕绉� + */ + @XStreamAsAttribute + private String text; + /** + * 灞炴�у�� + */ + @XStreamAsAttribute + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return "ProppertyVO{" + + "key='" + key + '\'' + + ", text='" + text + '\'' + + ", value='" + value + '\'' + + '}'; + } +} diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/result/xml/XMLResultClassfyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/result/xml/XMLResultClassfyVO.java index def234d..52ca711 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/result/xml/XMLResultClassfyVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/result/xml/XMLResultClassfyVO.java @@ -5,7 +5,7 @@ import java.util.List; -@XStreamAlias("classfy") +@XStreamAlias("classify") public class XMLResultClassfyVO { @XStreamAsAttribute private String classCode; diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java index b82489f..71cb533 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java @@ -39,7 +39,7 @@ /**** * 鐢宠鎺ュ彛 - * @param dataString 灞炴�т俊鎭� + * @param dataString 鏁版嵁淇℃伅 * @param dataType 鏁版嵁鏍煎紡绫诲瀷 * @return * @throws Throwable @@ -61,7 +61,7 @@ /**** * 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙� - * @param dataString 灞炴�т俊鎭� + * @param dataString 鏁版嵁淇℃伅 * @param dataType 鏁版嵁鏍煎紡绫诲瀷 * @return * @throws Throwable @@ -80,7 +80,7 @@ /**** * 鏌ヨ鍒嗙被鍙� - * @param dataString 灞炴�т俊鎭� + * @param dataString 鏁版嵁淇℃伅 * @param dataType 鏁版嵁鏍煎紡绫诲瀷 * @return * @throws Throwable @@ -99,7 +99,7 @@ /**** * 鏌ヨ鍒嗙被鍙� - * @param dataString 灞炴�т俊鎭� + * @param dataString 鏁版嵁淇℃伅 * @param dataType 鏁版嵁鏍煎紡绫诲瀷 * @return * @throws Throwable @@ -118,7 +118,7 @@ /**** * 鏌ヨ瑙勫垯 - * @param dataString 灞炴�т俊鎭� + * @param dataString 鏁版嵁淇℃伅 * @param dataType 鏁版嵁鏍煎紡绫诲瀷 * @return * @throws Throwable @@ -135,4 +135,21 @@ return result; } + /**** + * 鏍囧噯鍖栫敵璇锋帴鍙� + * @param dataString 鏁版嵁淇℃伅 + * @param dataType 鏁版嵁鏍煎紡绫诲瀷 + * @return + * @throws Throwable + */ + public String applyCodeForBZ(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType){ + String result=""; + try { + result= universalInterfaceI.applyCodeForBZ(dataString,dataType); + }catch (Throwable e){ + e.printStackTrace(); + logger.error("queryData->"+e.getMessage()); + } + return result; + } } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java index 428b3e0..f04be73 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java @@ -18,14 +18,15 @@ @WebService(targetNamespace = "http://code.ubcs.vci.com/",name = "universalInterface") public interface UniversalInterfaceI { - /** - *缁熶竴鐢宠缂栫爜鎺ュ彛 - * @param data 浼犻�掔殑鏁版嵁鍙傛暟 - * @param dataType 鏍囪瘑data鏄痻ml鏍煎紡杩樻槸json鏍煎紡锛屾帴鍙h繑鍥炴暟鎹篃鏄寜鐓ц繖涓牸寮忥紝浠ヤ笅鎺ュ彛绫诲悓 - * @return xml鏍煎紡/json鏍煎紡 - * @throws Throwable - */ - public String applyCode(String data, String dataType)throws Throwable; + /** + * 缁熶竴鐢宠缂栫爜鎺ュ彛 + * + * @param data 浼犻�掔殑鏁版嵁鍙傛暟 + * @param dataType 鏍囪瘑data鏄痻ml鏍煎紡杩樻槸json鏍煎紡锛屾帴鍙h繑鍥炴暟鎹篃鏄寜鐓ц繖涓牸寮忥紝浠ヤ笅鎺ュ彛绫诲悓 + * @return xml鏍煎紡/json鏍煎紡 + * @throws Throwable + */ + public String applyCode(String data, String dataType) throws Throwable; public void setThreadLocal(ThreadLocal<HttpServletRequest> threadLocal); @@ -36,6 +37,7 @@ * @throws Throwable */ public ResultOrgData syncDataForPerson(PersonData personData); + /**** * 閮ㄩ棬鏁版嵁鍚屾 * @param orgData @@ -44,34 +46,42 @@ */ public ResultOrgData syncDataForOrg(OrgData orgData); - /*** - * 缁熶竴鏇存柊鎺ュ彛 - * @param data - * @param dataType - * @return - * @throws Throwable - */ - public String syncEditData(String data,String dataType)throws Throwable; + /*** + * 缁熶竴鏇存柊鎺ュ彛 + * @param data + * @param dataType + * @return + * @throws Throwable + */ + public String syncEditData(String data, String dataType) throws Throwable; - /*** - * 鏌ヨ鍒嗙被鍙� - * @param data - * @param dataType - * @throws Throwable - */ - public String queryClassify(String data,String dataType)throws Throwable; + /*** + * 鏌ヨ鍒嗙被鍙� + * @param data + * @param dataType + * @throws Throwable + */ + public String queryClassify(String data, String dataType) throws Throwable; - /*** - * 鏌ヨ鏁版嵁 - * @param data - * @param dataType - * @throws Throwable - */ - public String queryData(String data,String dataType)throws Throwable; + /*** + * 鏌ヨ鏁版嵁 + * @param data + * @param dataType + * @throws Throwable + */ + public String queryData(String data, String dataType) throws Throwable; /*** * 杩斿洖缂栫爜瑙勫垯鎺ュ彛 */ - public String queryClassifyRule(String data,String datatype)throws Throwable; + public String queryClassifyRule(String data, String datatype) throws Throwable; + /**** + * 鏍囧噯鍖栫敵璇锋帴鍙� + * @param data 鏁版嵁淇℃伅 + * @param dataType 鏁版嵁鏍煎紡绫诲瀷 + * @return + * @throws Throwable + */ + public String applyCodeForBZ(String data,String dataType) throws Throwable; } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java index 31b61e1..1ec4fbc 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java @@ -17,6 +17,8 @@ import com.vci.ubcs.code.util.ClientBusinessObject; import com.vci.ubcs.code.util.gennerAttrMapUtil; import com.vci.ubcs.code.vo.pagemodel.*; +import com.vci.ubcs.code.vo.webserviceModel.applybz.ApplyBZParamVO; +import com.vci.ubcs.code.vo.webserviceModel.applybz.ApplyBZVO; import com.vci.ubcs.code.vo.webserviceModel.person.*; import com.vci.ubcs.code.vo.webserviceModel.apply.*; import com.vci.ubcs.code.vo.webserviceModel.attrmap.*; @@ -1936,6 +1938,134 @@ return resultStr; } + public String applyCodeForBZ(String data,String dataType){ + String resultStr = ""; +// log.info("鏂规硶->applyCodeForBZ start"); +// +// final String[] errorid = {"0"}; +// msg="鎴愬姛"; +// objerrorCode="0"; +// objerrorMsg="鎴愬姛"; +// log.info("鐢宠缂栫爜鐨勬暟鎹弬鏁�:->"+data); +// log.info("鐢宠缂栫爜鐨勬暟鎹被鍨�:->"+dataType); +// String systemId=""; +// List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>(); +// LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>(); +// try{ +// try { +// if(StringUtils.isBlank(data)) { +// errorid[0] ="101"; +// throw new Throwable("鎺ュ彛鍙傛暟锛氫紶閫掍负绌�"); +// } +// ApplyBZParamVO applyBZParamVO =new ApplyBZParamVO(); +// //濡傛灉dataType鏄痻ml鍒欙紝閫氳繃xml搴忓垪鍖栨垚瀵硅薄褰㈠紡锛屽鏋滄槸json鍒欓�氳繃json杞崲鎴愬璞℃牸寮� +// try { +// if ("xml".equals(dataType)) { +// XStream xStream = new XStream(new DomDriver()); +// xStream.processAnnotations(RootDataVO.class); +// xStream.autodetectAnnotations(true); +// ApplyBZVO rootDataVO = (ApplyBZVO) xStream.fromXML(data); +// applyBZParamVO.setData(rootDataVO); +// } else { +// applyBZParamVO = JSONObject.toJavaObject(JSONObject.parseObject(data), ApplyBZParamVO.class); +// } +// }catch (Throwable e){ +// errorid[0] ="101"; +// throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�"); +// } +// ClassfysVO classfysVO = interParameterVO.getData().getClassifys(); +// systemId = interParameterVO.getData().getSystemId(); +// UserVO userVo = interParameterVO.getData().getUser(); +// //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭� +// passwordFreeLoginService.passwordFreeLogin(userVo.getUserName(),this.getRequest()); +// AuthUtil.getUser(); +// List<ClassfyVO> classVOList = classfysVO.getClassify(); +// InterParameterVO finalInterParameterVO = interParameterVO; +// //杩欐槸璐﹀彿淇℃伅 +// SessionInfo sessionInfo = new SessionInfo(); +// sessionInfo.setUserId(userVo.getUserName()); +// sessionInfo.setUserName(userVo.getTrueName()); +// sessionInfo.setIp(userVo.getIp()); +// VciBaseUtil.setCurrentUserSessionInfo(sessionInfo); +//// List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>(); +// String finalSystemId = systemId; +// } catch (Throwable e) { +// List<ApplyDataVO> applyDataVOList= classVO.getObjects().getObject(); +// objerrorCode="1"; +// if(!CollectionUtils.isEmpty(applyDataVOList)) { +// applyDataVOList.stream().forEach(applyDataVO -> { +// XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO(); +// xmlResultDataObjectDetailDO.setCode(""); +// xmlResultDataObjectDetailDO.setId(applyDataVO.getId()); +// xmlResultDataObjectDetailDO.setErrorid(objerrorCode); +// xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage()); +// resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO); +// }); +// }else{ +// XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO(); +// xmlResultDataObjectDetailDO.setCode(""); +// xmlResultDataObjectDetailDO.setId(""); +// xmlResultDataObjectDetailDO.setErrorid(objerrorCode); +// xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage()); +// resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO); +// } +// e.printStackTrace(); +// }finally { +// XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO(); +// resultClassfyVO.setClassCode(classVO.getClassCode()); +// resultClassfyVO.setLibrary(classVO.getLibrary()); +// resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath()); +// resultClassfyVO.setObjects(resultDataObjectDetailDOs); +// resultClassfyVOList.add(resultClassfyVO); +// } +// XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO(); +// xmlResultSystemVO.setClassifys(resultClassfyVOList); +// xmlResultSystemVO.setMsg(msg); +// xmlResultSystemVO.setErrorid(errorid[0]); +// resultStr= transferResultXMl(xmlResultSystemVO,dataType); +// }catch (Throwable e){ +// e.printStackTrace(); +// msg="鐢宠缂栫爜澶辫触:"+e.getMessage(); +// /* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO(); +// XMLResultSystemVO.setErrorid(errorid); +// XMLResultSystemVO.setMsg("鐢宠缂栫爜澶辫触锛�->"+e.getMessage()); +// XMLResultSystemVO.setClassifys(resultClassfyVOList); +// resultStr=transferResultXMl(XMLResultSystemVO,dataType); +// +// log.error("鐢宠缂栫爜澶辫触锛�->"+e); +// return resultStr;*/ +// }finally { +// XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO(); +// xmlResultSystemVO.setClassifys(resultClassfyVOList); +// xmlResultSystemVO.setMsg(msg); +// xmlResultSystemVO.setErrorid(errorid[0]); +// resultStr= transferResultXMl(xmlResultSystemVO,dataType); +// final boolean[] issucess = {true}; +// if(!errorid[0].equals("0")) { +// issucess[0] = false; +// }else { +// if(!CollectionUtils.isEmpty(resultClassfyVOList)) { +// resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> { +// xMLResultClassfyVO.getObjects().stream().forEach(objec -> { +// if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) { +// issucess[0] = false; +// msg=objec.getMsg(); +// } +// }); +// }); +// } +// } +// try { +// //璁板綍鏃ュ織 +// this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCodeForBZ"); +// }catch (Throwable e){ +// e.printStackTrace(); +// } +// } +// log.info("杩斿洖鍙傛暟:"+resultStr); + //璋冪敤闆嗗洟鐢宠鎺ュ彛鐢宠闆嗗洟鐮� + return resultStr; + } /*** * 鏌ヨ鏍¢獙鍒嗙被淇℃伅 * @param classfyVO -- Gitblit v1.9.3