From 3ee30263eb9bb5f7bf1228ea45ce5d498fb3cdef Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 14:41:13 +0800
Subject: [PATCH] 设备类型增加效率和均耗绑定
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 3a172ed..44bed1e 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.dry.controller;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -9,6 +10,8 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.bean.BeanUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.system.query.QueryGenerator;
@@ -16,6 +19,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.common.CacheConstants;
+import org.jeecg.modules.dry.entity.DryEqpType;
import org.jeecg.modules.dry.entity.DryEquipment;
import org.jeecg.modules.dry.service.IDryEqpTypeService;
import org.jeecg.modules.dry.service.IDryEquipmentService;
@@ -25,6 +29,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.dry.vo.DryEquipmentVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -92,7 +97,7 @@
@ApiOperation(value="鏌ヨ鎵�鏈夊共鐕ユ満", notes="鏌ヨ鎵�鏈夊共鐕ユ満")
@GetMapping(value = "/listAll")
- public Result<List<DryEquipment>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
+ public Result<List<DryEquipmentVo>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
//------------------------------------------------------------------------------------------------
//鏄惁寮�鍚郴缁熺鐞嗘ā鍧楃殑澶氱鎴锋暟鎹殧绂汇�怱AAS澶氱鎴锋ā寮忋��
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
@@ -103,10 +108,17 @@
queryWrapper.orderByAsc("code");
List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
+ List<DryEquipmentVo> equipmentVos = new ArrayList<>();
eqps.stream().forEach(item -> {
- item.setType(dryEqpTypeService.getById(item.getType()).getName());
+ DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class);
+ DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType());
+ dryEquipmentVo.setType(dryEqpType.getName());
+ dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
+ dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());
+ dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption());
+ equipmentVos.add(dryEquipmentVo);
});
- return Result.OK(eqps);
+ return Result.OK(equipmentVos);
}
@@ -186,13 +198,18 @@
//@AutoLog(value = "骞茬嚗鏈�-閫氳繃id鏌ヨ")
@ApiOperation(value="骞茬嚗鏈�-閫氳繃id鏌ヨ", notes="骞茬嚗鏈�-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
- public Result<DryEquipment> queryById(@RequestParam(name="id",required=true) String id) {
+ public Result<DryEquipmentVo> queryById(@RequestParam(name="id",required=true) String id) {
DryEquipment dryEquipment = dryEquipmentService.getById(id);
- dryEquipment.setType(dryEqpTypeService.getById(dryEquipment.getType()).getName());
+ DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(dryEquipment, DryEquipmentVo.class);
+ DryEqpType dryEqpType = dryEqpTypeService.getById(dryEquipment.getType());
+ dryEquipmentVo.setType(dryEqpType.getName());
+ dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
+ dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());
+ dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption());
if(dryEquipment==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
- return Result.OK(dryEquipment);
+ return Result.OK(dryEquipmentVo);
}
/**
--
Gitblit v1.9.3