From a12194e71d7d7263e1b0a784dcd854f4bfc8a12b Mon Sep 17 00:00:00 2001 From: LSH Date: 星期四, 01 十二月 2022 16:07:40 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index b5792d8..dd56b27 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -1,21 +1,28 @@ package com.zy.asrs.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.core.annotations.ManagerAuth; import com.core.common.Arith; import com.core.common.Cools; +import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.domain.enums.CrnStatusType; import com.zy.asrs.domain.enums.SiteStatusType; import com.zy.asrs.domain.param.SystemSwitchParam; import com.zy.asrs.domain.vo.*; +import com.zy.asrs.entity.BasCrnError; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.mapper.BasCrnErrorMapper; import com.zy.asrs.mapper.LocMastMapper; import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.WrkMastService; import com.zy.common.CodeRes; import com.zy.core.CrnThread; +import com.zy.core.DevpThread; import com.zy.core.Slave; +import com.zy.core.cache.OutputQueue; import com.zy.core.cache.SlaveConnection; import com.zy.core.enums.CrnModeType; import com.zy.core.enums.SlaveType; @@ -26,15 +33,11 @@ import com.zy.core.properties.SlaveProperties; import com.zy.core.properties.SystemProperties; import com.zy.core.thread.BarcodeThread; +import com.zy.core.thread.MelsecCrnThread; import com.zy.core.thread.ScaleThread; -import com.zy.core.thread.SiemensCrnThread; -import com.zy.core.DevpThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.*; @@ -55,6 +58,8 @@ private BasDevpService basDevpService; @Autowired private LocMastMapper locMastMapper; + @Autowired + private BasCrnErrorMapper basCrnErrorMapper; @PostMapping("/system/running/status") @ManagerAuth(memo = "绯荤粺杩愯鐘舵��") @@ -131,7 +136,7 @@ /** * 鍫嗗灈鏈虹姸鎬佸垽鏂� */ - if (crn.getId() == 1 && crnProtocol.getAlarm1() > 0) { + if (crnProtocol.getAlarm() > 0) { vo.setCrnStatus(CrnStatusType.MACHINE_ERROR); } else { if (crnProtocol.getTaskNo()>0) { @@ -243,10 +248,17 @@ CrnDetailVo vo = new CrnDetailVo(); for (CrnSlave crnSlave : slaveProperties.getCrn()) { if (crnSlave.getId().equals(crnNo)) { - SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); + MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); vo.setCrnNo(crnNo); vo.setWorkNo(crnProtocol.getTaskNo()); + vo.setCrnStatus(crnProtocol.getStatusType().desc); + + if (crnProtocol.getAlarm() > 0) { + BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm()); + vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName()); + } + if (crnProtocol.getTaskNo() > 0) { WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); if (wrkMast != null) { @@ -280,4 +292,18 @@ return R.ok(); } + @GetMapping("/barcode/output/site") + public R crnOutput(){ + ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.BARCODE); + jsonObjects.sort(new Comparator<JSONObject>() { + @Override + public int compare(JSONObject o1, JSONObject o2) { + Date o1Time = DateUtils.convert(o1.getString("time"), DateUtils.yyyyMMddHHmmss_F); + Date o2Time = DateUtils.convert(o2.getString("time"), DateUtils.yyyyMMddHHmmss_F); + return (int) (o2Time.getTime() - o1Time.getTime()); + } + }); + return R.ok().add(JSON.toJSONString(jsonObjects)); + } + } -- Gitblit v1.9.1