Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java =================================================================== diff -u -r20513 -r20634 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java (.../WriteBackInventoryManagerImpl.java) (revision 20513) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java (.../WriteBackInventoryManagerImpl.java) (revision 20634) @@ -49,6 +49,8 @@ import com.forgon.disinfectsystem.inventorymanagement.model.WriteBackEntry; import com.forgon.disinfectsystem.inventorymanagement.model.WriteBackEntryItem; import com.forgon.disinfectsystem.inventorymanagement.model.WriteBackTousseStatisticsRecord; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.google.gson.JsonObject; @@ -71,7 +73,11 @@ private WriteBackInventoryDao writeBackInventoryDao; private WriteBackTousseStatisticsDao writeBackTousseStatisticsDao; private JsonObject config; + private LogManager appLogManager; + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } public void setWriteBackInventoryDao(WriteBackInventoryDao writeBackInventoryDao) { this.writeBackInventoryDao = writeBackInventoryDao; } @@ -253,14 +259,17 @@ } xmlParam += dataXml; //调用回写 + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_ADD, "定时发货回写参数xmlParam="+xmlParam); String writeBackResult = writeBackInventoryDao.insertWriteBackForCommon(xmlParam); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_ADD, "定时发货回写参数xmlParam="+xmlParam+",对应的回写结果=" + writeBackResult); JSONObject jsonReturn = JSONObject.fromObject(writeBackResult); if(jsonReturn.optBoolean("success")){ //回写成功申请单的inventoryWriteBackEntryId设为1 invoice.setInventoryWriteBackEntryId(1L); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVOICE, Log.TYPE_UPDATE, "发货单"+invoice.getSerialNumber()+"：inventoryWriteBackEntryId字段修改=1"); objectDao.saveOrUpdate(invoice); }else{ - logger.error(String.format("定时回写发货单%s失败", invoice.getSerialNumber()) + ",回写参数："+xmlParam+"失败原因" + jsonReturn.optBoolean("message")); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_ADD, "定时发货回写失败="+jsonReturn.optBoolean("message")); } } } catch (RuntimeException ex ) { Index: ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceLocator.java =================================================================== diff -u --- ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceLocator.java (revision 0) +++ ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceLocator.java (revision 20634) @@ -0,0 +1,144 @@ +/** + * CSSDServiceLocator.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.tempuri; + +import com.forgon.disinfectsystem.inventorymanagement.dao.sznsrmyy.Constant; + +public class CSSDServiceLocator extends org.apache.axis.client.Service implements org.tempuri.CSSDService { + + public CSSDServiceLocator() { + } + + + public CSSDServiceLocator(org.apache.axis.EngineConfiguration config) { + super(config); + } + + public CSSDServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException { + super(wsdlLoc, sName); + } + + // Use to get a proxy class for CSSDServiceSoap + private java.lang.String CSSDServiceSoap_address = Constant.SSO_WEBSERVICE_URL; + + public java.lang.String getCSSDServiceSoapAddress() { + return CSSDServiceSoap_address; + } + + // The WSDD service name defaults to the port name. + private java.lang.String CSSDServiceSoapWSDDServiceName = "CSSDServiceSoap"; + + public java.lang.String getCSSDServiceSoapWSDDServiceName() { + return CSSDServiceSoapWSDDServiceName; + } + + public void setCSSDServiceSoapWSDDServiceName(java.lang.String name) { + CSSDServiceSoapWSDDServiceName = name; + } + + public org.tempuri.CSSDServiceSoap getCSSDServiceSoap() throws javax.xml.rpc.ServiceException { + java.net.URL endpoint; + try { + endpoint = new java.net.URL(CSSDServiceSoap_address); + } + catch (java.net.MalformedURLException e) { + throw new javax.xml.rpc.ServiceException(e); + } + return getCSSDServiceSoap(endpoint); + } + + public org.tempuri.CSSDServiceSoap getCSSDServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { + try { + org.tempuri.CSSDServiceSoapStub _stub = new org.tempuri.CSSDServiceSoapStub(portAddress, this); + _stub.setPortName(getCSSDServiceSoapWSDDServiceName()); + return _stub; + } + catch (org.apache.axis.AxisFault e) { + return null; + } + } + + public void setCSSDServiceSoapEndpointAddress(java.lang.String address) { + CSSDServiceSoap_address = address; + } + + /** + * 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(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { + try { + if (org.tempuri.CSSDServiceSoap.class.isAssignableFrom(serviceEndpointInterface)) { + org.tempuri.CSSDServiceSoapStub _stub = new org.tempuri.CSSDServiceSoapStub(new java.net.URL(CSSDServiceSoap_address), this); + _stub.setPortName(getCSSDServiceSoapWSDDServiceName()); + return _stub; + } + } + catch (java.lang.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); + } + java.lang.String inputPortName = portName.getLocalPart(); + if ("CSSDServiceSoap".equals(inputPortName)) { + return getCSSDServiceSoap(); + } + 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://tempuri.org", "CSSDService"); + } + + 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://tempuri.org", "CSSDServiceSoap")); + } + return ports.iterator(); + } + + /** + * Set the endpoint address for the specified port name. + */ + public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException { + +if ("CSSDServiceSoap".equals(portName)) { + setCSSDServiceSoapEndpointAddress(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, java.lang.String address) throws javax.xml.rpc.ServiceException { + setEndpointAddress(portName.getLocalPart(), address); + } + +} Index: ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDService.java =================================================================== diff -u --- ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDService.java (revision 0) +++ ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDService.java (revision 20634) @@ -0,0 +1,16 @@ +/** + * CSSDService.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.tempuri; + +public interface CSSDService extends javax.xml.rpc.Service { + public java.lang.String getCSSDServiceSoapAddress(); + + public org.tempuri.CSSDServiceSoap getCSSDServiceSoap() throws javax.xml.rpc.ServiceException; + + public org.tempuri.CSSDServiceSoap getCSSDServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; +} Index: ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoapStub.java =================================================================== diff -u --- ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoapStub.java (revision 0) +++ ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoapStub.java (revision 20634) @@ -0,0 +1,171 @@ +/** + * CSSDServiceSoapStub.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.tempuri; + +public class CSSDServiceSoapStub extends org.apache.axis.client.Stub implements org.tempuri.CSSDServiceSoap { + 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("HelloWorld"); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org", "Input"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.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(java.lang.String.class); + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org", "HelloWorldResult")); + 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("InsertINIT"); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org", "data"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.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(java.lang.String.class); + oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org", "InsertINITResult")); + oper.setStyle(org.apache.axis.constants.Style.WRAPPED); + oper.setUse(org.apache.axis.constants.Use.LITERAL); + _operations[1] = oper; + + } + + public CSSDServiceSoapStub() throws org.apache.axis.AxisFault { + this(null); + } + + public CSSDServiceSoapStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { + this(service); + super.cachedEndpoint = endpointURL; + } + + public CSSDServiceSoapStub(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()) { + java.lang.String key = (java.lang.String) keys.nextElement(); + _call.setProperty(key, super.cachedProperties.get(key)); + } + return _call; + } + catch (java.lang.Throwable _t) { + throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); + } + } + + public java.lang.String helloWorld(java.lang.String input) 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://tempuri.org/DHC.Material.BS.HisServiceForCSSD.HelloWorld"); + _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://tempuri.org", "HelloWorld")); + + setRequestHeaders(_call); + setAttachments(_call); + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {input}); + + if (_resp instanceof java.rmi.RemoteException) { + throw (java.rmi.RemoteException)_resp; + } + else { + extractAttachments(_call); + try { + return (java.lang.String) _resp; + } catch (java.lang.Exception _exception) { + return (java.lang.String) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.String.class); + } + } + } catch (org.apache.axis.AxisFault axisFaultException) { + throw axisFaultException; +} + } + + public java.lang.String insertINIT(java.lang.String data) 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://tempuri.org/DHC.Material.BS.HisServiceForCSSD.InsertINIT"); + _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://tempuri.org", "InsertINIT")); + + setRequestHeaders(_call); + setAttachments(_call); + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {data}); + + if (_resp instanceof java.rmi.RemoteException) { + throw (java.rmi.RemoteException)_resp; + } + else { + extractAttachments(_call); + try { + return (java.lang.String) _resp; + } catch (java.lang.Exception _exception) { + return (java.lang.String) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.String.class); + } + } + } catch (org.apache.axis.AxisFault axisFaultException) { + throw axisFaultException; +} + } + +} Index: ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoapProxy.java =================================================================== diff -u --- ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoapProxy.java (revision 0) +++ ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoapProxy.java (revision 20634) @@ -0,0 +1,60 @@ +package org.tempuri; + +public class CSSDServiceSoapProxy implements org.tempuri.CSSDServiceSoap { + private String _endpoint = null; + private org.tempuri.CSSDServiceSoap cSSDServiceSoap = null; + + public CSSDServiceSoapProxy() { + _initCSSDServiceSoapProxy(); + } + + public CSSDServiceSoapProxy(String endpoint) { + _endpoint = endpoint; + _initCSSDServiceSoapProxy(); + } + + private void _initCSSDServiceSoapProxy() { + try { + cSSDServiceSoap = (new org.tempuri.CSSDServiceLocator()).getCSSDServiceSoap(); + if (cSSDServiceSoap != null) { + if (_endpoint != null) + ((javax.xml.rpc.Stub)cSSDServiceSoap)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint); + else + _endpoint = (String)((javax.xml.rpc.Stub)cSSDServiceSoap)._getProperty("javax.xml.rpc.service.endpoint.address"); + } + + } + catch (javax.xml.rpc.ServiceException serviceException) {} + } + + public String getEndpoint() { + return _endpoint; + } + + public void setEndpoint(String endpoint) { + _endpoint = endpoint; + if (cSSDServiceSoap != null) + ((javax.xml.rpc.Stub)cSSDServiceSoap)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint); + + } + + public org.tempuri.CSSDServiceSoap getCSSDServiceSoap() { + if (cSSDServiceSoap == null) + _initCSSDServiceSoapProxy(); + return cSSDServiceSoap; + } + + public java.lang.String helloWorld(java.lang.String input) throws java.rmi.RemoteException{ + if (cSSDServiceSoap == null) + _initCSSDServiceSoapProxy(); + return cSSDServiceSoap.helloWorld(input); + } + + public java.lang.String insertINIT(java.lang.String data) throws java.rmi.RemoteException{ + if (cSSDServiceSoap == null) + _initCSSDServiceSoapProxy(); + return cSSDServiceSoap.insertINIT(data); + } + + +} \ No newline at end of file Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/helper/WebServiceClientHelper.java =================================================================== diff -u -r20513 -r20634 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/helper/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 20513) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/helper/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 20634) @@ -11,10 +11,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.web.util.HtmlUtils; +import org.tempuri.CSSDServiceSoap; +import org.tempuri.CSSDServiceSoapProxy; -import webservice.client.sznsrmyy.org.tempuri.CSSDServiceSoap; -import webservice.client.sznsrmyy.org.tempuri.CSSDServiceSoapProxy; - import com.forgon.disinfectsystem.datasynchronization.dao.sznsrmyy.DatasyncConstant; /** Index: ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoap.java =================================================================== diff -u --- ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoap.java (revision 0) +++ ssts-datasync-default-impl/src/main/java/org/tempuri/CSSDServiceSoap.java (revision 20634) @@ -0,0 +1,13 @@ +/** + * CSSDServiceSoap.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.tempuri; + +public interface CSSDServiceSoap extends java.rmi.Remote { + public java.lang.String helloWorld(java.lang.String input) throws java.rmi.RemoteException; + public java.lang.String insertINIT(java.lang.String data) throws java.rmi.RemoteException; +} Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r20553 -r20634 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 20553) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 20634) @@ -2240,7 +2240,7 @@ logger.debug("发货回写参数xmlParam="+xmlParam); appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_ADD, "发货回写参数xmlParam="+xmlParam); final String xmlParamForWriteBack = xmlParam; - new Runnable() { + Thread t = new Thread(new Runnable() { @Override public void run() { String writeBackResult = writeBackInventoryDao.insertWriteBackForCommon(xmlParamForWriteBack);//调用回写 @@ -2256,7 +2256,8 @@ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_ADD, "发货回写失败="+jsonReturn.optBoolean("message")); } } - }.run(); + }); + t.start(); } } Fisheye: Tag 20634 refers to a dead (removed) revision in file `ssts-datasync-default-impl/src/main/java/webservice/client/sznsrmyy/org/tempuri/CSSDServiceLocator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 20634 refers to a dead (removed) revision in file `ssts-datasync-default-impl/src/main/java/webservice/client/sznsrmyy/org/tempuri/CSSDServiceSoapStub.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 20634 refers to a dead (removed) revision in file `ssts-datasync-default-impl/src/main/java/webservice/client/sznsrmyy/org/tempuri/CSSDServiceSoapProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 20634 refers to a dead (removed) revision in file `ssts-datasync-default-impl/src/main/java/webservice/client/sznsrmyy/org/tempuri/CSSDService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 20634 refers to a dead (removed) revision in file `ssts-datasync-default-impl/src/main/java/webservice/client/sznsrmyy/org/tempuri/CSSDServiceSoap.java'. Fisheye: No comparison available. Pass `N' to diff?