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

修改：参数修改逻辑问题

Browse Source
This commit is contained in:
zjh 2025-12-17 09:06:59 +08:00
parent c30f5ab842
commit 13640fce09
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xdap/self_development/config/BusinessDatabase.java
View File

@ -24,6 +24,6 @@ public class BusinessDatabase {
@Bean @Bean
public MpaasQuery getTCDatabase() { public MpaasQuery getTCDatabase() {
return queryFactory.buildFromDatasource("yc_lrs_test_relsult"); return queryFactory.buildFromDatasource(DatasourceConstant.XDAP_MYSQL_PREFIX + tenantId);
} }
} }

4
src/main/java/com/xdap/self_development/controller/form/ParameterForm.java
View File

@ -1,12 +1,14 @@
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@Data @Data
public class ParameterForm { public class ParameterForm {
private String id;
private String parameterId;
private Integer parameterNumber; private Integer parameterNumber;

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

@ -328,31 +328,27 @@ public class ParameterServiceImpl implements ParameterService {
List<RevisionRecord> revisionRecords, Template baseTemplate, List<RevisionRecord> revisionRecords, Template baseTemplate,
String userId String userId
) { ) {
Parameter originalParameter = parameterMap.get(form.getId()); Parameter originalParameter = parameterMap.get(form.getParameterId());
if (originalParameter == null) { if (originalParameter == null) {
throw new IllegalArgumentException("未找到要更新的参数，编号: " + form.getParameterNumber()); throw new IllegalArgumentException("未找到要更新的参数，编号: " + form.getParameterNumber());
} }
Parameter updatedParameter = new Parameter(); Parameter updatedParameter = new Parameter();
String detail; BeanUtils.copyProperties(form, updatedParameter);
String detail = getParameterChange(originalParameter, updatedParameter);
updatedParameter.setCreatedBy(userId);
// 如果是原模板，就更新 // 如果是原模板，就更新
if (Objects.equals(baseTemplate.getId(), newTemplate.getId())) { if (Objects.equals(baseTemplate.getId(), newTemplate.getId())) {
BeanUtils.copyProperties(form, updatedParameter); updatedParameter.setId(originalParameter.getId());
updatedParameter.setId(null);
updatedParameter.setCreatedBy(userId);
detail = getParameterChange(originalParameter, updatedParameter);
bd.getBusinessDatabase() bd.getBusinessDatabase()
.rowid("id", originalParameter.getRowId()) .rowid("id", originalParameter.getRowId())
.doUpdate(updatedParameter); .doUpdate(updatedParameter);
} }
// 如果是新模板，就新增 // 如果是新模板，就新增
else { else {
BeanUtils.copyProperties(form, updatedParameter); bd.getBusinessDatabase()
updatedParameter.setCreatedBy(userId); .doInsert(updatedParameter);
updatedParameter.setId(null);
detail = getParameterChange(originalParameter, updatedParameter);
bd.getBusinessDatabase().doInsert(updatedParameter);
} }
newParameters.add(updatedParameter); newParameters.add(updatedParameter);
revisionRecords.add(new RevisionRecord( revisionRecords.add(new RevisionRecord(
@ -406,7 +402,7 @@ public class ParameterServiceImpl implements ParameterService {
Template newTemplate, List<RevisionRecord> revisionRecords, Template newTemplate, List<RevisionRecord> revisionRecords,
Template baseTemplate Template baseTemplate
) { ) {
Parameter deletedParameter = parameterMap.get(form.getId()); Parameter deletedParameter = parameterMap.get(form.getParameterId());
if (deletedParameter != null) { if (deletedParameter != null) {
revisionRecords.add(new RevisionRecord( revisionRecords.add(new RevisionRecord(
@ -429,7 +425,7 @@ public class ParameterServiceImpl implements ParameterService {
ParameterForm form, Map<String, Parameter> parameterMap, ParameterForm form, Map<String, Parameter> parameterMap,
List<Parameter> newParameters List<Parameter> newParameters
) { ) {
Parameter unchangedParameter = parameterMap.get(form.getId()); Parameter unchangedParameter = parameterMap.get(form.getParameterId());
if (unchangedParameter != null) { if (unchangedParameter != null) {
newParameters.add(unchangedParameter); newParameters.add(unchangedParameter);
@ -440,7 +436,7 @@ public class ParameterServiceImpl implements ParameterService {
Map<String, Parameter> parameterMap, Map<String, Parameter> parameterMap,
List<ParameterForm> parameterForms) { List<ParameterForm> parameterForms) {
Set<String> formIds = parameterForms.stream() Set<String> formIds = parameterForms.stream()
.map(ParameterForm::getId) .map(ParameterForm::getParameterId)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
return parameterMap.entrySet().stream() return parameterMap.entrySet().stream()

1
src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java
View File

@ -296,7 +296,6 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
// BeanUtils.copyProperties(parameter, item); // BeanUtils.copyProperties(parameter, item);
// } // }
// }); // });
return results; return results;
} }