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 | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 2dc83a3..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,12 +10,18 @@
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;
+import org.jeecg.common.util.RedisUtil;
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;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,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;
@@ -53,6 +61,12 @@
@Autowired
private IDryEquipmentService dryEquipmentService;
+ @Autowired
+ private IDryEqpTypeService dryEqpTypeService;
+
+
+ @Autowired
+ private RedisUtil redisUtil;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -83,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){
@@ -92,9 +106,24 @@
//------------------------------------------------------------------------------------------------
QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());
+ queryWrapper.orderByAsc("code");
List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
- return Result.OK(eqps);
+ List<DryEquipmentVo> equipmentVos = new ArrayList<>();
+ eqps.stream().forEach(item -> {
+ 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(equipmentVos);
}
+
+
+
+
/**
* 娣诲姞
@@ -122,7 +151,9 @@
@RequiresPermissions("dry:dry_equipment:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody DryEquipment dryEquipment) {
+ redisUtil.del(CacheConstants.RedisKeyEnum.EQP_MAP.getCode());
dryEquipmentService.updateById(dryEquipment);
+
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -137,6 +168,7 @@
@RequiresPermissions("dry:dry_equipment:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ redisUtil.del(CacheConstants.RedisKeyEnum.EQP_MAP.getCode());
dryEquipmentService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -152,6 +184,7 @@
@RequiresPermissions("dry:dry_equipment:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ redisUtil.del(CacheConstants.RedisKeyEnum.EQP_MAP.getCode());
this.dryEquipmentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
@@ -165,12 +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);
+ 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