diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java index 0ebe4ba..df1c325 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java @@ -9,14 +9,18 @@ public enum SecretLevelEnum { /** + * s0("50", "公开", 0, "非密"), + * s1("60", "内部", 1, "非密"), + * s2("61", "普通商业机密", 2, "一般"), + * s3("70", "秘密", 2, "重要"), + * s4("71", "核心商业机密", 3, "核心"), + * s5("80", "机密", 3, "核心"); * 对应 secretUserLevel 相关字典值 */ - s0("50", "公开", 0, "非密"), - s1("60", "内部", 1, "非密"), - s2("61", "普通商业机密", 2, "一般"), - s3("70", "秘密", 2, "重要"), - s4("71", "核心商业机密", 3, "核心"), - s5("80", "机密", 3, "核心"); + s0("30", "非密", 0, "非密"), + s2("50", "一般", 1, "一般"), + s3("70", "重要", 2, "重要"), + s4("90", "核心", 3, "核心"); String code; Integer currCode; diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java index 0ebe4ba..df1c325 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java @@ -9,14 +9,18 @@ public enum SecretLevelEnum { /** + * s0("50", "公开", 0, "非密"), + * s1("60", "内部", 1, "非密"), + * s2("61", "普通商业机密", 2, "一般"), + * s3("70", "秘密", 2, "重要"), + * s4("71", "核心商业机密", 3, "核心"), + * s5("80", "机密", 3, "核心"); * 对应 secretUserLevel 相关字典值 */ - s0("50", "公开", 0, "非密"), - s1("60", "内部", 1, "非密"), - s2("61", "普通商业机密", 2, "一般"), - s3("70", "秘密", 2, "重要"), - s4("71", "核心商业机密", 3, "核心"), - s5("80", "机密", 3, "核心"); + s0("30", "非密", 0, "非密"), + s2("50", "一般", 1, "一般"), + s3("70", "重要", 2, "重要"), + s4("90", "核心", 3, "核心"); String code; Integer currCode; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java new file mode 100644 index 0000000..77ed3ed --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java @@ -0,0 +1,112 @@ +package com.casic.missiles.modular.task; + +import cn.hutool.core.util.StrUtil; +import com.casic.missiles.modular.client.huss.Exception_Exception; +import com.casic.missiles.modular.client.huss.MdmService; +import com.casic.missiles.modular.client.huss.MdmService_Service; +import com.casic.missiles.modular.config.MdmConst; +import com.casic.missiles.modular.device.dto.MdmResultDTO; +import com.casic.missiles.modular.device.dto.MdmResultInfo; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.casic.missiles.modular.device.service.ISyncService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +@Slf4j +@ConditionalOnProperty(prefix = "casic.mdm", name = "open", havingValue = "true") +@Component +public class MdmSyncTask { + private static final XmlMapper xmlMapper = new XmlMapper(); + private static QName SERVICE_NAME = null; + private static URL URL = null; + @Value("${casic.mdm.wsdl:http://localhost:6909/safe-server/ws/mdmService?wsdl}") + private String wsdl; + @Value("${casic.mdm.mqId:-1}") + private String mqId; + @Resource + private ISyncService syncService; + + @Scheduled(cron = "0 */2 * * * *") + public void sync() { + String disid = null; + MdmService port = null; + try { + MdmService_Service ss = new MdmService_Service(getWsdlURL(wsdl), getServiceName(MdmConst.namespace)); + + port = ss.getMdmWebServiceImplPort(); + log.info("Invoking getMq..."); + String xml = port.getMq(mqId); + + log.info("getMq.result={}", xml); + UumBaseList uumBaseList = syncService.getUumBaseList(xml); + disid = uumBaseList.getDisid(); + syncService.saveBaseList(uumBaseList); + + log.info("data sync success"); + if (StrUtil.isNotEmpty(disid)) { + port.updateDistributeState(getSuccess(disid)); + } + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + if (StrUtil.isNotEmpty(disid) && port != null) { + try { + port.updateDistributeState(getFail(disid)); + } catch (Exception_Exception e) { + log.error("send result error ", exception); + } + } + } + + } + + private static URL getWsdlURL(String wsdlURL) { + if (URL == null) { + try { + URL = new URL(wsdlURL); + } catch (MalformedURLException e) { + log.info("Can not initialize the default wsdl from {0}", wsdlURL); + } + } + return URL; + } + + private static QName getServiceName(String namespaceURI) { + if (SERVICE_NAME == null) { + SERVICE_NAME = new QName(namespaceURI, "MdmService"); + } + return SERVICE_NAME; + } + + public static String getSuccess(String disid) { + return getResult(disid, "S"); + } + + public static String getFail(String disid) { + return getResult(disid, "E"); + } + + public static String getResult(String disid, String result) { + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid(disid); + info.setResult(result); + resultDTO.setInfo(info); + try { + return "" + xmlMapper.writeValueAsString(info); + } catch (JsonProcessingException e) { + return "\n" + + "" + disid + "" + result + ""; + } + } + +} diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java index 0ebe4ba..df1c325 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java @@ -9,14 +9,18 @@ public enum SecretLevelEnum { /** + * s0("50", "公开", 0, "非密"), + * s1("60", "内部", 1, "非密"), + * s2("61", "普通商业机密", 2, "一般"), + * s3("70", "秘密", 2, "重要"), + * s4("71", "核心商业机密", 3, "核心"), + * s5("80", "机密", 3, "核心"); * 对应 secretUserLevel 相关字典值 */ - s0("50", "公开", 0, "非密"), - s1("60", "内部", 1, "非密"), - s2("61", "普通商业机密", 2, "一般"), - s3("70", "秘密", 2, "重要"), - s4("71", "核心商业机密", 3, "核心"), - s5("80", "机密", 3, "核心"); + s0("30", "非密", 0, "非密"), + s2("50", "一般", 1, "一般"), + s3("70", "重要", 2, "重要"), + s4("90", "核心", 3, "核心"); String code; Integer currCode; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java new file mode 100644 index 0000000..77ed3ed --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java @@ -0,0 +1,112 @@ +package com.casic.missiles.modular.task; + +import cn.hutool.core.util.StrUtil; +import com.casic.missiles.modular.client.huss.Exception_Exception; +import com.casic.missiles.modular.client.huss.MdmService; +import com.casic.missiles.modular.client.huss.MdmService_Service; +import com.casic.missiles.modular.config.MdmConst; +import com.casic.missiles.modular.device.dto.MdmResultDTO; +import com.casic.missiles.modular.device.dto.MdmResultInfo; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.casic.missiles.modular.device.service.ISyncService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +@Slf4j +@ConditionalOnProperty(prefix = "casic.mdm", name = "open", havingValue = "true") +@Component +public class MdmSyncTask { + private static final XmlMapper xmlMapper = new XmlMapper(); + private static QName SERVICE_NAME = null; + private static URL URL = null; + @Value("${casic.mdm.wsdl:http://localhost:6909/safe-server/ws/mdmService?wsdl}") + private String wsdl; + @Value("${casic.mdm.mqId:-1}") + private String mqId; + @Resource + private ISyncService syncService; + + @Scheduled(cron = "0 */2 * * * *") + public void sync() { + String disid = null; + MdmService port = null; + try { + MdmService_Service ss = new MdmService_Service(getWsdlURL(wsdl), getServiceName(MdmConst.namespace)); + + port = ss.getMdmWebServiceImplPort(); + log.info("Invoking getMq..."); + String xml = port.getMq(mqId); + + log.info("getMq.result={}", xml); + UumBaseList uumBaseList = syncService.getUumBaseList(xml); + disid = uumBaseList.getDisid(); + syncService.saveBaseList(uumBaseList); + + log.info("data sync success"); + if (StrUtil.isNotEmpty(disid)) { + port.updateDistributeState(getSuccess(disid)); + } + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + if (StrUtil.isNotEmpty(disid) && port != null) { + try { + port.updateDistributeState(getFail(disid)); + } catch (Exception_Exception e) { + log.error("send result error ", exception); + } + } + } + + } + + private static URL getWsdlURL(String wsdlURL) { + if (URL == null) { + try { + URL = new URL(wsdlURL); + } catch (MalformedURLException e) { + log.info("Can not initialize the default wsdl from {0}", wsdlURL); + } + } + return URL; + } + + private static QName getServiceName(String namespaceURI) { + if (SERVICE_NAME == null) { + SERVICE_NAME = new QName(namespaceURI, "MdmService"); + } + return SERVICE_NAME; + } + + public static String getSuccess(String disid) { + return getResult(disid, "S"); + } + + public static String getFail(String disid) { + return getResult(disid, "E"); + } + + public static String getResult(String disid, String result) { + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid(disid); + info.setResult(result); + resultDTO.setInfo(info); + try { + return "" + xmlMapper.writeValueAsString(info); + } catch (JsonProcessingException e) { + return "\n" + + "" + disid + "" + result + ""; + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java new file mode 100644 index 0000000..7943613 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java @@ -0,0 +1,136 @@ +package com.casic.missiles.modular.util; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.XmlUtil; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import java.util.ArrayList; +import java.util.List; + +public class MdmXmlUtil { + + public static UumBaseList parseXml(String xml) { + Document document = XmlUtil.readXML(xml); + UumBaseList list = new UumBaseList(); + NodeList dataNodes = document.getElementsByTagName("data"); + for (int i = 0; i < dataNodes.getLength(); i++) { + Element dataElement = (Element) dataNodes.item(i); + list.setDisid(dataElement.getAttribute("disid")); + } + + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + List organizationDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + operatorDisps.add(convertUumOperatorDTO(operatorElement)); + } + list.setUumOperatorDisps(operatorDisps); + } else if ("UumOrganizationDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOrganizationDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + organizationDisps.add(convertUumOrganizationDispDTO(operatorElement)); + } + list.setUumOrganizationDisp(organizationDisps); + } + } + + return list; + } + + /** + * 组织数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOrganizationDispDTO convertUumOrganizationDispDTO(Element operatorElement) { + UumOrganizationDispDTO organizationDispDTO = new UumOrganizationDispDTO(); + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + organizationDispDTO.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + organizationDispDTO.setSysID(sysID); + + //组织名称 + String orgName = XmlUtil.getElement(operatorElement, "orgName").getTextContent(); + organizationDispDTO.setOrgName(orgName); + + //排序 + String orderID = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + organizationDispDTO.setOrderId(Convert.toInt(orderID, 0)); + + //内设机构代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + organizationDispDTO.setInternalOrgCode(internalOrgCode); + + //内设机构代码父级 + String internalPOrgCode = XmlUtil.getElement(operatorElement, "internalPOrgCode").getTextContent(); + organizationDispDTO.setInternalPOrgCode(internalPOrgCode); + + //组织机构类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + organizationDispDTO.setSyncType(syncType); + return organizationDispDTO; + } + + /** + * 用户数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOperatorDTO convertUumOperatorDTO(Element operatorElement) { + UumOperatorDTO operatorDisp = new UumOperatorDTO(); + + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + operatorDisp.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + operatorDisp.setSysID(sysID); + + //排序ID + String orderId = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + operatorDisp.setOderID(Convert.toInt(orderId)); + + //密级 + String secretLevel = XmlUtil.getElement(operatorElement, "secretLevel").getTextContent(); + operatorDisp.setSecretLevel(secretLevel); + + //电话号码 + String mobileNo = XmlUtil.getElement(operatorElement, "mobileno").getTextContent(); + operatorDisp.setMobileno(mobileNo); + + String oEmail = XmlUtil.getElement(operatorElement, "oEmail").getTextContent(); + operatorDisp.setOEmail(oEmail); + + //电话号码 + String operatorName = XmlUtil.getElement(operatorElement, "operatorName").getTextContent(); + operatorDisp.setOperatorName(operatorName); + + //同步类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + operatorDisp.setSyncType(syncType); + + //内设机构组织代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + operatorDisp.setInternalOrgCode(internalOrgCode); + return operatorDisp; + } + +} \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java index 0ebe4ba..df1c325 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java @@ -9,14 +9,18 @@ public enum SecretLevelEnum { /** + * s0("50", "公开", 0, "非密"), + * s1("60", "内部", 1, "非密"), + * s2("61", "普通商业机密", 2, "一般"), + * s3("70", "秘密", 2, "重要"), + * s4("71", "核心商业机密", 3, "核心"), + * s5("80", "机密", 3, "核心"); * 对应 secretUserLevel 相关字典值 */ - s0("50", "公开", 0, "非密"), - s1("60", "内部", 1, "非密"), - s2("61", "普通商业机密", 2, "一般"), - s3("70", "秘密", 2, "重要"), - s4("71", "核心商业机密", 3, "核心"), - s5("80", "机密", 3, "核心"); + s0("30", "非密", 0, "非密"), + s2("50", "一般", 1, "一般"), + s3("70", "重要", 2, "重要"), + s4("90", "核心", 3, "核心"); String code; Integer currCode; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java new file mode 100644 index 0000000..77ed3ed --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java @@ -0,0 +1,112 @@ +package com.casic.missiles.modular.task; + +import cn.hutool.core.util.StrUtil; +import com.casic.missiles.modular.client.huss.Exception_Exception; +import com.casic.missiles.modular.client.huss.MdmService; +import com.casic.missiles.modular.client.huss.MdmService_Service; +import com.casic.missiles.modular.config.MdmConst; +import com.casic.missiles.modular.device.dto.MdmResultDTO; +import com.casic.missiles.modular.device.dto.MdmResultInfo; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.casic.missiles.modular.device.service.ISyncService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +@Slf4j +@ConditionalOnProperty(prefix = "casic.mdm", name = "open", havingValue = "true") +@Component +public class MdmSyncTask { + private static final XmlMapper xmlMapper = new XmlMapper(); + private static QName SERVICE_NAME = null; + private static URL URL = null; + @Value("${casic.mdm.wsdl:http://localhost:6909/safe-server/ws/mdmService?wsdl}") + private String wsdl; + @Value("${casic.mdm.mqId:-1}") + private String mqId; + @Resource + private ISyncService syncService; + + @Scheduled(cron = "0 */2 * * * *") + public void sync() { + String disid = null; + MdmService port = null; + try { + MdmService_Service ss = new MdmService_Service(getWsdlURL(wsdl), getServiceName(MdmConst.namespace)); + + port = ss.getMdmWebServiceImplPort(); + log.info("Invoking getMq..."); + String xml = port.getMq(mqId); + + log.info("getMq.result={}", xml); + UumBaseList uumBaseList = syncService.getUumBaseList(xml); + disid = uumBaseList.getDisid(); + syncService.saveBaseList(uumBaseList); + + log.info("data sync success"); + if (StrUtil.isNotEmpty(disid)) { + port.updateDistributeState(getSuccess(disid)); + } + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + if (StrUtil.isNotEmpty(disid) && port != null) { + try { + port.updateDistributeState(getFail(disid)); + } catch (Exception_Exception e) { + log.error("send result error ", exception); + } + } + } + + } + + private static URL getWsdlURL(String wsdlURL) { + if (URL == null) { + try { + URL = new URL(wsdlURL); + } catch (MalformedURLException e) { + log.info("Can not initialize the default wsdl from {0}", wsdlURL); + } + } + return URL; + } + + private static QName getServiceName(String namespaceURI) { + if (SERVICE_NAME == null) { + SERVICE_NAME = new QName(namespaceURI, "MdmService"); + } + return SERVICE_NAME; + } + + public static String getSuccess(String disid) { + return getResult(disid, "S"); + } + + public static String getFail(String disid) { + return getResult(disid, "E"); + } + + public static String getResult(String disid, String result) { + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid(disid); + info.setResult(result); + resultDTO.setInfo(info); + try { + return "" + xmlMapper.writeValueAsString(info); + } catch (JsonProcessingException e) { + return "\n" + + "" + disid + "" + result + ""; + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java new file mode 100644 index 0000000..7943613 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java @@ -0,0 +1,136 @@ +package com.casic.missiles.modular.util; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.XmlUtil; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import java.util.ArrayList; +import java.util.List; + +public class MdmXmlUtil { + + public static UumBaseList parseXml(String xml) { + Document document = XmlUtil.readXML(xml); + UumBaseList list = new UumBaseList(); + NodeList dataNodes = document.getElementsByTagName("data"); + for (int i = 0; i < dataNodes.getLength(); i++) { + Element dataElement = (Element) dataNodes.item(i); + list.setDisid(dataElement.getAttribute("disid")); + } + + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + List organizationDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + operatorDisps.add(convertUumOperatorDTO(operatorElement)); + } + list.setUumOperatorDisps(operatorDisps); + } else if ("UumOrganizationDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOrganizationDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + organizationDisps.add(convertUumOrganizationDispDTO(operatorElement)); + } + list.setUumOrganizationDisp(organizationDisps); + } + } + + return list; + } + + /** + * 组织数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOrganizationDispDTO convertUumOrganizationDispDTO(Element operatorElement) { + UumOrganizationDispDTO organizationDispDTO = new UumOrganizationDispDTO(); + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + organizationDispDTO.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + organizationDispDTO.setSysID(sysID); + + //组织名称 + String orgName = XmlUtil.getElement(operatorElement, "orgName").getTextContent(); + organizationDispDTO.setOrgName(orgName); + + //排序 + String orderID = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + organizationDispDTO.setOrderId(Convert.toInt(orderID, 0)); + + //内设机构代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + organizationDispDTO.setInternalOrgCode(internalOrgCode); + + //内设机构代码父级 + String internalPOrgCode = XmlUtil.getElement(operatorElement, "internalPOrgCode").getTextContent(); + organizationDispDTO.setInternalPOrgCode(internalPOrgCode); + + //组织机构类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + organizationDispDTO.setSyncType(syncType); + return organizationDispDTO; + } + + /** + * 用户数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOperatorDTO convertUumOperatorDTO(Element operatorElement) { + UumOperatorDTO operatorDisp = new UumOperatorDTO(); + + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + operatorDisp.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + operatorDisp.setSysID(sysID); + + //排序ID + String orderId = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + operatorDisp.setOderID(Convert.toInt(orderId)); + + //密级 + String secretLevel = XmlUtil.getElement(operatorElement, "secretLevel").getTextContent(); + operatorDisp.setSecretLevel(secretLevel); + + //电话号码 + String mobileNo = XmlUtil.getElement(operatorElement, "mobileno").getTextContent(); + operatorDisp.setMobileno(mobileNo); + + String oEmail = XmlUtil.getElement(operatorElement, "oEmail").getTextContent(); + operatorDisp.setOEmail(oEmail); + + //电话号码 + String operatorName = XmlUtil.getElement(operatorElement, "operatorName").getTextContent(); + operatorDisp.setOperatorName(operatorName); + + //同步类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + operatorDisp.setSyncType(syncType); + + //内设机构组织代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + operatorDisp.setInternalOrgCode(internalOrgCode); + return operatorDisp; + } + +} \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 0f14699..b8280ce 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.83.42:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true username: root - password: casic203 + password: 123456 druid: max-active: 50 min-idle: 20 diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java index 0ebe4ba..df1c325 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java @@ -9,14 +9,18 @@ public enum SecretLevelEnum { /** + * s0("50", "公开", 0, "非密"), + * s1("60", "内部", 1, "非密"), + * s2("61", "普通商业机密", 2, "一般"), + * s3("70", "秘密", 2, "重要"), + * s4("71", "核心商业机密", 3, "核心"), + * s5("80", "机密", 3, "核心"); * 对应 secretUserLevel 相关字典值 */ - s0("50", "公开", 0, "非密"), - s1("60", "内部", 1, "非密"), - s2("61", "普通商业机密", 2, "一般"), - s3("70", "秘密", 2, "重要"), - s4("71", "核心商业机密", 3, "核心"), - s5("80", "机密", 3, "核心"); + s0("30", "非密", 0, "非密"), + s2("50", "一般", 1, "一般"), + s3("70", "重要", 2, "重要"), + s4("90", "核心", 3, "核心"); String code; Integer currCode; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java new file mode 100644 index 0000000..77ed3ed --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java @@ -0,0 +1,112 @@ +package com.casic.missiles.modular.task; + +import cn.hutool.core.util.StrUtil; +import com.casic.missiles.modular.client.huss.Exception_Exception; +import com.casic.missiles.modular.client.huss.MdmService; +import com.casic.missiles.modular.client.huss.MdmService_Service; +import com.casic.missiles.modular.config.MdmConst; +import com.casic.missiles.modular.device.dto.MdmResultDTO; +import com.casic.missiles.modular.device.dto.MdmResultInfo; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.casic.missiles.modular.device.service.ISyncService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +@Slf4j +@ConditionalOnProperty(prefix = "casic.mdm", name = "open", havingValue = "true") +@Component +public class MdmSyncTask { + private static final XmlMapper xmlMapper = new XmlMapper(); + private static QName SERVICE_NAME = null; + private static URL URL = null; + @Value("${casic.mdm.wsdl:http://localhost:6909/safe-server/ws/mdmService?wsdl}") + private String wsdl; + @Value("${casic.mdm.mqId:-1}") + private String mqId; + @Resource + private ISyncService syncService; + + @Scheduled(cron = "0 */2 * * * *") + public void sync() { + String disid = null; + MdmService port = null; + try { + MdmService_Service ss = new MdmService_Service(getWsdlURL(wsdl), getServiceName(MdmConst.namespace)); + + port = ss.getMdmWebServiceImplPort(); + log.info("Invoking getMq..."); + String xml = port.getMq(mqId); + + log.info("getMq.result={}", xml); + UumBaseList uumBaseList = syncService.getUumBaseList(xml); + disid = uumBaseList.getDisid(); + syncService.saveBaseList(uumBaseList); + + log.info("data sync success"); + if (StrUtil.isNotEmpty(disid)) { + port.updateDistributeState(getSuccess(disid)); + } + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + if (StrUtil.isNotEmpty(disid) && port != null) { + try { + port.updateDistributeState(getFail(disid)); + } catch (Exception_Exception e) { + log.error("send result error ", exception); + } + } + } + + } + + private static URL getWsdlURL(String wsdlURL) { + if (URL == null) { + try { + URL = new URL(wsdlURL); + } catch (MalformedURLException e) { + log.info("Can not initialize the default wsdl from {0}", wsdlURL); + } + } + return URL; + } + + private static QName getServiceName(String namespaceURI) { + if (SERVICE_NAME == null) { + SERVICE_NAME = new QName(namespaceURI, "MdmService"); + } + return SERVICE_NAME; + } + + public static String getSuccess(String disid) { + return getResult(disid, "S"); + } + + public static String getFail(String disid) { + return getResult(disid, "E"); + } + + public static String getResult(String disid, String result) { + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid(disid); + info.setResult(result); + resultDTO.setInfo(info); + try { + return "" + xmlMapper.writeValueAsString(info); + } catch (JsonProcessingException e) { + return "\n" + + "" + disid + "" + result + ""; + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java new file mode 100644 index 0000000..7943613 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java @@ -0,0 +1,136 @@ +package com.casic.missiles.modular.util; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.XmlUtil; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import java.util.ArrayList; +import java.util.List; + +public class MdmXmlUtil { + + public static UumBaseList parseXml(String xml) { + Document document = XmlUtil.readXML(xml); + UumBaseList list = new UumBaseList(); + NodeList dataNodes = document.getElementsByTagName("data"); + for (int i = 0; i < dataNodes.getLength(); i++) { + Element dataElement = (Element) dataNodes.item(i); + list.setDisid(dataElement.getAttribute("disid")); + } + + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + List organizationDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + operatorDisps.add(convertUumOperatorDTO(operatorElement)); + } + list.setUumOperatorDisps(operatorDisps); + } else if ("UumOrganizationDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOrganizationDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + organizationDisps.add(convertUumOrganizationDispDTO(operatorElement)); + } + list.setUumOrganizationDisp(organizationDisps); + } + } + + return list; + } + + /** + * 组织数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOrganizationDispDTO convertUumOrganizationDispDTO(Element operatorElement) { + UumOrganizationDispDTO organizationDispDTO = new UumOrganizationDispDTO(); + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + organizationDispDTO.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + organizationDispDTO.setSysID(sysID); + + //组织名称 + String orgName = XmlUtil.getElement(operatorElement, "orgName").getTextContent(); + organizationDispDTO.setOrgName(orgName); + + //排序 + String orderID = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + organizationDispDTO.setOrderId(Convert.toInt(orderID, 0)); + + //内设机构代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + organizationDispDTO.setInternalOrgCode(internalOrgCode); + + //内设机构代码父级 + String internalPOrgCode = XmlUtil.getElement(operatorElement, "internalPOrgCode").getTextContent(); + organizationDispDTO.setInternalPOrgCode(internalPOrgCode); + + //组织机构类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + organizationDispDTO.setSyncType(syncType); + return organizationDispDTO; + } + + /** + * 用户数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOperatorDTO convertUumOperatorDTO(Element operatorElement) { + UumOperatorDTO operatorDisp = new UumOperatorDTO(); + + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + operatorDisp.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + operatorDisp.setSysID(sysID); + + //排序ID + String orderId = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + operatorDisp.setOderID(Convert.toInt(orderId)); + + //密级 + String secretLevel = XmlUtil.getElement(operatorElement, "secretLevel").getTextContent(); + operatorDisp.setSecretLevel(secretLevel); + + //电话号码 + String mobileNo = XmlUtil.getElement(operatorElement, "mobileno").getTextContent(); + operatorDisp.setMobileno(mobileNo); + + String oEmail = XmlUtil.getElement(operatorElement, "oEmail").getTextContent(); + operatorDisp.setOEmail(oEmail); + + //电话号码 + String operatorName = XmlUtil.getElement(operatorElement, "operatorName").getTextContent(); + operatorDisp.setOperatorName(operatorName); + + //同步类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + operatorDisp.setSyncType(syncType); + + //内设机构组织代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + operatorDisp.setInternalOrgCode(internalOrgCode); + return operatorDisp; + } + +} \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 0f14699..b8280ce 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.83.42:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true username: root - password: casic203 + password: 123456 druid: max-active: 50 min-idle: 20 diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 848f547..26faa63 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -26,7 +26,7 @@ ################### guns配置 ################### casic: web: - url: http://localhost/safe/#/tdashboard #前端地址 + url: http://localhost/dttwg/#/tdashboard #前端地址 swagger-open: true knife4j: groups: 系统管理:com.casic.missiles.modular.system,安全生产业务包:com.casic.missiles.modular.device; @@ -42,6 +42,10 @@ day: 180 #超期日志删除,日志保留天数 file: uploadPath: C:\casic\tmp\ + mdm: + wsdl: http://localhost:6909/safe-server/ws/mdmService?wsdl + mqId: 123456 + open: true video: admin: role: administrator #安全管理员角色标识 安全管理员可看未定密数据 @@ -62,9 +66,9 @@ deviceCorn: 0 */10 * * * * av: open: true - url: http://192.168.83.42:18080 - token: 234456 - deviceCorn: 0 */20 * * * * + url: http://10.20.90.196:10025 + token: 6bcffcdb-42fe-df6c-e704-e6034dd8a5a0 + deviceCorn: 0 */1 * * * * deviceStatusCorn: 0 */5 * * * * wvp: #wvp视频平台配置信息 open: true diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java index 0ebe4ba..df1c325 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java @@ -9,14 +9,18 @@ public enum SecretLevelEnum { /** + * s0("50", "公开", 0, "非密"), + * s1("60", "内部", 1, "非密"), + * s2("61", "普通商业机密", 2, "一般"), + * s3("70", "秘密", 2, "重要"), + * s4("71", "核心商业机密", 3, "核心"), + * s5("80", "机密", 3, "核心"); * 对应 secretUserLevel 相关字典值 */ - s0("50", "公开", 0, "非密"), - s1("60", "内部", 1, "非密"), - s2("61", "普通商业机密", 2, "一般"), - s3("70", "秘密", 2, "重要"), - s4("71", "核心商业机密", 3, "核心"), - s5("80", "机密", 3, "核心"); + s0("30", "非密", 0, "非密"), + s2("50", "一般", 1, "一般"), + s3("70", "重要", 2, "重要"), + s4("90", "核心", 3, "核心"); String code; Integer currCode; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java new file mode 100644 index 0000000..77ed3ed --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java @@ -0,0 +1,112 @@ +package com.casic.missiles.modular.task; + +import cn.hutool.core.util.StrUtil; +import com.casic.missiles.modular.client.huss.Exception_Exception; +import com.casic.missiles.modular.client.huss.MdmService; +import com.casic.missiles.modular.client.huss.MdmService_Service; +import com.casic.missiles.modular.config.MdmConst; +import com.casic.missiles.modular.device.dto.MdmResultDTO; +import com.casic.missiles.modular.device.dto.MdmResultInfo; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.casic.missiles.modular.device.service.ISyncService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +@Slf4j +@ConditionalOnProperty(prefix = "casic.mdm", name = "open", havingValue = "true") +@Component +public class MdmSyncTask { + private static final XmlMapper xmlMapper = new XmlMapper(); + private static QName SERVICE_NAME = null; + private static URL URL = null; + @Value("${casic.mdm.wsdl:http://localhost:6909/safe-server/ws/mdmService?wsdl}") + private String wsdl; + @Value("${casic.mdm.mqId:-1}") + private String mqId; + @Resource + private ISyncService syncService; + + @Scheduled(cron = "0 */2 * * * *") + public void sync() { + String disid = null; + MdmService port = null; + try { + MdmService_Service ss = new MdmService_Service(getWsdlURL(wsdl), getServiceName(MdmConst.namespace)); + + port = ss.getMdmWebServiceImplPort(); + log.info("Invoking getMq..."); + String xml = port.getMq(mqId); + + log.info("getMq.result={}", xml); + UumBaseList uumBaseList = syncService.getUumBaseList(xml); + disid = uumBaseList.getDisid(); + syncService.saveBaseList(uumBaseList); + + log.info("data sync success"); + if (StrUtil.isNotEmpty(disid)) { + port.updateDistributeState(getSuccess(disid)); + } + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + if (StrUtil.isNotEmpty(disid) && port != null) { + try { + port.updateDistributeState(getFail(disid)); + } catch (Exception_Exception e) { + log.error("send result error ", exception); + } + } + } + + } + + private static URL getWsdlURL(String wsdlURL) { + if (URL == null) { + try { + URL = new URL(wsdlURL); + } catch (MalformedURLException e) { + log.info("Can not initialize the default wsdl from {0}", wsdlURL); + } + } + return URL; + } + + private static QName getServiceName(String namespaceURI) { + if (SERVICE_NAME == null) { + SERVICE_NAME = new QName(namespaceURI, "MdmService"); + } + return SERVICE_NAME; + } + + public static String getSuccess(String disid) { + return getResult(disid, "S"); + } + + public static String getFail(String disid) { + return getResult(disid, "E"); + } + + public static String getResult(String disid, String result) { + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid(disid); + info.setResult(result); + resultDTO.setInfo(info); + try { + return "" + xmlMapper.writeValueAsString(info); + } catch (JsonProcessingException e) { + return "\n" + + "" + disid + "" + result + ""; + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java new file mode 100644 index 0000000..7943613 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java @@ -0,0 +1,136 @@ +package com.casic.missiles.modular.util; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.XmlUtil; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import java.util.ArrayList; +import java.util.List; + +public class MdmXmlUtil { + + public static UumBaseList parseXml(String xml) { + Document document = XmlUtil.readXML(xml); + UumBaseList list = new UumBaseList(); + NodeList dataNodes = document.getElementsByTagName("data"); + for (int i = 0; i < dataNodes.getLength(); i++) { + Element dataElement = (Element) dataNodes.item(i); + list.setDisid(dataElement.getAttribute("disid")); + } + + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + List organizationDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + operatorDisps.add(convertUumOperatorDTO(operatorElement)); + } + list.setUumOperatorDisps(operatorDisps); + } else if ("UumOrganizationDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOrganizationDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + organizationDisps.add(convertUumOrganizationDispDTO(operatorElement)); + } + list.setUumOrganizationDisp(organizationDisps); + } + } + + return list; + } + + /** + * 组织数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOrganizationDispDTO convertUumOrganizationDispDTO(Element operatorElement) { + UumOrganizationDispDTO organizationDispDTO = new UumOrganizationDispDTO(); + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + organizationDispDTO.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + organizationDispDTO.setSysID(sysID); + + //组织名称 + String orgName = XmlUtil.getElement(operatorElement, "orgName").getTextContent(); + organizationDispDTO.setOrgName(orgName); + + //排序 + String orderID = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + organizationDispDTO.setOrderId(Convert.toInt(orderID, 0)); + + //内设机构代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + organizationDispDTO.setInternalOrgCode(internalOrgCode); + + //内设机构代码父级 + String internalPOrgCode = XmlUtil.getElement(operatorElement, "internalPOrgCode").getTextContent(); + organizationDispDTO.setInternalPOrgCode(internalPOrgCode); + + //组织机构类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + organizationDispDTO.setSyncType(syncType); + return organizationDispDTO; + } + + /** + * 用户数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOperatorDTO convertUumOperatorDTO(Element operatorElement) { + UumOperatorDTO operatorDisp = new UumOperatorDTO(); + + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + operatorDisp.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + operatorDisp.setSysID(sysID); + + //排序ID + String orderId = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + operatorDisp.setOderID(Convert.toInt(orderId)); + + //密级 + String secretLevel = XmlUtil.getElement(operatorElement, "secretLevel").getTextContent(); + operatorDisp.setSecretLevel(secretLevel); + + //电话号码 + String mobileNo = XmlUtil.getElement(operatorElement, "mobileno").getTextContent(); + operatorDisp.setMobileno(mobileNo); + + String oEmail = XmlUtil.getElement(operatorElement, "oEmail").getTextContent(); + operatorDisp.setOEmail(oEmail); + + //电话号码 + String operatorName = XmlUtil.getElement(operatorElement, "operatorName").getTextContent(); + operatorDisp.setOperatorName(operatorName); + + //同步类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + operatorDisp.setSyncType(syncType); + + //内设机构组织代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + operatorDisp.setInternalOrgCode(internalOrgCode); + return operatorDisp; + } + +} \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 0f14699..b8280ce 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.83.42:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true username: root - password: casic203 + password: 123456 druid: max-active: 50 min-idle: 20 diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 848f547..26faa63 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -26,7 +26,7 @@ ################### guns配置 ################### casic: web: - url: http://localhost/safe/#/tdashboard #前端地址 + url: http://localhost/dttwg/#/tdashboard #前端地址 swagger-open: true knife4j: groups: 系统管理:com.casic.missiles.modular.system,安全生产业务包:com.casic.missiles.modular.device; @@ -42,6 +42,10 @@ day: 180 #超期日志删除,日志保留天数 file: uploadPath: C:\casic\tmp\ + mdm: + wsdl: http://localhost:6909/safe-server/ws/mdmService?wsdl + mqId: 123456 + open: true video: admin: role: administrator #安全管理员角色标识 安全管理员可看未定密数据 @@ -62,9 +66,9 @@ deviceCorn: 0 */10 * * * * av: open: true - url: http://192.168.83.42:18080 - token: 234456 - deviceCorn: 0 */20 * * * * + url: http://10.20.90.196:10025 + token: 6bcffcdb-42fe-df6c-e704-e6034dd8a5a0 + deviceCorn: 0 */1 * * * * deviceStatusCorn: 0 */5 * * * * wvp: #wvp视频平台配置信息 open: true diff --git a/cxf/wsdl.wsdl b/cxf/wsdl.wsdl new file mode 100644 index 0000000..5549577 --- /dev/null +++ b/cxf/wsdl.wsdl @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java index 1aed5bb..ab65aba 100644 --- a/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-device-sync/casic-device-dc/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.util.DcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ @Slf4j @Component +@ConditionalOnProperty(prefix = "casic.video.dc", name = "open", havingValue = "true") public class DcTask { @Resource diff --git a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java index 56a0f01..0ba4af2 100644 --- a/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java +++ b/casic-device-sync/casic-device-wvp/src/main/java/com/casic/missiles/modular/wvp/task/SyncWvpTask.java @@ -3,12 +3,14 @@ import com.casic.missiles.modular.service.IWvpDeviceStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Slf4j +@ConditionalOnProperty(prefix = "casic.video.wvp", name = "open", havingValue = "true") @Component public class SyncWvpTask { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java index b4f9f78..c83d65e 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiServiceImplService.java @@ -60,8 +60,6 @@ } - - /** * * @return diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java index 361d65f..b848339 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/cxf/TestApiService_DeptWsdl_Client.java @@ -54,7 +54,7 @@ { System.out.println("Invoking queryDeptList..."); - java.lang.String _queryDeptList_dept = ""; + java.lang.String _queryDeptList_dept = "123"; List deptList = port.queryDeptList(_queryDeptList_dept); for (Dept dept : deptList) { System.out.println(dept.getFullName()); diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java new file mode 100644 index 0000000..a0cbf30 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Exception complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="Exception">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Exception", propOrder = { + "message" +}) +public class Exception { + + protected String message; + + /** + * ��ȡmessage���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * ����message���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java new file mode 100644 index 0000000..7f14361 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/Exception_Exception.java @@ -0,0 +1,45 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.324+08:00 + * Generated source version: 3.5.9 + */ + +@WebFault(name = "Exception", targetNamespace = MdmConst.namespace) +public class Exception_Exception extends java.lang.Exception { + + private com.casic.missiles.modular.client.huss.Exception faultInfo; + + public Exception_Exception() { + super(); + } + + public Exception_Exception(String message) { + super(message); + } + + public Exception_Exception(String message, java.lang.Throwable cause) { + super(message, cause); + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception) { + super(message); + this.faultInfo = exception; + } + + public Exception_Exception(String message, com.casic.missiles.modular.client.huss.Exception exception, java.lang.Throwable cause) { + super(message, cause); + this.faultInfo = exception; + } + + public com.casic.missiles.modular.client.huss.Exception getFaultInfo() { + return this.faultInfo; + } +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java new file mode 100644 index 0000000..4f925df --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMq.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMq complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMq">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="mqID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMq", propOrder = { + "mqID" +}) +public class GetMq { + + protected String mqID; + + /** + * ��ȡmqID���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getMqID() { + return mqID; + } + + /** + * ����mqID���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMqID(String value) { + this.mqID = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java new file mode 100644 index 0000000..1522d60 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/GetMqResponse.java @@ -0,0 +1,62 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

getMqResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="getMqResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getMqResponse", propOrder = { + "_return" +}) +public class GetMqResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java new file mode 100644 index 0000000..c258b1c --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.328+08:00 + * Generated source version: 3.5.9 + * + */ +@WebService(targetNamespace = MdmConst.namespace, name = "MdmService") +@XmlSeeAlso({ObjectFactory.class}) +public interface MdmService { + + @WebMethod + @RequestWrapper(localName = "updateDistributeState", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeState") + @ResponseWrapper(localName = "updateDistributeStateResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.UpdateDistributeStateResponse") + @WebResult(name = "return", targetNamespace = "") + public boolean updateDistributeState( + + @WebParam(name = "str", targetNamespace = "") + java.lang.String str + ) throws Exception_Exception; + + @WebMethod + @RequestWrapper(localName = "getMq", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMq") + @ResponseWrapper(localName = "getMqResponse", targetNamespace = MdmConst.namespace, className = "com.casic.missiles.modular.client.huss.GetMqResponse") + @WebResult(name = "return", targetNamespace = "") + public java.lang.String getMq( + @WebParam(name = "mqID", targetNamespace = "") + java.lang.String mqID + ); +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java new file mode 100644 index 0000000..83b5bba --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_MdmWebServiceImplPort_Client.java @@ -0,0 +1,79 @@ + +package com.casic.missiles.modular.client.huss; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import com.casic.missiles.modular.config.MdmConst; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.292+08:00 + * Generated source version: 3.5.9 + * + */ +public final class MdmService_MdmWebServiceImplPort_Client { + + private static final QName SERVICE_NAME = new QName(MdmConst.namespace, "MdmService"); + + private MdmService_MdmWebServiceImplPort_Client() { + } + + public static void main(String args[]) throws java.lang.Exception { + URL wsdlURL = MdmService_Service.WSDL_LOCATION; + if (args.length > 0 && args[0] != null && !"".equals(args[0])) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + MdmService_Service ss = new MdmService_Service(wsdlURL, SERVICE_NAME); + MdmService port = ss.getMdmWebServiceImplPort(); + + { + System.out.println("Invoking updateDistributeState..."); + java.lang.String _updateDistributeState_str = ""; + try { + boolean _updateDistributeState__return = port.updateDistributeState(_updateDistributeState_str); + System.out.println("updateDistributeState.result=" + _updateDistributeState__return); + + } catch (Exception_Exception e) { + System.out.println("Expected exception: Exception has occurred."); + System.out.println(e.toString()); + } + + } + { + System.out.println("Invoking getMq..."); + java.lang.String _getMq_mqID = ""; + java.lang.String _getMq__return = port.getMq(_getMq_mqID); + System.out.println("getMq.result=" + _getMq__return); + + + } + + System.exit(0); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java new file mode 100644 index 0000000..312d6ab --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmService_Service.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:31:21.331+08:00 + * Generated source version: 3.5.9 + * + */ +@WebServiceClient(name = "MdmService", + targetNamespace = MdmConst.namespace) +public class MdmService_Service extends Service { + + public static final URL WSDL_LOCATION; + + public static final QName SERVICE = new QName(MdmConst.namespace, "MdmService"); + public static final QName MdmWebServiceImplPort = new QName(MdmConst.namespace, "MdmWebServiceImplPort"); + static { + URL url = null; + try { + url = new URL("file:/D:/casic/cxf/wsdl.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(MdmService_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/D:/casic/cxf/wsdl.wsdl"); + } + WSDL_LOCATION = url; + } + + public MdmService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MdmService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public MdmService_Service(WebServiceFeature ... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public MdmService_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort() { + return super.getPort(MdmWebServiceImplPort, MdmService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns MdmService + */ + @WebEndpoint(name = "MdmWebServiceImplPort") + public MdmService getMdmWebServiceImplPort(WebServiceFeature... features) { + return super.getPort(MdmWebServiceImplPort, MdmService.class, features); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java new file mode 100644 index 0000000..e18cd4e --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/MdmWebServiceImplPortImpl.java @@ -0,0 +1,109 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; +import org.springframework.stereotype.Component; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 3.5.9 + * 2024-11-05T17:32:41.487+08:00 + * Generated source version: 3.5.9 + * + */ +@Component +@WebService( serviceName = "MdmService", + portName = "MdmWebServiceImplPort", + targetNamespace = MdmConst.namespace, + wsdlLocation = "file:/D:/casic/cxf/wsdl.wsdl", + endpointInterface = "com.casic.missiles.modular.client.huss.MdmService") + +public class MdmWebServiceImplPortImpl implements MdmService { + + private static final Logger LOG = Logger.getLogger(MdmWebServiceImplPortImpl.class.getName()); + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#updateDistributeState(java.lang.String str)* + */ + public boolean updateDistributeState(String str) throws Exception_Exception { + LOG.info("Executing operation updateDistributeState"); + System.out.println(str); + try { + boolean _return = false; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + //throw new Exception_Exception("Exception..."); + } + + /* (non-Javadoc) + * @see com.casic.missiles.modular.client.huss.MdmService#getMq(java.lang.String mqID)* + */ + public String getMq(String mqID) { + LOG.info("Executing operation getMq"); + System.out.println(mqID); + try { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + String _return =xml; + return _return; + } catch (java.lang.Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java new file mode 100644 index 0000000..a21ceb2 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/ObjectFactory.java @@ -0,0 +1,147 @@ + +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.casic.missiles.modular.client.huss package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetMq_QNAME = new QName(MdmConst.namespace, "getMq"); + private final static QName _GetMqResponse_QNAME = new QName(MdmConst.namespace, "getMqResponse"); + private final static QName _UpdateDistributeState_QNAME = new QName(MdmConst.namespace, "updateDistributeState"); + private final static QName _UpdateDistributeStateResponse_QNAME = new QName(MdmConst.namespace, "updateDistributeStateResponse"); + private final static QName _Exception_QNAME = new QName(MdmConst.namespace, "Exception"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.casic.missiles.modular.client.huss + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetMq } + * + */ + public GetMq createGetMq() { + return new GetMq(); + } + + /** + * Create an instance of {@link GetMqResponse } + * + */ + public GetMqResponse createGetMqResponse() { + return new GetMqResponse(); + } + + /** + * Create an instance of {@link UpdateDistributeState } + * + */ + public UpdateDistributeState createUpdateDistributeState() { + return new UpdateDistributeState(); + } + + /** + * Create an instance of {@link UpdateDistributeStateResponse } + * + */ + public UpdateDistributeStateResponse createUpdateDistributeStateResponse() { + return new UpdateDistributeStateResponse(); + } + + /** + * Create an instance of {@link Exception } + * + */ + public Exception createException() { + return new Exception(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMq }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMq") + public JAXBElement createGetMq(GetMq value) { + return new JAXBElement(_GetMq_QNAME, GetMq.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link GetMqResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "getMqResponse") + public JAXBElement createGetMqResponse(GetMqResponse value) { + return new JAXBElement(_GetMqResponse_QNAME, GetMqResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeState }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeState") + public JAXBElement createUpdateDistributeState(UpdateDistributeState value) { + return new JAXBElement(_UpdateDistributeState_QNAME, UpdateDistributeState.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link UpdateDistributeStateResponse }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "updateDistributeStateResponse") + public JAXBElement createUpdateDistributeStateResponse(UpdateDistributeStateResponse value) { + return new JAXBElement(_UpdateDistributeStateResponse_QNAME, UpdateDistributeStateResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Exception }{@code >} + */ + @XmlElementDecl(namespace = MdmConst.namespace, name = "Exception") + public JAXBElement createException(Exception value) { + return new JAXBElement(_Exception_QNAME, Exception.class, null, value); + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java new file mode 100644 index 0000000..24c8a3d --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeState.java @@ -0,0 +1,60 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeState complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeState">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="str" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeState", propOrder = { + "str" +}) +public class UpdateDistributeState { + + protected String str; + + /** + * ��ȡstr���Ե�ֵ�� + * + * @return + * possible object is + * {@link String } + * + */ + public String getStr() { + return str; + } + + /** + * ����str���Ե�ֵ�� + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStr(String value) { + this.str = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java new file mode 100644 index 0000000..f80b2b1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/UpdateDistributeStateResponse.java @@ -0,0 +1,54 @@ + +package com.casic.missiles.modular.client.huss; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

updateDistributeStateResponse complex type�� Java �ࡣ + * + *

����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ� + * + * 

+ * <complexType name="updateDistributeStateResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateDistributeStateResponse", propOrder = { + "_return" +}) +public class UpdateDistributeStateResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * ��ȡreturn���Ե�ֵ�� + * + */ + public boolean isReturn() { + return _return; + } + + /** + * ����return���Ե�ֵ�� + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java new file mode 100644 index 0000000..c0195fe --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/client/huss/package-info.java @@ -0,0 +1,4 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = MdmConst.namespace) +package com.casic.missiles.modular.client.huss; + +import com.casic.missiles.modular.config.MdmConst; \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java new file mode 100644 index 0000000..afbd98a --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/MdmConst.java @@ -0,0 +1,5 @@ +package com.casic.missiles.modular.config; + +public class MdmConst { + public static final String namespace = "http://webService.service.zsjgl._000000.hussar.jxdinfo.com"; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java index 367b088..7e0f4a2 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/config/WebServiceConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.config; +import com.casic.missiles.modular.client.huss.MdmService; import com.casic.missiles.modular.device.service.TestApiService; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; @@ -32,11 +33,11 @@ @Qualifier(Bus.DEFAULT_BUS_ID) private SpringBus bus; @Resource - private TestApiService apiService; + private MdmService apiService; @Bean public Endpoint endpoint(){ EndpointImpl endpoint = new EndpointImpl(bus, apiService); - endpoint.publish("/testApiService"); + endpoint.publish("/mdmService"); return endpoint; } // @Bean diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java index efd28e1..6acb71f 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/GateController.java @@ -43,6 +43,7 @@ */ @GetMapping("/login") public void resourceCode(HttpServletRequest request,String x, HttpServletResponse response) throws IOException { + String noPage = getBaseWeb(); try { super.getSession().setAttribute(PermissionConstants.IS_APP, false); String dnName = request.getHeader("dnname"); @@ -50,17 +51,13 @@ String clientip = request.getHeader("clientip"); dnName = x; if(StrUtil.isEmpty(dnName)){ - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限获取异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } - String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); - String account = getValueByDn(dn, key1); -// String account = x; +// String dn = new String(request.getHeader("dnname").getBytes("ISO8859-1"), "UTF-8"); +// String account = getValueByDn(dn, key1); + String account = x; //token自定义 CasicCustomToken token = new CasicCustomToken(account, "password"); token.setType(LoginType.NO_PASSWD); @@ -70,11 +67,7 @@ currentUser.login(token); } catch (Exception e) { e.printStackTrace(); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - out.println("用户权限异常!"); - out.flush(); - out.close(); + response.sendRedirect(noPage); return; } AuthUser shiroUser = ShiroKit.getUser(); @@ -88,10 +81,18 @@ String sid = ShiroKit.getSession().getId().toString(); response.sendRedirect(webUrl+"?token=" + sid); } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + log.error(e.getMessage()); + response.sendRedirect(noPage); } } - + private String getBaseWeb(){ + String[] parts = webUrl.split("#", 2); // 限制分割后的数组长度为2，避免将#号之后的内容也分割 + if (parts.length > 0) { + String beforeHash = parts[0]; // 获取#号之前的部分 + return beforeHash+"#/noPage"; + } + return ""; + } private String getValueByDn(String dn, String key) { try { int start = dn.indexOf(key) + 2; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java index c9e5e64..b185f61 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/controller/SyncController.java @@ -3,10 +3,10 @@ import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,39 +28,104 @@ */ @GetMapping("/testDept") public ResponseDataDTO resourceCode() { - List mdmOrgDTOS = new ArrayList<>(); - MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); - mdmOrgDTO.setOrgcode("G001"); - mdmOrgDTO.setOrgname("航天二院七〇六所"); - mdmOrgDTO.setImmeuporg("0"); - mdmOrgDTO.setMdm_status_v("1"); - mdmOrgDTOS.add(mdmOrgDTO); +// List mdmOrgDTOS = new ArrayList<>(); +// MdmOrgDTO mdmOrgDTO = new MdmOrgDTO(); +// mdmOrgDTO.setOrgcode("G001"); +// mdmOrgDTO.setOrgname("航天二院七〇六所"); +// mdmOrgDTO.setImmeuporg("0"); +// mdmOrgDTO.setMdm_status_v("1"); +// mdmOrgDTOS.add(mdmOrgDTO); +// MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); +// mdmOrgDTO1.setOrgcode("G00101"); +// mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); +// mdmOrgDTO1.setImmeuporg("G001"); +// mdmOrgDTO1.setMdm_status_v("4"); +// mdmOrgDTOS.add(mdmOrgDTO1); - MdmOrgDTO mdmOrgDTO1 = new MdmOrgDTO(); - mdmOrgDTO1.setOrgcode("G00101"); - mdmOrgDTO1.setOrgname("航天二院七〇六所艾薇"); - mdmOrgDTO1.setImmeuporg("G001"); - mdmOrgDTO1.setMdm_status_v("4"); - mdmOrgDTOS.add(mdmOrgDTO1); - syncService.saveDeptList(mdmOrgDTOS); + String xml = "" + + "G001 \n" + + "航天二院七〇六所 \n" + + " 组织机构代码\n" + + "社会信用代码 \n" + + "国别\n" + + "\t\t城市\n" + + "\t\t语言 \n" + + "\t\t机构层级\n" + + "\t\t是否上市\n" + + "\t\t所属三级机构\n" + + "\t\t顺序码 \n" + + "\t\t军工代码 \n" + + "\t\t省\n" + + "\t\t区县\n" + + "\t\t信息涉密等级\n" + + "\t\t机构性质\n" + + "\t\t0 \n" + + "\t\t所属二级机构\n" + + "\t\terp代码\n" + + "\t行业类\n" + + "\t\terp公司名称\n" + + "\t\t1\n" + + "\t\t\n" + + "\t\t\t\n" + + "\t\t\t\t\n" + + "\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + + "\t\t"; + + xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t472853529@qq.com\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t1710\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; + try { +// List mdmOrgDTOS = syncService.getDeptList(xml); + UumBaseList baseList = syncService.getUumBaseList(xml); + syncService.saveBaseList(baseList); +// syncService.saveUserList(mdmPersonList); +// syncService.saveDeptList(mdmOrgDTOS); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseDataDTO.success(); } - @PostMapping("/testUser") - public ResponseDataDTO testUser() { - List mdmPersonList = new ArrayList<>(); - MdmPerson mdmPerson = new MdmPerson(); - mdmPerson.setA0144("A01001"); - mdmPerson.setA0101("王五"); - mdmPerson.setA0107("2"); - mdmPerson.setA0111("2012-08-09"); - mdmPerson.setE0122("G001"); - mdmPerson.setUnique_id("001"); - mdmPersonList.add(mdmPerson); - syncService.saveUserList(mdmPersonList); - return ResponseDataDTO.success(); - } } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java index da27600..f0aea92 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/dto/MdmResultDTO.java @@ -1,11 +1,13 @@ package com.casic.missiles.modular.device.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "xml") public class MdmResultDTO { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java index 1a6ca2f..10e7f0c 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmOrgDTO.java @@ -1,7 +1,8 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; - +@JsonIgnoreProperties(ignoreUnknown = true) @Data public class MdmOrgDTO { public MdmOrgDTO() { diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java index a03d40e..9fa6235 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/MdmPerson.java @@ -1,20 +1,23 @@ package com.casic.missiles.modular.device.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; import java.util.Date; @Data +@JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 public class MdmPerson { + private String opeType; // 简单元素 - private String mdmId; - private String mdmName; - private Date mdmCreateTime; - private Date mdmUpdateTime; - private long mdmTimestamp; - private String mdmState; + private String mdm_id; + private String mdm_name; + private Date mdm_createtime; + private Date mdm_updatetime; + private long mdm_timestamp; + private String mdm_state; // 假设以下字段都是字符串类型 private String a0144; @@ -52,7 +55,7 @@ private String nbase_0; private String nbase; private String sdate; - private String a0100; +// private String a0100; private String uuid; private String a011g; private String a0162; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java new file mode 100644 index 0000000..79efb57 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOperatorDTO.java @@ -0,0 +1,69 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDTO { + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private String secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java new file mode 100644 index 0000000..83e52ec --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/UumOrganizationDispDTO.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.device.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDispDTO { + + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java index 3d0868c..ccc433b 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/XmlTest.java @@ -1,23 +1,164 @@ package com.casic.missiles.modular.device.model; +import cn.hutool.core.util.XmlUtil; import com.casic.missiles.modular.device.dto.MdmResultDTO; import com.casic.missiles.modular.device.dto.MdmResultInfo; -import com.casic.missiles.modular.device.model.base.MainDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.MDataUserWrapper; +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOperatorRoot; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.SneakyThrows; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; public class XmlTest { private static final XmlMapper xmlMapper = new XmlMapper(); + @SneakyThrows public static void main(String[] args) throws JAXBException { + parseUumUserXml(); + } + public static void parseUumUserXml() throws Exception { + String xml = "" + + "\t\n" + + "\t\n" + + "\t" + + "\t171\n" + + "\t171\n" + + "\t001000\n" + + "\t\n" + + "\t\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t1\n" + + "\t\n" + + "\t\n" + + "\t1711\n" + + "\t1711\n" + + "\t001000\n" + + "\t1\n" + + "\t1\n" + + "\t1\n" + + "\t30\n" + + "\t18600202639\n" + + "\t李四\n" + + "\t2\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t171\n" + + "\t171\n" + + "\t科研生产部\n" + + "\t1\n" + + "\t001000\n" + + "\t001\n" + + "\t001000\n" + + "\t1\n" + + "\t\n" + + "\t\n"; +// UumOperatorRoot obj = xmlMapper.readValue(xml, UumOperatorRoot.class); + Document document = XmlUtil.readXML(xml); + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + UumOperatorDisp operatorDisp = new UumOperatorDisp(); +// XmlUtil.getElement(operatorElement,"hID"); +// XmlUtil.getElement(operatorElement,"sysID"); + operatorDisp.setRowNum(operatorElement.getAttribute("rowNum")); + operatorDisp.setCriteria(operatorElement.getAttribute("criteria")); +// operatorDisp.setHID(XmlUtil.getElementContent(operatorElement, "hID")); +// operatorDisp.setSysID(XmlUtil.getElementContent(operatorElement, "sysID")); +// operatorDisp.setInternalOrgCode(XmlUtil.getElementContent(operatorElement, "internalOrgCode")); + // ... 设置其他属性 + operatorDisps.add(operatorDisp); + } + } + } +// xmlMapper.readValue +// System.out.println(obj.getData().getUumOperatorDisps()); + System.out.println(xml); + } + public static void parseUserXml() throws Exception { + String xml = "\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\tA01001\n" + + "\t王五\n" + + "\t2\n" + + "\t\n" + + "\t2012-08-09\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + " \n" + + " \n" + + " \n" + + " G001\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t\n" + + "\t001 \n" + + "\t\n" + + "\t\n" + + "\t"; + MDataUserWrapper obj = xmlMapper.readValue(xml, MDataUserWrapper.class); + System.out.println(obj); + + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid("123"); + info.setResult("OK"); + resultDTO.setInfo(info); + System.out.printf("" + xmlMapper.writeValueAsString(info)); + } + + public static void parseOrgXml() throws Exception { String xml = "" + - "code \n" + - "name \n" + + "G001 \n" + + "航天二院七〇六所 \n" + " 组织机构代码\n" + "社会信用代码 \n" + "国别\n" + @@ -32,25 +173,26 @@ "\t\t区县\n" + "\t\t信息涉密等级\n" + "\t\t机构性质\n" + - "\t\t上级机构 \n" + + "\t\t0 \n" + "\t\t所属二级机构\n" + "\t\terp代码\n" + "\t行业类\n" + "\t\terp公司名称\n" + - "\t\t主数据状态\n" + + "\t\t1\n" + "\t\t\n" + "\t\t\t\n" + "\t\t\t\t\n" + "\t\t\t\t\t\n" + "\t\t\t\t\t\t\n" + "\t\t"; - MainDataOrgWrapper obj = xmlMapper.readValue(xml, MainDataOrgWrapper.class); + MDataOrgWrapper obj = xmlMapper.readValue(xml, MDataOrgWrapper.class); System.out.println(obj); - MdmResultDTO resultDTO = new MdmResultDTO(); + + MdmResultDTO resultDTO = new MdmResultDTO(); MdmResultInfo info = new MdmResultInfo(); info.setDisid("123"); info.setResult("OK"); resultDTO.setInfo(info); - System.out.printf(""+xmlMapper.writeValueAsString(info)); + System.out.printf("" + xmlMapper.writeValueAsString(info)); } } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java new file mode 100644 index 0000000..6efc838 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataOrgWrapper.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; +@Data + +@JacksonXmlRootElement(localName = "root") +public class MDataOrgWrapper { + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List orgList; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java new file mode 100644 index 0000000..e2b7fc1 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MDataUserWrapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.MdmPerson; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +@JacksonXmlRootElement(localName = "root") +public class MDataUserWrapper { + private String table; + private String disid; + private String mainName; + @JacksonXmlElementWrapper(useWrapping = false) + @JacksonXmlProperty(localName = "item") + private List users; + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java deleted file mode 100644 index fb60cf4..0000000 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/MainDataOrgWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.modular.device.model.base; - -import com.casic.missiles.modular.device.model.MdmOrgDTO; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import lombok.Data; - -import java.util.List; -@Data -@JacksonXmlRootElement(localName = "root") -public class MainDataOrgWrapper { - @JacksonXmlElementWrapper(useWrapping = false) - @JacksonXmlProperty(localName = "item") - private List orgDTOS; - -} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java new file mode 100644 index 0000000..6fc1b51 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseData.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import java.util.List; + +@Data +public class UumBaseData { + private String disid; +// @JacksonXmlProperty(localName = "list") + private List list; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java new file mode 100644 index 0000000..7a360ca --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumBaseList.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumBaseList { + private String name; + private String rowNum; + private String criteria; + private String disid; + + @JacksonXmlProperty(localName = "UumOperatorDisp") + private List uumOperatorDisps; + + @JacksonXmlProperty(localName = "UumOrganizationDisp") + private List uumOrganizationDisp; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java new file mode 100644 index 0000000..d38d120 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/base/UumDispBaseDTO.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.device.model.base; + +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; + +import java.util.List; + +/** + * 主数据同步信息 + */ +@Data +//@JacksonXmlRootElement(localName = "root") +public class UumDispBaseDTO { + + private UumBaseData data; +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java new file mode 100644 index 0000000..fa1cea4 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorDisp.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +//@JacksonXmlRootElement(localName = "root") // 假设XML有一个根元素 +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOperatorDisp { + private String rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + /** + * 应用ID + */ + private String sysID; + /** + * 性别 1男 2 女 3 未知 + */ + private String gender; + /** + * 身份证号吗 + */ + private String pID; + + /** + * 行政岗位-行政职务 + */ + private String workPost; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + + /** + * 电子邮件 + */ + private String oEmail; + + /** + * 生日 19870101 + */ + private String birthDate; + + /** + * 30 非密 50 一般 70 重要 90 核心 + */ + private Integer secretLevel; + + /** + * 排序 + */ + private Integer oderID; + + /** + * 手机号 + */ + private String mobileno; + + /** + * 姓名 + */ + private String operatorName; + + /** + * 更新类型 0 更新 1 修改 2 删除 + */ + private String syncType; + private String remark; + private String orderID; + private String orgName; + private String internalPOrgCode; + private String internalSort; + + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java new file mode 100644 index 0000000..c217c80 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOperatorRoot.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.casic.missiles.modular.device.model.xml.data.UumOperatorData; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOperatorRoot { + private UumOperatorData data; + + public UumOperatorData getData() { + return data; + } + + public void setData(UumOperatorData data) { + this.data = data; + } + + public List getUumOperatorDisps() { + return data.getUumOperatorDisps(); + } + +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java new file mode 100644 index 0000000..8881186 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationDisp.java @@ -0,0 +1,129 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class UumOrganizationDisp { + private int rowNum; + private String criteria; + /** + * 自增ID + */ + private String hID; + + /** + * 应用ID + */ + private String sysID; + + /** + * 机构名称 + */ + private String orgName; + + /** + * 保密资格等级 + */ + private String casicOrgSecret; + + /** + * 排序 + */ + private Integer orderID; + + /** + * 备注 + */ + private String remark; + + /** + * 内设机构代码 + */ + private String internalOrgCode; + /** + * 父级机构代码 + */ + private String internalPOrgCode; + + public int getRowNum() { + return rowNum; + } + + public void setRowNum(int rowNum) { + this.rowNum = rowNum; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String gethID() { + return hID; + } + + public void sethID(String hID) { + this.hID = hID; + } + + public String getSysID() { + return sysID; + } + + public void setSysID(String sysID) { + this.sysID = sysID; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getCasicOrgSecret() { + return casicOrgSecret; + } + + public void setCasicOrgSecret(String casicOrgSecret) { + this.casicOrgSecret = casicOrgSecret; + } + + public Integer getOrderID() { + return orderID; + } + + public void setOrderID(Integer orderID) { + this.orderID = orderID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getInternalOrgCode() { + return internalOrgCode; + } + + public void setInternalOrgCode(String internalOrgCode) { + this.internalOrgCode = internalOrgCode; + } + + public String getInternalPOrgCode() { + return internalPOrgCode; + } + + public void setInternalPOrgCode(String internalPOrgCode) { + this.internalPOrgCode = internalPOrgCode; + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java new file mode 100644 index 0000000..bfcaa40 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/UumOrganizationRoot.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.device.model.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.List; + +@JacksonXmlRootElement(localName = "root") +public class UumOrganizationRoot { + private UumOrganizationData data; + + public UumOrganizationData getData() { + return data; + } + + public void setData(UumOrganizationData data) { + this.data = data; + } + + public class UumOrganizationData { + private String disid; + private List uumOrganizationDisps; + + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + + @JacksonXmlElementWrapper(localName = "list") + @JacksonXmlProperty(namespace = "UumOrganizationDisp") + public List getUumOrganizationDisps() { + return uumOrganizationDisps; + } + + public void setUumOrganizationDisps(List uumOrganizationDisps) { + this.uumOrganizationDisps = uumOrganizationDisps; + } + } +} \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java new file mode 100644 index 0000000..fa13a63 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/model/xml/data/UumOperatorData.java @@ -0,0 +1,52 @@ +package com.casic.missiles.modular.device.model.xml.data; + +import com.casic.missiles.modular.device.model.xml.UumOperatorDisp; +import com.casic.missiles.modular.device.model.xml.UumOrganizationDisp; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +import java.util.List; + +public class UumOperatorData { + private String disid; + @JacksonXmlProperty(localName = "UumOperatorDisp",isAttribute = true) + @JacksonXmlElementWrapper(localName = "list") + private List uumOperatorDisps; + + @JacksonXmlElementWrapper(localName = "list",useWrapping = false) + @JacksonXmlProperty(localName = "UumOrganizationDisp",isAttribute = true) + private List organizationDisps; + + public UumOperatorData() { + } + + public UumOperatorData(String disid, List uumOperatorDisps, List organizationDisps) { + this.disid = disid; + this.uumOperatorDisps = uumOperatorDisps; + this.organizationDisps = organizationDisps; + } + + public String getDisid() { + return disid; + } + + public void setDisid(String disid) { + this.disid = disid; + } + + public List getUumOperatorDisps() { + return uumOperatorDisps; + } + + public void setUumOperatorDisps(List uumOperatorDisps) { + this.uumOperatorDisps = uumOperatorDisps; + } + + public List getOrganizationDisps() { + return organizationDisps; + } + + public void setOrganizationDisps(List organizationDisps) { + this.organizationDisps = organizationDisps; + } + } \ No newline at end of file diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java index 1d922ba..783371d 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/ISyncService.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.device.service; -import com.casic.missiles.modular.device.model.MdmPerson; import com.casic.missiles.modular.device.model.MdmOrgDTO; +import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; @@ -14,11 +16,38 @@ * * @param orgDTOS */ - void saveDeptList(List orgDTOS); +// void saveDeptList(List orgDTOS); /** * 保存用户信息 + * * @param orgDTOS */ - void saveUserList(List orgDTOS); +// void saveUserList(List orgDTOS); + + /** + * 获取同步组织信息 + * + * @return 组织信息同步集合 + */ + List getDeptList(String orgXmlData) throws JsonProcessingException; + + /** + * 获取同步用户信息 + * + * @return + */ + List getUserList(String userXmlData); + /** + * 获取同步信息 + * + * @return + */ + UumBaseList getUumBaseList(String xml); + /** + * 保存同步信息 + * + * @return + */ + void saveBaseList(UumBaseList baseList); } diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java index d00eba6..224b143 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/device/service/impl/SyncServiceImpl.java @@ -7,20 +7,25 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.modular.device.model.MdmOrgDTO; import com.casic.missiles.modular.device.model.MdmPerson; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.MDataOrgWrapper; +import com.casic.missiles.modular.device.model.base.UumBaseList; import com.casic.missiles.modular.device.service.ISyncService; import com.casic.missiles.modular.enums.SecretLevelEnum; import com.casic.missiles.modular.enums.SexEnum; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.util.MdmXmlUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -37,25 +42,26 @@ } @Transactional - @Override - public void saveDeptList(List orgDTOS) { + public void saveDeptList(List orgDTOS) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.isNotNull(Dept::getSyncId); List oldDeptList = deptService.list(query); Map deptMap = oldDeptList.stream().collect(Collectors.toMap(Dept::getSyncId, (dept -> dept))); - for (MdmOrgDTO orgDTO : orgDTOS) { + for (UumOrganizationDispDTO orgDTO : orgDTOS) { Dept dept = createDefaultDept(); - dept.setFullName(orgDTO.getOrgname()); - dept.setSimpleName(orgDTO.getOrgname()); - dept.setSyncId(orgDTO.getOrgcode()); - if (deptMap.containsKey(orgDTO.getOrgcode())) { - dept.setId(deptMap.get(orgDTO.getOrgcode()).getId()); - dept.setPid(deptMap.get(orgDTO.getOrgcode()).getPid()); + dept.setFullName(orgDTO.getOrgName()); + dept.setSimpleName(orgDTO.getOrgName()); + dept.setSyncId(orgDTO.getInternalOrgCode()); + if (deptMap.containsKey(orgDTO.getInternalOrgCode())) { + dept.setId(deptMap.get(orgDTO.getInternalOrgCode()).getId()); + dept.setPid(deptMap.get(orgDTO.getInternalOrgCode()).getPid()); } - if ("4".equals(orgDTO.getMdm_status_v())) { + if ("2".equals(orgDTO.getSyncType())) { dept.setDelFlag("1"); + }else{ + dept.setDelFlag("0"); } - dept.setSyncPid(orgDTO.getImmeuporg()); + dept.setSyncPid(orgDTO.getInternalPOrgCode()); deptService.saveOrUpdate(dept); } @@ -74,8 +80,8 @@ deptService.reloadPidsByPid(0); } - @Override - public void saveUserList(List personList) { + @Transactional + public void saveUserList(List uumOperatorDisps) { log.info("sync user start....."); LambdaQueryWrapper deptQuery = new LambdaQueryWrapper<>(); deptQuery.isNotNull(Dept::getSyncId); @@ -84,45 +90,81 @@ LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); userQuery.isNotNull(User::getSyncId); List users = userService.list(userQuery); - Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); - for (MdmPerson mdmPerson : personList) { - String account = mdmPerson.getA0144(); + Map userMap = users.stream().collect(Collectors.toMap(User::getSyncId, (user -> user))); + List delIds = new ArrayList<>(); + for (UumOperatorDTO mdmPerson : uumOperatorDisps) { + String account = mdmPerson.getHID(); User user = null; - if(userMap.containsKey(mdmPerson.getUnique_id())){ - user=userMap.get(mdmPerson.getUnique_id()); - }else{ + if (userMap.containsKey(mdmPerson.getHID())) { + user = userMap.get(mdmPerson.getHID()); + } else { user = createDefaultUser(); } - user.setSyncId(mdmPerson.getUnique_id()); + user.setSyncId(mdmPerson.getHID()); + //转换为当前系统密级 - SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getA011g()); - user.setSecretLevel(secretLevelEnum.getCurrCode()+""); + SecretLevelEnum secretLevelEnum = SecretLevelEnum.valueOfCode(mdmPerson.getSecretLevel()); + user.setSecretLevel(secretLevelEnum.getCurrCode() + ""); //用户名设置 user.setAccount(account); //名称设置 - user.setName(mdmPerson.getA0101()); + user.setName(mdmPerson.getOperatorName()); //性别设置 - user.setSex(SexEnum.valueOfCode(mdmPerson.getA0107()).getCurrCode()); + user.setSex(SexEnum.valueOfCode(mdmPerson.getGender()).getCurrCode()); try { //生日设置 - user.setBirthday(DateUtil.parse(mdmPerson.getA0111())); + user.setBirthday(DateUtil.parse(mdmPerson.getBirthDate())); } catch (Exception e) { - log.error("生日解析异常：{}", mdmPerson.getA0144()); + log.error("生日解析异常：{}", mdmPerson.getBirthDate()); } //同步组织设置 - user.setSyncDeptid(mdmPerson.getE0122()); - if(deptMap.containsKey(mdmPerson.getE0122())){ - user.setDeptId(deptMap.get(mdmPerson.getE0122()).getId()); - }else{ - log.error("组织数据未同步", mdmPerson.getE0122()); + user.setSyncDeptid(mdmPerson.getInternalOrgCode()); + if (deptMap.containsKey(mdmPerson.getInternalOrgCode())) { + user.setDeptId(deptMap.get(mdmPerson.getInternalOrgCode()).getId()); + } else { + log.error("组织数据未同步", mdmPerson.getInternalOrgCode()); } + + if ("2".equals(mdmPerson.getSyncType())) { + user.setDelFlag("1"); + user.setStatus("3"); + }else{ + user.setStatus("1"); + user.setDelFlag("0"); + } + //用户数据修改 userService.saveOrUpdate(user); } log.info("sync user end....."); } + private static final XmlMapper xmlMapper = new XmlMapper(); + + @Override + public List getDeptList(String orgXmlData) throws JsonProcessingException { + MDataOrgWrapper obj = xmlMapper.readValue(orgXmlData, MDataOrgWrapper.class); + return obj.getOrgList(); + } + + @Override + public List getUserList(String userXmlData) { + return Collections.emptyList(); + } + + @Override + public UumBaseList getUumBaseList(String xml) { + return MdmXmlUtil.parseXml(xml); + } + + @Override + public void saveBaseList(UumBaseList baseList) { + //更新组织数据 + saveDeptList(baseList.getUumOrganizationDisp()); + //更新用户数据 + saveUserList(baseList.getUumOperatorDisps()); + } /** * 创建用户信息 diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java index 0ebe4ba..df1c325 100644 --- a/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/enums/SecretLevelEnum.java @@ -9,14 +9,18 @@ public enum SecretLevelEnum { /** + * s0("50", "公开", 0, "非密"), + * s1("60", "内部", 1, "非密"), + * s2("61", "普通商业机密", 2, "一般"), + * s3("70", "秘密", 2, "重要"), + * s4("71", "核心商业机密", 3, "核心"), + * s5("80", "机密", 3, "核心"); * 对应 secretUserLevel 相关字典值 */ - s0("50", "公开", 0, "非密"), - s1("60", "内部", 1, "非密"), - s2("61", "普通商业机密", 2, "一般"), - s3("70", "秘密", 2, "重要"), - s4("71", "核心商业机密", 3, "核心"), - s5("80", "机密", 3, "核心"); + s0("30", "非密", 0, "非密"), + s2("50", "一般", 1, "一般"), + s3("70", "重要", 2, "重要"), + s4("90", "核心", 3, "核心"); String code; Integer currCode; diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java new file mode 100644 index 0000000..77ed3ed --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/task/MdmSyncTask.java @@ -0,0 +1,112 @@ +package com.casic.missiles.modular.task; + +import cn.hutool.core.util.StrUtil; +import com.casic.missiles.modular.client.huss.Exception_Exception; +import com.casic.missiles.modular.client.huss.MdmService; +import com.casic.missiles.modular.client.huss.MdmService_Service; +import com.casic.missiles.modular.config.MdmConst; +import com.casic.missiles.modular.device.dto.MdmResultDTO; +import com.casic.missiles.modular.device.dto.MdmResultInfo; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import com.casic.missiles.modular.device.service.ISyncService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +@Slf4j +@ConditionalOnProperty(prefix = "casic.mdm", name = "open", havingValue = "true") +@Component +public class MdmSyncTask { + private static final XmlMapper xmlMapper = new XmlMapper(); + private static QName SERVICE_NAME = null; + private static URL URL = null; + @Value("${casic.mdm.wsdl:http://localhost:6909/safe-server/ws/mdmService?wsdl}") + private String wsdl; + @Value("${casic.mdm.mqId:-1}") + private String mqId; + @Resource + private ISyncService syncService; + + @Scheduled(cron = "0 */2 * * * *") + public void sync() { + String disid = null; + MdmService port = null; + try { + MdmService_Service ss = new MdmService_Service(getWsdlURL(wsdl), getServiceName(MdmConst.namespace)); + + port = ss.getMdmWebServiceImplPort(); + log.info("Invoking getMq..."); + String xml = port.getMq(mqId); + + log.info("getMq.result={}", xml); + UumBaseList uumBaseList = syncService.getUumBaseList(xml); + disid = uumBaseList.getDisid(); + syncService.saveBaseList(uumBaseList); + + log.info("data sync success"); + if (StrUtil.isNotEmpty(disid)) { + port.updateDistributeState(getSuccess(disid)); + } + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + if (StrUtil.isNotEmpty(disid) && port != null) { + try { + port.updateDistributeState(getFail(disid)); + } catch (Exception_Exception e) { + log.error("send result error ", exception); + } + } + } + + } + + private static URL getWsdlURL(String wsdlURL) { + if (URL == null) { + try { + URL = new URL(wsdlURL); + } catch (MalformedURLException e) { + log.info("Can not initialize the default wsdl from {0}", wsdlURL); + } + } + return URL; + } + + private static QName getServiceName(String namespaceURI) { + if (SERVICE_NAME == null) { + SERVICE_NAME = new QName(namespaceURI, "MdmService"); + } + return SERVICE_NAME; + } + + public static String getSuccess(String disid) { + return getResult(disid, "S"); + } + + public static String getFail(String disid) { + return getResult(disid, "E"); + } + + public static String getResult(String disid, String result) { + MdmResultDTO resultDTO = new MdmResultDTO(); + MdmResultInfo info = new MdmResultInfo(); + info.setDisid(disid); + info.setResult(result); + resultDTO.setInfo(info); + try { + return "" + xmlMapper.writeValueAsString(info); + } catch (JsonProcessingException e) { + return "\n" + + "" + disid + "" + result + ""; + } + } + +} diff --git a/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java new file mode 100644 index 0000000..7943613 --- /dev/null +++ b/casic-server-sync/src/main/java/com/casic/missiles/modular/util/MdmXmlUtil.java @@ -0,0 +1,136 @@ +package com.casic.missiles.modular.util; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.XmlUtil; +import com.casic.missiles.modular.device.model.UumOperatorDTO; +import com.casic.missiles.modular.device.model.UumOrganizationDispDTO; +import com.casic.missiles.modular.device.model.base.UumBaseList; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import java.util.ArrayList; +import java.util.List; + +public class MdmXmlUtil { + + public static UumBaseList parseXml(String xml) { + Document document = XmlUtil.readXML(xml); + UumBaseList list = new UumBaseList(); + NodeList dataNodes = document.getElementsByTagName("data"); + for (int i = 0; i < dataNodes.getLength(); i++) { + Element dataElement = (Element) dataNodes.item(i); + list.setDisid(dataElement.getAttribute("disid")); + } + + NodeList listNodes = document.getElementsByTagName("list"); + List operatorDisps = new ArrayList<>(); + List organizationDisps = new ArrayList<>(); + + for (int i = 0; i < listNodes.getLength(); i++) { + Element listElement = (Element) listNodes.item(i); + if ("UumOperatorDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOperatorDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + operatorDisps.add(convertUumOperatorDTO(operatorElement)); + } + list.setUumOperatorDisps(operatorDisps); + } else if ("UumOrganizationDisp".equals(listElement.getAttribute("name"))) { + NodeList operatorNodes = listElement.getElementsByTagName("UumOrganizationDisp"); + for (int j = 0; j < operatorNodes.getLength(); j++) { + Element operatorElement = (Element) operatorNodes.item(j); + organizationDisps.add(convertUumOrganizationDispDTO(operatorElement)); + } + list.setUumOrganizationDisp(organizationDisps); + } + } + + return list; + } + + /** + * 组织数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOrganizationDispDTO convertUumOrganizationDispDTO(Element operatorElement) { + UumOrganizationDispDTO organizationDispDTO = new UumOrganizationDispDTO(); + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + organizationDispDTO.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + organizationDispDTO.setSysID(sysID); + + //组织名称 + String orgName = XmlUtil.getElement(operatorElement, "orgName").getTextContent(); + organizationDispDTO.setOrgName(orgName); + + //排序 + String orderID = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + organizationDispDTO.setOrderId(Convert.toInt(orderID, 0)); + + //内设机构代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + organizationDispDTO.setInternalOrgCode(internalOrgCode); + + //内设机构代码父级 + String internalPOrgCode = XmlUtil.getElement(operatorElement, "internalPOrgCode").getTextContent(); + organizationDispDTO.setInternalPOrgCode(internalPOrgCode); + + //组织机构类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + organizationDispDTO.setSyncType(syncType); + return organizationDispDTO; + } + + /** + * 用户数据转换 + * + * @param operatorElement 用户数据 + * @return + */ + public static UumOperatorDTO convertUumOperatorDTO(Element operatorElement) { + UumOperatorDTO operatorDisp = new UumOperatorDTO(); + + //主键序列号 + String hid = XmlUtil.getElement(operatorElement, "hID").getTextContent(); + operatorDisp.setHID(hid); + + //系统应用ID + String sysID = XmlUtil.getElement(operatorElement, "sysID").getTextContent(); + operatorDisp.setSysID(sysID); + + //排序ID + String orderId = XmlUtil.getElement(operatorElement, "orderID").getTextContent(); + operatorDisp.setOderID(Convert.toInt(orderId)); + + //密级 + String secretLevel = XmlUtil.getElement(operatorElement, "secretLevel").getTextContent(); + operatorDisp.setSecretLevel(secretLevel); + + //电话号码 + String mobileNo = XmlUtil.getElement(operatorElement, "mobileno").getTextContent(); + operatorDisp.setMobileno(mobileNo); + + String oEmail = XmlUtil.getElement(operatorElement, "oEmail").getTextContent(); + operatorDisp.setOEmail(oEmail); + + //电话号码 + String operatorName = XmlUtil.getElement(operatorElement, "operatorName").getTextContent(); + operatorDisp.setOperatorName(operatorName); + + //同步类型 + String syncType = XmlUtil.getElement(operatorElement, "syncType").getTextContent(); + operatorDisp.setSyncType(syncType); + + //内设机构组织代码 + String internalOrgCode = XmlUtil.getElement(operatorElement, "internalOrgCode").getTextContent(); + operatorDisp.setInternalOrgCode(internalOrgCode); + return operatorDisp; + } + +} \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 0f14699..b8280ce 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.83.42:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true username: root - password: casic203 + password: 123456 druid: max-active: 50 min-idle: 20 diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 848f547..26faa63 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -26,7 +26,7 @@ ################### guns配置 ################### casic: web: - url: http://localhost/safe/#/tdashboard #前端地址 + url: http://localhost/dttwg/#/tdashboard #前端地址 swagger-open: true knife4j: groups: 系统管理:com.casic.missiles.modular.system,安全生产业务包:com.casic.missiles.modular.device; @@ -42,6 +42,10 @@ day: 180 #超期日志删除,日志保留天数 file: uploadPath: C:\casic\tmp\ + mdm: + wsdl: http://localhost:6909/safe-server/ws/mdmService?wsdl + mqId: 123456 + open: true video: admin: role: administrator #安全管理员角色标识 安全管理员可看未定密数据 @@ -62,9 +66,9 @@ deviceCorn: 0 */10 * * * * av: open: true - url: http://192.168.83.42:18080 - token: 234456 - deviceCorn: 0 */20 * * * * + url: http://10.20.90.196:10025 + token: 6bcffcdb-42fe-df6c-e704-e6034dd8a5a0 + deviceCorn: 0 */1 * * * * deviceStatusCorn: 0 */5 * * * * wvp: #wvp视频平台配置信息 open: true diff --git a/cxf/wsdl.wsdl b/cxf/wsdl.wsdl new file mode 100644 index 0000000..5549577 --- /dev/null +++ b/cxf/wsdl.wsdl @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cxf/wsdl1.wsdl b/cxf/wsdl1.wsdl new file mode 100644 index 0000000..4c3e131 --- /dev/null +++ b/cxf/wsdl1.wsdl @@ -0,0 +1,3 @@ + + + \ No newline at end of file