Skip to content

Commit f31d590

Browse files
xwintopxwintop
committed
添加显示主配置详情
1 parent 3d93806 commit f31d590

4 files changed

Lines changed: 61 additions & 12 deletions

File tree

‎src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolController.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.GatewayConfToolService;
44
import com.xwintop.xJavaFxTool.view.epmsTools.gatewayConfTool.GatewayConfToolView;
5+
import javafx.application.Platform;
56
import javafx.beans.value.ChangeListener;
67
import javafx.beans.value.ObservableValue;
78
import javafx.event.ActionEvent;
@@ -30,7 +31,7 @@ public void initialize(URL location, ResourceBundle resources) {
3031
private void initView() {
3132
TreeItem<String> treeItem = new TreeItem<String>("TaskConfig列表");
3233
configurationTreeView.setRoot(treeItem);
33-
configurationPathTextField.setText("E:\\ideaWorkspaces\\gatewaySpring\\configuration");
34+
configurationPathTextField.setText("D:\\ideaWorkspaces\\gatewaySpring\\configuration");
3435
}
3536

3637
private void initEvent() {
@@ -39,10 +40,12 @@ private void initEvent() {
3940
@Override
4041
public void changed(ObservableValue<? extends TreeItem<String>> observable,
4142
TreeItem<String> oldValue, TreeItem<String> newValue) {
42-
String name = newValue.getValue();
43-
if (newValue.getChildren().size() == 0) {
44-
gatewayConfToolService.addTaskConfigTabPane(newValue.getParent().getValue(), name);
45-
}
43+
Platform.runLater(()->{
44+
String name = newValue.getValue();
45+
if (newValue.getChildren().size() == 0) {
46+
gatewayConfToolService.addTaskConfigTabPane(newValue.getParent().getValue(), name);
47+
}
48+
});
4649
}
4750
});
4851
}

‎src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolTaskViewController.java‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.xwintop.xJavaFxTool.controller.epmsTools.gatewayConfTool;
22

3+
import com.easipass.gateway.entity.TaskConfig;
4+
import com.easipass.gateway.filter.bean.FilterConfig;
5+
import com.easipass.gateway.receiver.entity.ReceiverConfig;
6+
import com.easipass.gateway.route.entity.SenderConfig;
37
import com.xwintop.xJavaFxTool.controller.IndexController;
48
import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.GatewayConfToolTaskViewService;
59
import com.xwintop.xJavaFxTool.utils.JavaFxViewUtil;
@@ -12,6 +16,7 @@
1216
import lombok.extern.slf4j.Slf4j;
1317

1418
import java.net.URL;
19+
import java.util.HashMap;
1520
import java.util.Map;
1621
import java.util.ResourceBundle;
1722

