Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DsyyPrescriptionService.java

@@ -601,12 +601,15 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        String rsCode = "";
        String serialNo = "";
        if (res!=null){
            JSONObject object = res.getJSONObject("returnContents");
            serialNo = object.getString("registerNo");
            if (object!=null){
            String returnCode = res.getString("returnCode");
            if (returnCode.equalsIgnoreCase("0")){
                result.put("@RESULT", "0");
                result.put("@MSG","挂号成功！");
                rsCode = object.getString("registerNo");
                serialNo = res.getString("registerNo");
                rsCode = serialNo;
            }else {
                result.put("@RESULT", "-1");
                result.put("@MSG",res.getString("#text"));
            }
        }else {
            result.put("@RESULT", "-1");
@@ -614,7 +617,6 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        }
        if (StringUtils.isNoneBlank(rsCode)) {
            //存储挂号号
            outpatientDO.setRegisterNo(serialNo);
            outpatientDO.setAdmDate(new Date());
            outpatientDO.setAdmNo(serialNo);
@@ -687,9 +689,9 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     */
    public JSONObject refundRegisterNo(String outpatientId) throws Exception {
        JSONObject object = new JSONObject();
        WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientId).orElse(null);
        WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientId).get();
        logger.info("1111111111111"+outpatientDO.getDoctor());
        if(outpatientDO!=null){
            DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(outpatientDO.getDoctor());
            if (StringUtils.isNoneBlank(outpatientDO.getRegisterNo())){
                object = refundConsultation(outpatientDO.getRegisterNo(), outpatientDO.getCardNo());
                logger.info("退号结果 res: " + object.toString());

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -10357,9 +10357,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        logger.info("上传诊断返回参数"+jsonObject2);
                        //{"msg":"交易成功","code":"0","data":{"PresDetail":{"PresNo":"16151365"}},"success":"True"}
                        if (jsonObject2!=null){
                            if (jsonObject2.getString("code").equalsIgnoreCase("0")){
                                com.alibaba.fastjson.JSONObject jsonObject = jsonObject2.getJSONObject("data");
                            if (jsonObject2.getString("returnCode").equalsIgnoreCase("0")){
                                String HISTradeNo = jsonObject2.getString("HISTradeNo");
                                logger.info("上传诊断成功"+jsonObject2);
                            }else {
                                throw new Exception(jsonObject2.getString("msg"));
                            }
                        }
                    }
@@ -10369,13 +10371,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    logger.info("成功上传处方"+object);
                    //{"msg":"交易成功","code":"0","data":{"PresDetail":{"PresNo":"16151365"}},"success":"True"}
                    if (object!=null){
                        if (object.getString("code").equalsIgnoreCase("0")){
                            com.alibaba.fastjson.JSONObject jsonObject = object.getJSONObject("data");
                            com.alibaba.fastjson.JSONObject jsonObject1 = jsonObject.getJSONObject("PresDetail");
                            String realOrder = jsonObject1.getString("PresNo");
                        if (object.getString("returnCode").equalsIgnoreCase("0")){
                            String realOrder = object.getString("PresNo");
                            wlyyPrescriptionDO.setAdmNo(outpatientDO.getAdmNo());
                            wlyyPrescriptionDO.setSerialNo(outpatientDO.getAdmNo());
                            wlyyPrescriptionDO.setRealOrder(realOrder);
                        }else {
                            throw new Exception(object.getString("msg"));
                        }
                    }
                /*    logger.info("进入处方签名");

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java

@@ -36,6 +36,7 @@ import com.yihu.jw.util.network.HttpUtils;
import com.yihu.jw.utils.WebserviceUtil;
import com.yihu.jw.utils.dsyyUtil.SendMessge_ServiceLocator;
import com.yihu.jw.utils.dsyyUtil.WritebackCvalueInterfaceLocator;
import com.yihu.jw.utils.dsyyUtil.ZoesoftHipServiceLocator;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import net.sf.json.xml.XMLSerializer;
@@ -199,16 +200,12 @@ public class DsyyEntranceService {
     * @throws Exception
     */
    public String getDsyyWebServiceInfo(String api, Map<String,String> params,String url)throws Exception{
        logger.info("url"+url);
        List<WlyyHospitalSysDictDO> xzzxNamespaces =  wlyyHospitalSysDictDao.findByDictName("dsyyNamespace");
        String xzzxNamespace = xzzxNamespaces.get(0).getDictCode();
        logger.info("dsyyNamespace",xzzxNamespace);
        return WebserviceUtil.post(url,xzzxNamespace,api,params);
        String msgHeader = params.get("msgHeader");
        String msgBody = params.get("msgBody");
        ZoesoftHipServiceLocator locator = new ZoesoftHipServiceLocator();
        String returnStr = locator.getZoesoftHipServiceSoap().callInterface(msgHeader,msgBody);
        logger.info("his调用日志===="+returnStr);
        return returnStr;
    }
    /**
@@ -355,8 +352,29 @@ public class DsyyEntranceService {
//                            doctor.setExpertise(doctorJson.getString("expertise"));
//                            doctor.setIntroduce(doctorJson.getString("introduce"));
//                            doctor.setMobile(doctorJson.getString("mobile"));
                            BaseDoctorDO temp = baseDoctorDao.save(doctor);
                            DoctorMappingDO mappingDO = doctorMappingDao.findByDoctor(doctor.getId());
                            if (mappingDO==null){
                                mappingDO= new DoctorMappingDO();
                            }
                            mappingDO.setIdcard(idcard);
                            mappingDO.setDoctor(temp.getId());
                            mappingDO.setDoctorName(temp.getName());
                            mappingDO.setOrgCode(orgCode);
                            mappingDO.setOrgName("厦门市第三医院");
                            mappingDO.setMappingCode(doctorJson.getString("code"));
                            mappingDO.setMappingName(temp.getName());
                            mappingDO.setCreateTime(new Date());
                            doctorMappingDao.save(mappingDO);
                            BaseDoctorRoleDO role = doctorRoleDao.findByDoctorCodeAndRoleCode(doctor.getId(),"specialist");
                            if (role==null){
                                role = new BaseDoctorRoleDO();
                            }
                            role.setDoctorCode(temp.getId());
                            role.setRoleCode("specialist");
                            role.setDel(1);
                            doctorRoleDao.save(role);
                            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByOrgCodeAndDeptCodeAndDoctorCode(orgCode,doctorJson.getString("dept"),doctor.getId());
                            if(hospitalDOs!=null&&hospitalDOs.size()>0){
@@ -417,6 +435,7 @@ public class DsyyEntranceService {
                            BaseDoctorRoleDO role = new BaseDoctorRoleDO();
                            role.setDoctorCode(temp.getId());
                            role.setRoleCode("specialist");
                            role.setDel(1);
                            doctorRoleDao.save(role);
                            //保存mapping
@@ -973,12 +992,12 @@ public class DsyyEntranceService {
     * 查询药品信息
     * @return
     */
    public JSONArray findDrugs(String chagreCode,String pydm) throws Exception {
    public JSONArray findDrugs(String chargeCode,String pydm) throws Exception {
        String sql ="SELECT\n" +
                "\tcharge_code as \"charge_code\",\n" +
                "\tserial as \"serial\",\n" +
                "\tgroup_no as \"group_no\",\n" +
                "\tdrugname as \"drugName\",\n" +
                "\tdrugname as \"drugname\",\n" +
                "\tdosage as \"dosage\",\n" +
                "\tmini_unit as \"mini_unit\",\n" +
                "\tpack_size as \"packSize\",\n" +
@@ -1002,8 +1021,11 @@ public class DsyyEntranceService {
                "\tv_internet_physic_dict_info \n" +
                "WHERE\n" +
                "\t1 = 1 ";
        if (StringUtils.isNoneBlank(chagreCode)){
            sql+=" and (lower(yp.charge_code) like '%"+chagreCode.toLowerCase()+"%' or chagreCode like '%"+chagreCode+"%' ) ";
        if (StringUtils.isNoneBlank(pydm)){
            sql+=" and (lower(py_code) like '%"+pydm.toLowerCase()+"%' or drugname like '%"+pydm+"%' ) ";
        }
        if (StringUtils.isNoneBlank(chargeCode)){
            sql+=" and charge_code = '"+chargeCode+"' ";
        }
        JSONArray array = new JSONArray();
        Map<String,Object> params = new HashedMap();
@@ -1063,7 +1085,7 @@ public class DsyyEntranceService {
     */
    public JSONArray getDrugFrequency() throws Exception {
        String sql = "SELECT\n" +
                "\tfreq_code AS \"FREQ_CODE\",\n" +
                "\tfreq_name AS \"FREQ_CODE\",\n" +
                "\tfreq_name AS \"FREQ_NAME\",\n" +
                "\tfreq_sp AS \"FREQ_SP\",\n" +
                "\tdaily_times AS \"DAILY_TIMES\",\n" +

business/base-service/src/main/java/com/yihu/jw/utils/WebserviceUtil.java

@@ -36,6 +36,7 @@ public class WebserviceUtil {
            call.setTargetEndpointAddress(new java.net.URL(urlString));
            call.setOperationName(new QName(namespace, api));
            call.setUseSOAPAction(true);
            call.setSOAPActionURI("http://www.zoesoft.com.cn/CallInterface");
            Object[] objs = null;
            logger.info("=======>组装参数:"+params.size());
            if(params!=null && params.size()>0)

business/base-service/src/main/java/com/yihu/jw/utils/dsyyUtil/ZoesoftHipService.java

@@ -0,0 +1,21 @@
/**
 * ZoesoftHipService.java
 *
 * This file was auto-generated from WSDL
 * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
 */
package com.yihu.jw.utils.dsyyUtil;
public interface ZoesoftHipService extends javax.xml.rpc.Service {
    public String getZoesoftHipServiceSoap12Address();
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap12() throws javax.xml.rpc.ServiceException;
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap12(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
    public String getZoesoftHipServiceSoapAddress();
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap() throws javax.xml.rpc.ServiceException;
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
}

business/base-service/src/main/java/com/yihu/jw/utils/dsyyUtil/ZoesoftHipServiceLocator.java

@@ -0,0 +1,202 @@
/**
 * ZoesoftHipServiceLocator.java
 *
 * This file was auto-generated from WSDL
 * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
 */
package com.yihu.jw.utils.dsyyUtil;
public class ZoesoftHipServiceLocator extends org.apache.axis.client.Service implements ZoesoftHipService {
    public ZoesoftHipServiceLocator() {
    }
    public ZoesoftHipServiceLocator(org.apache.axis.EngineConfiguration config) {
        super(config);
    }
    public ZoesoftHipServiceLocator(String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException {
        super(wsdlLoc, sName);
    }
    // Use to get a proxy class for ZoesoftHipServiceSoap12
    private String ZoesoftHipServiceSoap12_address = "http://192.168.155.8:8090/ZoesoftHipService.asmx";
    public String getZoesoftHipServiceSoap12Address() {
        return ZoesoftHipServiceSoap12_address;
    }
    // The WSDD service name defaults to the port name.
    private String ZoesoftHipServiceSoap12WSDDServiceName = "ZoesoftHipServiceSoap12";
    public String getZoesoftHipServiceSoap12WSDDServiceName() {
        return ZoesoftHipServiceSoap12WSDDServiceName;
    }
    public void setZoesoftHipServiceSoap12WSDDServiceName(String name) {
        ZoesoftHipServiceSoap12WSDDServiceName = name;
    }
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap12() throws javax.xml.rpc.ServiceException {
       java.net.URL endpoint;
        try {
            endpoint = new java.net.URL(ZoesoftHipServiceSoap12_address);
        }
        catch (java.net.MalformedURLException e) {
            throw new javax.xml.rpc.ServiceException(e);
        }
        return getZoesoftHipServiceSoap12(endpoint);
    }
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap12(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
        try {
            ZoesoftHipServiceSoap12Stub _stub = new ZoesoftHipServiceSoap12Stub(portAddress, this);
            _stub.setPortName(getZoesoftHipServiceSoap12WSDDServiceName());
            return _stub;
        }
        catch (org.apache.axis.AxisFault e) {
            return null;
        }
    }
    public void setZoesoftHipServiceSoap12EndpointAddress(String address) {
        ZoesoftHipServiceSoap12_address = address;
    }
    // Use to get a proxy class for ZoesoftHipServiceSoap
    private String ZoesoftHipServiceSoap_address = "http://192.168.155.8:8090/ZoesoftHipService.asmx";
    public String getZoesoftHipServiceSoapAddress() {
        return ZoesoftHipServiceSoap_address;
    }
    // The WSDD service name defaults to the port name.
    private String ZoesoftHipServiceSoapWSDDServiceName = "ZoesoftHipServiceSoap";
    public String getZoesoftHipServiceSoapWSDDServiceName() {
        return ZoesoftHipServiceSoapWSDDServiceName;
    }
    public void setZoesoftHipServiceSoapWSDDServiceName(String name) {
        ZoesoftHipServiceSoapWSDDServiceName = name;
    }
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap() throws javax.xml.rpc.ServiceException {
       java.net.URL endpoint;
        try {
            endpoint = new java.net.URL(ZoesoftHipServiceSoap_address);
        }
        catch (java.net.MalformedURLException e) {
            throw new javax.xml.rpc.ServiceException(e);
        }
        return getZoesoftHipServiceSoap(endpoint);
    }
    public ZoesoftHipServiceSoap getZoesoftHipServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
        try {
            ZoesoftHipServiceSoapStub _stub = new ZoesoftHipServiceSoapStub(portAddress, this);
            _stub.setPortName(getZoesoftHipServiceSoapWSDDServiceName());
            return _stub;
        }
        catch (org.apache.axis.AxisFault e) {
            return null;
        }
    }
    public void setZoesoftHipServiceSoapEndpointAddress(String address) {
        ZoesoftHipServiceSoap_address = address;
    }
    /**
     * For the given interface, get the stub implementation.
     * If this service has no port for the given interface,
     * then ServiceException is thrown.
     * This service has multiple ports for a given interface;
     * the proxy implementation returned may be indeterminate.
     */
    public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
        try {
            if (ZoesoftHipServiceSoap.class.isAssignableFrom(serviceEndpointInterface)) {
                ZoesoftHipServiceSoap12Stub _stub = new ZoesoftHipServiceSoap12Stub(new java.net.URL(ZoesoftHipServiceSoap12_address), this);
                _stub.setPortName(getZoesoftHipServiceSoap12WSDDServiceName());
                return _stub;
            }
            if (ZoesoftHipServiceSoap.class.isAssignableFrom(serviceEndpointInterface)) {
                ZoesoftHipServiceSoapStub _stub = new ZoesoftHipServiceSoapStub(new java.net.URL(ZoesoftHipServiceSoap_address), this);
                _stub.setPortName(getZoesoftHipServiceSoapWSDDServiceName());
                return _stub;
            }
        }
        catch (Throwable t) {
            throw new javax.xml.rpc.ServiceException(t);
        }
        throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface:  " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
    }
    /**
     * For the given interface, get the stub implementation.
     * If this service has no port for the given interface,
     * then ServiceException is thrown.
     */
    public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
        if (portName == null) {
            return getPort(serviceEndpointInterface);
        }
        String inputPortName = portName.getLocalPart();
        if ("ZoesoftHipServiceSoap12".equals(inputPortName)) {
            return getZoesoftHipServiceSoap12();
        }
        else if ("ZoesoftHipServiceSoap".equals(inputPortName)) {
            return getZoesoftHipServiceSoap();
        }
        else  {
            java.rmi.Remote _stub = getPort(serviceEndpointInterface);
            ((org.apache.axis.client.Stub) _stub).setPortName(portName);
            return _stub;
        }
    }
    public javax.xml.namespace.QName getServiceName() {
        return new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "ZoesoftHipService");
    }
    private java.util.HashSet ports = null;
    public java.util.Iterator getPorts() {
        if (ports == null) {
            ports = new java.util.HashSet();
            ports.add(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "ZoesoftHipServiceSoap12"));
            ports.add(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "ZoesoftHipServiceSoap"));
        }
        return ports.iterator();
    }
    /**
    * Set the endpoint address for the specified port name.
    */
    public void setEndpointAddress(String portName, String address) throws javax.xml.rpc.ServiceException {
        
if ("ZoesoftHipServiceSoap12".equals(portName)) {
            setZoesoftHipServiceSoap12EndpointAddress(address);
        }
        else 
if ("ZoesoftHipServiceSoap".equals(portName)) {
            setZoesoftHipServiceSoapEndpointAddress(address);
        }
        else 
{ // Unknown Port Name
            throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
        }
    }
    /**
    * Set the endpoint address for the specified port name.
    */
    public void setEndpointAddress(javax.xml.namespace.QName portName, String address) throws javax.xml.rpc.ServiceException {
        setEndpointAddress(portName.getLocalPart(), address);
    }
}

business/base-service/src/main/java/com/yihu/jw/utils/dsyyUtil/ZoesoftHipServiceSoap.java

@@ -0,0 +1,21 @@
/**
 * ZoesoftHipServiceSoap.java
 *
 * This file was auto-generated from WSDL
 * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
 */
package com.yihu.jw.utils.dsyyUtil;
public interface ZoesoftHipServiceSoap extends java.rmi.Remote {
    /**
     * 互联互通中转统一入口
     */
    public String HIPMessageServerTransit(String msgHeader, String message_id) throws java.rmi.RemoteException;
    /**
     * 互联互通交互统一入口
     */
    public String callInterface(String msgHeader, String msgBody) throws java.rmi.RemoteException;
}

business/base-service/src/main/java/com/yihu/jw/utils/dsyyUtil/ZoesoftHipServiceSoap12Stub.java

@@ -0,0 +1,177 @@
/**
 * ZoesoftHipServiceSoap12Stub.java
 *
 * This file was auto-generated from WSDL
 * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
 */
package com.yihu.jw.utils.dsyyUtil;
public class ZoesoftHipServiceSoap12Stub extends org.apache.axis.client.Stub implements ZoesoftHipServiceSoap {
    private java.util.Vector cachedSerClasses = new java.util.Vector();
    private java.util.Vector cachedSerQNames = new java.util.Vector();
    private java.util.Vector cachedSerFactories = new java.util.Vector();
    private java.util.Vector cachedDeserFactories = new java.util.Vector();
    static org.apache.axis.description.OperationDesc [] _operations;
    static {
        _operations = new org.apache.axis.description.OperationDesc[2];
        _initOperationDesc1();
    }
    private static void _initOperationDesc1(){
        org.apache.axis.description.OperationDesc oper;
        org.apache.axis.description.ParameterDesc param;
        oper = new org.apache.axis.description.OperationDesc();
        oper.setName("HIPMessageServerTransit");
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "msgHeader"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "message_id"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
        oper.setReturnClass(String.class);
        oper.setReturnQName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "HIPMessageServerTransitResult"));
        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
        oper.setUse(org.apache.axis.constants.Use.LITERAL);
        _operations[0] = oper;
        oper = new org.apache.axis.description.OperationDesc();
        oper.setName("CallInterface");
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "msgHeader"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "msgBody"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
        oper.setReturnClass(String.class);
        oper.setReturnQName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "CallInterfaceResult"));
        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
        oper.setUse(org.apache.axis.constants.Use.LITERAL);
        _operations[1] = oper;
    }
    public ZoesoftHipServiceSoap12Stub() throws org.apache.axis.AxisFault {
         this(null);
    }
    public ZoesoftHipServiceSoap12Stub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
         this(service);
         super.cachedEndpoint = endpointURL;
    }
    public ZoesoftHipServiceSoap12Stub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
        if (service == null) {
            super.service = new org.apache.axis.client.Service();
        } else {
            super.service = service;
        }
        ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
    }
    protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
        try {
            org.apache.axis.client.Call _call = super._createCall();
            if (super.maintainSessionSet) {
                _call.setMaintainSession(super.maintainSession);
            }
            if (super.cachedUsername != null) {
                _call.setUsername(super.cachedUsername);
            }
            if (super.cachedPassword != null) {
                _call.setPassword(super.cachedPassword);
            }
            if (super.cachedEndpoint != null) {
                _call.setTargetEndpointAddress(super.cachedEndpoint);
            }
            if (super.cachedTimeout != null) {
                _call.setTimeout(super.cachedTimeout);
            }
            if (super.cachedPortName != null) {
                _call.setPortName(super.cachedPortName);
            }
            java.util.Enumeration keys = super.cachedProperties.keys();
            while (keys.hasMoreElements()) {
                String key = (String) keys.nextElement();
                _call.setProperty(key, super.cachedProperties.get(key));
            }
            return _call;
        }
        catch (Throwable _t) {
            throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
        }
    }
    public String HIPMessageServerTransit(String msgHeader, String message_id) throws java.rmi.RemoteException {
        if (super.cachedEndpoint == null) {
            throw new org.apache.axis.NoEndPointException();
        }
        org.apache.axis.client.Call _call = createCall();
        _call.setOperation(_operations[0]);
        _call.setUseSOAPAction(true);
        _call.setSOAPActionURI("http://www.zoesoft.com.cn/HIPMessageServerTransit");
        _call.setEncodingStyle(null);
        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP12_CONSTANTS);
        _call.setOperationName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "HIPMessageServerTransit"));
        setRequestHeaders(_call);
        setAttachments(_call);
 try {        Object _resp = _call.invoke(new Object[] {msgHeader, message_id});
        if (_resp instanceof java.rmi.RemoteException) {
            throw (java.rmi.RemoteException)_resp;
        }
        else {
            extractAttachments(_call);
            try {
                return (String) _resp;
            } catch (Exception _exception) {
                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
            }
        }
  } catch (org.apache.axis.AxisFault axisFaultException) {
  throw axisFaultException;
}
    }
    public String callInterface(String msgHeader, String msgBody) throws java.rmi.RemoteException {
        if (super.cachedEndpoint == null) {
            throw new org.apache.axis.NoEndPointException();
        }
        org.apache.axis.client.Call _call = createCall();
        _call.setOperation(_operations[1]);
        _call.setUseSOAPAction(true);
        _call.setSOAPActionURI("http://www.zoesoft.com.cn/CallInterface");
        _call.setEncodingStyle(null);
        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP12_CONSTANTS);
        _call.setOperationName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "CallInterface"));
        setRequestHeaders(_call);
        setAttachments(_call);
 try {        Object _resp = _call.invoke(new Object[] {msgHeader, msgBody});
        if (_resp instanceof java.rmi.RemoteException) {
            throw (java.rmi.RemoteException)_resp;
        }
        else {
            extractAttachments(_call);
            try {
                return (String) _resp;
            } catch (Exception _exception) {
                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
            }
        }
  } catch (org.apache.axis.AxisFault axisFaultException) {
  throw axisFaultException;
}
    }
}

