Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
XMTT
/
storage
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Commitit 29 Julkaisut 0 Wiki
Selaa lähdekoodia

ddd

jiapeng 5 vuotta sitten
vanhempi
8b94aadaa9
commit
9a3c4b31a0
2 muutettua tiedostoa jossa 98 lisäystä ja 101 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 96 99
      pom.xml
  2. 2 2
      src/main/java/com/ekexiu/project/storage/dicom/DicomQueryStudy.java

+ 96 - 99
pom.xml
Näytä tiedosto 

@ -1,71 +1,77 @@
1 1 
<?xml version="1.0" encoding="UTF-8"?>
2 
<project xmlns="http://maven.apache.org/POM/4.0.0"
3 
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 
    <modelVersion>4.0.0</modelVersion>
2 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3 
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4 
	<modelVersion>4.0.0</modelVersion>
6 5
7 
    <groupId>com.ekexiu.storage</groupId>
8 
    <artifactId>storage</artifactId>
9 
    <version>0.0.1</version>
10 
    <packaging>war</packaging>
11 
    <properties>
12 
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13 
        <maven.compiler.source>1.7</maven.compiler.source>
14 
        <maven.compiler.target>1.7</maven.compiler.target>
15 
        <maven.war.filteringDeploymentDescriptors>true</maven.war.filteringDeploymentDescriptors>
16 
        <maven.tomcat.path>/</maven.tomcat.path>
17 
    </properties>
18 
    <dependencies>
19 
        <dependency>
20 
            <groupId>org.postgresql</groupId>
21 
            <artifactId>postgresql</artifactId>
22 
            <version>9.4.1207.jre7</version>
23 
        </dependency>
24 
        <dependency>
25 
            <groupId>org.jfw</groupId>
26 
            <artifactId>jfwApt</artifactId>
27 
            <version>0.0.2-SNAPSHOT</version>
28 
            <optional>true</optional>
29 
        </dependency>
30 
        <dependency>
31 
            <groupId>org.jfw</groupId>
32 
            <artifactId>jfwAptOrm</artifactId>
33 
            <version>0.0.2-SNAPSHOT</version>
34 
            <optional>true</optional>
35 
        </dependency>
36 
        <dependency>
37 
            <groupId>org.jfw</groupId>
38 
            <artifactId>jfwAptWeb</artifactId>
39 
            <version>0.0.2-SNAPSHOT</version>
40 
            <optional>true</optional>
41 
        </dependency>
42 
        <dependency>
43 
            <groupId>org.jfw</groupId>
44 
            <artifactId>jfwUtil</artifactId>
45 
            <version>0.0.2-SNAPSHOT</version>
46 
        </dependency>
47 
        <dependency>
48 
            <groupId>org.jfw</groupId>
49 
            <artifactId>jfwWebUtil</artifactId>
50 
            <version>0.0.2-SNAPSHOT</version>
51 
        </dependency>
52 
        <dependency>
53 
            <groupId>javax.servlet</groupId>
54 
            <artifactId>servlet-api</artifactId>
55 
            <scope>provided</scope>
56 
            <version>2.5</version>
57 
        </dependency>
58 
        <dependency>
59 
            <groupId>com.alibaba</groupId>
60 
            <artifactId>druid</artifactId>
61 
            <version>1.0.20</version>
62 
        </dependency>
63 
        <dependency>
64 
            <groupId>javax.mail</groupId>
65 
            <artifactId>mail</artifactId>
66 
            <version>1.4</version>
67 
        </dependency>
68 
        		<dependency>
6 
	<groupId>com.ekexiu.storage</groupId>
7 
	<artifactId>storage</artifactId>
8 
	<version>0.0.1</version>
9 
	<packaging>war</packaging>
10 
	<properties>
11 
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12 
		<maven.compiler.source>1.7</maven.compiler.source>
13 
		<maven.compiler.target>1.7</maven.compiler.target>
14 
		<maven.war.filteringDeploymentDescriptors>true</maven.war.filteringDeploymentDescriptors>
15 
		<maven.tomcat.path>/</maven.tomcat.path>
16 
	</properties>
17 
	<repositories>
18 
		<repository>
19 
			<id>www.dcm4che.org</id>
20 
			<name>dcm4che Repository</name>
21 
			<url>http://maven.dcm4che.org</url>
22 
		</repository>
23 
	</repositories>
24 
	<dependencies>
25 
		<dependency>
26 
			<groupId>org.postgresql</groupId>
27 
			<artifactId>postgresql</artifactId>
28 
			<version>9.4.1207.jre7</version>
29 
		</dependency>
30 
		<dependency>
31 
			<groupId>org.jfw</groupId>
32 
			<artifactId>jfwApt</artifactId>
33 
			<version>0.0.2-SNAPSHOT</version>
34 
			<optional>true</optional>
35 
		</dependency>
36 
		<dependency>
37 
			<groupId>org.jfw</groupId>
38 
			<artifactId>jfwAptOrm</artifactId>
