From 291c7abda2a116bbf599532e7bf0a318b3e67fee Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Thu, 26 Feb 2026 17:21:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=89=88=E6=9C=AC7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/ParameterValueCalculationTimer.java | 8 ++++++-- .../listener/PersonReadListener.java | 4 +++- .../listener/SheetDataListener.java | 4 +++- .../impl/AnalysisCommonParametersServiceImpl.java | 2 +- .../impl/DataEntryEngineModelServiceImpl.java | 8 ++++---- .../service/impl/EngineParamDetailServiceImpl.java | 12 ++++++++---- .../service/impl/EngineReviewListServiceImpl.java | 2 +- .../service/impl/ModelRoleServiceImpl.java | 6 ++++-- .../service/impl/ParameterServiceImpl.java | 2 ++ .../service/impl/ResponsiblePersonServiceImpl.java | 14 ++++++++++---- .../service/impl/TcDataQueryServiceImpl.java | 4 +++- .../service/impl/TemplateApprovalServiceImpl.java | 2 +- .../service/impl/TemplateServiceImpl.java | 6 +++++- .../service/impl/TodoTaskServiceImpl.java | 4 +++- .../utils/FormulaValidatorUtils.java | 4 ++-- 15 files changed, 56 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/xdap/self_development/job/ParameterValueCalculationTimer.java b/src/main/java/com/xdap/self_development/job/ParameterValueCalculationTimer.java index 9dbdd1b..c065fdf 100644 --- a/src/main/java/com/xdap/self_development/job/ParameterValueCalculationTimer.java +++ b/src/main/java/com/xdap/self_development/job/ParameterValueCalculationTimer.java @@ -154,7 +154,9 @@ public class ParameterValueCalculationTimer { String key = modelId + "|" + paramId + "|" + paramName; // 跳过已成功计算的 - if (computedKeys.contains(key)) continue; + if (computedKeys.contains(key)) { + continue; + } try { String replacedFormula = replaceParametersInFormula( @@ -274,7 +276,9 @@ public class ParameterValueCalculationTimer { } private boolean isNumeric(String str) { - if (str == null || str.isEmpty()) return false; + if (str == null || str.isEmpty()) { + return false; + } try { Double.parseDouble(str); return true; diff --git a/src/main/java/com/xdap/self_development/listener/PersonReadListener.java b/src/main/java/com/xdap/self_development/listener/PersonReadListener.java index 709346b..a80f695 100644 --- a/src/main/java/com/xdap/self_development/listener/PersonReadListener.java +++ b/src/main/java/com/xdap/self_development/listener/PersonReadListener.java @@ -25,7 +25,9 @@ public class PersonReadListener implements ReadListener { @Override public void invoke(ResponsiblePersonPojo responsiblePerson, AnalysisContext analysisContext) { - if (analysisContext.readRowHolder().getRowIndex() == 1) return; + if (analysisContext.readRowHolder().getRowIndex() == 1) { + return; + } if ( responsiblePerson.getDepartment() == null || responsiblePerson.getUsername() == null || diff --git a/src/main/java/com/xdap/self_development/listener/SheetDataListener.java b/src/main/java/com/xdap/self_development/listener/SheetDataListener.java index 8463c57..4fd168a 100644 --- a/src/main/java/com/xdap/self_development/listener/SheetDataListener.java +++ b/src/main/java/com/xdap/self_development/listener/SheetDataListener.java @@ -51,7 +51,9 @@ public class SheetDataListener implements ReadListener { public void invoke(ParameterPojo data, AnalysisContext context) { log.info("开始解析数据行: {}", context.readRowHolder().getRowIndex()); log.info("解析到一条数据: {}", data); - if (context.readRowHolder().getRowIndex() == 1) return; + if (context.readRowHolder().getRowIndex() == 1) { + return; + } // 参数校验 if (data == null) { return; diff --git a/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java index e8a796a..97e7c31 100644 --- a/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java @@ -108,7 +108,7 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame // 按权限过滤 List parameters = engineParamDetailService.selectParamByIsUserId(modelParams, userId); return parameters.stream() - .filter(x -> x.getUnit() != null && !x.getUnit().equals("/")) + .filter(x -> x.getUnit() != null && !"/".equals(x.getUnit())) .map(ParameterPojo::getParameterName).distinct().collect(Collectors.toList()); } diff --git a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java index dd92bb8..c2e58b3 100644 --- a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java @@ -425,8 +425,8 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ detailPojo.setParameterName(parameter.getParameterName()); detailPojo.setParameterSource(parameter.getParameterSource()); detailPojo.setParameterType(parameter.getParameterType()); - detailPojo.setIsDistributedFilled(parameter.getParameterSource().equals("数据平台手工录入") ? 0 : 2); - detailPojo.setIsDistributedRes(parameter.getParameterSource().equals("数据平台手工录入") ? 0 : 2); + detailPojo.setIsDistributedFilled("数据平台手工录入".equals(parameter.getParameterSource()) ? 0 : 2); + detailPojo.setIsDistributedRes("数据平台手工录入".equals(parameter.getParameterSource()) ? 0 : 2); detailPojo.setResponsiblePersonId(null); detailPojo.setFilledBy(null); detailPojo.setMajorVersion(model.getVersionNumber()); @@ -520,8 +520,8 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ detailPojo.setParameterName(parameter.getParameterName()); detailPojo.setParameterSource(parameter.getParameterSource()); detailPojo.setParameterType(parameter.getParameterType()); - detailPojo.setIsDistributedFilled(parameter.getParameterSource().equals("数据平台手工录入") ? 0 : 2); - detailPojo.setIsDistributedRes(parameter.getParameterSource().equals("数据平台手工录入") ? 0 : 2); + detailPojo.setIsDistributedFilled("数据平台手工录入".equals(parameter.getParameterSource()) ? 0 : 2); + detailPojo.setIsDistributedRes("数据平台手工录入".equals(parameter.getParameterSource()) ? 0 : 2); detailPojo.setResponsiblePersonId(null); detailPojo.setFilledBy(null); detailPojo.setMajorVersion(model.getVersionNumber()); diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java index d4d765f..c539ee1 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java @@ -154,7 +154,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { String manufacturerName = dataEntryEngineModelPojo.getManufacturerName(); String manufacturerAbbreviation = dataEntryEngineModelPojo.getManufacturerAbbreviation(); Set strings = new HashSet<>(); - if (dataEntryEngineModelPojo.getYcOrOth().equals("玉柴")) { + if ("玉柴".equals(dataEntryEngineModelPojo.getYcOrOth())) { strings.add("状态代号:" + productNumber); } else { strings.add("产品编号:" + productNumber); @@ -253,7 +253,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { String manufacturerName = dataEntryEngineModelPojo.getManufacturerName(); String manufacturerAbbreviation = dataEntryEngineModelPojo.getManufacturerAbbreviation(); Set strings = new HashSet<>(); - if (dataEntryEngineModelPojo.getYcOrOth().equals("玉柴")) { + if ("玉柴".equals(dataEntryEngineModelPojo.getYcOrOth())) { strings.add("状态代号:" + productNumber); } else { strings.add("产品编号:" + productNumber); @@ -719,7 +719,9 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { .eq("owner_id", filledBy) .eq("process_title", modelPojo.getModelName() + "-" + "填写参数任务") .doQuery(TodoTaskPojo.class); - if (!filledTodos.isEmpty()) continue; + if (!filledTodos.isEmpty()) { + continue; + } TodoTaskPojo todoTask = new TodoTaskPojo(); todoTask.setCreatedById(userID); @@ -1094,7 +1096,9 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { @Override @Transactional public void updateDept(EngineDeptUpdateDTO engineDeptUpdateDTO) { - if (engineDeptUpdateDTO.getList().isEmpty()) throw new CommonException("部门信息不能为空"); + if (engineDeptUpdateDTO.getList().isEmpty()) { + throw new CommonException("部门信息不能为空"); + } // 检查机型 DataEntryEngineModelPojo model = bd.getBusinessDatabase() diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java index 71cc905..9ebc212 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java @@ -117,7 +117,7 @@ public class EngineReviewListServiceImpl implements EngineReviewListService { List paramApprovalRecordPojos = bd.getBusinessDatabase() .eq("approval_id", approvalId) .doQuery(ParamApprovalRecordPojo.class); - if (paramApprovalRecordPojos.stream().anyMatch(x -> x.getOperator().equals("同意"))) { + if (paramApprovalRecordPojos.stream().anyMatch(x -> "同意".equals(x.getOperator()))) { b = false; } if (b) { diff --git a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java index 057538c..4bb5965 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java @@ -207,7 +207,7 @@ public class ModelRoleServiceImpl implements ModelRoleService { .eq("is_enabled", 1) .eq("id", roleID) .doQueryFirst(ModelRolesPojo.class); - if (ObjectUtils.isNotEmpty(modelRolesPojos) && (modelRolesPojos.getRoleCode().equals("super_admin"))) { + if (ObjectUtils.isNotEmpty(modelRolesPojos) && ("super_admin".equals(modelRolesPojos.getRoleCode()))) { return Collections.singletonList(new MenuParamView(roleID, "", "", "", "", 1)); } ArrayList menuParamViews = new ArrayList<>(); @@ -366,7 +366,9 @@ public class ModelRoleServiceImpl implements ModelRoleService { String comp = Optional.ofNullable(pojo.getPartsName()).orElse("/"); Map> sysMap = permissionIndex.get(cat); - if (sysMap == null) return false; + if (sysMap == null) { + return false; + } // 1. 检查是否有 cat/*/* （即 parts.length == 1） if (sysMap.containsKey("*")) { diff --git a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java index dcc1995..6cf2688 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java @@ -139,6 +139,7 @@ public class ParameterServiceImpl implements ParameterService { * @param benchmark 模板基准信息 * @return void */ + @Override public void validateTemplateStatus(TemplateBenchmark benchmark) { // 当前修改的模板不为最新版 if (!Objects.equals(benchmark.getLastTemplate().getId(), benchmark.getBaseTemplate().getId())) { @@ -281,6 +282,7 @@ public class ParameterServiceImpl implements ParameterService { * @param isLastComplete 是否最后完成 * @return 参数处理结果 */ + @Override public ParameterProcessingResult processParameters( List parameterForms, List existingParameters, diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java index 59bded8..ebfc2c9 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java @@ -385,22 +385,26 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { XdapDepartments xdapDepartments = bd.getSystemDatabase() .eq("name", "研发总院") .doQueryFirst(XdapDepartments.class); - if (xdapDepartments == null) return xdapUserView; + if (xdapDepartments == null) { + return xdapUserView; + } XdapDepartments currentDept = bd.getSystemDatabase() .eq("name", department) .eq("parent_id", xdapDepartments.getId()) .doQueryFirst(XdapDepartments.class); - if (currentDept != null) + if (currentDept != null) { xdapUserView.setDepartmentId(currentDept.getId()); + } if (userAccount != null) { XdapUsers currentUser = bd.getSystemDatabase() .eq("user_number", userAccount) .eq("username", username) .eq("exit_status", "ENABLE") .doQueryFirst(XdapUsers.class); - if (currentUser != null) + if (currentUser != null) { xdapUserView.setUserId(currentUser.getId()); + } } else { List xdapUsers = bd.getSystemDatabase() .eq("username", username) @@ -423,7 +427,9 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { XdapDepartments currentDept = bd.getSystemDatabase() .eq("name", "研发总院") .doQueryFirst(XdapDepartments.class); - if (currentDept == null) return Collections.emptyList(); + if (currentDept == null) { + return Collections.emptyList(); + } return bd.getSystemDatabase() .eq("parent_id", currentDept.getId()) .doQuery(XdapDepartments.class); diff --git a/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java index 1981c02..88f2d98 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java @@ -799,7 +799,9 @@ public class TcDataQueryServiceImpl implements TcDataQueryService { // .filter(Objects::nonNull) // 增加null过滤 .filter(pojo -> subsystemParts.stream().anyMatch(part -> { String[] parts = part.split("-"); - if (parts.length != 2) return false; + if (parts.length != 2) { + return false; + } String subsystem = parts[0]; String partsName = parts[1]; diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java index 100ac57..ebc6edb 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java @@ -221,7 +221,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService { throw new CommonException("流程不存在"); } - if (flow.getFlowStatus().equals("APPROVING")) { + if ("APPROVING".equals(flow.getFlowStatus())) { throw new CommonException("流程正在审批中"); } diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java index 28c7f67..e352e4d 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java @@ -62,6 +62,10 @@ public class TemplateServiceImpl implements TemplateService { .like("template_name", form.getTemplateName()) .doPageQuery(form.getPageNumber(), form.getPageSize(), TemplatePojo.class); result.getResult().forEach(templatePojo -> { + if (Objects.equals(templatePojo.getCreateBy(), "超级管理员")) { + templatePojo.setCreateBy("超级管理员"); + return; + } XdapUsers user = bd.getSystemDatabase() .eq("id", templatePojo.getCreateBy()) .doQueryFirst(XdapUsers.class); @@ -508,7 +512,7 @@ public class TemplateServiceImpl implements TemplateService { } // 返回问题 - if (problems.getHasImported().toString().equals("已完成导入：无")) { + if ("已完成导入：无".equals(problems.getHasImported().toString())) { problems.setHasImported(new StringBuilder("已完成导入：")); problems.getHasImported().append(templateName); } else { diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java index 2d76ccf..add75d3 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java @@ -232,7 +232,9 @@ public class TodoTaskServiceImpl implements TodoTaskService { .eq("owner_id", resId) .eq("process_title", model.getModelName() + "-" + "分发参数填写人任务") .doQuery(TodoTaskPojo.class); - if (!resTodos.isEmpty()) continue; + if (!resTodos.isEmpty()) { + continue; + } // 没有就新增待办 TodoTaskPojo todoTaskPojo = new TodoTaskPojo(); todoTaskPojo.setCreatedById(userID); diff --git a/src/main/java/com/xdap/self_development/utils/FormulaValidatorUtils.java b/src/main/java/com/xdap/self_development/utils/FormulaValidatorUtils.java index 9f7bf50..ab8418f 100644 --- a/src/main/java/com/xdap/self_development/utils/FormulaValidatorUtils.java +++ b/src/main/java/com/xdap/self_development/utils/FormulaValidatorUtils.java @@ -146,7 +146,7 @@ public class FormulaValidatorUtils { // 第一个token：可以是参数/数字/常量/负号/占位符 if (i == 0) { - if (token.equals("-")) { + if ("-".equals(token)) { // 负号开头，检查下一个token是否为有效值 if (tokens.size() < 2 || isValidOperand(tokens.get(1)) && !tokens.get(1).equals(PLACEHOLDER)) { throw new IllegalArgumentException(String.format("负号后必须跟有效参数/数字/常量 [错误片段：-%s][原始公式：%s]", @@ -169,7 +169,7 @@ public class FormulaValidatorUtils { token, currentFormula, originalFormula)); } // 检查除法分母不能为0 - if (token.equals("/") && i + 1 < tokens.size()) { + if ("/".equals(token) && i + 1 < tokens.size()) { String nextToken = tokens.get(i + 1); if (!nextToken.equals(PLACEHOLDER) && nextToken.matches("^-?0+(\\.0+)?$")) { throw new IllegalArgumentException(String.format("除法运算分母不能为0 [错误片段：/%s][原始公式：%s]",