business/base-service/src/main/java/com/yihu/jw/utils/dsyyUtil/ZoesoftHipServiceSoapStub.java

@@ -0,0 +1,177 @@
/**
 * ZoesoftHipServiceSoapStub.java
 *
 * This file was auto-generated from WSDL
 * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
 */
package com.yihu.jw.utils.dsyyUtil;
public class ZoesoftHipServiceSoapStub extends org.apache.axis.client.Stub implements ZoesoftHipServiceSoap {
    private java.util.Vector cachedSerClasses = new java.util.Vector();
    private java.util.Vector cachedSerQNames = new java.util.Vector();
    private java.util.Vector cachedSerFactories = new java.util.Vector();
    private java.util.Vector cachedDeserFactories = new java.util.Vector();
    static org.apache.axis.description.OperationDesc [] _operations;
    static {
        _operations = new org.apache.axis.description.OperationDesc[2];
        _initOperationDesc1();
    }
    private static void _initOperationDesc1(){
        org.apache.axis.description.OperationDesc oper;
        org.apache.axis.description.ParameterDesc param;
        oper = new org.apache.axis.description.OperationDesc();
        oper.setName("HIPMessageServerTransit");
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "msgHeader"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "message_id"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
        oper.setReturnClass(String.class);
        oper.setReturnQName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "HIPMessageServerTransitResult"));
        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
        oper.setUse(org.apache.axis.constants.Use.LITERAL);
        _operations[0] = oper;
        oper = new org.apache.axis.description.OperationDesc();
        oper.setName("CallInterface");
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "msgHeader"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "msgBody"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
        param.setOmittable(true);
        oper.addParameter(param);
        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
        oper.setReturnClass(String.class);
        oper.setReturnQName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "CallInterfaceResult"));
        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
        oper.setUse(org.apache.axis.constants.Use.LITERAL);
        _operations[1] = oper;
    }
    public ZoesoftHipServiceSoapStub() throws org.apache.axis.AxisFault {
         this(null);
    }
    public ZoesoftHipServiceSoapStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
         this(service);
         super.cachedEndpoint = endpointURL;
    }
    public ZoesoftHipServiceSoapStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
        if (service == null) {
            super.service = new org.apache.axis.client.Service();
        } else {
            super.service = service;
        }
        ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
    }
    protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
        try {
            org.apache.axis.client.Call _call = super._createCall();
            if (super.maintainSessionSet) {
                _call.setMaintainSession(super.maintainSession);
            }
            if (super.cachedUsername != null) {
                _call.setUsername(super.cachedUsername);
            }
            if (super.cachedPassword != null) {
                _call.setPassword(super.cachedPassword);
            }
            if (super.cachedEndpoint != null) {
                _call.setTargetEndpointAddress(super.cachedEndpoint);
            }
            if (super.cachedTimeout != null) {
                _call.setTimeout(super.cachedTimeout);
            }
            if (super.cachedPortName != null) {
                _call.setPortName(super.cachedPortName);
            }
            java.util.Enumeration keys = super.cachedProperties.keys();
            while (keys.hasMoreElements()) {
                String key = (String) keys.nextElement();
                _call.setProperty(key, super.cachedProperties.get(key));
            }
            return _call;
        }
        catch (Throwable _t) {
            throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
        }
    }
    public String HIPMessageServerTransit(String msgHeader, String message_id) throws java.rmi.RemoteException {
        if (super.cachedEndpoint == null) {
            throw new org.apache.axis.NoEndPointException();
        }
        org.apache.axis.client.Call _call = createCall();
        _call.setOperation(_operations[0]);
        _call.setUseSOAPAction(true);
        _call.setSOAPActionURI("http://www.zoesoft.com.cn/HIPMessageServerTransit");
        _call.setEncodingStyle(null);
        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
        _call.setOperationName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "HIPMessageServerTransit"));
        setRequestHeaders(_call);
        setAttachments(_call);
 try {        Object _resp = _call.invoke(new Object[] {msgHeader, message_id});
        if (_resp instanceof java.rmi.RemoteException) {
            throw (java.rmi.RemoteException)_resp;
        }
        else {
            extractAttachments(_call);
            try {
                return (String) _resp;
            } catch (Exception _exception) {
                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
            }
        }
  } catch (org.apache.axis.AxisFault axisFaultException) {
  throw axisFaultException;
}
    }
    public String callInterface(String msgHeader, String msgBody) throws java.rmi.RemoteException {
        if (super.cachedEndpoint == null) {
            throw new org.apache.axis.NoEndPointException();
        }
        org.apache.axis.client.Call _call = createCall();
        _call.setOperation(_operations[1]);
        _call.setUseSOAPAction(true);
        _call.setSOAPActionURI("http://www.zoesoft.com.cn/CallInterface");
        _call.setEncodingStyle(null);
        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
        _call.setOperationName(new javax.xml.namespace.QName("http://www.zoesoft.com.cn/", "CallInterface"));
        setRequestHeaders(_call);
        setAttachments(_call);
 try {        Object _resp = _call.invoke(new Object[] {msgHeader, msgBody});
        if (_resp instanceof java.rmi.RemoteException) {
            throw (java.rmi.RemoteException)_resp;
        }
        else {
            extractAttachments(_call);
            try {
                return (String) _resp;
            } catch (Exception _exception) {
                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
            }
        }
  } catch (org.apache.axis.AxisFault axisFaultException) {
  throw axisFaultException;
}
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -325,8 +325,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
     * @throws Exception
     */
    @RequestMapping(value = "/oauth/login", method = RequestMethod.POST)
    public ResponseEntity<Oauth2Envelop<WlyyUserSimple>> login(@RequestParam Map<String, String> parameters, HttpSession httpSession)  {
        try {
    public ResponseEntity<Oauth2Envelop<WlyyUserSimple>> login(@RequestParam Map<String, String> parameters, HttpSession httpSession) throws Exception {
            logger.info("login:登录进入1");
            //图形验证码验证
            String key = parameters.get("key");
@@ -509,14 +508,6 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            //客户端类型 app,wx,pad,pc
            userDetailsService.updateInfo(clientId,getuiClientType,padImei,loginType,wlyyUserSimple.getId(),baseLoginLogDO);
            return getResponse(wlyyUserSimple);
        }catch (Exception e){
            e.printStackTrace();
            HttpHeaders headers = new HttpHeaders();
            headers.set("Cache-Control", "no-store");
            headers.set("Pragma", "no-cache");
            Oauth2Envelop<WlyyUserSimple> oauth2Envelop = new Oauth2Envelop<>("登录失败", -1, null);
            return new ResponseEntity<>(oauth2Envelop, headers, HttpStatus.OK);
        }
    }