@@ -21,7 +26,12 @@
2126
public class GatewayConfToolTaskViewController extends GatewayConfToolTaskViewView {
2227
private GatewayConfToolTaskViewService gatewayConfToolTaskViewService = new GatewayConfToolTaskViewService(this);
2328
private ObservableList<Map<String, String>> propertiesTableData = FXCollections.observableArrayList();
24-
private String[] triggerTypeChoiceBoxStrings = new String[] { "SIMPLE", "CRON" };
29+
private ObservableList<String> receiverConfigListData = FXCollections.observableArrayList();
30+
private ObservableList<String> filterConfigsListData = FXCollections.observableArrayList();
31+
private ObservableList<String> senderConfigListData = FXCollections.observableArrayList();
32+
private String[] triggerTypeChoiceBoxStrings = new String[]{"SIMPLE", "CRON"};
33+
34+
private TaskConfig taskConfig;
2535

2636
private GatewayConfToolController gatewayConfToolController;
2737
private String tabName;
@@ -46,6 +56,9 @@ private void initView() {
4656
triggerTypeChoiceBox.setValue(triggerTypeChoiceBox.getItems().get(0));
4757
JavaFxViewUtil.setSpinnerValueFactory(intervalTimeSpinner, 5, Integer.MAX_VALUE);
4858
JavaFxViewUtil.setSpinnerValueFactory(executeTimesSpinner, -1, Integer.MAX_VALUE);
59+
receiverConfigListView.setItems(receiverConfigListData);
60+
filterConfigsListView.setItems(filterConfigsListData);
61+
senderConfigListView.setItems(senderConfigListData);
4962
}
5063

5164
private void initEvent() {
@@ -54,8 +67,37 @@ private void initEvent() {
5467
private void initService() {
5568
}
5669

57-
public void setData(GatewayConfToolController gatewayConfToolController) {
70+
public void setData(GatewayConfToolController gatewayConfToolController, TaskConfig taskConfig) {
5871
this.gatewayConfToolController = gatewayConfToolController;
72+
this.taskConfig = taskConfig;
5973
// gatewayConfToolTaskViewService.reloadTableData();
74+
75+
nameTextField.setText(taskConfig.getName());
76+
isEnableCheckBox.setSelected(taskConfig.getIsEnable());
77+
taskTypeTextField.setText(taskConfig.getTaskType());
78+
triggerTypeChoiceBox.setValue(taskConfig.getTriggerType());
79+
intervalTimeSpinner.getValueFactory().setValue(taskConfig.getIntervalTime());
80+
executeTimesSpinner.getValueFactory().setValue(taskConfig.getExecuteTimes());
81+
triggerCronTextField.setText(taskConfig.getTriggerCron());
82+
isStatefullJobCheckBox.setSelected(taskConfig.getIsStatefulJob());
83+
receiverConfigListData.clear();
84+
for (ReceiverConfig receiverConfig : taskConfig.getReceiverConfig()) {
85+
receiverConfigListData.add(receiverConfig.getServiceName());
86+
}
87+
filterConfigsListData.clear();
88+
for (FilterConfig filterConfig : taskConfig.getFilterConfigs()) {
89+
filterConfigsListData.add(filterConfig.getServiceName());
90+
}
91+
senderConfigListData.clear();
92+
for (SenderConfig senderConfig : taskConfig.getSenderConfig()) {
93+
senderConfigListData.add(senderConfig.getServiceName());
94+
}
95+
propertiesTableData.clear();
96+
taskConfig.getProperties().forEach((s, o) -> {
97+
Map<String, String> map = new HashMap<>();
98+
map.put("key",s);
99+
map.put("value", o.toString());
100+
propertiesTableData.add(map);
101+
});
60102
}
61103
}

‎src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolService.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@
2525
import java.util.HashMap;
2626
import java.util.List;
2727
import java.util.Map;
28+
import java.util.concurrent.ConcurrentHashMap;
2829

2930
@Getter
3031
@Setter
3132
@Slf4j
3233
public class GatewayConfToolService {
3334
private GatewayConfToolController gatewayConfToolController;
35+
private Map<String, Map<String, TaskConfig>> taskConfigFileMap = new ConcurrentHashMap<>();//任务对应配置文件map
3436

3537
private Map<String, Tab> taskConfigTabMap = new HashMap<String, Tab>();
3638

@@ -58,6 +60,7 @@ public boolean accept(File dir, String name) {
5860
});
5961
for (File file : all) {
6062
try {
63+
Map<String, TaskConfig> taskConfigMap = new ConcurrentHashMap<>();
6164
TreeItem<String> treeItem2 = new TreeItem<String>(file.getName());
6265
treeItem.getChildren().add(treeItem2);
6366
Yaml yaml = new Yaml();
@@ -67,12 +70,15 @@ public boolean accept(File dir, String name) {
6770
for (TaskConfig taskConfig : taskConfigs) {
6871
TreeItem<String> treeItem3 = new TreeItem<String>(taskConfig.getName());
6972
treeItem2.getChildren().add(treeItem3);
73+
taskConfigMap.put(taskConfig.getName(), taskConfig);
7074
}
7175
} else {
7276
TaskConfig taskConfig = (TaskConfig) config;
7377
TreeItem<String> treeItem3 = new TreeItem<String>(taskConfig.getName());
7478
treeItem2.getChildren().add(treeItem3);
79+
taskConfigMap.put(taskConfig.getName(), taskConfig);
7580
}
81+
taskConfigFileMap.put(file.getName(), taskConfigMap);
7682
} catch (Exception e) {
7783
log.error("load config [" + file.getPath() + "] error.", e);
7884
}
@@ -92,8 +98,8 @@ public void addTaskConfigTabPane(String fileName, String taskName) {
9298
@Override
9399
public void handle(Event event) {
94100
List<Tab> tabList = new ArrayList<Tab>();
95-
gatewayConfToolController.getTaskConfigTabPane().getTabs().forEach((Tab tab2)->{
96-
if(tab2.getText().startsWith(tabName)){
101+
gatewayConfToolController.getTaskConfigTabPane().getTabs().forEach((Tab tab2) -> {
102+
if (tab2.getText().startsWith(tabName)) {
97103
tabList.add(tab2);
98104
}
99105
});
@@ -108,7 +114,7 @@ public void handle(Event event) {
108114
e.printStackTrace();
109115
}
110116
GatewayConfToolTaskViewController gatewayConfToolTaskViewController = fXMLLoader.getController();
111-
gatewayConfToolTaskViewController.setData(gatewayConfToolController);
117+
gatewayConfToolTaskViewController.setData(gatewayConfToolController, taskConfigFileMap.get(fileName).get(taskName));
112118
gatewayConfToolTaskViewController.setTabName(tabName);
113119
gatewayConfToolController.getTaskConfigTabPane().getTabs().add(tab);
114120
gatewayConfToolController.getTaskConfigTabPane().getSelectionModel().select(tab);

‎src/main/resources/com/xwintop/xJavaFxTool/fxmlView/epmsTools/gatewayConfTool/GatewayConfToolTaskView.fxml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<?import com.jfoenix.controls.JFXCheckBox?>
4-
<?import com.jfoenix.controls.JFXSnackbar?>
54
<?import javafx.scene.control.ChoiceBox?>
65
<?import javafx.scene.control.Label?>
76
<?import javafx.scene.control.ListView?>
@@ -25,7 +24,6 @@
2524
<ChoiceBox fx:id="triggerTypeChoiceBox" prefWidth="150.0" />
2625
<Label text="intervalTime：" />
2726
<Spinner fx:id="intervalTimeSpinner" editable="true" />
28-
<JFXSnackbar />
2927
<Label text="executeTimes：" />
3028
<Spinner fx:id="executeTimesSpinner" editable="true" />
3129
<Label text="triggerCron：" />

0 commit comments

Comments
 (0)