webservice接口对象更改

 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 + '\'' +

 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;
}

 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 +
            '}';
    }
}

 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 +
            '}';
    }
}

 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 +
            '}';
    }
}

 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 {
    /**
     * åˆ†ç±»ä»£å·
     */
    @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 +
            '}';
    }
}

 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 + '\'' +
            '}';
    }
}

 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;

 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;
    }
}

 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是xml格式还是json格式，接口返回数据也是按照这个格式，以下接口类同
     * @return xml格式/json格式
     * @throws Throwable
     */
    public String applyCode(String data, String dataType)throws Throwable;
    /**
     * ç»Ÿä¸€ç”³è¯·ç¼–码接口
     *
     * @param data     ä¼ é€’的数据参数
     * @param dataType æ ‡è¯†data是xml格式还是json格式，接口返回数据也是按照这个格式，以下接口类同
     * @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;
}

 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是xml则，通过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，request中添加用户信息
//                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