From a8ddac646d5129e9818ea82f404d0c0a8d2bc239 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 09 十一月 2023 10:39:25 +0800
Subject: [PATCH] 设备参数阈值管理接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java
index e749aa3..c56a186 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +17,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.ProcessParameters;
+import org.jeecg.modules.eam.entity.ProcessParametersCategory;
import org.jeecg.modules.eam.entity.ProcessParametersTemplate;
import org.jeecg.modules.eam.entity.ProcessParametersTemplateDetail;
import org.jeecg.modules.eam.service.IProcessParametersCategoryService;
@@ -80,7 +83,17 @@
if (processParameters != null) {
processParametersTemplateDetail.setProcessParametersNum(processParameters.getNum());
processParametersTemplateDetail.setProcessParametersName(processParameters.getName());
- processParametersTemplateDetail.setProcessParametersCategory(processParametersCategoryService.getById(processParameters.getProcessParametersCategoryId()).getName());
+ if(processParameters != null){
+ String id = processParameters.getProcessParametersCategoryId();
+ if(StringUtils.isNotBlank(id)){
+ ProcessParametersCategory processParametersCategory = processParametersCategoryService.getById(id);
+ if(ObjectUtils.isNotNull(processParametersCategory)&&StringUtils.isNotBlank(processParametersCategory.getName())){
+ processParametersTemplateDetail.setProcessParametersCategory(processParametersCategory.getName());
+ }
+ }
+ }else{
+ processParametersTemplateDetail.setProcessParametersCategory("/");
+ }
// processParametersTemplateDetail.setUnit(unitService.getById(processParameters.getUnitId()).getName());
String unitName = sysBaseApi.getUnitNameById(processParameters.getUnitId());
processParametersTemplateDetail.setUnit(unitName);
--
Gitblit v1.9.3