Browse Source

迁移公共类

menglu 3 years ago
parent
commit
03d71c2c58
19 changed files with 75 additions and 484 deletions
  1. 1 1
      ibms-data-sdk/pom.xml
  2. 2 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java
  3. 3 3
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_config.java
  4. 2 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_ibms.java
  5. 2 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_rwd.java
  6. 2 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_zkt.java
  7. 1 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/RefreshThread.java
  8. 32 18
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/BaseApi.java
  9. 1 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/BaseUtil.java
  10. 0 14
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ConfigRefresh.java
  11. 2 0
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java
  12. 1 0
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExeclReadEquipStaticInfoUtil.java
  13. 1 0
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExportUtil.java
  14. 0 234
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/FileUtil.java
  15. 0 84
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/LogOfDownload.java
  16. 0 111
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/LogOfRun.java
  17. 20 7
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java
  18. 1 0
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java
  19. 4 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RepositoryProject.java

+ 1 - 1
ibms-data-sdk/pom.xml

@@ -214,7 +214,7 @@
 		<dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>sailfish</artifactId>
-			<version>0.0.34</version>
+			<version>0.0.35</version>
 		</dependency>
 	</dependencies>
 

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java

@@ -11,13 +11,13 @@ import javax.annotation.PostConstruct;
 import org.springframework.stereotype.Component;
 
 import com.persagy.ibms.core.util.KeywordUtil;
+import com.persagy.ibms.core.util.LogOfDownload;
+import com.persagy.ibms.core.util.LogOfRun;
 import com.persagy.ibms.core.util.LogUtil;
 import com.persagy.ibms.core.util.RepositoryComputeThread;
 import com.persagy.ibms.data.sdk.test.CheckTest;
 import com.persagy.ibms.data.sdk.util.Constant;
 import com.persagy.ibms.data.sdk.util.DeamonUtil;
-import com.persagy.ibms.data.sdk.util.LogOfDownload;
-import com.persagy.ibms.data.sdk.util.LogOfRun;
 import com.persagy.ibms.data.sdk.util.RWDLoadUtil;
 import com.persagy.ibms.data.sdk.util.RWDRepositoryUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;

+ 3 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_config.java

@@ -8,11 +8,11 @@ import javax.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 
+import com.persagy.ibms.core.util.ConfigRefresh;
+import com.persagy.ibms.core.util.FileUtil;
+import com.persagy.ibms.core.util.LogOfDownload;
 import com.persagy.ibms.core.util.LogUtil;
-import com.persagy.ibms.data.sdk.util.ConfigRefresh;
 import com.persagy.ibms.data.sdk.util.Constant;
-import com.persagy.ibms.data.sdk.util.FileUtil;
-import com.persagy.ibms.data.sdk.util.LogOfDownload;
 import com.persagy.ibms.data.sdk.util.RWDDownloadUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_ibms.java

@@ -6,10 +6,10 @@ import javax.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 
+import com.persagy.ibms.core.util.ConfigRefresh;
+import com.persagy.ibms.core.util.LogOfDownload;
 import com.persagy.ibms.core.util.LogUtil;
-import com.persagy.ibms.data.sdk.util.ConfigRefresh;
 import com.persagy.ibms.data.sdk.util.Constant;
-import com.persagy.ibms.data.sdk.util.LogOfDownload;
 import com.persagy.ibms.data.sdk.util.RWDDownloadUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_rwd.java

@@ -6,10 +6,10 @@ import javax.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 
+import com.persagy.ibms.core.util.ConfigRefresh;
+import com.persagy.ibms.core.util.LogOfDownload;
 import com.persagy.ibms.core.util.LogUtil;
-import com.persagy.ibms.data.sdk.util.ConfigRefresh;
 import com.persagy.ibms.data.sdk.util.Constant;
-import com.persagy.ibms.data.sdk.util.LogOfDownload;
 import com.persagy.ibms.data.sdk.util.RWDDownloadUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DownloadThread_zkt.java

@@ -6,10 +6,10 @@ import javax.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 
+import com.persagy.ibms.core.util.ConfigRefresh;
+import com.persagy.ibms.core.util.LogOfDownload;
 import com.persagy.ibms.core.util.LogUtil;
-import com.persagy.ibms.data.sdk.util.ConfigRefresh;
 import com.persagy.ibms.data.sdk.util.Constant;
