Commit 97209dacec31b9d4fdc0a2ec6ce83a59aa112aa5
1 parent
cee2004d
refactor(mapping): 优化远程参数字段映射逻辑
- 修改 MappingUtils 中的远程参数获取方式,使用 getRemoteParam() 替代 getPipelineDocFieldTypeRemoteParamDO() - 更新 PipelineDocFieldTypeDO 模型中的字段命名,统一为 remoteParam - 简化 PipelineDocFieldTypeService 中的方法签名,去除冗余的全限定类名 - 调整 saveConfig 和相关方法参数类型,提升代码一致性与可读性 - 统一 queryByPipelineRemoteFieldTypeId 返回值设置方式为 setRemoteParam()
Showing
3 changed files
with
9 additions
and
9 deletions
tax-central/src/main/java/com/diligrp/tax/central/model/PipelineDocFieldTypeDO.java
| @@ -48,5 +48,5 @@ public class PipelineDocFieldTypeDO { | @@ -48,5 +48,5 @@ public class PipelineDocFieldTypeDO { | ||
| 48 | /** | 48 | /** |
| 49 | * 远程参数 | 49 | * 远程参数 |
| 50 | */ | 50 | */ |
| 51 | - private PipelineDocFieldTypeRemoteParamDO pipelineDocFieldTypeRemoteParamDO; | 51 | + private PipelineDocFieldTypeRemoteParamDO remoteParam; |
| 52 | } | 52 | } |
tax-central/src/main/java/com/diligrp/tax/central/utils/MappingUtils.java
| @@ -106,7 +106,7 @@ public class MappingUtils { | @@ -106,7 +106,7 @@ public class MappingUtils { | ||
| 106 | } | 106 | } |
| 107 | } | 107 | } |
| 108 | case REMOTE -> { | 108 | case REMOTE -> { |
| 109 | - PipelineDocFieldTypeRemoteParamDO pipelineDocFieldTypeRemoteParamDO = cfg.getPipelineDocFieldTypeRemoteParamDO(); | 109 | + PipelineDocFieldTypeRemoteParamDO pipelineDocFieldTypeRemoteParamDO = cfg.getRemoteParam(); |
| 110 | String value = (String) field.get(object); | 110 | String value = (String) field.get(object); |
| 111 | String fixedParams = pipelineDocFieldTypeRemoteParamDO.getFixedParams(); | 111 | String fixedParams = pipelineDocFieldTypeRemoteParamDO.getFixedParams(); |
| 112 | String remoteAddress = pipelineDocFieldTypeRemoteParamDO.getRemoteAddress(); | 112 | String remoteAddress = pipelineDocFieldTypeRemoteParamDO.getRemoteAddress(); |
tax-storage/src/main/java/com/diligrp/tax/storage/service/PipelineDocFieldTypeService.java
| @@ -104,25 +104,25 @@ public class PipelineDocFieldTypeService { | @@ -104,25 +104,25 @@ public class PipelineDocFieldTypeService { | ||
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | @Transactional | 106 | @Transactional |
| 107 | - public void deleteRemoteConfig(com.diligrp.tax.storage.domain.PipelineDocFieldType e) { | 107 | + public void deleteRemoteConfig(PipelineDocFieldType e) { |
| 108 | LambdaQueryWrapper<PipelineDocFieldTypeRemote> wrapper = new LambdaQueryWrapper<PipelineDocFieldTypeRemote>().eq(PipelineDocFieldTypeRemote::getPipelineFieldTypeId, e.getId()); | 108 | LambdaQueryWrapper<PipelineDocFieldTypeRemote> wrapper = new LambdaQueryWrapper<PipelineDocFieldTypeRemote>().eq(PipelineDocFieldTypeRemote::getPipelineFieldTypeId, e.getId()); |
| 109 | pipelineDocFieldTypeRemoteRepository.delete(wrapper); | 109 | pipelineDocFieldTypeRemoteRepository.delete(wrapper); |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | @Transactional | 112 | @Transactional |
| 113 | - public void deleteDynamicConfig(com.diligrp.tax.storage.domain.PipelineDocFieldType e) { | 113 | + public void deleteDynamicConfig(PipelineDocFieldType e) { |
| 114 | LambdaQueryWrapper<PipelineDocFieldTypeDynamic> wrapper = new LambdaQueryWrapper<PipelineDocFieldTypeDynamic>().eq(PipelineDocFieldTypeDynamic::getPipelineFieldTypeId, e.getId()); | 114 | LambdaQueryWrapper<PipelineDocFieldTypeDynamic> wrapper = new LambdaQueryWrapper<PipelineDocFieldTypeDynamic>().eq(PipelineDocFieldTypeDynamic::getPipelineFieldTypeId, e.getId()); |
| 115 | pipelineDocFieldTypeDynamicRepository.delete(wrapper); | 115 | pipelineDocFieldTypeDynamicRepository.delete(wrapper); |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | @Transactional | 118 | @Transactional |
| 119 | - public void deleteFixedConfig(com.diligrp.tax.storage.domain.PipelineDocFieldType e) { | 119 | + public void deleteFixedConfig(PipelineDocFieldType e) { |
| 120 | LambdaQueryWrapper<PipelineDocFieldTypeFixed> wrapper = new LambdaQueryWrapper<PipelineDocFieldTypeFixed>().eq(PipelineDocFieldTypeFixed::getPipelineFieldTypeId, e.getId()); | 120 | LambdaQueryWrapper<PipelineDocFieldTypeFixed> wrapper = new LambdaQueryWrapper<PipelineDocFieldTypeFixed>().eq(PipelineDocFieldTypeFixed::getPipelineFieldTypeId, e.getId()); |
| 121 | pipelineDocFieldTypeFixedRepository.delete(wrapper); | 121 | pipelineDocFieldTypeFixedRepository.delete(wrapper); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | @Transactional | 124 | @Transactional |
| 125 | - public void saveConfig(PipelineDocFieldTypeCO co, SettingFieldType from, com.diligrp.tax.storage.domain.PipelineDocFieldType newType) { | 125 | + public void saveConfig(PipelineDocFieldTypeCO co, SettingFieldType from, PipelineDocFieldType newType) { |
| 126 | switch (from) { | 126 | switch (from) { |
| 127 | case FIXED -> saveFixedConfig(co, newType); | 127 | case FIXED -> saveFixedConfig(co, newType); |
| 128 | case DYNAMIC -> saveDynamicConfig(co, newType); | 128 | case DYNAMIC -> saveDynamicConfig(co, newType); |
| @@ -131,7 +131,7 @@ public class PipelineDocFieldTypeService { | @@ -131,7 +131,7 @@ public class PipelineDocFieldTypeService { | ||
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | @Transactional | 133 | @Transactional |
| 134 | - public void saveRemoteConfig(PipelineDocFieldTypeCO co, com.diligrp.tax.storage.domain.PipelineDocFieldType newType) { | 134 | + public void saveRemoteConfig(PipelineDocFieldTypeCO co, PipelineDocFieldType newType) { |
| 135 | PipelineDocFieldTypeRemote config = new PipelineDocFieldTypeRemote(); | 135 | PipelineDocFieldTypeRemote config = new PipelineDocFieldTypeRemote(); |
| 136 | config.setPipelineFieldTypeId(newType.getId()); | 136 | config.setPipelineFieldTypeId(newType.getId()); |
| 137 | config.setRemoteAddress(co.getRemoteParam().getRemoteAddress()); | 137 | config.setRemoteAddress(co.getRemoteParam().getRemoteAddress()); |
| @@ -142,7 +142,7 @@ public class PipelineDocFieldTypeService { | @@ -142,7 +142,7 @@ public class PipelineDocFieldTypeService { | ||
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | @Transactional | 144 | @Transactional |
| 145 | - public void saveDynamicConfig(PipelineDocFieldTypeCO co, com.diligrp.tax.storage.domain.PipelineDocFieldType newType) { | 145 | + public void saveDynamicConfig(PipelineDocFieldTypeCO co, PipelineDocFieldType newType) { |
| 146 | co.getDynamicValues().forEach(dynamicValueDO -> { | 146 | co.getDynamicValues().forEach(dynamicValueDO -> { |
| 147 | PipelineDocFieldTypeDynamic dynamicConfig = new PipelineDocFieldTypeDynamic(); | 147 | PipelineDocFieldTypeDynamic dynamicConfig = new PipelineDocFieldTypeDynamic(); |
| 148 | dynamicConfig.setPipelineFieldTypeId(newType.getId()); | 148 | dynamicConfig.setPipelineFieldTypeId(newType.getId()); |
| @@ -175,7 +175,7 @@ public class PipelineDocFieldTypeService { | @@ -175,7 +175,7 @@ public class PipelineDocFieldTypeService { | ||
| 175 | switch (SettingFieldType.from(e.getSettingFieldType())) { | 175 | switch (SettingFieldType.from(e.getSettingFieldType())) { |
| 176 | case FIXED -> res.setFixedValue(queryByPipelineFixedFieldTypeId(e.getId())); | 176 | case FIXED -> res.setFixedValue(queryByPipelineFixedFieldTypeId(e.getId())); |
| 177 | case DYNAMIC -> res.setDynamicValues(queryByPipelineDynamicFieldTypeId(e.getId())); | 177 | case DYNAMIC -> res.setDynamicValues(queryByPipelineDynamicFieldTypeId(e.getId())); |
| 178 | - case REMOTE -> res.setPipelineDocFieldTypeRemoteParamDO(queryByPipelineRemoteFieldTypeId(e.getId())); | 178 | + case REMOTE -> res.setRemoteParam(queryByPipelineRemoteFieldTypeId(e.getId())); |
| 179 | } | 179 | } |
| 180 | return res; | 180 | return res; |
| 181 | }).toList(); | 181 | }).toList(); |