commit

DataFusion/.classpath

@@ -2,12 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/annotations-13.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cron4j-2.2.5.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/druid-1.1.21.jar"/>
@@ -27,5 +21,11 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cos-2020.4.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jcifs-1.3.17.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

DataFusion/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -43,6 +43,7 @@ public class ZskkConfig extends JFinalConfig {
 	public void configConstant(Constants me) {
 		loadProp("config.properties", "a_little_config.txt");
 		me.setDevMode(PropKit.getBoolean("devMode", false));
+//		me.setBaseUploadPath("/zskk_system/zskk_dicomQRScp/DICOM");
 	}
 
 	@Override

DataFusion/src/com/zskk/control/ViewController.java

@@ -70,6 +70,18 @@ public class ViewController extends Controller {
 	
 	}
 	
+	public void ttt4() {
+		try {
+			DataService dataService = new DataService();
+			dataService.downloadFileToFolder("smb://" +"192.168.1.140", "/ConsoleTest", "app.config", "./tempImg",null);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+
+		}
+			
+	}
+	
 	
 	public void testStart() {
 		renderText(PropKit.get("institution_id"));

DataFusion/src/com/zskk/service/DataService.java

@@ -95,7 +95,7 @@ public class DataService {
         InputStream in = null;
         OutputStream out = null;
         try {
-            SmbFile remoteFile = new SmbFile(remoteUrl + shareFolderPath + File.separator + fileName);
+            SmbFile remoteFile = new SmbFile(remoteUrl + shareFolderPath + "/" + fileName);
             File localFile = new File(localDir + File.separator + fileName);
             localFile.getParentFile().mkdirs();
             in = new BufferedInputStream(new SmbFileInputStream(remoteFile));
@@ -121,7 +121,7 @@ public class DataService {
                         .build();
                 
                 Request request = new Request.Builder()
-                    .url("http://192.168.233.1:8080/view/upload")
+                    .url("http://127.0.0.1:8080/df/view/upload")
                     .post(requestBody)
                     .build();
 
@@ -148,7 +148,13 @@ public class DataService {
 //		postWithParameters(GET_EXAM_URL, map);
 //    	ThreadPoolService tService = new ThreadPoolService();
 //		tService.execute(() -> {
-//			downloadFileToFolder("smb://"+"hao:"+"123456@" +"192.168.31.150", "/share/pagkage", "factor1.py", "./tempImg");		});	
+//			downloadFileToFolder("smb://"+"hao:"+"123456@" +"192.168.1.140", "/VAIO/ConsoleTest", "app.config", "./tempImg",null);
+    	downloadFileToFolder("smb://" +"192.168.1.140", "/ConsoleTest", "app.config", "./tempImg",null);
+//			});	
+    	
+//    	String spString = "\\\\102\\jm\\2017\\22\\img";
+//    	String[] spStrings = spString.split("\\\\");
+//    	System.out.print(spStrings[2]);
     }    
 
 }

DataFusion/src/com/zskk/task/UpdateTask.java

@@ -28,7 +28,7 @@ public class UpdateTask implements ITask {
         	String[] spStrings = spString.split("\\\\");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
-				dService.downloadFileToFolder("smb://"+ PropKit.get("smb_user") + ":"+ PropKit.get("smb_password") +"@" +"192.168.129.120", "/"+spStrings[4]+spStrings[5]+spStrings[6], spStrings[7], "./tempImg",recordinfo);	
+				dService.downloadFileToFolder("smb://"+ PropKit.get("smb_user") + ":"+ PropKit.get("smb_password") +"@" +"192.168.129.120", "/"+spStrings[3]+"/"+spStrings[4]+"/"+spStrings[5], spStrings[6], "./tempImg",recordinfo);	
 			});	
         }
 	}