-import com.persagy.ibms.data.sdk.util.LogOfDownload;
 import com.persagy.ibms.data.sdk.util.RWDDownloadUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/RefreshThread.java

@@ -6,9 +6,9 @@ import javax.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 
+import com.persagy.ibms.core.util.LogOfRun;
 import com.persagy.ibms.core.util.LogUtil;
 import com.persagy.ibms.data.sdk.util.Constant;
-import com.persagy.ibms.data.sdk.util.LogOfRun;
 import com.persagy.ibms.data.sdk.util.RWDRepositoryUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 import com.persagy.ibms.data.sdk.util.RepositoryImpl;

+ 32 - 18
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/BaseApi.java

@@ -19,11 +19,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.persagy.ibms.core.util.CheckUtil;
+import com.persagy.ibms.core.util.LogOfDownload;
+import com.persagy.ibms.core.util.LogOfRun;
 import com.persagy.ibms.data.sdk.service.websocket.server.WebSocketChannelInfo;
 import com.persagy.ibms.data.sdk.service.websocket.server.WebSocketChannelPool;
 import com.persagy.ibms.data.sdk.service.websocket.server.WebSocketUtil;
-import com.persagy.ibms.data.sdk.util.LogOfDownload;
-import com.persagy.ibms.data.sdk.util.LogOfRun;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 import com.persagy.ibms.data.sdk.util.ToolUtil;
 import com.persagy.ibms.data.sdk.websocket.AlarmWebSocketClient;
@@ -142,6 +142,19 @@ public class BaseApi {
 		return JSONObject.toJSONString(result, SerializerFeature.WriteMapNullValue);
 	}
 
