From 880671a5a9ff5ff1c2100a5b776400767f45ff5f Mon Sep 17 00:00:00 2001 From: songqq Date: Wed, 17 Dec 2025 16:56:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E6=9B=BF=E6=8D=A2=E7=A1=AC=E7=BC=96=E7=A0=81=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在ServiceConstant中添加常用方法名常量 - 使用ParamUtils重构多处参数构建逻辑 - 统一QueryService中的方法名调用为常量 - 修复CompanyOldNameService中的字段别名问题 --- .../controller/employee/EmployeeTabSkinRole.java | 4 +++- .../service/CompanyCustomerFileTypeService.java | 9 ++++----- .../contract/service/CompanyInvoiceInfoService.java | 6 +++--- .../com/ecep/contract/service/CompanyService.java | 4 ++-- .../java/com/ecep/contract/service/QueryService.java | 11 ++++++----- .../com/ecep/contract/constant/ServiceConstant.java | 5 +++++ .../ds/company/service/CompanyOldNameService.java | 2 +- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/client/src/main/java/com/ecep/contract/controller/employee/EmployeeTabSkinRole.java b/client/src/main/java/com/ecep/contract/controller/employee/EmployeeTabSkinRole.java index 1bb3f6e..16414a7 100644 --- a/client/src/main/java/com/ecep/contract/controller/employee/EmployeeTabSkinRole.java +++ b/client/src/main/java/com/ecep/contract/controller/employee/EmployeeTabSkinRole.java @@ -2,7 +2,9 @@ package com.ecep.contract.controller.employee; import java.util.HashMap; import java.util.List; +import java.util.Map; +import com.ecep.contract.util.ParamUtils; import org.springframework.data.domain.Pageable; import com.ecep.contract.controller.tab.TabSkin; @@ -48,7 +50,7 @@ public class EmployeeTabSkinRole private void initializeListView() { // 非系统内置账户 - HashMap params = new HashMap<>(); + Map params = ParamUtils.builder().build(); List roles = getEmployeeRoleService().findAll(params, Pageable.ofSize(500)).getContent(); controller.rolesField.getSourceItems().setAll(roles); diff --git a/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java b/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java index e586889..fa6524b 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java +++ b/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java @@ -39,13 +39,13 @@ public class CompanyCustomerFileTypeService return super.findAll(); } - @Caching(put = { @CachePut(key = "#p0.id"), @CachePut(key = "'all'") }) + @Caching(put = {@CachePut(key = "#p0.id"), @CachePut(key = "'all'")}) @Override public CustomerFileTypeLocalVo save(CustomerFileTypeLocalVo entity) { return super.save(entity); } - @Caching(put = { @CachePut(key = "#p0.id"), @CachePut(key = "'all'") }) + @Caching(put = {@CachePut(key = "#p0.id"), @CachePut(key = "'all'")}) @Override public void delete(CustomerFileTypeLocalVo entity) { super.delete(entity); @@ -53,8 +53,7 @@ public class CompanyCustomerFileTypeService @Cacheable public Map findAll(Locale locale) { - Map params = new HashMap<>(); - params.put("lang", locale.toLanguageTag()); + Map params = ParamUtils.builder().equals("lang", locale.toLanguageTag()).build(); return findAll(params, Pageable.unpaged()).stream() .collect(Collectors.toMap(CustomerFileTypeLocalVo::getType, Function.identity())); } @@ -66,7 +65,7 @@ public class CompanyCustomerFileTypeService /** * 根据语言标签和参数查找单个 CustomerFileTypeLocalVo 对象 - * + * * @param locale 语言区域 * @param key 参数键 * @param value 参数值 diff --git a/client/src/main/java/com/ecep/contract/service/CompanyInvoiceInfoService.java b/client/src/main/java/com/ecep/contract/service/CompanyInvoiceInfoService.java index a4468aa..3a2b39b 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyInvoiceInfoService.java +++ b/client/src/main/java/com/ecep/contract/service/CompanyInvoiceInfoService.java @@ -1,5 +1,6 @@ package com.ecep.contract.service; +import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vm.CompanyInvoiceInfoViewModel; import com.ecep.contract.vo.CompanyInvoiceInfoVo; import com.ecep.contract.vo.CompanyVo; @@ -15,9 +16,8 @@ import java.util.Map; public class CompanyInvoiceInfoService extends QueryService { public List searchByCompany(CompanyVo company, String searchText) { - Map params = new HashMap<>(); - params.put("company", company); - params.put("searchText", searchText); + Map params = ParamUtils.builder().equals("company", company.getId()) + .search(searchText).build(); return findAll(params, Pageable.unpaged()).getContent(); } } diff --git a/client/src/main/java/com/ecep/contract/service/CompanyService.java b/client/src/main/java/com/ecep/contract/service/CompanyService.java index e4ef40f..99e8b69 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyService.java +++ b/client/src/main/java/com/ecep/contract/service/CompanyService.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import com.ecep.contract.SpringApp; +import com.ecep.contract.util.ParamUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; @@ -58,8 +59,7 @@ public class CompanyService extends QueryService { } public List findAllByName(String name) { - Map params = new HashMap<>(); - params.put("name", name); + Map params = ParamUtils.builder().equals("name", name).build(); return findAll(params, Pageable.unpaged()).getContent(); } diff --git a/client/src/main/java/com/ecep/contract/service/QueryService.java b/client/src/main/java/com/ecep/contract/service/QueryService.java index efb4fc5..7dfd842 100644 --- a/client/src/main/java/com/ecep/contract/service/QueryService.java +++ b/client/src/main/java/com/ecep/contract/service/QueryService.java @@ -3,6 +3,7 @@ package com.ecep.contract.service; import com.ecep.contract.PageArgument; import com.ecep.contract.PageContent; import com.ecep.contract.WebSocketClientService; +import com.ecep.contract.constant.ServiceConstant; import com.ecep.contract.model.IdentityEntity; import com.ecep.contract.model.NamedEntity; import com.ecep.contract.util.ParamUtils; @@ -67,7 +68,7 @@ public class QueryService { + return async(ServiceConstant.SAVE_METHOD_NAME, entity, entity.getClass().getName()).handle((response, ex) -> { if (ex != null) { throw new RuntimeException("保存实体失败", ex); } @@ -88,7 +89,7 @@ public class QueryService { + async(ServiceConstant.DELETE_METHOD_NAME, entity, entity.getClass().getName()).handle((response, ex) -> { if (ex != null) { throw new RuntimeException("删除实体失败", ex); } @@ -117,7 +118,7 @@ public class QueryService asyncFindById(Integer id) { - return async("findById", id, Integer.class).handle((response, ex) -> { + return async(ServiceConstant.FIND_BY_ID_METHOD_NAME, id, Integer.class).handle((response, ex) -> { if (ex != null) { throw new RuntimeException("查询实体失败", ex); } @@ -149,7 +150,7 @@ public class QueryService> asyncFindAll(Map params, Pageable pageable) { // 调用async方法发送WebSocket请求，获取异步响应结果 - return async("findAll", params, PageArgument.of(pageable)).handle((response, ex) -> { + return async(ServiceConstant.FIND_ALL_METHOD_NAME, params, PageArgument.of(pageable)).handle((response, ex) -> { if (ex != null) { throw new RuntimeException("远程方法+findAll+调用失败", ex); } @@ -202,7 +203,7 @@ public class QueryService asyncCount(Map params) { // 调用async方法执行名为"count"的异步操作，传入参数params // 使用handle方法处理异步操作的结果或异常 - return async("count", params).handle((response, ex) -> { + return async(ServiceConstant.COUNT_METHOD_NAME, params).handle((response, ex) -> { if (ex != null) { throw new RuntimeException("远程方法+count+调用失败", ex); } diff --git a/common/src/main/java/com/ecep/contract/constant/ServiceConstant.java b/common/src/main/java/com/ecep/contract/constant/ServiceConstant.java index 7541f17..dd47ce0 100644 --- a/common/src/main/java/com/ecep/contract/constant/ServiceConstant.java +++ b/common/src/main/java/com/ecep/contract/constant/ServiceConstant.java @@ -1,4 +1,9 @@ package com.ecep.contract.constant; public class ServiceConstant { + public static final String COUNT_METHOD_NAME = "count"; + public static final String FIND_ALL_METHOD_NAME = "findAll"; + public static final String FIND_BY_ID_METHOD_NAME = "findById"; + public static final String DELETE_METHOD_NAME = "delete"; + public static final String SAVE_METHOD_NAME = "save"; } diff --git a/server/src/main/java/com/ecep/contract/ds/company/service/CompanyOldNameService.java b/server/src/main/java/com/ecep/contract/ds/company/service/CompanyOldNameService.java index f0b04b0..56e796c 100644 --- a/server/src/main/java/com/ecep/contract/ds/company/service/CompanyOldNameService.java +++ b/server/src/main/java/com/ecep/contract/ds/company/service/CompanyOldNameService.java @@ -210,7 +210,7 @@ public class CompanyOldNameService extends EntityService