test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 修改服务集成的日志类型显示创建 

--bug=1018688 --user=李玉号 【系统设置】操作日志-修改服务集成的日志类型显示了“创建”
https://www.tapd.cn/55049933/s/1278804
This commit is contained in:
shiziyuan9527 2022-10-26 17:56:06 +08:00 committed by lyh
parent 5784cd9bf9
commit dc30efb75f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/ServiceIntegrationController.java
View File

@ -20,7 +20,7 @@ public class ServiceIntegrationController {
private BaseIntegrationService baseIntegrationService;
@PostMapping("/save")
@MsAuditLog(module = OperLogModule.WORKSPACE_SERVICE_INTEGRATION, type = OperLogConstants.CREATE, content = "#msClass.getLogDetails(#service.id)", msClass = BaseIntegrationService.class)
@MsAuditLog(module = OperLogModule.WORKSPACE_SERVICE_INTEGRATION, type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#service.workspaceId, #service.platform)", content = "#msClass.getLogDetails(#service.workspaceId, #service.platform)", msClass = BaseIntegrationService.class)
public ServiceIntegration save(@RequestBody ServiceIntegration service) {
return baseIntegrationService.save(service);
}
@ -31,7 +31,7 @@ public class ServiceIntegrationController {
}
@PostMapping("/delete")
@MsAuditLog(module = OperLogModule.WORKSPACE_SERVICE_INTEGRATION, type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#request.id)", msClass = BaseIntegrationService.class)
@MsAuditLog(module = OperLogModule.WORKSPACE_SERVICE_INTEGRATION, title = "#request.platform", type = OperLogConstants.DELETE, msClass = BaseIntegrationService.class)
public void delete(@RequestBody IntegrationRequest request) {
baseIntegrationService.delete(request);
}

16
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/BaseIntegrationService.java
View File

@ -87,14 +87,22 @@ public class BaseIntegrationService {
return CollectionUtils.isEmpty(list) ? new ArrayList<>() : list;
}
public String getLogDetails(String id) {
ServiceIntegration ser = serviceIntegrationMapper.selectByPrimaryKey(id);
if (ser != null) {
public String getLogDetails(String workspaceId, String platform) {
ServiceIntegrationExample example = new ServiceIntegrationExample();
example.createCriteria()
.andWorkspaceIdEqualTo(workspaceId)
.andPlatformEqualTo(platform);
List<ServiceIntegration> list = serviceIntegrationMapper.selectByExampleWithBLOBs(example);
if (!CollectionUtils.isEmpty(list)) {
ServiceIntegration ser = list.get(0);
List<DetailColumn> columns = ReflexObjectUtil.getColumns(ser, SystemReference.serverColumns);
OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(ser.getId()), null, ser.getPlatform(), null, columns);
return JSON.toJSONString(details);
} else {
List<DetailColumn> columns = ReflexObjectUtil.getColumns(new ServiceIntegration(), SystemReference.serverColumns);
OperatingLogDetails details = new OperatingLogDetails("", null, platform, null, columns);
return JSON.toJSONString(details);
}
return null;
}
public void authServiceIntegration(String workspaceId, String platform) {