Browse Source

回退bug代码

feature/x
obo 1 year ago
parent
commit
8695dc35a6
  1. 7
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

7
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@ -8,7 +8,6 @@ import com.fr.data.impl.JDBCDatabaseConnection;
import com.fr.data.impl.JNDIDatabaseConnection; import com.fr.data.impl.JNDIDatabaseConnection;
import com.fr.data.metric.utils.DatabaseConnectionMetricHandler; import com.fr.data.metric.utils.DatabaseConnectionMetricHandler;
import com.fr.data.operator.DataOperator; import com.fr.data.operator.DataOperator;
import com.fr.decision.record.OperateConstants;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.general.MapCompareUtils; import com.fr.general.MapCompareUtils;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
@ -50,8 +49,6 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import static com.fr.base.ConnectionLogHelper.logDesignerConnectionOperateMessage;
/** /**
* Connection List Pane. * Connection List Pane.
*/ */
@ -354,19 +351,15 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
@Override @Override
public void run() { public void run() {
removedConnNames.forEach(n -> ConnectionConfig.getInstance().removeConnection(n)); removedConnNames.forEach(n -> ConnectionConfig.getInstance().removeConnection(n));
logDesignerConnectionOperateMessage(removedConnNames, OperateConstants.DELETE);
int innerRemaining = remaining; int innerRemaining = remaining;
List<String> addConnNames = new ArrayList<>();
for (ConnectionBean cb : addedOrUpdatedConnections) { for (ConnectionBean cb : addedOrUpdatedConnections) {
if (innerRemaining > 0) { if (innerRemaining > 0) {
ConnectionConfig.getInstance().addConnectionWithoutCheck(cb.getName(), cb.getConnection()); ConnectionConfig.getInstance().addConnectionWithoutCheck(cb.getName(), cb.getConnection());
innerRemaining--; innerRemaining--;
addConnNames.add(cb.getName());
} else { } else {
break; break;
} }
} }
logDesignerConnectionOperateMessage(addConnNames, OperateConstants.ADD);
} }
}); });
} catch (Exception e) { } catch (Exception e) {

Loading…
Cancel
Save