jiapeng vor 6 Jahren
Ursprung
Commit
d75f9eb48b

+ 0 - 10
pom.xml

@ -65,16 +65,6 @@
65 65
            <artifactId>mail</artifactId>
66 66
            <version>1.4</version>
67 67
        </dependency>
68
        <dependency>
69
        	<groupId>com.ekexiu</groupId>
70
        	<artifactId>decamino_nonames</artifactId>
71
        	<version>0.0.1</version>
72
        </dependency>
73
                <dependency>
74
        	<groupId>com.ekexiu</groupId>
75
        	<artifactId>decamino_nonames_rt</artifactId>
76
        	<version>0.0.1</version>
77
        </dependency>
78 68
<!-- 		<dependency>
79 69
			<groupId>org.apache.hadoop</groupId>
80 70
			<artifactId>hadoop-hdfs</artifactId>

+ 1 - 1
src/main/java/com/ekexiu/project/hdfs/HdfsService.java

@ -53,7 +53,7 @@ public class HdfsService {
53 53
	public static void main(String args[]) throws Exception{
54 54
		HdfsService service = new HdfsService();
55 55
		service.setRemoteUrl("hdfs://39.97.161.48:9000");
56
		service.upload("11",new File("D:\\pdftest"));
56
		service.upload("11",new File("/ekexiu/storage_asd/dst/a"));
57 57
	}
58 58

59 59
}

+ 30 - 30
src/main/java/com/ekexiu/project/storage/diacrisis/AiFormatTask.java

@ -13,7 +13,7 @@ import javax.imageio.event.IIOWriteWarningListener;
13 13
import org.jfw.util.log.LogFactory;
14 14
import org.jfw.util.log.Logger;
15 15

16
import fr.apteryx.imageio.dicom.DicomReader;
16

17 17

18 18
public class AiFormatTask implements Runnable {
19 19
	private static Logger LOG = LogFactory.getLog(AiFormatTask.class);
@ -63,37 +63,37 @@ public class AiFormatTask implements Runnable {
63 63
				}
64 64
				if (dst.mkdir()) {
65 65

66
					try {
67
						DicomReader reader = new DicomReader();
68
						reader.addIIOReadWarningListener(new WarningListener());
69
						reader.setInput(src);
70
						int nf = reader.getNumImages(true);
71
						if (nf <= 0) {
72
							LOG.error("file [" + src.getAbsolutePath() + "] invalid");
73
							aiTaskService.updateTaskState(taskId, 551, "ERR0402", null);
74
							return;
75
						}
76

77
						for (int k = 0; k < nf; ++k) {
78
							BufferedImage bi = reader.read(i);
79
							if (bi == null) {
80
								LOG.error("file [" + src.getAbsolutePath() + "] invalid");
81
								aiTaskService.updateTaskState(taskId, 551, "ERR0402", null);
82
								return;
83
							}
84

85
							File jpg = new File(dst, String.format("ASD_%02d_%03d.JPG", i, k));
86
							if (jpg.exists()) {
87
								LOG.error("file[" + jpg.getAbsolutePath() + "]  exists");
88
								aiTaskService.updateTaskState(taskId, 552, "ERR0403", null);
89
								return;
90
							}
91
							ImageIO.write(bi, "JPG", jpg);
92
						}
93
					} catch (Exception e) {
66
//					try {
67
//						DicomReader reader = new DicomReader();
68
//						reader.addIIOReadWarningListener(new WarningListener());
69
//						reader.setInput(src);
70
//						int nf = reader.getNumImages(true);
71
//						if (nf <= 0) {
72
//							LOG.error("file [" + src.getAbsolutePath() + "] invalid");
73
//							aiTaskService.updateTaskState(taskId, 551, "ERR0402", null);
74
//							return;
75
//						}
76
//
77
//						for (int k = 0; k < nf; ++k) {
78
//							BufferedImage bi = reader.read(i);
79
//							if (bi == null) {
80
//								LOG.error("file [" + src.getAbsolutePath() + "] invalid");
81
//								aiTaskService.updateTaskState(taskId, 551, "ERR0402", null);
82
//								return;
83
//							}
84
//
85
//							File jpg = new File(dst, String.format("ASD_%02d_%03d.JPG", i, k));
86
//							if (jpg.exists()) {
87
//								LOG.error("file[" + jpg.getAbsolutePath() + "]  exists");
88
//								aiTaskService.updateTaskState(taskId, 552, "ERR0403", null);
89
//								return;
90
//							}
91
//							ImageIO.write(bi, "JPG", jpg);
92
//						}
93
//					} catch (Exception e) {
94 94
						aiTaskService.updateTaskState(taskId, 552, "ERR0403", null);
95 95
						return;
96
					}
96
//					}
97 97

98 98
				} else {
99 99
					LOG.error("makdir [" + dst.getAbsolutePath() + "] error");

+ 0 - 17
src/main/java/com/ekexiu/project/storage/servlet/StartupServlet.java

@ -1,17 +0,0 @@
1
package com.ekexiu.project.storage.servlet;
2

3
import javax.servlet.ServletException;
4
import javax.servlet.http.HttpServlet;
5

6
import fr.apteryx.imageio.dicom.Plugin;
7

8
public class StartupServlet extends HttpServlet {
9
	private static final long serialVersionUID = 1L;
10

11
	@Override
12
	public void init() throws ServletException {
13
		super.init();
14
		 System.loadLibrary("decamino");
15
		Plugin.setLicenseKey("1758D1W8YEYL81675OA9ABHD");
16
	}
17
}

+ 0 - 5
src/main/webapp/WEB-INF/web.xml

@ -17,11 +17,6 @@
17 17
    </init-param>
18 18
    <load-on-startup>1</load-on-startup>
19 19
  </servlet>
20
  <servlet>
21
  	<servlet-name>startupServlet</servlet-name>
22
  	<servlet-class>com.ekexiu.project.storage.servlet.StartupServlet</servlet-class>
23
  	<load-on-startup>2</load-on-startup>
24
  </servlet>
25 20
  <servlet-mapping>
26 21
    <servlet-name>ajax</servlet-name>
27 22
    <url-pattern>/ajax/*</url-pattern>