From 38c6f00b5efbbb9ce21669a887e03d6cb8ce3df9 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 20 十一月 2023 19:03:45 +0800
Subject: [PATCH] 生产线
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java | 47 +++++++++++++++++++++--------------------------
1 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java
index a80b540..00e305e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java
@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.jeecg.common.api.vo.CommonGenericTree;
@@ -25,6 +26,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.system.entity.SysDict;
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.system.service.ISysDictItemService;
+import org.jeecg.modules.system.service.ISysDictService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -54,6 +59,10 @@
public class EquipmentCategoryController extends JeecgController<EquipmentCategory, IEquipmentCategoryService> {
@Autowired
private IEquipmentCategoryService equipmentCategoryService;
+ @Autowired
+ private ISysDictService sysDictService;
+ @Autowired
+ private ISysDictItemService sysDictItemService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -121,32 +130,18 @@
//@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment_category:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody EquipmentCategory equipmentCategory) {
- if(!StringUtils.isNotBlank( equipmentCategory.getParentId())){
- equipmentCategory.setParentId("-1");
- if("鐢熶骇璁惧".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("producter");
- } else if("璇曢獙鍣�".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("tester");
- }else if("鏁版帶鍥炶浆搴�".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("filesCarousel");
- }else if("闈炴爣鍚婄储鍏�".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("nonStandardLiftingLocks");
- }else if("杩愯緭杞�".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("truck");
- }else if("璧烽噸璁惧".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("crane");
- }else if("骞宠 鏈�".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("balanceMachine");
- }else if("鐒婃満".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("weldingMachine");
- }else if("鍘嬪姏瀹瑰櫒".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("pressureVessel");
- }else if("鐜繚璁惧".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("envProEquipment");
- }else if("杞﹀彴".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("ride");
- }else if("妫�娴嬨�佽閲忚澶�".equals(equipmentCategory.getName())){
- equipmentCategory.setEquipmentCategoryUda1("checkoutEquipment");
+ if(equipmentCategory.getParentId().equals("-1")){
+ SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","equipment_category"),false);
+ if(ObjectUtils.isNotNull(sysDict)){
+ List<SysDictItem> sysDictItems = sysDictItemService.selectItemsByMainId(sysDict.getId());
+ for(SysDictItem sysDictItem:sysDictItems){
+ if(equipmentCategory.getName().equals(sysDictItem.getItemText())){
+ equipmentCategory.setEquipmentCategoryUda1(sysDictItem.getItemValue());
+ }
+ }
+ }
+ else {
+ return Result.error("娣诲姞澶辫触锛岄渶瑕佸幓缁存姢鏁版嵁瀛楀吀璁惧澶х被锛�");
}
}
equipmentCategoryService.save(equipmentCategory);
--
Gitblit v1.9.3