From 07df3edd01d77d77d2653a6a9ee325e53e607955 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 04 十二月 2023 08:31:09 +0800
Subject: [PATCH] 增加opc设备维护和控制
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 2dc83a3..3a172ed 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
@@ -12,9 +12,12 @@
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.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 +56,12 @@
@Autowired
private IDryEquipmentService dryEquipmentService;
+ @Autowired
+ private IDryEqpTypeService dryEqpTypeService;
+
+
+ @Autowired
+ private RedisUtil redisUtil;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -92,9 +101,17 @@
//------------------------------------------------------------------------------------------------
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);
}
+
+
+
+
/**
* 娣诲姞
@@ -122,7 +139,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 +156,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 +172,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("鎵归噺鍒犻櫎鎴愬姛!");
}
@@ -167,6 +188,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