commit

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

@@ -110,7 +110,7 @@ public class ViewController extends Controller {
 	public void ttt4() {
 		try {
 			DataService dataService = new DataService();
-			dataService.downloadFileToFolder("smb://"+ "administrator:"+"Passw0rd@"+"192.168.8.21", "/PACS/sht/20241122/CT/CT161019_CT_101763288_031202", "CT_1.2.840.113619.2.284.3.2831180544.921.1556021108.55.2.dcm", "/home/zskk/SMB_FILE",null);
+			dataService.downloadFileToFolder("smb://"+ "administrator:"+"Passw0rd@"+"192.168.8.21", "/PACS/sht/20241122/CT/CT161019_CT_101763288_031202", "CT_1.2.840.113619.2.284.3.2831180544.921.1556021108.55.2.dcm", "/home/SMB_FILE",null);
 		} catch (Exception e) {
 			// TODO: handle exception
 			this.renderText(e.toString());
@@ -124,10 +124,15 @@ public class ViewController extends Controller {
 		try {
 			SmbFile remoteFile = new SmbFile("smb://administrator:Passw0rd@192.168.8.21/PACS/sht/20241122/CT/CT161019_CT_101763288_031202");
 			if(remoteFile.exists()){
-	            File localFile = new File("/home/zskk/SMB_FILE" + File.separator + "CT_1.2.840.113619.2.284.3.2831180544.921.1556021108.55.2.dcm");
+	            File localFile = new File("/home/SMB_FILE" + File.separator + "CT_1.2.840.113619.2.284.3.2831180544.921.1556021108.55.2.dcm");
 	            localFile.getParentFile().mkdirs();
 	            in = new BufferedInputStream(new SmbFileInputStream(remoteFile));
 	            out = new BufferedOutputStream(new FileOutputStream(localFile));
+	            byte[] buffer = new byte[1024];
+	            while (in.read(buffer) != -1) {
+	                out.write(buffer);
+	                buffer = new byte[1024];
+	            }
 //	            SmbFile[] files = remoteFile.listFiles();
 //	            for(SmbFile f : files){
 	                System.out.println(remoteFile.getName());
@@ -139,7 +144,13 @@ public class ViewController extends Controller {
 	        else {
 				renderText("");
 			}
-		} catch (MalformedURLException | SmbException | UnknownHostException | FileNotFoundException e) {
+//			} catch (MalformedURLException | SmbException e) {
+
+		} catch (MalformedURLException | SmbException | UnknownHostException | FileNotFoundException  e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			renderText(e.toString());
+		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			renderText(e.toString());

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

@@ -36,7 +36,7 @@ public class ReCMoveTask implements ITask {
 //			recordfind.set("modalities", object.getStr("F_MODALITY"));
 			String[] strings = object.getStr("FILEPATH").split("\\\\");
 			int len = strings.length;
-			dService.downloadFileToFolder("smb://administrator:Passw0rd@192.168.8.21/PACS/sht/", strings[len-4] +"/" + strings[len-3] + "/" + strings[len-2], strings[len-1],"/home/zskk/SMB_FILE",null);
+			dService.downloadFileToFolder("smb://administrator:Passw0rd@192.168.8.21/PACS/sht/", strings[len-4] +"/" + strings[len-3] + "/" + strings[len-2], strings[len-1],"/home/SMB_FILE",null);
 		}
 		recordfind.set("status", 3);
 		recordfind.set("updateAt", parseStringToDateTime());

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

@@ -21,7 +21,7 @@ public class UpdateTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-		List<Record> records = Db.use("connected").find("select * from examinfo where REQDATE > TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')",parseStringToDate());
+		List<Record> records = Db.use("connected").find("select * from examinfo where REQDATE > ?",parseStringToDate());
 		if (records==null) {
 			return;
 		}
@@ -42,32 +42,16 @@ public class UpdateTask implements ITask {
 	}
 
 	/**
-	 * 日期字符串格式转换年月日
-	 * 
+	 * 日期字符串格式转换
 	 * @param dateStr
 	 * @return
 	 */
 	private String parseStringToDate() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		Date date = new Date();
-		long dInteger = date.getTime();
-		String daString = sdf.format(new Date(dInteger));
-		return daString;
-
-	}
-	
-	/**
-	 * 日期字符串格式转换年月日时分秒
-	 * 
-	 * @param dateStr
-	 * @return
-	 */
-	private String parseStringToDateTime() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Date date = new Date();
-		String daString = sdf.format(date);
-		return daString;
-
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = new Date();
+	    String timeString = null;
+		timeString = sdf.format(new Date(date.getTime()-3600000));
+        return timeString;
 	}
 	
 	/**