|
|
@@ -14,12 +14,15 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.jfinal.kit.PropKit;
|
|
|
+import com.jfinal.plugin.activerecord.Db;
|
|
|
+import com.jfinal.plugin.activerecord.Record;
|
|
|
|
|
|
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;
|
|
|
import okhttp3.RequestBody;
|
|
|
@@ -32,7 +35,7 @@ public class DataService {
|
|
|
private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
|
|
|
|
|
|
private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
|
|
|
- public static final MediaType MEDIA_TYPE_MARKDOWN = MediaType.parse("text/x-markdown; charset=utf-8");
|
|
|
+ public static final MediaType MEDIA_TYPE_MARKDOWN = MediaType.parse("multipart/form-data");
|
|
|
|
|
|
/**
|
|
|
* 获取未出报告的检查列表
|
|
|
@@ -88,7 +91,7 @@ public class DataService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public static void downloadFileToFolder(String remoteUrl, String shareFolderPath, String fileName, String localDir) {
|
|
|
+ public static void downloadFileToFolder(String remoteUrl, String shareFolderPath, String fileName, String localDir,Record recoeRecord) {
|
|
|
InputStream in = null;
|
|
|
OutputStream out = null;
|
|
|
try {
|
|
|
@@ -105,23 +108,34 @@ public class DataService {
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
} finally {
|
|
|
+ File localFile = new File(localDir + File.separator + fileName);
|
|
|
try {
|
|
|
out.close();
|
|
|
in.close();
|
|
|
System.out.print("11");
|
|
|
- File localFile = new File(localDir + File.separator + fileName);
|
|
|
|
|
|
+ RequestBody requestBody = new MultipartBody.Builder()
|
|
|
+ .setType(MultipartBody.FORM)
|
|
|
+ .addFormDataPart("file", localFile.getName(),
|
|
|
+ RequestBody.create(MEDIA_TYPE_MARKDOWN, localFile))
|
|
|
+ .build();
|
|
|
+
|
|
|
Request request = new Request.Builder()
|
|
|
- .url("https://api.github.com/markdown/raw")
|
|
|
- .post(RequestBody.create(MEDIA_TYPE_MARKDOWN, localFile))
|
|
|
+ .url("http://192.168.233.1:8080/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();
|
|
|
+
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
@@ -132,7 +146,9 @@ public class DataService {
|
|
|
// map.put("institution_id", "47600001");
|
|
|
// map.put("num", "10");
|
|
|
// postWithParameters(GET_EXAM_URL, map);
|
|
|
- downloadFileToFolder("smb://"+"hao:"+"123456@" +"192.168.31.150", "/share/pagkage", "factor1.py", "./tempImg");
|
|
|
- }
|
|
|
+// ThreadPoolService tService = new ThreadPoolService();
|
|
|
+// tService.execute(() -> {
|
|
|
+// downloadFileToFolder("smb://"+"hao:"+"123456@" +"192.168.31.150", "/share/pagkage", "factor1.py", "./tempImg"); });
|
|
|
+ }
|
|
|
|
|
|
}
|
