From 11eaa61d046200bb5eeecfc35d1ca1964505136d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 十月 2024 11:46:07 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/SteController.java | 43 -------------------------------------------
1 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index 190ce4c..a1577a6 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -1,13 +1,11 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.param.SteModeParam;
import com.zy.asrs.domain.param.SteOperatorParam;
import com.zy.asrs.domain.vo.SteDataVo;
@@ -17,7 +15,6 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasSteService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -109,46 +106,6 @@
if (!Cools.isEmpty(steProtocol.getAlarm0())) {
vo.setAlarm2(String.valueOf(steProtocol.getAlarm0()));
}
- }
- return R.ok().add(list);
- }
-
- @PostMapping("/table/ste/msg")
- @ManagerAuth(memo = "绌挎杞︽暟鎹〃")
- public R steMsgTable(){
- List<SteMsgTableVo> list = new ArrayList<>();
- List<BasSte> stes = basSteService.selectList(new EntityWrapper<BasSte>().orderBy("ste_no"));
- for (BasSte basSte : stes) {
- // 琛ㄦ牸琛�
- SteMsgTableVo vo = new SteMsgTableVo();
- vo.setSteNo(basSte.getSteNo()); // 绌挎杞﹀彿
- list.add(vo);
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo());
- if (steThread == null) {
- continue;
- }
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) {
- continue;
- }
-
- vo.setWorkNo(steProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
- if (steProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(steProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
- vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯
- vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔�
- vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣�
- vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
- }
- } else {
- vo.setStatus(steProtocol.mode == 1? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
- }
- vo.setSpeed(steProtocol.getSpeed()); // 閫熷害
- vo.setCloser(steProtocol.getCloser()); // 杩戠偣璺濈
- vo.setPakMk(steProtocol.getPakMk()); // 浣滀笟鏍囪
}
return R.ok().add(list);
}
--
Gitblit v1.9.1