v5.8.8

Author: 839536

bus-image/pom.xml

@@ -23,8 +23,9 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>bus-logger</artifactId>
+            <artifactId>bus-health</artifactId>
             <version>${project.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

bus-image/src/main/java/org/aoju/bus/image/Args.java

@@ -25,7 +25,6 @@
 package org.aoju.bus.image;
 
 import lombok.Data;
-import org.aoju.bus.image.centre.Device;
 import org.aoju.bus.image.galaxy.data.ElementDictionary;
 import org.aoju.bus.image.metric.ApplicationEntity;
 import org.aoju.bus.image.metric.Connection;
@@ -139,13 +138,8 @@ public Args(Option option,
         }
     }
 
-    public void configureConnect(AAssociateRQ aAssociateRQ, Connection remote, Node calledNode) {
-        aAssociateRQ.setCalledAET(calledNode.getAet());
-        if (identity != null) {
-            aAssociateRQ.setIdentityRQ(identity);
-        }
-        remote.setHostname(calledNode.getHostname());
-        remote.setPort(calledNode.getPort());
+    public String getTagName() {
+        return ElementDictionary.keywordOf(tag, null);
     }
 
     /**
@@ -154,7 +148,8 @@ public void configureConnect(AAssociateRQ aAssociateRQ, Connection remote, Node
      * @param connection  Connection
      * @param callingNode Node
      */
-    public void configureBind(Connection connection, Node callingNode) {
+    public void configureBind(Connection connection,
+                              Node callingNode) {
         if (callingNode.getHostname() != null) {
             connection.setHostname(callingNode.getHostname());
         }
@@ -163,14 +158,27 @@ public void configureBind(Connection connection, Node callingNode) {
         }
     }
 
+    public void configureBind(AAssociateRQ aAssociateRQ,
+                              Connection remote,
+                              Node calledNode) {
+        aAssociateRQ.setCalledAET(calledNode.getAet());
+        if (identity != null) {
+            aAssociateRQ.setIdentityRQ(identity);
+        }
+        remote.setHostname(calledNode.getHostname());
+        remote.setPort(calledNode.getPort());
+    }
+
     /**
      * Bind the connection and applicationEntity with the callingNode
      *
      * @param applicationEntity ApplicationEntity
      * @param connection        Connection
      * @param callingNode       the Node
      */
-    public void configureBind(ApplicationEntity applicationEntity, Connection connection, Node callingNode) {
+    public void configureBind(ApplicationEntity applicationEntity,
+                              Connection connection,
+                              Node callingNode) {
         applicationEntity.setAETitle(callingNode.getAet());
         if (callingNode.getHostname() != null) {
             connection.setHostname(callingNode.getHostname());
@@ -224,8 +232,4 @@ public void configureTLS(Connection conn, Connection remote) throws IOException
         }
     }
 
-    public String getTagName() {
-        return ElementDictionary.keywordOf(tag, null);
-    }
-
 }

bus-image/src/main/java/org/aoju/bus/image/centre/Device.java renamed to bus-image/src/main/java/org/aoju/bus/image/Device.java

@@ -22,9 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN     *
  * THE SOFTWARE.                                                                 *
  ********************************************************************************/
-package org.aoju.bus.image.centre;
+package org.aoju.bus.image;
 
 import org.aoju.bus.core.lang.Symbol;
+import org.aoju.bus.core.lang.exception.InstrumentException;
 import org.aoju.bus.image.galaxy.Property;
 import org.aoju.bus.image.galaxy.data.Code;
 import org.aoju.bus.image.galaxy.data.Issuer;
@@ -111,12 +112,37 @@ public class Device implements Serializable {
     private Boolean arcDevExt;
 
     public Device() {
+
     }
 
     public Device(String name) {
         setDeviceName(name);
     }
 
+    public boolean isRunning() {
+        return executor != null;
+    }
+
+    public void start() {
+        try {
+            if (executor != null) {
+                throw new IllegalStateException("Already started");
+            }
+            bindConnections();
+        } catch (Exception e) {
+            stop();
+            throw new InstrumentException("Binding error, please check the port or IP");
+        }
+    }
+
+    public void stop() {
+        unbindConnections();
+        if (scheduledExecutor != null)
+            scheduledExecutor.shutdown();
+        executor = null;
+        scheduledExecutor = null;
+    }
+
     private static X509Certificate[] toArray(Collection<X509Certificate[]> c) {
         int size = 0;
         for (X509Certificate[] certs : c)

bus-image/src/main/java/org/aoju/bus/image/centre/DeviceService.java

@@ -25,7 +25,7 @@
 package org.aoju.bus.image.galaxy;
 
 import org.aoju.bus.core.lang.exception.InstrumentException;
-import org.aoju.bus.image.centre.Device;
+import org.aoju.bus.image.Device;
 import org.aoju.bus.image.metric.ApplicationEntity;
 import org.aoju.bus.image.metric.WebApplication;
 

bus-image/src/main/java/org/aoju/bus/image/centre/ImageStoreSCP.java

@@ -25,7 +25,7 @@
 package org.aoju.bus.image.galaxy;
 
 import org.aoju.bus.core.lang.exception.InstrumentException;
-import org.aoju.bus.image.centre.Device;
+import org.aoju.bus.image.Device;
 
 /**
  * @author Kimi Liu

bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java

@@ -25,7 +25,7 @@
 package org.aoju.bus.image.galaxy;
 
 import org.aoju.bus.core.lang.exception.InstrumentException;
-import org.aoju.bus.image.centre.Device;
+import org.aoju.bus.image.Device;
 
 /**
  * @author Kimi Liu

bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java

@@ -27,9 +27,9 @@
 import org.aoju.bus.core.lang.Symbol;
 import org.aoju.bus.core.lang.exception.InstrumentException;
 import org.aoju.bus.core.utils.IoUtils;
+import org.aoju.bus.image.Device;
 import org.aoju.bus.image.Dimse;
 import org.aoju.bus.image.Option;
-import org.aoju.bus.image.centre.Device;
 import org.aoju.bus.image.galaxy.Property;
 import org.aoju.bus.image.galaxy.data.Attributes;
 import org.aoju.bus.image.metric.acquire.AEExtension;

bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java

@@ -28,7 +28,6 @@
 import org.aoju.bus.core.lang.exception.InstrumentException;
 import org.aoju.bus.core.utils.IoUtils;
 import org.aoju.bus.image.*;
-import org.aoju.bus.image.centre.Device;
 import org.aoju.bus.image.galaxy.Capacity;
 import org.aoju.bus.image.galaxy.data.Attributes;
 import org.aoju.bus.image.galaxy.data.VR;