From 794e63e4cc2f153441604a72364dbb63a259da9b Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期六, 12 十月 2024 11:19:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
.gitignore | 11 +++++++++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml | 10 ++++++----
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleReqDTO.java | 5 +++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/resources/application-prod.yml | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yaml | 10 ++++++----
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java | 2 ++
8 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3f7ae50
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+/iailab-module-ai/
+/*/*/target/
+/.idea/
+/derby.log
+/iailab-plat.iml
+/.flattened-pom.xml
+/*/.flattened-pom.xml
+/*/*/.flattened-pom.xml
+/*/replay_pid15548.log
+/logs/
+/*/*/*.iml
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java
similarity index 99%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java
index 1bb4e80..4072571 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java
@@ -40,7 +40,7 @@
@RestController
@RequestMapping("/api/data")
@Tag(name = "数据")
-public class DataController {
+public class ApiDataController {
@Resource
private DaPointService daPointService;
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/IndItemController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java
similarity index 98%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/IndItemController.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java
index bbc9c15..86b5abf 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/IndItemController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java
@@ -29,7 +29,7 @@
@RestController
@RequestMapping("/api/data/ind-item")
@Tag(name = "指标")
-public class IndItemController {
+public class ApiIndItemController {
@Autowired
private IndItemCollector indItemCollector;
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml
index 80f21a9..90f45e0 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml
@@ -50,10 +50,12 @@
# password: 123456 # 密码，建议生产环境开启
influx-db:
- org: IAILab
- bucket: whs_data
- token: gxhXM4H1VOBv07kYXKWyPag_zJ8_oChP4ooZ3u-BkSae9LS8R1wWzJYlmUjL3Qe9t1hDU3DtoYD5HTgjWoTGOg==
- url: http://localhost:8086
+ org: iailab
+ bucket: iailab_data
+ token: 2_wr57sVbZQx2QHhN3wWNGOCOtPan_NdCu06NsCGcB8G7rjhjK3yHcLf3uTXE9xkjHHSQwo37E1Mxa0367qXgg==
+ url: http://172.16.8.200:8086
+ username: root
+ password: iailab12345678
iems:
upload-dir: D:/DLUT/upload/
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-prod.yml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-prod.yml
index 5d3d877..79ac1f5 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-prod.yml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-prod.yml
@@ -61,7 +61,7 @@
token: FLkSbhpYgPrMJBNnOdmxuY3YcG8D_roPtdGPEhwXW9JSxJkEPe1sXUkrYgWcV-nOL9Zjm09RoTfMW44NoRYaXA==
url: http://192.168.55.180:8086
username: root
- password: ntt12345678
+ password: iailab12345678
iems:
upload-dir: C:/DLUT/upload/
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yaml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yaml
index 52382fa..3f9ce6a 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yaml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yaml
@@ -50,10 +50,12 @@
password: 123456 # 密码，建议生产环境开启
influx-db:
- org: IAILab
- bucket: whs_data
- token: gxhXM4H1VOBv07kYXKWyPag_zJ8_oChP4ooZ3u-BkSae9LS8R1wWzJYlmUjL3Qe9t1hDU3DtoYD5HTgjWoTGOg==
- url: http://172.16.8.100:8086
+ org: iailab
+ bucket: buk_shasteel
+ token: Q2qsriQG3FEfZ35lik1KSkFToma3bsgfQLwJrNQfSK06MC569sZ9mrQ0vLtsVYn70HMfQcC9gf_yUG16JQtm8w==
+ url: http://172.16.8.200:8086
+ username: root
+ password: iailab12345678
iems:
upload-dir: D:/DLUT/upload/
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleReqDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleReqDTO.java
index f0a18cc..b0ae867 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleReqDTO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleReqDTO.java
@@ -3,6 +3,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.Map;
@@ -15,8 +16,12 @@
@Data
public class MdkScheduleReqDTO {
+ @Schema(description = "调度方案编号")
+ @NotNull(message="调度方案编号不能为空")
private String scheduleCode;
+ @Schema(description = "调度方案时间")
+ @NotNull(message="调度方案时间不能为空")
private Date scheduleTime;
private String modelCode;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
index 853bd14..2e2b1a5 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
@@ -62,6 +62,8 @@
Long drtSave = Duration.between(end, endSave).getSeconds();
log.info(MessageFormat.format("预测项：{0}，保存时间：{1}秒", predictItem.getItemName(),
drtSave));
+
+ result.put(predictItem.getItemNo(), predictResult);
} catch (Exception e) {
e.printStackTrace();
log.error(MessageFormat.format("预测项编号：{0}，预测项名称：{1}，预测失败：{2} 预测时刻：{3}",
--
Gitblit v1.9.3