瀏覽代碼

Merge branch 'master' of http://git.sagacloud.cn/IBMS/ibms-sdk

menglu 3 年之前
父節點
當前提交
845eb12789
共有 22 個文件被更改,包括 200 次插入139 次删除
  1. 12 0
      ibms-data-sdk/docker/Dockerfile
  2. 6 0
      ibms-data-sdk/docker/deploy.sh
  3. 4 0
      ibms-data-sdk/docker/entrypoint.sh
  4. 15 0
      ibms-data-sdk/docker/ibms-data-sdk.yml
  5. 6 6
      ibms-data-sdk/pom.xml
  6. 3 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/AlarmDurationThread.java
  7. 2 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java
  8. 4 4
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/RefreshThread.java
  9. 3 3
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/WebSocketCheckThread.java
  10. 1 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestApi.java
  11. 24 52
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java
  12. 73 39
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java
  13. 1 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExcelCommonUtil.java
  14. 6 13
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExeclReadEquipStaticInfoUtil.java
  15. 6 5
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExportUtil.java
  16. 20 0
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/FileUtil.java
  17. 4 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/GZIPCompressUtil.java
  18. 5 5
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java
  19. 1 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java
  20. 2 2
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java
  21. 1 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/AlarmWebSocketClient.java
  22. 1 1
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/IOTWebSocketClient.java

+ 12 - 0
ibms-data-sdk/docker/Dockerfile

@@ -0,0 +1,12 @@
+#FROM openjdk:8-jdk-alpine 文件下载会出现空指针错误
+FROM java:8
+ARG WORKER_HOME
+RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
+RUN mkdir -p $WORKER_HOME/config
+COPY *.jar $WORKER_HOME/ibms-data-sdk.jar
+COPY entrypoint.sh $WORKER_HOME/
+RUN pwd
+WORKDIR $WORKER_HOME
+RUN ls
+ENTRYPOINT ["sh","./entrypoint.sh"]

+ 6 - 0
ibms-data-sdk/docker/deploy.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+docker stop ibms-data-sdk
+docker rm ibms-data-sdk
+docker rmi $(docker images | grep "ibms-data-sdk" | awk '{print $3}')
+docker-compose --env-file ./docker/.env -f ./docker/ibms-data-sdk.yml up -d
+docker logout labisenlin.persagy.com

+ 4 - 0
ibms-data-sdk/docker/entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "entrypoint run..."
+#注意此处目录为 pipeline 中定义的目录
+java -jar -Xms4096m -Xmx4096m -Dfile.encoding=utf-8 ibms-data-sdk.jar

+ 15 - 0
ibms-data-sdk/docker/ibms-data-sdk.yml

@@ -0,0 +1,15 @@
+version: '3'
+services:
+  ibms-data-sdk:
+    image: labisenlin.persagy.com/library/ibms-data-sdk:${tag}
+    container_name: ibms-data-sdk
+    restart: always
+    ports:
+      # 服务暴露端口号
+      - 8862:8862
+    volumes:
+      # ibms-data-sdk.yml 文件同级放config文件夹
+      - ./config/:/ibms-data-sdk/config/
+#      - ./zhiwuyuan-physical_world/:/ibms-data-sdk/zhiwuyuan-physical_world/
+    environment:
+      - server.port=8862

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

@@ -239,12 +239,12 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<excludes>
-						<exclude>*.properties</exclude>
-						<exclude>*.xml</exclude>
-						<exclude>*.json</exclude>
-						<exclude>*.xlsx</exclude>
-					</excludes>
+<!--					<excludes>-->
+<!--						<exclude>*.properties</exclude>-->
+<!--						<exclude>*.xml</exclude>-->
+<!--						<exclude>*.json</exclude>-->
+<!--						<exclude>*.xlsx</exclude>-->
+<!--					</excludes>-->
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>

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

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import javax.annotation.PostConstruct;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import com.persagy.ibms.core.data.SceneDataObject;
@@ -13,6 +14,7 @@ import com.persagy.ibms.data.sdk.util.RWDAlarmUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 
 @Component
