From 070cdbd7937788a4890ed80e880777fac69ab01c Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期四, 08 十二月 2022 13:27:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 42 +++++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index 6379d35..7dbab85 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -1,16 +1,20 @@ 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; @@ -33,10 +37,7 @@ import com.zy.core.thread.ScaleThread; 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.*; @@ -57,6 +58,8 @@ private BasDevpService basDevpService; @Autowired private LocMastMapper locMastMapper; + @Autowired + private BasCrnErrorMapper basCrnErrorMapper; @PostMapping("/system/running/status") @ManagerAuth(memo = "绯荤粺杩愯鐘舵��") @@ -104,6 +107,7 @@ vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿 vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙� vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵�� + vo.setNearbySta(staProtocol.getNearbySta()); vos.add(vo); } return R.ok().add(vos); @@ -133,7 +137,7 @@ /** * 鍫嗗灈鏈虹姸鎬佸垽鏂� */ - if (crn.getId() == 1 && crnProtocol.getAlarm() > 0) { + if (crnProtocol.getAlarm() > 0) { vo.setCrnStatus(CrnStatusType.MACHINE_ERROR); } else { if (crnProtocol.getTaskNo()>0) { @@ -249,6 +253,13 @@ 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) { @@ -282,17 +293,18 @@ return R.ok(); } - @PostMapping("/barcode/output/site") + @GetMapping("/barcode/output/site") public R crnOutput(){ -// StringBuilder str = new StringBuilder(); -// String s; -// int i = 0; -// while((s = OutputQueue.CRN.poll()) != null && i <=32) { -// str.append("\n").append(s); -// i++; -// } -// return R.ok().add(str.toString()); - return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE))); + 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