39 
			<version>0.0.2-SNAPSHOT</version>
40 
			<optional>true</optional>
41 
		</dependency>
42 
		<dependency>
43 
			<groupId>org.jfw</groupId>
44 
			<artifactId>jfwAptWeb</artifactId>
45 
			<version>0.0.2-SNAPSHOT</version>
46 
			<optional>true</optional>
47 
		</dependency>
48 
		<dependency>
49 
			<groupId>org.jfw</groupId>
50 
			<artifactId>jfwUtil</artifactId>
51 
			<version>0.0.2-SNAPSHOT</version>
52 
		</dependency>
53 
		<dependency>
54 
			<groupId>org.jfw</groupId>
55 
			<artifactId>jfwWebUtil</artifactId>
56 
			<version>0.0.2-SNAPSHOT</version>
57 
		</dependency>
58 
		<dependency>
59 
			<groupId>javax.servlet</groupId>
60 
			<artifactId>servlet-api</artifactId>
61 
			<scope>provided</scope>
62 
			<version>2.5</version>
63 
		</dependency>
64 
		<dependency>
65 
			<groupId>com.alibaba</groupId>
66 
			<artifactId>druid</artifactId>
67 
			<version>1.0.20</version>
68 
		</dependency>
69 
		<dependency>
70 
			<groupId>javax.mail</groupId>
71 
			<artifactId>mail</artifactId>
72 
			<version>1.4</version>
73 
		</dependency>
74 
		<dependency>
69 75 
			<groupId>org.dcm4che</groupId>
70 76 
			<artifactId>dcm4che-core</artifactId>
71 77 
			<version>5.16.0</version>
 
@ -85,39 +91,30 @@
85 91 
			<artifactId>dcm4che-tool-common</artifactId>
86 92 
			<version>5.16.0</version>
87 93 
		</dependency>
88 
<!-- 		<dependency>
89 
			<groupId>org.apache.hadoop</groupId>
90 
			<artifactId>hadoop-hdfs</artifactId>
91 
			<version>3.0.3</version>
92 
		</dependency> -->
93 
<!-- 		<dependency>
94 
			<groupId>org.apache.hadoop</groupId>
95 
			<artifactId>hadoop-client</artifactId>
96 
			<version>2.9.2</version>
97 
		</dependency> -->
98 
<!-- 		<dependency>
99 
			<groupId>org.apache.hadoop</groupId>
100 
			<artifactId>hadoop-common</artifactId>
101 
			<version>3.0.3</version>
102 
		</dependency> -->
103 
    </dependencies>
104 
    <build>
105 
        <plugins>
106 
            <plugin>
107 
                <groupId>org.mortbay.jetty</groupId>
108 
                <artifactId>jetty-maven-plugin</artifactId>
109 
                <version>8.1.0.RC5</version>
110 
                <configuration>
111 
                    <stopPort>9966</stopPort>
112 
                    <stopKey>foo</stopKey>
113 
                    <webAppConfig>
114 
                        <contextPath>/storage</contextPath>
115 
                    </webAppConfig>
116 
                </configuration>
117 
            </plugin>
118 
        </plugins>
119 
        <finalName>storage</finalName>
120 
    </build>
94 
		<!-- <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId>
95 
			<version>3.0.3</version> </dependency> -->
96 
		<!-- <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId>
97 
			<version>2.9.2</version> </dependency> -->
98 
		<!-- <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId>
99 
			<version>3.0.3</version> </dependency> -->
100 
	</dependencies>
101 
	<build>
102 
		<plugins>
103 
			<plugin>
104 
				<groupId>org.mortbay.jetty</groupId>
105 
				<artifactId>jetty-maven-plugin</artifactId>
106 
				<version>8.1.0.RC5</version>
107 
				<configuration>
108 
					<stopPort>9966</stopPort>
109 
					<stopKey>foo</stopKey>
110 
					<webAppConfig>
111 
						<contextPath>/storage</contextPath>
112 
					</webAppConfig>
113 
				</configuration>
114 
			</plugin>
115 
		</plugins>
116 
		<finalName>storage</finalName>
117 
	</build>
121 118
122 119
123 120 
</project>

+ 2 - 2
src/main/java/com/ekexiu/project/storage/dicom/DicomQueryStudy.java
Näytä tiedosto 

@ -132,8 +132,8 @@ public class DicomQueryStudy extends DicomBase {
132 132
133 133 
	public static void main(String args[])
134 134 
			throws IOException, InterruptedException, IncompatibleConnectionException, GeneralSecurityException {
135 
		DicomQueryStudy q = new DicomQueryStudy("findscu");
136 
		q.query("DCM4CHEE", "192.168.3.97", 11112, "759417ASD", null);
135 
		DicomQueryStudy q = new DicomQueryStudy("AIADS");
136 
		q.query("STPACS", "133.0.14.150", 104, "759417ASD", null);
137 137
138 138 
		for(PatientStudy s:q.result){
139 139 
			System.out.println(JsonService.toJson(s));