+@Slf4j
 public class AlarmDurationThread extends Thread {
 	@PostConstruct
 	public void init() {
@@ -25,7 +27,7 @@ public class AlarmDurationThread extends Thread {
 			try {
 				Thread.sleep(1000L * 5);
 			} catch (InterruptedException e) {
-				e.printStackTrace();
+				log.error(e.getMessage(),e);
 			}
 
 			Date currentTime = new Date();

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

@@ -37,7 +37,7 @@ public class DaemonThread extends Thread {
 		try {
 			this.join();
 		} catch (InterruptedException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 	}
 
@@ -148,7 +148,7 @@ public class DaemonThread extends Thread {
 				try {
 					Thread.sleep(1000 * 60 * 5);
 				} catch (Exception e) {
-					e.printStackTrace();
+					log.error(e.getMessage(),e);
 				}
 
 				try {

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

@@ -32,7 +32,7 @@ public class RefreshThread extends Thread {
 		try {
 			this.join();
 		} catch (InterruptedException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 	}
 
@@ -41,7 +41,7 @@ public class RefreshThread extends Thread {
 			try {
 				Thread.sleep(1000L);
 			} catch (InterruptedException e) {
-				e.printStackTrace();
+				log.error(e.getMessage(),e);
 			}
 
 			if (RepositoryContainer.RepositoryBase.compute_finish) {
@@ -56,7 +56,7 @@ public class RefreshThread extends Thread {
 			try {
 				Thread.sleep(1000L);
 			} catch (InterruptedException e) {
-				e.printStackTrace();
+				log.error(e.getMessage(),e);
 			}
 
 			Date currTime = new Date();
@@ -92,7 +92,7 @@ public class RefreshThread extends Thread {
 					log.warn("recompute finish");
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
+				log.error(e.getMessage(),e);
 			}
 		}
 	}

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

@@ -27,7 +27,7 @@ public class WebSocketCheckThread extends Thread {
 			try {
 				Thread.sleep(1000L * 15);
 			} catch (InterruptedException e) {
-				e.printStackTrace();
+				log.error(e.getMessage(),e);
 			}
 
 			if (IOTWebSocketClient.client != null) {
@@ -39,7 +39,7 @@ public class WebSocketCheckThread extends Thread {
 					}
 				} catch (URISyntaxException e) {
 					log.warn(e.getMessage(), e);
-					e.printStackTrace();
+					log.error(e.getMessage(),e);
 				}
 			}
 			if (AlarmWebSocketClient.client != null) {
@@ -50,7 +50,7 @@ public class WebSocketCheckThread extends Thread {
 					}
 				} catch (URISyntaxException e) {
 					log.warn(e.getMessage(), e);
-					e.printStackTrace();
+					log.error(e.getMessage(),e);
 				}
 			}
 		}

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

@@ -53,7 +53,7 @@ public class RestApi {
 			long millisecond = Long.parseLong(sleep);
 			Thread.sleep(millisecond);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 		return body;
 	}

+ 24 - 52
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

@@ -1,49 +1,21 @@
 package com.persagy.ibms.data.sdk.service.rest;
 
-import java.io.File;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.http.ResponseEntity;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.persagy.ibms.core.data.SceneDataObject;
-import com.persagy.ibms.core.data.SceneDataPrimitive;
-import com.persagy.ibms.core.data.SceneDataSet;
-import com.persagy.ibms.core.data.SceneDataValue;
-import com.persagy.ibms.core.data.SceneProperty;
-import com.persagy.ibms.core.util.ComputeUtil;
-import com.persagy.ibms.core.util.FastJsonCompareUtil;
-import com.persagy.ibms.core.util.FastJsonReaderUtil;
-import com.persagy.ibms.core.util.FilterUtil;
-import com.persagy.ibms.core.util.IntWrapper;
-import com.persagy.ibms.core.util.LogUtil;
-import com.persagy.ibms.core.util.QueryAssist;
-import com.persagy.ibms.core.util.QueryUtil;
-import com.persagy.ibms.core.util.RecursiveUtil;
-import com.persagy.ibms.data.sdk.util.Constant;
-import com.persagy.ibms.data.sdk.util.ControlUtil;
-import com.persagy.ibms.data.sdk.util.DrawUtil;
-import com.persagy.ibms.data.sdk.util.ExeclReadEquipStaticInfoUtil;
-import com.persagy.ibms.data.sdk.util.ExportUtil;
-import com.persagy.ibms.data.sdk.util.HttpClientUtil;
-import com.persagy.ibms.data.sdk.util.RWDAlarmUtil;
-import com.persagy.ibms.data.sdk.util.RepositoryContainer;
-import com.persagy.ibms.data.sdk.util.RepositoryImpl;
-
+import com.persagy.ibms.core.data.*;
+import com.persagy.ibms.core.util.*;
+import com.persagy.ibms.data.sdk.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.ResponseEntity;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Slf4j
 public class RestUtil {
@@ -87,7 +59,7 @@ public class RestUtil {
 			}
 			return JSONObject.toJSONString(Content, SerializerFeature.WriteMapNullValue);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			result.put("Result", "failure");
 			result.put("Reason", LogUtil.GetExceptionStackTrace(e));
 		}
@@ -120,7 +92,7 @@ public class RestUtil {
 			String result = RestUtil.query(JSONObject.toJSONString(query_json_new, SerializerFeature.WriteMapNullValue));
 			return result;
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String error = LogUtil.GetExceptionStackTrace(e);
 			return error;
 		}
@@ -331,7 +303,7 @@ public class RestUtil {
 			Object valueJSON = ComputeUtil.getValueJSON(valueObject, read_level);
 			return JSONObject.toJSONString(valueJSON, SerializerFeature.WriteMapNullValue);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			return message;
@@ -353,7 +325,7 @@ public class RestUtil {
 		try {
 			if (valuePath[valuePath.length - 1].equals("工单")) {
 				JSONObject work_order = FastJsonReaderUtil.Instance()
-						.ReadJSONObject(new File(Constant.GetPath() + Constant.getSeperator() + "work_order_sample.json"));
+						.ReadJSONObject(FileUtil.file("work_order_sample.json"));
 				JSONArray work_orders = new JSONArray();
 				work_orders.add(work_order);
 				return work_orders;
@@ -364,7 +336,7 @@ public class RestUtil {
 				return valueJSON;
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			return message;
@@ -417,7 +389,7 @@ public class RestUtil {
 				result.put("success_count", success_points.size());
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("result", "failure");
@@ -439,7 +411,7 @@ public class RestUtil {
 			result.put("Content", Content);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");
@@ -517,7 +489,7 @@ public class RestUtil {
 			result.put("Content", parseArray);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");
@@ -569,7 +541,7 @@ public class RestUtil {
 			result.put("Content", datas);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");
@@ -645,7 +617,7 @@ public class RestUtil {
 				result.add(timeJSON);
 			}
 		} catch (ParseException e) {
-			// e.printStackTrace();
+			// log.error(e.getMessage(),e);
 		}
 		return result.toJSONString();
 	}
@@ -655,11 +627,11 @@ public class RestUtil {
 		try {
 			pointResult = fjd_query_inner(points);
 		} catch (Exception e) {
-			// e.printStackTrace();
+			// log.error(e.getMessage(),e);
 			try {
 				pointResult = fjd_query_inner(points);
 			} catch (Exception e1) {
-				// e.printStackTrace();
+				// log.error(e.getMessage(),e);
 			}
 		}
 		if (pointResult == null) {
@@ -723,7 +695,7 @@ public class RestUtil {
 			result.put("Content", datas);
 			result.put("Result", "success");
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("Result", "failure");

+ 73 - 39
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java

@@ -1,22 +1,22 @@
 package com.persagy.ibms.data.sdk.util;
 
-import java.io.File;
-import java.net.URL;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.File;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @SuppressWarnings({ "rawtypes" })
+@Slf4j
 public class Constant {
 	public static boolean debug = false;
 
@@ -46,29 +46,15 @@ public class Constant {
 	public static List<ConfigRelation> ConfigRelationList = new ArrayList<ConfigRelation>();
 	public static Map<String, Boolean> keyWordMap = new HashMap<String, Boolean>();
 
-	private static String Config_path = null;
-
-	public static String GetPath() {
-		return Config_path;
-	}
 
 	static {
-		String filepathLog4j;
-		URL urlDatabase = Constant.class.getResource("/logback-spring.xml");
-		if (urlDatabase == null) {
-			filepathLog4j = System.getProperty("user.dir") + "/logback-spring.xml";
-			Config_path = filepathLog4j.substring(0, filepathLog4j.length() - "/logback-spring.xml".length());
-		} else {
-			filepathLog4j = urlDatabase.getPath();
-			Config_path = filepathLog4j.substring(0, filepathLog4j.length() - "/logback-spring.xml".length());
-		}
 
 		try {
 			{
-				File xmlFile = new File(Constant.GetPath() + getSeperator() + "config.xml");
-				if (xmlFile.exists()) {
-					SAXReader saxReader = new SAXReader();
-					Document document = saxReader.read(xmlFile);
+				SAXReader saxReader = new SAXReader();
+				InputStream stream = getStream("config.xml");
+				Document document = saxReader.read(stream);
+				if (document != null) {
 					Iterator iter;
 					Element element;
 
@@ -188,7 +174,7 @@ public class Constant {
 				}
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 	}
 
@@ -205,7 +191,7 @@ public class Constant {
 							sdf.parse(fileIndex.getName());
 							nameList.add(fileIndex.getName());
 						} catch (ParseException e) {
-							// e.printStackTrace();
+							// log.error(e.getMessage(),e);
 						}
 					}
 				}
@@ -224,7 +210,7 @@ public class Constant {
 								sdf.parse(nameTrim);
 								nameList.add(nameTrim);
 							} catch (ParseException e) {
-								// e.printStackTrace();
+								// log.error(e.getMessage(),e);
 							}
 						}
 					}
@@ -252,7 +238,7 @@ public class Constant {
 							sdf.parse(fileIndex.getName());
 							nameList.add(fileIndex.getName());
 						} catch (ParseException e) {
-							// e.printStackTrace();
+							// log.error(e.getMessage(),e);
 						}
 					}
 				}
@@ -271,7 +257,7 @@ public class Constant {
 								sdf.parse(nameTrim);
 								nameList.add(nameTrim);
 							} catch (ParseException e) {
-								// e.printStackTrace();
+								// log.error(e.getMessage(),e);
 							}
 						}
 					}
@@ -285,12 +271,60 @@ public class Constant {
 		}
 		return null;
 	}
+	public static InputStream getStream(String resourc) {
+		if (resourc.startsWith(File.separator)) {
+			resourc = StrUtil.removePrefix(resourc, File.separator);
+		}
+		try {
+			// jar包同级config目录
+			String filePath = System.getProperty("user.dir") + File.separator + "config" + File.separator + resourc;
+			InputStream stream = ResourceUtil.getStream(filePath);
+			if (stream != null) {
+				log.info("使用1路径{}获取配置{}",filePath,resourc);
+				return stream;
+			}
+		} catch (Exception e) {
+		}
+		try {
+			// jar包同级目录
+			String filePath = System.getProperty("user.dir") + File.separator + resourc;
+			InputStream stream = ResourceUtil.getStream(filePath);
+			if (stream != null) {
+				log.info("使用2路径{}获取配置{}",filePath,resourc);
+				return stream;
+			}
+		} catch (Exception e) {
+		}
+		try {
+			// ClassPath目录
+			InputStream in = new org.springframework.core.io.ClassPathResource(File.separator + resourc).getInputStream();
+			if (in != null) {
+				log.info("使用3路径{}获取配置{}","ClassPathResource/"+resourc,resourc);
+				return in;
+			}
+		} catch (Exception e) {
+		}
+		try {
+			InputStream stream = Constant.class.getResourceAsStream(File.separator + resourc);
+			if (stream != null) {
+				log.info("使用4路径{}获取配置{}","resource/"+resourc,resourc);
+				return stream;
+			}
+		} catch (Exception e) {
+		}
+		try {
+			InputStream stream = new ClassPathResource(File.separator + resourc).getInputStream();
+			if (stream != null) {
+				log.info("使用5路径{}获取配置{}","ClassPathResource/"+resourc,resourc);
+				return stream;
+			}
+		} catch (Exception e) {
+		}
+		log.info("无法获取配置{}",resourc);
+		return null;
+	}
 
 	public static String getSeperator() {
-		if (System.getProperty("os.name").equals("Linux") || System.getProperty("os.name").equals("Mac OS X")) {
-			return "/";
-		} else {
-			return "\\";
-		}
+		return File.separator;
 	}
 }

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

@@ -305,7 +305,7 @@ public class ExcelCommonUtil {
 			default:
 			}
 		} catch (Exception e) {
-			// e.printStackTrace();
+			// log.error(e.getMessage(),e);
 		}
 
 		return cellText;

+ 6 - 13
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExeclReadEquipStaticInfoUtil.java

@@ -1,24 +1,17 @@
 package com.persagy.ibms.data.sdk.util;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddress;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
 
 public class ExeclReadEquipStaticInfoUtil {
 
 	public static JSONObject ReadEquipStaticInfo(String firstName, String sheetName) throws Exception {
-		String filepath = Constant.GetPath() + Constant.getSeperator() + firstName + ".xlsx";
-		FileInputStream fis = new FileInputStream(new File(filepath));
+		FileInputStream fis = new FileInputStream(FileUtil.file(firstName + ".xlsx"));
 		Workbook workbook = WorkbookFactory.create(new BufferedInputStream(fis));
 		Sheet sheet = workbook.getSheet(sheetName);
 		JSONObject object = new JSONObject();

+ 6 - 5
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExportUtil.java

@@ -13,6 +13,7 @@ import java.util.UUID;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
@@ -26,7 +27,7 @@ import com.persagy.ibms.core.util.FastJsonReaderUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-
+@Slf4j
 public class ExportUtil {
 	private static ResponseEntity<FileSystemResource> export(File file) {
 		if (file == null) {
@@ -47,7 +48,7 @@ public class ExportUtil {
 
 	public static ResponseEntity<FileSystemResource> alarm_export(JSONObject result) throws Exception {
 		JSONArray alarm_export_title = FastJsonReaderUtil.Instance()
-				.ReadJSONArray(new File(Constant.GetPath() + Constant.getSeperator() + "alarm_export_title.json"));
+				.ReadJSONArray(FileUtil.file("alarm_export_title.json"));
 		List<String> codeList = new ArrayList<String>();
 		List<String> titleList = new ArrayList<String>();
 		Map<String, String> titleMap = new HashMap<String, String>();
@@ -76,7 +77,7 @@ public class ExportUtil {
 		try {
 			ExcelCommonUtil.Write(filepath, sheetMap);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 		return ExportUtil.export(new File(filepath));
 	}
@@ -84,7 +85,7 @@ public class ExportUtil {
 	public static void alarm_export(JSONObject result, HttpServletResponse response) throws Exception {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss.SSS");
 		JSONArray alarm_export_title = FastJsonReaderUtil.Instance()
-				.ReadJSONArray(new File(Constant.GetPath() + Constant.getSeperator() + "alarm_export_title.json"));
+				.ReadJSONArray(FileUtil.file("alarm_export_title.json"));
 		JSONArray content = result.getJSONArray("content");
 		String xlsFileName = sdf.format(new Date()) + ".xlsx";
 		ExcelWriter writer = ExcelUtil.getBigWriter();
@@ -150,7 +151,7 @@ public class ExportUtil {
 		try {
 			ExcelCommonUtil.Write(filepath, sheetMap);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 		return ExportUtil.export(new File(filepath));
 	}

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

@@ -108,4 +108,24 @@ public class FileUtil {
 			}
 		}
 	}
+
+	/**
+	 * 判断文件是否存在,如果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;
+		}
+		if( cn.hutool.core.io.FileUtil.exist("config/" + path)){
+			return cn.hutool.core.io.FileUtil.file("config/" + path);
+		}
+		return cn.hutool.core.io.FileUtil.file( path);
+	}
 }

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

@@ -1,11 +1,13 @@
 package com.persagy.ibms.data.sdk.util;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
-
+@Slf4j
 public class GZIPCompressUtil {
 
 	public static String compress(String str) throws IOException {
@@ -38,7 +40,7 @@ public class GZIPCompressUtil {
 				out.write(buffer, 0, n);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 		return out.toByteArray();
 	}

+ 5 - 5
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -141,7 +141,7 @@ public class RWDAlarmUtil {
 				try {
 					RWDAlarmUtil.modify_alarm(alarm);
 				} catch (Exception e) {
-					e.printStackTrace();
+					log.error(e.getMessage(),e);
 					log.error(LogUtil.GetExceptionStackTrace(e));
 				}
 			}
@@ -149,7 +149,7 @@ public class RWDAlarmUtil {
 
 			result.put("result", "success");
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("result", "failure");
@@ -388,7 +388,7 @@ public class RWDAlarmUtil {
 			try {
 				RWDAlarmUtil.modify_alarm(alarm);
 			} catch (Exception e) {
-				e.printStackTrace();
+				log.error(e.getMessage(),e);
 				log.error(LogUtil.GetExceptionStackTrace(e));
 			}
 			RWDAlarmUtil.ProcessAlarm(alarm);
@@ -430,7 +430,7 @@ public class RWDAlarmUtil {
 			Date endDate = sdf.parse(endTimestamp);
 			return endDate.getTime() - startDate.getTime();
 		} catch (ParseException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 		return 0;
 	}
@@ -441,7 +441,7 @@ public class RWDAlarmUtil {
 			Date endDate = sdf.parse(endTimestamp);
 			return getTimeDiff(startDate, endDate);
 		} catch (ParseException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(),e);
 		}
 		return "0";
 	}

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

@@ -193,7 +193,7 @@ public class RWDDownloadUtil {
 					FastJsonUtil.toFormatString(infoArray));
 		}
 		Map<String, Map<String, Integer>> relDic = new HashMap<String, Map<String, Integer>>();
-		ExcelRelationUtil.ReadRel(Constant.GetPath() + Constant.getSeperator() + "relation.xlsx", relDic);
+		ExcelRelationUtil.ReadRel(FileUtil.file("relation.xlsx").getPath(), relDic);
 		for (String graphCode : relDic.keySet().toArray(new String[0])) {
 			File graph = new File(path + Constant.getSeperator() + "relation" + Constant.getSeperator() + graphCode);
 			if (!graph.exists()) {

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

@@ -505,12 +505,12 @@ public class RWDLoadUtil {
 				if (use_sample) {
 					if (BKDRHash.getHashCode(objId) % 3 == 0) {
 						JSONObject alarm = FastJsonReaderUtil.Instance()
-								.ReadJSONObject(new File(Constant.GetPath() + Constant.getSeperator() + "alarm_sample.json"));
+								.ReadJSONObject(FileUtil.file("alarm_sample.json"));
 						alarm.put("objId", objId);
 						try {
 							RWDAlarmUtil.modify_alarm(alarm);
 						} catch (Exception e) {
-							e.printStackTrace();
+							log.error(e.getMessage(),e);
 							log.error(LogUtil.GetExceptionStackTrace(e));
 						}
 						RWDAlarmUtil.ProcessAlarm(alarm);

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/AlarmWebSocketClient.java

@@ -59,7 +59,7 @@ public class AlarmWebSocketClient extends WebSocketClient {
 			try {
 				RWDAlarmUtil.modify_alarm(alarm);
 			} catch (Exception e) {
-				e.printStackTrace();
+				log.error(e.getMessage(),e);
 				log.error(LogUtil.GetExceptionStackTrace(e));
 			}
 			RWDAlarmUtil.ProcessAlarm(alarm);

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/IOTWebSocketClient.java

@@ -73,7 +73,7 @@ public class IOTWebSocketClient extends WebSocketClient {
 							try {
 								data.value_prim.value = Double.parseDouble(value);
 							} catch (Exception e) {
-								// e.printStackTrace();
+								// log.error(e.getMessage(),e);
 							}
 						} else if (type.equals("text")) {
 							data.value_prim.value = value;