From 450cedf62f1c264912996566cddb3b5e637b65a0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 24 九月 2025 14:38:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TVController.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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..0a0fe3e 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -7,17 +7,11 @@
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.LedCommand;
import com.zy.asrs.entity.result.MatDto;
import com.zy.asrs.mapper.ReportQueryMapper;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.common.model.annotations.RateLimit;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
@@ -49,6 +43,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private BasCrnpService basCrnpService;
/**
@@ -279,10 +275,9 @@
}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);
-
return R.ok().add(commands);
}
@@ -291,9 +286,42 @@
*/
@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);
}
+ /**
+ * 璁惧寮傚父閫氱煡
+ */
+ @GetMapping("/device/error")
+ public R monitorDeviceError() {
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ List<BasCrnp> basCrnpLiset=basCrnpService.selectList(new EntityWrapper<BasCrnp>());
+ for (BasCrnp basCrnp : basCrnpLiset) {
+ HashMap<String, Object> map = new HashMap<>();
+ if (basCrnp.getCrnErr() > 0) {
+ //鏁呴殰涓�
+ map.put("deviceNo", basCrnp.getCrnNo());//璁惧鍙�-灏忚溅鍙�
+ map.put("errorMsg", basCrnp.getCrnErr$());//寮傚父淇℃伅
+ map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
+ list.add(map);
+ }
+ }
+ return R.ok().add(list);
+ }
/**
* 鑷姩琛ラ浂
--
Gitblit v1.9.1