commit

DataFusion/res/config.properties

@@ -12,4 +12,7 @@ institution_id     = 25500005
 jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_local	   = zskk
-password_local = Zskk_2023
+password_local = Zskk_2023
+#SMB
+smb_user           = pacs
+smb_password       = pacs

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

@@ -145,6 +145,18 @@ public class ViewController extends Controller {
 		
 	}
 	
+	public void ttt4() {
+		try {
+			DataService dataService = new DataService();
+			dataService.downloadFileToFolder("smb://" +"172.27.64.61", "/datacenter/20240115", "/home/zskk/aa", "0532FB45.img",null);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+
+		}
+			
+	}
+	
 	public void sdcfind() {
 		String execCmd = ExecUtil.execCmd("/zskk_system/other/cfind.sh " + this.getPara("time") + " STUDYUID_" + "temppp" + ".xml");
 		if (execCmd.contains("Connection refused")) {

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

@@ -1,8 +1,11 @@
 package com.zskk.service;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -24,8 +27,11 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.zskk.tools.XmlHelper;
 
+import jcifs.smb.NtlmPasswordAuthentication;
 import jcifs.smb.SmbFile;
+import jcifs.smb.SmbFileInputStream;
 import okhttp3.FormBody;
+import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -41,6 +47,8 @@ public class DataService {
     private static String UPDATE_PATIENT_URL = "https://risserver3.pacsonline.cn/butt/saveExam";
 	
     private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
+    public static final MediaType MEDIA_TYPE_MARKDOWN = MediaType.parse("multipart/form-data");
+
     
     /**
      * 获取未出报告的检查列表
@@ -135,20 +143,20 @@ public class DataService {
                         .addFormDataPart("file", localFile.getName(),
                             RequestBody.create(MEDIA_TYPE_MARKDOWN, localFile))
                         .build();
-                
-                Request request = new Request.Builder()
-                    .url("http://127.0.0.1:8080/df/view/upload")
-                    .post(requestBody)
-                    .build();
-
-                try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
-                  if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
-
-                  System.out.println(response.body().string());
-                  localFile.delete();
-                  recoeRecord.set("pmh", "1");
-                  Db.use("connected").update("reportinfo", "IMAGESFILENAME",recoeRecord);
-                }
+//                
+//                Request request = new Request.Builder()
+//                    .url("http://127.0.0.1:8080/df/view/upload")
+//                    .post(requestBody)
+//                    .build();
+//
+//                try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+//                  if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+//
+//                  System.out.println(response.body().string());
+//                  localFile.delete();
+////                  recoeRecord.set("pmh", "1");
+////                  Db.use("connected").update("reportinfo", "IMAGESFILENAME",recoeRecord);
+//                }
             } catch (IOException e) {
 //                localFile.delete();