+	@GetMapping(path = "/LogOfAlarmList/{count}", produces = "application/json;charset=UTF-8")
+	public JSONArray LogOfAlarmList(@PathVariable("count") int count) {
+		JSONArray result = new JSONArray();
+		if (count == 0) {
+			count = Integer.MAX_VALUE;
+		}
+		for (int i = 0; i < count && i < RepositoryContainer.RepositoryProject.LogOfAlarmList.size() - 1; i++) {
+			JSONObject LogOfRun = RepositoryContainer.RepositoryProject.LogOfAlarmList.get(i);
+			result.add(LogOfRun);
+		}
+		return result;
+	}
+
 	@PostMapping(path = { "/RefreshCommand" }, produces = "application/json;charset=UTF-8")
 	public String RefreshCommand(@RequestBody String param) {
 		JSONObject paramJSON = JSON.parseObject(param);
@@ -167,35 +180,36 @@ public class BaseApi {
 		return result;
 	}
 
-	@GetMapping(path = "/LogOfAlarmList/{count}", produces = "application/json;charset=UTF-8")
-	public JSONArray LogOfAlarmList(@PathVariable("count") int count) {
+	@GetMapping(path = "/SuccessLogOfRunList", produces = "application/json;charset=UTF-8")
+	public JSONArray SuccessLogOfRunList() {
 		JSONArray result = new JSONArray();
-		if (count == 0) {
-			count = Integer.MAX_VALUE;
-		}
-		for (int i = 0; i < count && i < RepositoryContainer.RepositoryProject.LogOfAlarmList.size() - 1; i++) {
-			JSONObject LogOfRun = RepositoryContainer.RepositoryProject.LogOfAlarmList.get(i);
-			result.add(LogOfRun);
+		for (LogOfRun LogOfRun : RepositoryContainer.RepositoryProject.SuccessLogOfRunList) {
+			result.add(LogOfRun.toJSON());
 		}
 		return result;
 	}
 
-	@GetMapping(path = "/LogOfDownload/{name}", produces = "application/json;charset=UTF-8")
-	public JSONObject LogOfDownload(@PathVariable("name") String name) {
-		JSONObject result = null;
+	@GetMapping(path = "/LogOfDownloadList/{name}/{count}", produces = "application/json;charset=UTF-8")
+	public JSONArray LogOfDownloadList(@PathVariable("name") String name, @PathVariable("count") int count) {
+		JSONArray result = new JSONArray();
+		if (count == 0) {
+			count = Integer.MAX_VALUE;
+		}
 		List<LogOfDownload> list = RepositoryContainer.RepositoryProject.LogOfDownloadListMap.get(name);
-		LogOfDownload LogOfDownload = list.get(0);
-		result = LogOfDownload.toJSON();
+		for (int i = 0; i < count && i < list.size() - 1; i++) {
+			JSONObject LogOfRun = list.get(i).toJSON();
+			result.add(LogOfRun);
+		}
 		return result;
 	}
 
-	@GetMapping(path = "/LogOfDownloadList/{name}/{count}", produces = "application/json;charset=UTF-8")
-	public JSONArray LogOfDownloadList(@PathVariable("name") String name, @PathVariable("count") int count) {
+	@GetMapping(path = "/SuccessLogOfDownloadList/{name}/{count}", produces = "application/json;charset=UTF-8")
+	public JSONArray SuccessLogOfDownloadList(@PathVariable("name") String name, @PathVariable("count") int count) {
 		JSONArray result = new JSONArray();
 		if (count == 0) {
 			count = Integer.MAX_VALUE;
 		}
-		List<LogOfDownload> list = RepositoryContainer.RepositoryProject.LogOfDownloadListMap.get(name);
+		List<LogOfDownload> list = RepositoryContainer.RepositoryProject.SuccessLogOfDownloadListMap.get(name);
 		for (int i = 0; i < count && i < list.size() - 1; i++) {
 			JSONObject LogOfRun = list.get(i).toJSON();
 			result.add(LogOfRun);

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/BaseUtil.java

@@ -10,9 +10,9 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.persagy.ibms.core.data.SceneDataObject;
 import com.persagy.ibms.core.data.SceneDataValue;
 import com.persagy.ibms.core.util.ComputeUtil;
+import com.persagy.ibms.core.util.ConfigRefresh;
 import com.persagy.ibms.core.util.LogUtil;
 import com.persagy.ibms.core.util.RecursiveUtil;
-import com.persagy.ibms.data.sdk.util.ConfigRefresh;
 import com.persagy.ibms.data.sdk.util.Constant;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 import com.persagy.ibms.data.sdk.util.RepositoryImpl;

+ 0 - 14
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ConfigRefresh.java

@@ -1,14 +0,0 @@
-package com.persagy.ibms.data.sdk.util;
-
-import java.util.Date;
-
-public class ConfigRefresh {
-	public boolean enable;
-	public long interval_second;
-	public Date last_refresh;
-
-	public ConfigRefresh(boolean enable, long interval_second) {
-		this.enable = enable;
-		this.interval_second = interval_second;
-	}
-}

+ 2 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java

@@ -17,6 +17,8 @@ import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 import org.springframework.core.io.ClassPathResource;
 
+import com.persagy.ibms.core.util.ConfigRefresh;
+
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExeclReadEquipStaticInfoUtil.java

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.ibms.core.data.SceneDataObject;
 import com.persagy.ibms.core.data.SceneDataSet;
+import com.persagy.ibms.core.util.FileUtil;
 
 public class ExeclReadEquipStaticInfoUtil {
 

+ 1 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExportUtil.java

@@ -26,6 +26,7 @@ import org.springframework.http.ResponseEntity;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.ibms.core.util.FastJsonReaderUtil;
+import com.persagy.ibms.core.util.FileUtil;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;

+ 0 - 234
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/FileUtil.java

@@ -1,234 +0,0 @@
-package com.persagy.ibms.data.sdk.util;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.persagy.ibms.core.util.FastJsonCompareUtil;
-import com.persagy.ibms.core.util.FastJsonReaderUtil;
-
-import cn.hutool.core.util.StrUtil;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class FileUtil {
-	public static void Save(String filename, String content) throws Exception {
-		Save(filename, content, null);
-	}
-
-	public static void Save(String filename, String content, List<JSONObject> downloadList) throws Exception {
-		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(filename), "UTF-8"));
-		writer.write(content);
-		writer.close();
-		if (downloadList != null) {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-			JSONObject json = new JSONObject();
-			json.put("time", sdf.format(new Date()));
-			json.put("filename", filename);
-			json.put("filesize", content.length());
-			downloadList.add(json);
-		}
-	}
-
-	public static void deleteRecursive(File file) {
-		if (!file.exists()) {
-			return;
-		}
-
-		if (file.isDirectory()) {
-			File[] fs = file.listFiles();
-			for (int i = 0; i < fs.length; i++) {
-				File f = fs[i];
-				if (f.isFile()) {
-					f.delete();
-				} else if (f.isDirectory()) {
-					deleteRecursive(f);
-					f.delete();
-				}
-			}
-		}
-		file.delete();
-	}
-
-	public static boolean compareRecursive(File file1, File file2, LogOfDownload LogOfDownload) throws Exception {
-		if (file1.isDirectory() && file2.isDirectory()) {
-			boolean result = true;
-			Map<String, File> fileMap1 = new ConcurrentHashMap<String, File>();
-			Map<String, File> dirMap1 = new ConcurrentHashMap<String, File>();
-			draw(file1, fileMap1, dirMap1);
-			Map<String, File> fileMap2 = new ConcurrentHashMap<String, File>();
-			Map<String, File> dirMap2 = new ConcurrentHashMap<String, File>();
-			draw(file2, fileMap2, dirMap2);
-
-			if (!compareKey(fileMap1, fileMap2) || !compareKey(dirMap1, dirMap2)) {
-				result = false;
-
-				if (LogOfDownload != null) {
-					JSONArray file_old = new JSONArray();
-					JSONArray file_new = new JSONArray();
-					JSONArray dir_old = new JSONArray();
-					JSONArray dir_new = new JSONArray();
-					if (!compareKey(fileMap1, fileMap2)) {
-						for (String key : fileMap1.keySet()) {
-							if (!fileMap2.containsKey(key)) {
-								file_old.add(fileMap1.get(key).getPath());
-							}
-						}
-						for (String key : fileMap2.keySet()) {
-							if (!fileMap1.containsKey(key)) {
-								file_new.add(fileMap2.get(key).getPath());
-							}
-						}
-					}
-					if (!compareKey(dirMap1, dirMap2)) {
-						for (String key : dirMap1.keySet()) {
-							if (!dirMap2.containsKey(key)) {
-								dir_old.add(dirMap1.get(key).getPath());
-							}
-						}
-						for (String key : dirMap2.keySet()) {
-							if (!dirMap1.containsKey(key)) {
-								dir_new.add(dirMap2.get(key).getPath());
-							}
-						}
-					}
-					JSONObject file_change = new JSONObject();
-					file_change.put("dir_name", file1.getPath());
-					if (file_old.size() > 0) {
-						file_change.put("file_old", file_old);
-					}
-					if (file_new.size() > 0) {
-						file_change.put("file_new", file_new);
-					}
-					if (dir_old.size() > 0) {
-						file_change.put("dir_old", dir_old);
-					}
-					if (dir_new.size() > 0) {
-						file_change.put("dir_new", dir_new);
-					}
-					LogOfDownload.changeList.add(file_change);
-				}
-			}
-
-			for (String key : fileMap1.keySet()) {
-				if (fileMap2.containsKey(key)) {
-					File tmp1 = fileMap1.get(key);
-					File tmp2 = fileMap2.get(key);
-					if (!compareRecursive(tmp1, tmp2, LogOfDownload)) {
-						result = false;
-					}
-				}
-			}
-			for (String key : dirMap1.keySet()) {
-				if (dirMap2.containsKey(key)) {
-					File tmp1 = dirMap1.get(key);
-					File tmp2 = dirMap2.get(key);
-					if (!compareRecursive(tmp1, tmp2, LogOfDownload)) {
-						result = false;
-					}
-				}
-			}
-
-			return result;
-		} else if (file1.isFile() && file2.isFile()) {
-			Object json1 = FastJsonReaderUtil.Instance().Read(file1);
-			Object json2 = FastJsonReaderUtil.Instance().Read(file2);
-			boolean file_compare = FastJsonCompareUtil.Instance().CompareObject(json1, json2, true);
-			// boolean file_compare = file1.length() == file2.length();
-			log.debug("Compare " + file1.getPath() + " " + file2.getPath() + "\t" + file_compare);
-			if (!file_compare) {
-				if (LogOfDownload != null) {
-					JSONObject file_change = new JSONObject();
-					file_change.put("file_name", file1.getPath());
-					file_change.put("length_old", file1.length());
-					file_change.put("length_new", file2.length());
-					LogOfDownload.changeList.add(file_change);
-				}
-			}
-			return file_compare;
-		} else {
-			return false;
-		}
-	}
-
-	private static boolean compareKey(Map<String, File> Map1, Map<String, File> Map2) {
-		if (Map1.size() != Map2.size()) {
-			return false;
-		}
-
-		for (String key1 : Map1.keySet()) {
-			if (!Map2.containsKey(key1)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static void draw(File file1, Map<String, File> fileMap1, Map<String, File> dirMap1) {
-		File[] fs1 = file1.listFiles();
-		for (int i = 0; i < fs1.length; i++) {
-			File f = fs1[i];
-			if (f.isFile()) {
-				if (f.getName().endsWith(".json")) {
-					fileMap1.put(f.getName(), f);
-				}
-			} else if (f.isDirectory()) {
-				dirMap1.put(f.getName(), f);
-			}
-		}
-	}
-
-	/**
-	 * 判断文件是否存在,如果path为null,则返回false
-	 *
-	 * @param path
-	 *            文件路径
-	 * @return 如果存在返回true
-	 */
-	public static boolean exist(String path) {
-		return (null != path) && (cn.hutool.core.io.FileUtil.file("config/" + path).exists() || cn.hutool.core.io.FileUtil.file(path).exists());
-	}
-
-	public static File file(String path) {
-		if (null == path) {
-			return null;
-		}
-		path = StrUtil.removePrefix(path, File.separator);
-		String filePath = System.getProperty("user.dir") + File.separator + "config" + File.separator + path;
-		if (cn.hutool.core.io.FileUtil.exist(filePath)) {
-			log.info("文件{}获取1路径:{}", path, filePath);
-			return cn.hutool.core.io.FileUtil.file(filePath);
-		}
-		filePath = System.getProperty("user.dir") + File.separator + path;
-		if (cn.hutool.core.io.FileUtil.exist(filePath)) {
-			log.info("文件{}获取2路径:{}", path, filePath);
-			return cn.hutool.core.io.FileUtil.file(filePath);
-		}
-		if (cn.hutool.core.io.FileUtil.exist("config/" + path)) {
-			log.info("文件{}获取3路径:{}", path, cn.hutool.core.io.FileUtil.file("config/" + path).getPath());
-			return cn.hutool.core.io.FileUtil.file("config/" + path);
-		}
-		if (cn.hutool.core.io.FileUtil.exist(path)) {
-			log.info("文件{}获取4路径:{}", path, cn.hutool.core.io.FileUtil.file(path).getPath());
-			return cn.hutool.core.io.FileUtil.file(path);
-		}
-		log.info("文件{}获取5路径:{}", path, path);
-		return new File(path);
-	}
-
-	// public static File file(String path) {
-	// if (null == path) {
-	// return null;
-	// }
-	// return new File(path);
-	// }
-}

+ 0 - 84
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/LogOfDownload.java

@@ -1,84 +0,0 @@
-package com.persagy.ibms.data.sdk.util;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-public class LogOfDownload {
-	private SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-
-	public Date startTime;
-	public Date endTime;
-	public List<JSONObject> downloadList = new CopyOnWriteArrayList<JSONObject>();
-	public String pathOld;
-	public String pathNew;
-	public long fileCountOld;
-	public long fileSizeOld;
-	public long fileCountNew;
-	public long fileSizeNew;
-	public List<JSONObject> changeList = new CopyOnWriteArrayList<JSONObject>();
-	public List<JSONObject> errorList = new CopyOnWriteArrayList<JSONObject>();
-	public String status;// running,success,failure
-
-	public LogOfDownload() {
-		this.startTime = new Date();
-	}
-
-	public synchronized void error(String path, String message) {
-		JSONObject item = new JSONObject();
-		item.put("path", path);
-		item.put("message", message);
-		if (this.errorList.size() <= 1024) {
-			this.errorList.add(item);
-		}
-	}
-
-	public synchronized JSONObject toJSON() {
-		JSONObject result = new JSONObject();
-		if (startTime != null) {
-			result.put("startTime", sdf.format(startTime));
-		}
-		// {
-		// JSONArray downloadArray = new JSONArray();
-		// downloadArray.addAll(downloadList);
-		// result.put("downloadArray", downloadArray);
-		// }
-		if (downloadList.size() > 0) {
-			int downloadCount = 0;
-			long donwloadSize = 0L;
-			for (JSONObject item : downloadList) {
-				downloadCount++;
-				donwloadSize += item.getLong("filesize");
-			}
-			result.put("downloadCount", downloadCount);
-			result.put("donwloadSize", donwloadSize);
-		}
-		{
-			JSONArray changeArray = new JSONArray();
-			changeArray.addAll(changeList);
-			result.put("changeArray", changeArray);
-		}
-		{
-			JSONArray errorArray = new JSONArray();
-			errorArray.addAll(errorList);
-			result.put("errorArray", errorArray);
-		}
-		if (pathOld != null) {
-			result.put("pathOld", pathOld);
-		}
-		if (pathNew != null) {
-			result.put("pathNew", pathNew);
-		}
-		if (endTime != null) {
-			result.put("endTime", sdf.format(endTime));
-		}
-		if (status != null) {
-			result.put("status", status);
-		}
-		return result;
-	}
-}

+ 0 - 111
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/LogOfRun.java

@@ -1,111 +0,0 @@
-package com.persagy.ibms.data.sdk.util;
-
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import com.alibaba.fastjson.JSONObject;
-
-import cn.hutool.json.JSONArray;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class LogOfRun {
-	private SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-
-	public Date startTime;
-	public Date endTime;
-	public Map<String, String> contentTime = new ConcurrentHashMap<String, String>();
-	public Map<String, String> contentTimeLast = new ConcurrentHashMap<String, String>();
-	public int step_count;
-	public List<JSONObject> stepList = new CopyOnWriteArrayList<JSONObject>();
-	public List<JSONObject> errorList = new CopyOnWriteArrayList<JSONObject>();
-	public String status;// running,success,failure
-
-	public LogOfRun() {
-		this.startTime = new Date();
-	}
-
-	public synchronized void setTime(String name, String oldTime, String newTime) {
-		log.warn(name + ": " + (oldTime == null ? "" : oldTime + " -> ") + newTime);
-		if (oldTime != null) {
-			this.contentTimeLast.put(name, oldTime);
-		}
-		this.contentTime.put(name, newTime);
-	}
-
-	public synchronized void error(String path, String message) {
-		JSONObject item = new JSONObject();
-		item.put("path", path);
-		item.put("message", message);
-		if (this.errorList.size() <= 1024) {
-			this.errorList.add(item);
-		}
-	}
-
-	public synchronized JSONObject toJSON() {
-		JSONObject result = new JSONObject();
-		if (startTime != null) {
-			result.put("startTime", sdf.format(startTime));
-		}
-		String[] keys = contentTime.keySet().toArray(new String[0]);
-		Arrays.sort(keys);
-		JSONObject content = new JSONObject();
-		for (String key : keys) {
-			String time = (contentTimeLast.containsKey(key) ? contentTimeLast.get(key) + " -> " : "") + contentTime.get(key);
-			content.put(key, time);
-		}
-		result.put("content", content);
-		if (this.step_count > 0) {
-			result.put("step_count", step_count);
-		}
-		{
-			JSONArray stepArray = new JSONArray();
-			for (JSONObject step : stepList) {
-				stepArray.add(step);
-			}
-			result.put("stepArray", stepArray);
-		}
-		{
-			JSONArray errorArray = new JSONArray();
-			for (JSONObject error : errorList) {
-				errorArray.add(error);
-			}
-			result.put("errorArray", errorArray);
-		}
-		if (endTime != null) {
-			result.put("endTime", sdf.format(endTime));
-		}
-		if (status != null) {
-			result.put("status", status);
-		}
-		return result;
-	}
-
-	@Override
-	public synchronized String toString() {
-		StringBuffer sb = new StringBuffer();
-		if (startTime != null) {
-			sb.append("startTime: " + sdf.format(startTime));
-		}
-		String[] keys = contentTime.keySet().toArray(new String[0]);
-		Arrays.sort(keys);
-		for (String key : keys) {
-			sb.append("<BR>");
-			sb.append(key + ": " + (contentTimeLast.containsKey(key) ? contentTimeLast.get(key) + " -> " : "") + contentTime.get(key));
-		}
-		if (endTime != null) {
-			sb.append("<BR>");
-			sb.append("endTime: " + sdf.format(endTime));
-		}
-		if (status != null) {
-			sb.append("<BR>");
-			sb.append("status: " + status);
-		}
-		return sb.toString();
-	}
-}

+ 20 - 7
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -14,6 +14,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.ibms.core.util.FastJsonUtil;
+import com.persagy.ibms.core.util.FileUtil;
+import com.persagy.ibms.core.util.LogOfDownload;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -572,8 +574,14 @@ public class RWDDownloadUtil {
 			criteria.put("userId", "systemId");
 			criteria.put("projectId", RepositoryContainer.RepositoryProject.projectId);
 			criteria.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
-			classArray = post_by_page("zkt_monitor", Constant.zkt_monitor_url + "/logicalGrouping/list", criteria, page_size);
-			FileUtil.Save(path + Constant.getSeperator() + "groupArray.json", FastJsonUtil.toFormatString(classArray), LogOfDownload.downloadList);
+			try {
+				classArray = post_by_page("zkt_monitor", Constant.zkt_monitor_url + "/logicalGrouping/list", criteria, page_size);
+				FileUtil.Save(path + Constant.getSeperator() + "groupArray.json", FastJsonUtil.toFormatString(classArray),
+						LogOfDownload.downloadList);
+			} catch (Exception e) {
+				log.error("/logicalGrouping/list" + "\n" + FastJsonUtil.toFormatString(criteria), e);
+				throw e;
+			}
 		}
 		Map<String, Map<String, List<String>>> idListMapMap = new ConcurrentHashMap<String, Map<String, List<String>>>();
 		for (int i = 0; i < classArray.size(); i++) {
@@ -606,12 +614,17 @@ public class RWDDownloadUtil {
 					criteria.put("projectId", RepositoryContainer.RepositoryProject.projectId);
 					criteria.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
 					criteria.put("logicalGroupingId", logicalGroupingId);
-					JSONArray Content = post_by_page("zkt_monitor", Constant.zkt_monitor_url + "/logicalObject/listPage", criteria, page_size);
-					for (int i = 0; i < Content.size(); i++) {
-						JSONObject ContentItem = (JSONObject) Content.get(i);
-						ContentItem.put("logicalGroupingId", logicalGroupingId);
+					try {
+						JSONArray Content = post_by_page("zkt_monitor", Constant.zkt_monitor_url + "/logicalObject/listPage", criteria, page_size);
+						for (int i = 0; i < Content.size(); i++) {
+							JSONObject ContentItem = (JSONObject) Content.get(i);
+							ContentItem.put("logicalGroupingId", logicalGroupingId);
+						}
+						infoArray.addAll(Content);
+					} catch (Exception e) {
+						log.error("/logicalObject/listPage" + "\n" + FastJsonUtil.toFormatString(criteria), e);
+						throw e;
 					}
-					infoArray.addAll(Content);
 				}
 				infoArray = infoArray == null ? new JSONArray() : infoArray;
 				FileUtil.Save(path + Constant.getSeperator() + ibmsSceneCode + Constant.getSeperator() + ibmsClassCode + ".json",

+ 1 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -19,6 +19,7 @@ import com.persagy.ibms.core.data.SceneDataSet;
 import com.persagy.ibms.core.data.SceneDataValue;
 import com.persagy.ibms.core.util.FastJsonReaderUtil;
 import com.persagy.ibms.core.util.FastJsonUtil;
+import com.persagy.ibms.core.util.FileUtil;
 import com.persagy.ibms.core.util.LogUtil;
 import com.persagy.ibms.core.util.RWDUtil;
 

+ 4 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RepositoryProject.java

@@ -10,6 +10,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.persagy.ibms.core.data.SceneDataObject;
 import com.persagy.ibms.core.data.SceneDataSet;
 import com.persagy.ibms.core.data.SceneDataValue;
+import com.persagy.ibms.core.util.LogOfDownload;
+import com.persagy.ibms.core.util.LogOfRun;
 
 public class RepositoryProject {
 	public String groupCode;
@@ -34,12 +36,12 @@ public class RepositoryProject {
 	// 限流用
 	public ConcurrentHashMap<String, ConcurrentHashMap<String, Date>> ip2param2time = new ConcurrentHashMap<String, ConcurrentHashMap<String, Date>>();
 
+	public List<JSONObject> LogOfAlarmList = new CopyOnWriteArrayList<JSONObject>();
+
 	public LogOfRun LogOfRun;
 	public List<LogOfRun> LogOfRunList = new CopyOnWriteArrayList<LogOfRun>();
 	public List<LogOfRun> SuccessLogOfRunList = new CopyOnWriteArrayList<LogOfRun>();
 
-	public List<JSONObject> LogOfAlarmList = new CopyOnWriteArrayList<JSONObject>();
-
 	public Map<String, List<LogOfDownload>> LogOfDownloadListMap = new ConcurrentHashMap<String, List<LogOfDownload>>();
 	public Map<String, List<LogOfDownload>> SuccessLogOfDownloadListMap = new ConcurrentHashMap<String, List<LogOfDownload>>();