jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ys.git 2025-12-11 18:24:19 +08:00
commit 832e0fd2c3
3 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
View File

@ -141,7 +141,7 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
String uploadId = new ObjectId().toHexString(); String uploadId = new ObjectId().toHexString();
FileUploadDTO fileUploadDTO = apaasMyTokenFeign.uploadFile( FileUploadDTO fileUploadDTO = apaasMyTokenFeign.uploadFile(
userToken.getAccess_token(), "Bearer " + userToken.getAccess_token(),
"application/x-www-form-urlencoded", "application/x-www-form-urlencoded",
file, file,
uploadId, uploadId,

52
src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java
View File

@ -127,7 +127,7 @@ public class ParameterServiceImpl implements ParameterService {
); );
// 5. 保存所有数据 // 5. 保存所有数据
saveAllData(newVersionTemplate, processingResult); saveAllData(benchmark.getBaseTemplate(), newVersionTemplate, processingResult);
TemplateInfoView result = new TemplateInfoView(); TemplateInfoView result = new TemplateInfoView();
result.setTemplateRowId(newVersionTemplate.getRowId()); result.setTemplateRowId(newVersionTemplate.getRowId());
@ -332,11 +332,22 @@ public class ParameterServiceImpl implements ParameterService {
} }
Parameter updatedParameter = new Parameter(); Parameter updatedParameter = new Parameter();
BeanUtils.copyProperties(form, updatedParameter); String detail;
updatedParameter.setCreatedBy(permissionGetter.getCurrentUserId()); // 如果是原模板，就更新
String detail = getParameterChange(originalParameter, updatedParameter); if (Objects.equals(baseTemplate.getId(), newTemplate.getId())) {
BeanUtils.copyProperties(form, updatedParameter);
bd.getBusinessDatabase().doInsert(updatedParameter); updatedParameter.setId(originalParameter.getId());
updatedParameter.setCreatedBy(permissionGetter.getCurrentUserId());
detail = getParameterChange(originalParameter, updatedParameter);
bd.getBusinessDatabase().rowid("id", originalParameter.getRowId()).doUpdate(updatedParameter);
}
// 如果是新模板，就新增
else {
BeanUtils.copyProperties(form, updatedParameter);
updatedParameter.setCreatedBy(permissionGetter.getCurrentUserId());
detail = getParameterChange(originalParameter, updatedParameter);
bd.getBusinessDatabase().doInsert(updatedParameter);
}
newParameters.add(updatedParameter); newParameters.add(updatedParameter);
revisionRecords.add(new RevisionRecord( revisionRecords.add(new RevisionRecord(
newTemplate.getTemplateName(), newTemplate.getTemplateName(),
@ -435,20 +446,33 @@ public class ParameterServiceImpl implements ParameterService {
/** /**
* 保存所有数据 * 保存所有数据
*/ */
private void saveAllData(Template newTemplate, ParameterProcessingResult result) { private void saveAllData(Template originalTemplate, Template newTemplate, ParameterProcessingResult result) {
List<String> parameterIds = bd.getBusinessDatabase() List<String> parameterIds = bd.getBusinessDatabase()
.eq("template_id", newTemplate.getId()) .eq("template_id", newTemplate.getId())
.doQuery(TemplateAndParameter.class).stream() .doQuery(TemplateAndParameter.class).stream()
.map(TemplateAndParameter::getParameterId) .map(TemplateAndParameter::getParameterId)
.collect(Collectors.toList()); .collect(Collectors.toList());
// 创建并保存模板参数关联 // 如果是原模板
List<TemplateAndParameter> templateAndParameters = if (Objects.equals(originalTemplate.getId(), newTemplate.getId())) {
result.getNewParameters().stream() bd.getBusinessDatabase()
.filter(parameter -> !parameterIds.contains(parameter.getId())) .eq("template_id", originalTemplate.getId())
.map(parameter -> createTemplateAndParameter(newTemplate.getId(), parameter.getId())) .doDelete(TemplateAndParameter.class);
.collect(Collectors.toList()); List<TemplateAndParameter> templateAndParameters =
bd.getBusinessDatabase().doBatchInsert(templateAndParameters); result.getNewParameters().stream()
.map(parameter -> createTemplateAndParameter(newTemplate.getId(), parameter.getId()))
.collect(Collectors.toList());
bd.getBusinessDatabase().doBatchInsert(templateAndParameters);
}
// 如果不是原模板
else {
List<TemplateAndParameter> templateAndParameters =
result.getNewParameters().stream()
.filter(parameter -> !parameterIds.contains(parameter.getId()))
.map(parameter -> createTemplateAndParameter(newTemplate.getId(), parameter.getId()))
.collect(Collectors.toList());
bd.getBusinessDatabase().doBatchInsert(templateAndParameters);
}
// 保存修订记录 // 保存修订记录
if (!result.getRevisionRecords().isEmpty()) { if (!result.getRevisionRecords().isEmpty()) {
bd.getBusinessDatabase().doBatchInsert(result.getRevisionRecords()); bd.getBusinessDatabase().doBatchInsert(result.getRevisionRecords());

8
src/main/resources/sql.sql
View File

@ -113,3 +113,11 @@ CREATE TABLE yc_datasource_0.yfsjglpt_model_role_permission(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) COMMENT '角色权限关联表'; ) COMMENT '角色权限关联表';
DELETE FROM yfsjglpt_model_template;
DELETE FROM yfsjglpt_model_parameter_and_template;
DELETE FROM yfsjglpt_model_parameter;
DELETE FROM yfsjglpt_model_approval_flow;
DELETE FROM yfsjglpt_model_approval_record;
DELETE FROM yfsjglpt_model_responsible_person;
DELETE FROM yfsjglpt_model_benchmarking_report;
DELETE FROM yfsjglpt_model_revision_record;