增加了application和module的增删改查方法。
This commit is contained in:
parent
f13b8c3c51
commit
3f60b32df3
@ -905,11 +905,11 @@ public class DatasourceServer implements DatasourceApi {
|
||||
|
||||
private void preCheckDs(DatasourceDTO datasource) throws DEException {
|
||||
List<String> list = datasourceTypes().stream().map(DatasourceConfiguration.DatasourceType::getType).collect(Collectors.toList());
|
||||
List<XpackPluginsDatasourceVO> xpackPluginsDatasourceVOS = pluginManage.queryPluginDs();
|
||||
xpackPluginsDatasourceVOS.forEach(ele -> list.add(ele.getType()));
|
||||
if (!list.contains(datasource.getType())) {
|
||||
DEException.throwException("Datasource type not supported.");
|
||||
}
|
||||
// List<XpackPluginsDatasourceVO> xpackPluginsDatasourceVOS = pluginManage.queryPluginDs();
|
||||
// xpackPluginsDatasourceVOS.forEach(ele -> list.add(ele.getType()));
|
||||
// if (!list.contains(datasource.getType())) {
|
||||
// DEException.throwException("Datasource type not supported.");
|
||||
// }
|
||||
}
|
||||
|
||||
public void checkDatasourceStatus(DatasourceDTO coreDatasource) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.gisbi.api.license.bo;
|
||||
package io.gisbi.license.server;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
@ -1,4 +1,4 @@
|
||||
package io.gisbi.api.license.bo;
|
||||
package io.gisbi.license.server;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
@ -1,7 +1,8 @@
|
||||
package io.gisbi.license.server;
|
||||
|
||||
|
||||
import io.gisbi.api.license.dto.LicenseRequest;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@ -9,12 +10,13 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@RequestMapping("/license")
|
||||
public class LicenseServer {
|
||||
|
||||
public Object validate(LicenseRequest request) {
|
||||
// F2CLicResult result = new F2CLicResult();
|
||||
return null;
|
||||
@PostMapping("/validate")
|
||||
public F2CLicResult validate(LicenseRequest request) {
|
||||
F2CLicResult result = new F2CLicResult();
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/version")
|
||||
public String version() {
|
||||
return "1.0.0";
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Status.java
|
||||
package io.gisbi.api.license.bo;
|
||||
package io.gisbi.license.server;
|
||||
|
||||
public enum Status {
|
||||
no_record,
|
@ -657,10 +657,10 @@ public class DataVisualizationServer implements DataVisualizationApi {
|
||||
String dynamicData = null;
|
||||
String staticResource = null;
|
||||
String appDataStr = null;
|
||||
String appId = request.getAppId();
|
||||
String name = null;
|
||||
String dvType = null;
|
||||
Integer version = null;
|
||||
|
||||
//内部模板新建
|
||||
if (DataVisualizationConstants.NEW_PANEL_FROM.NEW_INNER_TEMPLATE.equals(newFrom)) {
|
||||
VisualizationTemplate visualizationTemplate = templateMapper.selectById(request.getTemplateId());
|
||||
@ -759,7 +759,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
|
||||
request.setCanvasStyleData(templateStyle);
|
||||
//Store static resource into the server
|
||||
staticResourceServer.saveFilesToServe(staticResource);
|
||||
return new DataVisualizationVO(newDvId,appId, name, dvType, version, templateStyle, templateData, appDataStr, canvasViewInfo, null);
|
||||
return new DataVisualizationVO(newDvId, name, dvType, version, templateStyle, templateData, appDataStr, canvasViewInfo, null);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
DEException.throwException("解析错误");
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,17 +0,0 @@
|
||||
package io.gisbi.api.license;
|
||||
|
||||
import io.gisbi.api.license.bo.F2CLicResult;
|
||||
import io.gisbi.api.license.dto.LicenseRequest;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
public interface LicenseApi {
|
||||
|
||||
@PostMapping("/validate")
|
||||
F2CLicResult validate(@RequestBody LicenseRequest request);
|
||||
|
||||
@GetMapping("/version")
|
||||
String version();
|
||||
}
|
@ -192,9 +192,8 @@ public class DataVisualizationVO implements Serializable {
|
||||
private VisualizationExport2AppVO appData;
|
||||
|
||||
|
||||
public DataVisualizationVO(Long id,String appId, String name, String type, Integer version, String canvasStyleData, String componentData,String appDataStr, Map<Long, ChartViewDTO> canvasViewInfo, Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo) {
|
||||
public DataVisualizationVO(Long id,String name, String type, Integer version, String canvasStyleData, String componentData,String appDataStr, Map<Long, ChartViewDTO> canvasViewInfo, Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo) {
|
||||
this.id = id;
|
||||
this.appId = appId;
|
||||
this.name = name;
|
||||
this.type = type;
|
||||
this.canvasStyleData = canvasStyleData;
|
||||
|
Loading…
Reference in New Issue
Block a user