From b4b962e1ca05abd8bfc63c80f1adc3df5cfa1a24 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 26 六月 2023 13:00:06 +0800
Subject: [PATCH] 增加电能和蒸汽消耗，完善工单机器状态
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
index e2a2116..6f6e2a8 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
@@ -15,6 +15,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.entity.DryEquipment;
+import org.jeecg.modules.dry.service.IDryEqpTypeService;
import org.jeecg.modules.dry.service.IDryEquipmentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -53,6 +54,9 @@
@Autowired
private IDryEquipmentService dryEquipmentService;
+ @Autowired
+ private IDryEqpTypeService dryEqpTypeService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -79,6 +83,25 @@
Page<DryEquipment> page = new Page<DryEquipment>(pageNo, pageSize);
IPage<DryEquipment> pageList = dryEquipmentService.page(page, queryWrapper);
return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="鏌ヨ鎵�鏈夊共鐕ユ満", notes="鏌ヨ鎵�鏈夊共鐕ユ満")
+ @GetMapping(value = "/listAll")
+ public Result<List<DryEquipment>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
+ //------------------------------------------------------------------------------------------------
+ //鏄惁寮�鍚郴缁熺鐞嗘ā鍧楃殑澶氱鎴锋暟鎹殧绂汇�怱AAS澶氱鎴锋ā寮忋��
+ if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
+ dryEquipment.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
+ }
+ //------------------------------------------------------------------------------------------------
+ QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());
+
+ queryWrapper.orderByAsc("code");
+ List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
+ eqps.stream().forEach(item -> {
+ item.setType(dryEqpTypeService.getById(item.getType()).getName());
+ });
+ return Result.OK(eqps);
}
/**
@@ -152,6 +175,7 @@
@GetMapping(value = "/queryById")
public Result<DryEquipment> queryById(@RequestParam(name="id",required=true) String id) {
DryEquipment dryEquipment = dryEquipmentService.getById(id);
+ dryEquipment.setType(dryEqpTypeService.getById(dryEquipment.getType()).getName());
if(dryEquipment==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
--
Gitblit v1.9.3