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 | 126 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 123 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index d61429f..0a0fe3e 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -1,12 +1,17 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
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.*;
+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.*;
import com.zy.common.model.annotations.RateLimit;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
@@ -31,7 +36,16 @@
@Autowired
private ReportQueryMapper reportQueryMapper;
@Autowired
- private SlaveProperties slaveProperties;
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -191,7 +205,80 @@
*/
@GetMapping("/led")
public R monitorLed(@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();
+ }
+ WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",basDevp.getWrkNo()));
+ if(Cools.isEmpty(wrkMast)){
+ return R.ok();
+ }
+ List<LedCommand> commands = new ArrayList<>();
+
+ // 缁勮鍛戒护
+ LedCommand ledCommand = new LedCommand();
+ ledCommand.setWorkNo(wrkMast.getWrkNo());
+ ledCommand.setIoType(wrkMast.getIoType());
+ // 鍑哄簱妯″紡
+ switch (wrkMast.getIoType()) {
+ case 1:
+ ledCommand.setTitle("鍏ㄦ澘鍏ュ簱");
+ break;
+ case 10:
+ ledCommand.setTitle("绌烘澘鍏ュ簱");
+ break;
+ case 101:
+ ledCommand.setTitle("鍏ㄦ澘鍑哄簱");
+ break;
+ case 103:
+ ledCommand.setTitle("鎷ｆ枡鍑哄簱");
+ break;
+ case 104:
+ ledCommand.setTitle("骞舵澘鍑哄簱");
+ break;
+ case 107:
+ ledCommand.setTitle("鐩樼偣鍑哄簱");
+ break;
+ case 110:
+ ledCommand.setTitle("绌烘澘鍑哄簱");
+ ledCommand.setEmptyMk(true);
+ break;
+ case 53:
+ ledCommand.setTitle("鎷ｆ枡鍏ュ簱");
+ break;
+ case 57:
+ ledCommand.setTitle("鐩樼偣鍏ュ簱");
+ break;
+ case 54:
+ ledCommand.setTitle("骞舵澘鍏ュ簱");
+ break;
+ default:
+ break;
+ }
+ ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
+ ledCommand.setLocNo(wrkMast.getLocNo());
+ ledCommand.setStaNo(wrkMast.getStaNo());
+// ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
+ if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ try{
+ if (wrkMast.getIoType()>100){
+ for (WrkDetl wrkDetl : wrkDetls){
+ LocDetl locDetl = locDetlService.selectMatnrSpecs(wrkDetl.getMatnr(), wrkDetl.getSpecs(), wrkMast.getSourceLocNo());
+ wrkDetl.setWeight(locDetl.getAnfme());
+ }
+ }else {
+ for (WrkDetl wrkDetl : wrkDetls){
+ wrkDetl.setWeight(wrkDetl.getAnfme());
+ }
+ }
+ }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(),wrkDetl.getModel())));
+ }
+ commands.add(ledCommand);
+ return R.ok().add(commands);
}
/**
@@ -199,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