From 9db215895121e5bedee61cfe1ce1cca5cf8888f9 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期三, 04 六月 2025 11:18:34 +0800
Subject: [PATCH] 设备监控-列表添加状态查询条件
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 4 ++--
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 2 +-
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 12 ++++++++++++
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 5 +++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java | 10 +++++-----
6 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
index f841eeb..5c5f99c 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
@@ -63,7 +63,7 @@
/**
* 鏌ユ壘璁惧鐩戞帶淇℃伅
*/
- List<MdcEquipmentMonitor> checkStatusFromEquipmentIds(@Param("equipmentIds") List<String> equipmentIds);
+ List<MdcEquipmentMonitor> checkStatusFromEquipmentIds(@Param("equipmentIds") List<String> equipmentIds, @Param("status") String status);
/**
* 鏍规嵁浜х嚎id鏌ヨ璁惧id闆嗗悎
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 66e6ef5..89873f7 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -108,6 +108,18 @@
<foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
+ <if test="status !=null and status == 1">
+ and t2.Oporation in ('1', '2')
+ </if>
+ <if test="status !=null and status == 2">
+ and t2.Oporation = '3'
+ </if>
+ <if test="status !=null and status == 3">
+ and t2.Oporation = '22'
+ </if>
+ <if test="status !=null and status == 4">
+ and t2.Oporation not in ('1', '2', '3', '22') or t2.Oporation is null
+ </if>
</select>
<!--鏍规嵁閮ㄩ棬id鏌ヨ璁惧id闆嗗悎-->
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index c3c9548..a76ae1a 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -108,7 +108,7 @@
/**
* 璁惧鐩戞帶鍒楄〃
*/
- List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key);
+ List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key, String status);
/**
* 璁惧鐩戞帶 - 璁惧璇︾粏淇℃伅
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index b479291..e7a1088 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -409,12 +409,12 @@
* 璁惧鐩戞帶鍒楄〃
*/
@Override
- public List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key) {
+ public List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key, String status) {
List<String> equipmentIds = this.getEquipmentIdsProduction(userId, key);
if (equipmentIds == null || equipmentIds.isEmpty()) {
return Collections.emptyList();
}
- List<MdcEquipmentMonitor> result = this.baseMapper.checkStatusFromEquipmentIds(equipmentIds);
+ List<MdcEquipmentMonitor> result = this.baseMapper.checkStatusFromEquipmentIds(equipmentIds, status);
if (result != null && !result.isEmpty()) {
for (MdcEquipmentMonitor mdcEquipmentMonitor : result) {
if (mdcEquipmentMonitor.getOporation() != null) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index 69a1a9f..c3df8e0 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -116,10 +116,11 @@
@AutoLog(value = "璁惧琛�-璁惧鐩戞帶鍒楄〃")
@ApiOperation(value = "璁惧琛�-璁惧鐩戞帶鍒楄〃", notes = "璁惧琛�-璁惧鐩戞帶鍒楄〃")
@GetMapping(value = "/queryEquipmentMonitorList")
- public Result<List<MdcEquipmentMonitor>> queryEquipmentMonitorList(@RequestParam(name = "key", required = false) String key) {
+ public Result<List<MdcEquipmentMonitor>> queryEquipmentMonitorList(@RequestParam(name = "key", required = false) String key,
+ @RequestParam(name = "status", required = false) String status) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- List<MdcEquipmentMonitor> list = mdcEquipmentService.queryEquipmentMonitorList(userId, key);
+ List<MdcEquipmentMonitor> list = mdcEquipmentService.queryEquipmentMonitorList(userId, key, status);
return Result.OK(list);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
index b3513a9..516ec3f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
@@ -346,23 +346,23 @@
if (mapData != null) {
if (mapData.containsKey("Sequencenumber")) {
Object object = mapData.get("Sequencenumber");
- mdcBoardEquRealTImeVo.setSequenceNumber(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setSequenceNumber(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
if (mapData.containsKey("spindlespeed")) {
Object object = mapData.get("spindlespeed");
- mdcBoardEquRealTImeVo.setSpindleSpeed(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setSpindleSpeed(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
if (mapData.containsKey("spindleload")) {
Object object = mapData.get("spindleload");
- mdcBoardEquRealTImeVo.setSpindleLoad(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setSpindleLoad(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
if (mapData.containsKey("spindlebeilv")) {
Object object = mapData.get("spindlebeilv");
- mdcBoardEquRealTImeVo.setSpindlebeilv(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setSpindlebeilv(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
if (mapData.containsKey("feedbeilv")) {
Object object = mapData.get("feedbeilv");
- mdcBoardEquRealTImeVo.setFeedbeilv(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setFeedbeilv(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
}
// 缁翠繚鐘舵��
--
Gitblit v1.9.3