Skip to content

Commit

Permalink
[Feature][scaleph-dataservice] add dataservice config web (#687)
Browse files Browse the repository at this point in the history
* feature: add dataservice config web

* feature: add dataservice config web

* feature: update dataservice config web

* feature: update dataservice config web

---------

Co-authored-by: wangqi <wangqi@xinxuan.net>
  • Loading branch information
kalencaya and wangqi authored Feb 7, 2024
1 parent 5b1bed5 commit a48db8d
Show file tree
Hide file tree
Showing 29 changed files with 932 additions and 270 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
import cn.sliew.scaleph.api.annotation.Logging;
import cn.sliew.scaleph.dataservice.service.DataserviceConfigService;
import cn.sliew.scaleph.dataservice.service.dto.DataserviceConfigDTO;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigAddParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigListParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigUpdateParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigSaveParam;
import cn.sliew.scaleph.system.model.ResponseVO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
Expand All @@ -48,23 +47,24 @@ public class DataserviceConfigController {
@Logging
@GetMapping
@Operation(summary = "查询 config 列表", description = "查询 config 列表")
public ResponseEntity<ResponseVO<Page<DataserviceConfigDTO>>> get(@Valid DataserviceConfigListParam param) throws ParseException {
public ResponseEntity<Page<DataserviceConfigDTO>> get(@Valid DataserviceConfigListParam param) throws ParseException {
Page<DataserviceConfigDTO> result = dataserviceConfigService.list(param);
return new ResponseEntity<>(ResponseVO.success(result), HttpStatus.OK);
return new ResponseEntity<>(result, HttpStatus.OK);
}

@Logging
@PutMapping
@Operation(summary = "新增 config", description = "新增 config")
public ResponseEntity<ResponseVO> insert(@Valid @RequestBody DataserviceConfigAddParam param) throws ParseException {
public ResponseEntity<ResponseVO> insert(@Valid @RequestBody DataserviceConfigSaveParam param) throws ParseException {
dataserviceConfigService.insert(param);
return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
}

@Logging
@PostMapping
@PostMapping("{id}")
@Operation(summary = "修改 config", description = "修改 config")
public ResponseEntity<ResponseVO> update(@Valid @RequestBody DataserviceConfigUpdateParam param) throws ParseException {
public ResponseEntity<ResponseVO> update(@PathVariable("id") Long id, @Valid @RequestBody DataserviceConfigSaveParam param) throws ParseException {
param.setId(id);
dataserviceConfigService.update(param);
return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import cn.sliew.scaleph.common.dict.catalog.CatalogFunctionLanguage;
import cn.sliew.scaleph.common.dict.catalog.CatalogTableKind;
import cn.sliew.scaleph.common.dict.common.*;
import cn.sliew.scaleph.common.dict.dataservice.HttpMethod;
import cn.sliew.scaleph.common.dict.dataservice.QueryType;
import cn.sliew.scaleph.common.dict.ds.RedisMode;
import cn.sliew.scaleph.common.dict.flink.*;
import cn.sliew.scaleph.common.dict.flink.kubernetes.*;
Expand Down Expand Up @@ -116,6 +118,9 @@ public enum DictType implements DictDefinition {
SCHEDULE_STATUS("schedule_status", "Schedule Status", ScheduleStatus.class),

REDIS_MODE("redis_mode", "Redis Mode", RedisMode.class),

HTTP_METHOD("http_method", "Http Method", HttpMethod.class),
QUERY_TYPE("query_type", "Query Type", QueryType.class),
;

@JsonCreator
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package cn.sliew.scaleph.common.dict.dataservice;

import cn.sliew.scaleph.common.dict.DictInstance;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Arrays;

@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HttpMethod implements DictInstance {

GET("GET", "GET"),
POST("POST", "POST"),
;

@JsonCreator
public static HttpMethod of(String value) {
return Arrays.stream(values())
.filter(instance -> instance.getValue().equals(value))
.findAny().orElseThrow(() -> new EnumConstantNotPresentException(HttpMethod.class, value));
}

@EnumValue
private String value;
private String label;

HttpMethod(String value, String label) {
this.value = value;
this.label = label;
}

@Override
public String getValue() {
return value;
}

@Override
public String getLabel() {
return label;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package cn.sliew.scaleph.common.dict.dataservice;

import cn.sliew.scaleph.common.dict.DictInstance;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Arrays;

@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QueryType implements DictInstance {

SELECT("SELECT", "SELECT"),
UPSERT("UPSERT", "UPSERT"),
INSERT("INSERT", "INSERT"),
UPDATE("UPDATE", "UPDATE"),
DELETE("DELETE", "DELETE"),
;

@JsonCreator
public static QueryType of(String value) {
return Arrays.stream(values())
.filter(instance -> instance.getValue().equals(value))
.findAny().orElseThrow(() -> new EnumConstantNotPresentException(QueryType.class, value));
}

@EnumValue
private String value;
private String label;

QueryType(String value, String label) {
this.value = value;
this.label = label;
}

@Override
public String getValue() {
return value;
}

@Override
public String getLabel() {
return label;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ public class DataserviceConfig extends BaseDO {
@TableField(exist = false)
private DataserviceResultMap resultMap;

@TableField("`type`")
private String type;

@TableField("query")
private String query;

@TableField("remark")
private String remark;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
<result column="status" property="status"/>
<result column="parameter_map_id" property="parameterMapId"/>
<result column="result_map_id" property="resultMapId"/>
<result column="type" property="type"/>
<result column="query" property="query"/>
<result column="remark" property="remark"/>
<association column="parameter_map_id" property="parameterMap"
select="cn.sliew.scaleph.dao.mapper.master.dataservice.DataserviceParameterMapMapper.selectById"/>
Expand All @@ -64,8 +66,8 @@
create_time,
editor,
update_time,
project_id, `name`, path, method, content_type, `status`,
parameter_map_id, result_map_id, remark
project_id, `name`, `path`, `method`, content_type, `status`,
parameter_map_id, result_map_id, `type`, query, remark
</sql>

<select id="getById" resultMap="DataserviceConfigMap">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
package cn.sliew.scaleph.dataservice.service;

import cn.sliew.scaleph.dataservice.service.dto.DataserviceConfigDTO;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigAddParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigListParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigUpdateParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigSaveParam;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.List;
Expand All @@ -32,9 +31,9 @@ public interface DataserviceConfigService {

DataserviceConfigDTO selectOne(Long id);

int insert(DataserviceConfigAddParam param);
int insert(DataserviceConfigSaveParam param);

int update(DataserviceConfigUpdateParam param);
int update(DataserviceConfigSaveParam param);

int deleteById(Long id);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public interface DataserviceParameterMapService {

DataserviceParameterMapDTO selectOne(Long id);

int insert(DataserviceParameterMapAddParam param);
DataserviceParameterMapDTO insert(DataserviceParameterMapAddParam param);

int update(DataserviceParameterMapUpdateParam param);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public interface DataserviceResultMapService {

DataserviceResultMapDTO selectOne(Long id);

int insert(DataserviceResultMapAddParam param);
DataserviceResultMapDTO insert(DataserviceResultMapAddParam param);

int update(DataserviceResultMapUpdateParam param);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ public class DataserviceConfigDTO extends BaseDTO {
@Schema(description = "result map")
private DataserviceResultMapDTO resultMap;

@Schema(description = "type")
private String type;

@Schema(description = "query")
private String query;

@Schema(description = "备注")
private String remark;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,25 @@

package cn.sliew.scaleph.dataservice.service.impl;

import cn.sliew.scaleph.common.dict.common.YesOrNo;
import cn.sliew.scaleph.common.util.BeanUtil;
import cn.sliew.scaleph.common.util.UUIDUtil;
import cn.sliew.scaleph.dao.entity.master.dataservice.DataserviceConfig;
import cn.sliew.scaleph.dao.mapper.master.dataservice.DataserviceConfigMapper;
import cn.sliew.scaleph.dataservice.service.DataserviceConfigService;
import cn.sliew.scaleph.dataservice.service.DataserviceParameterMapService;
import cn.sliew.scaleph.dataservice.service.DataserviceResultMapService;
import cn.sliew.scaleph.dataservice.service.convert.DataserviceConfigConvert;
import cn.sliew.scaleph.dataservice.service.dto.DataserviceConfigDTO;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigAddParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigListParam;
import cn.sliew.scaleph.dataservice.service.param.DataserviceConfigUpdateParam;
import cn.sliew.scaleph.dataservice.service.dto.DataserviceParameterMapDTO;
import cn.sliew.scaleph.dataservice.service.dto.DataserviceResultMapDTO;
import cn.sliew.scaleph.dataservice.service.param.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.List;
Expand All @@ -43,6 +48,10 @@ public class DataserviceConfigServiceImpl implements DataserviceConfigService {

@Autowired
private DataserviceConfigMapper dataserviceConfigMapper;
@Autowired
private DataserviceParameterMapService dataserviceParameterMapService;
@Autowired
private DataserviceResultMapService dataserviceResultMapService;

@Override
public Page<DataserviceConfigDTO> list(DataserviceConfigListParam param) {
Expand All @@ -66,14 +75,50 @@ public DataserviceConfigDTO selectOne(Long id) {
}

@Override
public int insert(DataserviceConfigAddParam param) {
public int insert(DataserviceConfigSaveParam param) {
DataserviceConfig record = BeanUtil.copy(param, new DataserviceConfig());
record.setStatus(YesOrNo.NO.getValue());
if (CollectionUtils.isEmpty(param.getParameterMappings()) == false) {
DataserviceParameterMapAddParam addParam = new DataserviceParameterMapAddParam();
addParam.setProjectId(param.getProjectId());
addParam.setName(UUIDUtil.randomUUId());
DataserviceParameterMapDTO parameterMapDTO = dataserviceParameterMapService.insert(addParam);
DataserviceParameterMappingReplaceParam replaceParam = new DataserviceParameterMappingReplaceParam();
replaceParam.setParameterMapId(parameterMapDTO.getId());
replaceParam.setMappings(param.getParameterMappings());
dataserviceParameterMapService.replaceMappings(replaceParam);
record.setParameterMapId(parameterMapDTO.getId());
}
if (CollectionUtils.isEmpty(param.getResultMappings()) == false) {
DataserviceResultMapAddParam addParam = new DataserviceResultMapAddParam();
addParam.setProjectId(param.getProjectId());
addParam.setName(UUIDUtil.randomUUId());
DataserviceResultMapDTO resultMapDTO = dataserviceResultMapService.insert(addParam);
DataserviceResultMappingReplaceParam replaceParam = new DataserviceResultMappingReplaceParam();
replaceParam.setResultMapId(resultMapDTO.getId());
replaceParam.setMappings(param.getResultMappings());
dataserviceResultMapService.replaceMappings(replaceParam);
record.setResultMapId(resultMapDTO.getId());
}
return dataserviceConfigMapper.insert(record);
}

@Override
public int update(DataserviceConfigUpdateParam param) {
public int update(DataserviceConfigSaveParam param) {
DataserviceConfigDTO dto = selectOne(param.getId());
DataserviceConfig record = BeanUtil.copy(param, new DataserviceConfig());
if (CollectionUtils.isEmpty(param.getParameterMappings()) == false) {
DataserviceParameterMappingReplaceParam replaceParam = new DataserviceParameterMappingReplaceParam();
replaceParam.setParameterMapId(dto.getParameterMap().getId());
replaceParam.setMappings(param.getParameterMappings());
dataserviceParameterMapService.replaceMappings(replaceParam);
}
if (CollectionUtils.isEmpty(param.getResultMappings()) == false) {
DataserviceResultMappingReplaceParam replaceParam = new DataserviceResultMappingReplaceParam();
replaceParam.setResultMapId(dto.getResultMap().getId());
replaceParam.setMappings(param.getResultMappings());
dataserviceResultMapService.replaceMappings(replaceParam);
}
return dataserviceConfigMapper.updateById(record);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,10 @@ public DataserviceParameterMapDTO selectOne(Long id) {
}

@Override
public int insert(DataserviceParameterMapAddParam param) {
public DataserviceParameterMapDTO insert(DataserviceParameterMapAddParam param) {
DataserviceParameterMap record = BeanUtil.copy(param, new DataserviceParameterMap());
return dataserviceParameterMapMapper.insert(record);
dataserviceParameterMapMapper.insert(record);
return selectOne(record.getId());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ public DataserviceResultMapDTO selectOne(Long id) {
}

@Override
public int insert(DataserviceResultMapAddParam param) {
public DataserviceResultMapDTO insert(DataserviceResultMapAddParam param) {
DataserviceResultMap record = BeanUtil.copy(param, new DataserviceResultMap());
return dataserviceResultMapMapper.insert(record);
dataserviceResultMapMapper.insert(record);
return selectOne(record.getId());
}

@Override
Expand Down
Loading

0 comments on commit a48db8d

Please sign in to comment.