From f52627e8432451f13bad65a5a6a0c165e16b0193 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 10:06:20 +0800
Subject: [PATCH] 电视机新增图号显示
---
src/main/java/com/zy/asrs/controller/TVController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index da568cd..ab53703 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -279,7 +279,7 @@
}catch (Exception e){
// log.error("宸ヤ綔妗ｆ鏄庣粏杈撳叆鐢佃鏈哄け璐�1锛氬紓甯镐俊鎭�==銆�"+e);
}
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs())));
+ wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs(),wrkDetl.getModel())));
}
commands.add(ledCommand);
@@ -291,7 +291,21 @@
*/
@GetMapping("/led/error")
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
- return R.ok();
+ BasDevp basDevp =basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",ledId));
+ if(Cools.isEmpty(basDevp)){
+ return R.ok();
+ }
+ if(Cools.isEmpty(basDevp.getArea())){
+ return R.ok();
+ }
+ if(basDevp.getLoading().equals("N")){
+ basDevp.setArea("");
+ basDevpService.updateById(basDevp);
+ return R.ok();
+ }
+ String errorMsg = basDevp.getArea();
+
+ return R.ok().add(errorMsg);
}
--
Gitblit v1.9.1