Complete operation addition, deletion, modification, and check

This commit is contained in:
JiaJu Zhuang
2023-09-02 14:51:48 +08:00
parent 26644b0e36
commit dcffa3d971
20 changed files with 259 additions and 47 deletions

View File

@ -3,8 +3,8 @@ package ai.chat2db.server.web.api.controller.operation.log;
import java.util.List;
import ai.chat2db.server.domain.api.model.OperationLog;
import ai.chat2db.server.domain.api.param.OperationLogCreateParam;
import ai.chat2db.server.domain.api.param.OperationLogPageQueryParam;
import ai.chat2db.server.domain.api.param.operation.OperationLogCreateParam;
import ai.chat2db.server.domain.api.param.operation.OperationLogPageQueryParam;
import ai.chat2db.server.domain.api.service.OperationLogService;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;

View File

@ -3,8 +3,8 @@ package ai.chat2db.server.web.api.controller.operation.log.converter;
import java.util.List;
import ai.chat2db.server.domain.api.model.OperationLog;
import ai.chat2db.server.domain.api.param.OperationLogCreateParam;
import ai.chat2db.server.domain.api.param.OperationLogPageQueryParam;
import ai.chat2db.server.domain.api.param.operation.OperationLogCreateParam;
import ai.chat2db.server.domain.api.param.operation.OperationLogPageQueryParam;
import ai.chat2db.server.web.api.controller.operation.log.request.OperationLogCreateRequest;
import ai.chat2db.server.web.api.controller.operation.log.request.OperationLogQueryRequest;
import ai.chat2db.server.web.api.controller.operation.log.vo.OperationLogVO;

View File

@ -3,9 +3,10 @@ package ai.chat2db.server.web.api.controller.operation.saved;
import java.util.List;
import ai.chat2db.server.domain.api.model.Operation;
import ai.chat2db.server.domain.api.param.OperationPageQueryParam;
import ai.chat2db.server.domain.api.param.OperationSavedParam;
import ai.chat2db.server.domain.api.param.OperationUpdateParam;
import ai.chat2db.server.domain.api.param.operation.OperationPageQueryParam;
import ai.chat2db.server.domain.api.param.operation.OperationQueryParam;
import ai.chat2db.server.domain.api.param.operation.OperationSavedParam;
import ai.chat2db.server.domain.api.param.operation.OperationUpdateParam;
import ai.chat2db.server.domain.api.service.OperationService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
@ -54,7 +55,7 @@ public class OperationSavedController {
*/
@GetMapping("/list")
public WebPageResult<OperationVO> list(OperationQueryRequest request) {
OperationPageQueryParam param = operationWebConverter.queryReq2param(request);
OperationPageQueryParam param = operationWebConverter.queryReq2param(request,ContextUtils.getUserId());
param.setUserId(ContextUtils.getUserId());
PageResult<Operation> dtoPageResult = operationService.queryPage(param);
List<OperationVO> operationVOS = operationWebConverter.dto2vo(dtoPageResult.getData());
@ -69,8 +70,11 @@ public class OperationSavedController {
*/
@GetMapping("/{id}")
public DataResult<OperationVO> get(@PathVariable("id") Long id) {
DataResult<Operation> dtoPageResult = operationService.find(id);
return DataResult.of(operationWebConverter.dto2vo(dtoPageResult.getData()));
OperationQueryParam param = new OperationQueryParam();
param.setId(id);
param.setUserId(ContextUtils.getUserId());
return operationService.queryExistent(param)
.map(operationWebConverter::dto2vo);
}
/**
@ -83,7 +87,7 @@ public class OperationSavedController {
public DataResult<Long> create(@RequestBody OperationCreateRequest request) {
OperationSavedParam param = operationWebConverter.req2param(request);
param.setTabOpened("y");
return operationService.create(param);
return operationService.createWithPermission(param);
}
/**
@ -95,7 +99,7 @@ public class OperationSavedController {
@RequestMapping(value = "/update", method = {RequestMethod.POST, RequestMethod.PUT})
public ActionResult update(@RequestBody OperationUpdateRequest request) {
OperationUpdateParam param = operationWebConverter.updateReq2param(request);
return operationService.update(param);
return operationService.updateWithPermission(param);
}
/**
@ -113,7 +117,7 @@ public class OperationSavedController {
OperationUpdateParam param = new OperationUpdateParam();
param.setId(id);
param.setTabOpened("n");
operationService.update(param);
operationService.updateWithPermission(param);
});
return ActionResult.isSuccess();
}
@ -126,6 +130,6 @@ public class OperationSavedController {
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable("id") Long id) {
return operationService.delete(id);
return operationService.deleteWithPermission(id);
}
}

View File

@ -3,9 +3,9 @@ package ai.chat2db.server.web.api.controller.operation.saved.converter;
import java.util.List;
import ai.chat2db.server.domain.api.model.Operation;
import ai.chat2db.server.domain.api.param.OperationPageQueryParam;
import ai.chat2db.server.domain.api.param.OperationSavedParam;
import ai.chat2db.server.domain.api.param.OperationUpdateParam;
import ai.chat2db.server.domain.api.param.operation.OperationPageQueryParam;
import ai.chat2db.server.domain.api.param.operation.OperationSavedParam;
import ai.chat2db.server.domain.api.param.operation.OperationUpdateParam;
import ai.chat2db.server.web.api.controller.operation.saved.request.OperationCreateRequest;
import ai.chat2db.server.web.api.controller.operation.saved.request.OperationQueryRequest;
import ai.chat2db.server.web.api.controller.operation.saved.request.OperationUpdateRequest;
@ -45,7 +45,7 @@ public abstract class OperationWebConverter {
* @param request
* @return
*/
public abstract OperationPageQueryParam queryReq2param(OperationQueryRequest request);
public abstract OperationPageQueryParam queryReq2param(OperationQueryRequest request, Long userId);
/**
* 模型转换

View File

@ -43,4 +43,9 @@ public class OperationUpdateRequest {
* operation type
*/
private String operationType;
/**
* 用户id
*/
private Long userId;
}