Selaa lähdekoodia

模式日历可能不成功,记录,增加fjd导出

menglu 3 vuotta sitten
vanhempi
commit
99d9d25681

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

@@ -139,8 +139,6 @@ public class DaemonThread extends Thread {
 			Repository.use_thread = !Constant.debug;
 			Repository.RepositoryBase = RepositoryContainer.RepositoryBase;
 			RWDRepositoryUtil.DoRepository(Repository, true);
-			log.warn("LoadCalendar");
-			RWDLoadUtil.LoadCalendar(Repository);
 			log.warn("compute finish");
 			RepositoryContainer.RepositoryBase.compute_finish = true;
 			// 查询可变集合
@@ -154,9 +152,18 @@ public class DaemonThread extends Thread {
 				}
 
 				try {
-					DeamonUtil.Process(Repository);
+					log.warn("refresh calendar start");
+					RWDLoadUtil.LoadCalendar(Repository);
+					log.warn("refresh calendar finish");
 				} catch (Exception e) {
-					e.printStackTrace();
+					log.error(e.getMessage(), e);
+				}
+				try {
+					log.warn("deamon start");
+					DeamonUtil.Process_deamon(Repository);
+					log.warn("deamon finish");
+				} catch (Exception e) {
+					log.error(e.getMessage(), e);
 				}
 			}
 		} catch (Exception e) {

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

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Component;
 import com.persagy.ibms.data.sdk.util.Constant;
 import com.persagy.ibms.data.sdk.util.FileUtil;
 import com.persagy.ibms.data.sdk.util.RWDDownloadUtil;
-import com.persagy.ibms.data.sdk.util.RWDLoadUtil;
 import com.persagy.ibms.data.sdk.util.RWDRepositoryUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 import com.persagy.ibms.data.sdk.util.RepositoryImpl;
@@ -89,8 +88,6 @@ public class RefreshThread extends Thread {
 					Repository.use_thread = !Constant.debug;
 					Repository.RepositoryBase = RepositoryContainer.RepositoryBase;
 					RWDRepositoryUtil.DoRepository(Repository, changed_physical_world || changed_zkt_physical_world);
-					log.warn("LoadCalendar");
-					RWDLoadUtil.LoadCalendar(Repository);
 					RepositoryContainer.instance = Repository;
 					log.warn("recompute finish");
 				}

+ 0 - 8
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/DeamonUtil.java

@@ -20,14 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class DeamonUtil {
-	public static void Process(RepositoryImpl Repository) throws Exception {
-		log.warn("deamon start");
-		log.warn("refresh_calendar");
-		RWDLoadUtil.LoadCalendar(Repository);
-		log.warn("refresh_deamon");
-		Process_deamon(Repository);
-		log.warn("deamon finish");
-	}
 
 	public static void Process_deamon(RepositoryBase Repository) throws Exception {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");

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

@@ -82,6 +82,8 @@ public class ExportUtil {
 	}
 
 	public static ResponseEntity<FileSystemResource> fjd_export(JSONArray parseArray) throws Exception {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat sdf_ = new SimpleDateFormat("yyyyMMddHHmmss");
 		Map<String, ExcelSheet> sheetMap = new HashMap<String, ExcelSheet>();
 		for (int i = 0; i < parseArray.size(); i++) {
 			JSONObject parseObject = parseArray.getJSONObject(i);
@@ -94,7 +96,7 @@ public class ExportUtil {
 			for (int ii = 0; ii < datas.size(); ii++) {
 				JSONObject data = datas.getJSONObject(ii);
 				List<String> contentList = new ArrayList<String>();
-				contentList.add(data.getString("data_time"));
+				contentList.add(sdf.format(sdf_.parse(data.getString("data_time"))));
 				contentList.add(data.getString("data_value"));
 				sheet.contentListList.add(contentList);
 			}

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

@@ -99,7 +99,16 @@ public class RWDRepositoryUtil {
 		log.warn("computeAll");
 		ComputeUtil.computeAll(Repository, spListList);
 		try {
-			DeamonUtil.Process(Repository);
+			log.warn("refresh calendar start");
+			RWDLoadUtil.LoadCalendar(Repository);
+			log.warn("refresh calendar finish");
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		try {
+			log.warn("deamon start");
+			DeamonUtil.Process_deamon(Repository);
+			log.warn("deamon finish");
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 		}