commit

DataFusion/.classpath

@@ -9,6 +9,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/annotations-13.0.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cos-2020.4.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"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fastjson-1.2.62.jar"/>
@@ -16,6 +17,8 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-api-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-core-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-impl-2.3.0.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jcifs-1.3.17.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-4.8-bin-with-src.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-1.3.50.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-common-1.3.50.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-1.2.17.jar"/>
@@ -24,7 +27,5 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okhttp-4.2.2.jar" sourcepath="/Users/liutao/.m2/repository/com/squareup/okhttp3/okhttp/4.2.2/okhttp-4.2.2-sources.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okio-2.2.2.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-4.8-bin-with-src.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jcifs-1.3.17.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

DataFusion/res/config.properties

@@ -1,6 +1,8 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:mysql://127.0.0.1:3306/pacsonline
+jdbcUrl_connected  = jdbc:mysql://192.168.233.1:3306/pacsonline
 user_connected 	   = root
 password_connected = Zskk_2017
 #DATA-Parms
-institution_id     = 43700004
+institution_id     = 43700004
+smb_user           = root
+smb_password       = 123456

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

@@ -7,6 +7,7 @@ import com.jfinal.config.JFinalConfig;
 import com.jfinal.config.Plugins;
 import com.jfinal.config.Routes;
 import com.jfinal.core.JFinal;
+import com.jfinal.kit.PathKit;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
@@ -55,6 +56,7 @@ public class ZskkConfig extends JFinalConfig {
 	public void configEngine(Engine me) {
 		// TODO Auto-generated method stub
 
+		
 	}
 
 	public static DruidPlugin createConnectedDruidPlugin() {
@@ -67,20 +69,19 @@ public class ZskkConfig extends JFinalConfig {
 		// 配置数据库连接池插件
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		me.add(druidPluginConnected);
-//
-//		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new MysqlDialect());
-//		me.add(arpConnected);
+		// 配置ActiveRecord插件
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		arpConnected.setDialect(new MysqlDialect());
+		me.add(arpConnected);
 
 		
 //		Cron4jPlugin cpData = new Cron4jPlugin();
 //		cpData.addTask("*/5 * * * *", new DataTask());
 //		me.add(cpData);
 		
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/5 * * * *", new UpdateTask());
-		me.add(cpData);
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/1 * * * *", new UpdateTask());
+//		me.add(cpData);
 	}
 
 	@Override
@@ -102,8 +103,9 @@ public class ZskkConfig extends JFinalConfig {
 		ServiceFactory.init();
 	}
 	
-	public static void main(String[] args) {
-		JFinal.start("WebRoot", 10002, "/", 5);
-	}
+//	public static void main(String[] args) {
+//		PathKit.setWebRootPath("/WebRoot");
+//		JFinal.start("WebRoot", 10002, "/", 1000);
+//	}
 
 }

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

@@ -1,5 +1,6 @@
 package com.zskk.control;
 
+import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -10,6 +11,7 @@ import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
 import com.jfinal.core.Controller;
+import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.zskk.service.DataService;
@@ -38,14 +40,44 @@ public class ViewController extends Controller {
 	public void ttt() {
 		try {
 			DataService dataService = new DataService();
-			dataService.downloadFileToFolder("smb://192.168.129.120", "/JIMAGE", "/20721103/29/B4446F3F", "/zskk_system");
+//			dataService.downloadFileToFolder("smb://192.168.129.120", "/JIMAGE", "/20721103/29/B4446F3F", "/zskk_system");
 		} catch (Exception e) {
 			// TODO: handle exception
 			this.renderText(e.toString());
 		}
-		
+	
+	}
+	
+	
+	public void ttt3() {
+		try {
+			List<Record> d = Db.use("connected").find("select * from reportinfo");
+			for (Record record : d) {
+				record.set("pmh", "1");
+				 Db.use("connected").update("reportinfo","idqwe", record);
+			}
+			File dFile = new File("./img");
+			dFile.mkdirs();
+			this.renderText(d.toString());
 
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+	
+	}
+	
+	
+	public void testStart() {
+		renderText(PropKit.get("institution_id"));
+	
 	}
+	
+	public void upload(File ddFile) {
+//		ddFile.save();
+	getFiles();
+    renderNull();
+}
 	/**
 	 * post请求
 	 * @param url-请求地址

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

@@ -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");		});	
+    }    
 
 }

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

@@ -1,14 +1,17 @@
 package com.zskk.task;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 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 com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.ThreadPoolService;
 
@@ -16,15 +19,16 @@ public class UpdateTask implements ITask {
 
 	@Override
 	public void run() {
+		DataService dService = ServiceFactory.getService(DataService.class);
+		List<Record> record = Db.use("connected").find("select * from reportinfo where pmh is null limit 10");
 		// TODO Auto-generated method stub
 		JSONArray jsonArray = null;	
-        for (Object object : jsonArray) {
-        	String spString = "\\\\\\11\\22\\33\\44";
+        for (Record recordinfo : record) {
+        	String spString = recordinfo.getStr("IMAGESFILENAME");
         	String[] spStrings = spString.split("\\\\");
-        	
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
-//				dService.saveReport(params);
+				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);	
 			});	
         }
 	}
@@ -35,10 +39,10 @@ public class UpdateTask implements ITask {
 
 	}
 
-	public static void main(String[] args) {
-		String dString = "\\\\11\\223344\\d";
-    	String[] fdStrings = dString.split("\\\\");
-//		String dString2 = dString.replaceAll("\\\", ",");
-    	System.out.print(fdStrings[fdStrings.length-1]);
-	}
+//	public static void main(String[] args) {
+//		String dString = "\\\\11\\223344\\d";
+//    	String[] fdStrings = dString.split("\\\\");,
+////		String dString2 = dString.replaceAll("\\\", ",");
+//    	System.out.print(fdStrings[fdStrings.length-1]);
+//	}
 }