commit

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

@@ -134,13 +134,17 @@ public class DataService {
 		Boolean eBoolean = OSS_CLIENT.doesObjectExist(PropKit.get("oss_bucketName"), key);
 		if (!eBoolean) {
 			OSS_CLIENT.putObject(PropKit.get("oss_bucketName"), key, inputStream);
-			Boolean bBoolean = OSS_CLIENT.doesObjectExist(PropKit.get("oss_bucketName"), key);
-			if (bBoolean) {
-				file.delete();
+//			Boolean bBoolean = OSS_CLIENT.doesObjectExist(PropKit.get("oss_bucketName"), key);
+//			if (bBoolean) {
 				map.put("url", "https://zskk-image.oss-cn-beijing.aliyuncs.com/" + key);
 				map.put("name", key);
 				postWithParameters(SAVE_ANNEX_URL, map);
-			}
+				file.delete();
+//			}
+		}else {
+			map.put("url", "https://zskk-image.oss-cn-beijing.aliyuncs.com/" + key);
+			map.put("name", key);
+			postWithParameters(SAVE_ANNEX_URL, map);
 		}
 
 	}

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

@@ -24,7 +24,7 @@ public class PrintTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-		List<Record> records = Db.use("print").find("select top 60 * from IMAGEVIEW order by ADDTIME desc");
+		List<Record> records = Db.use("print").find("select top 80 * from IMAGEVIEW where ADDTIME >? order by ADDTIME desc",parseStringToDate1());
 		for (Record record : records) {
 			try {
 				if (record == null) {
@@ -76,5 +76,22 @@ public class PrintTask implements ITask {
 		}
         return timeString;
 	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * 
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate1() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date date = new Date();
+		String timeString = null;
+		Long i = date.getTime();
+		Long j = i - 43200;
+		Date newdate = new Date(j);
+		timeString = sdf.format(newdate);
+		return timeString;
+	}
 
 }