From a73ef74a7b215299d2e6be291266d7cc1c3da85c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 26 十一月 2024 22:29:53 +0800
Subject: [PATCH] queue表 增加 episode_id 字段
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
index 3451fa9..415acc4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
@@ -13,6 +13,7 @@
import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,21 +33,39 @@
@RestController
@RequestMapping("/ecg/screen")
@Validated
+@Slf4j
public class CallingScreenController {
@Resource
private CallingScreenService callingScreenService;
+ @GetMapping("/display-col-info")
+ @Operation(summary = "鏄剧ず鍒椾俊鎭�")
+ @PermitAll
+ public CommonResult<Map<Integer, List<String>>> displayColInfo()
+ {
+ Map<Integer, List<String>> map = callingScreenService.getDisplayColInfo();
+ return success( map );
+ }
+
@GetMapping("/big-screen-data")
@Operation(summary = "澶у睆鍙彿鏁版嵁")
@PermitAll
- public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingData()
+ public CommonResult<Map<Integer, Map<Integer, List<ScreenQueueRespVO>>>> callingData()
{
- Map<Integer, List<QueueDO>> map = callingScreenService.callingData();
+ Map<Integer, Map<Integer, List<QueueDO>>> map = callingScreenService.callingData();
- Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
- map.keySet().forEach( key -> {
- mapVO.put(key, BeanUtils.toBean(map.get(key), ScreenQueueRespVO.class));
+ Map<Integer, Map<Integer, List<ScreenQueueRespVO>>> mapVO = new HashMap<>();
+ map.keySet().forEach( displayCol -> {
+ //log.info("dispayCol: " + displayCol);
+ Map<Integer, List<QueueDO>> mapSoltQueueDO = map.get(displayCol);
+ Map<Integer, List<ScreenQueueRespVO>> mapSoltQueueVO = new HashMap<>();
+ mapSoltQueueDO.keySet().forEach( displaySlot -> {
+ //log.info("displaySlot: " + displaySlot);
+ mapSoltQueueVO.put(displaySlot, BeanUtils.toBean(mapSoltQueueDO.get(displaySlot), ScreenQueueRespVO.class));
+ });
+
+ mapVO.put(displayCol, mapSoltQueueVO);
});
return success( mapVO );
@@ -64,6 +83,7 @@
queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
queueStatusList.add(QueueStatusEnum.READY.getStatus());
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
--
Gitblit v1.9.3