From 046aafed4f02408da84def139015b6877d171a8c Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Tue, 7 Mar 2023 13:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E7=BB=9F=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=87=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/cockpit/rest/CockpitController.java    | 4 +++-
 .../java/org/nl/wms/cockpit/service/CockpitService.java    | 2 +-
 .../org/nl/wms/cockpit/service/dto/DeviceStatusDto.java    | 2 +-
 .../wms/cockpit/service/dto/ProductionStatisticsDto.java   | 2 +-
 .../nl/wms/cockpit/service/impl/CockpitServiceImpl.java    | 7 ++++---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
index 2e74f4e..0dc2fb5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.cockpit.rest;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.modules.common.api.CommonResult;
 import org.nl.modules.common.api.RestBusinessTemplate;
@@ -19,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 大屏数据1
+ * 大屏数据
  *
  * @author gbx
  * @since 2023/2/27
@@ -29,6 +30,7 @@ import java.util.Map;
 @Api(tags = "大屏数据")
 @RequestMapping("/api/cockpit")
 @Slf4j
+@SaIgnore
 public class CockpitController{
      private final CockpitService cockpitService;
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/CockpitService.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/CockpitService.java
index 7ad3690..24f4f02 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/CockpitService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/CockpitService.java
@@ -9,7 +9,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * 大屏服务接口1
+ * 大屏服务接口
  *
  * @author gbx
  * @date 2023-02-27
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/DeviceStatusDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/DeviceStatusDto.java
index aaf437e..6e76042 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/DeviceStatusDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/DeviceStatusDto.java
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 
 /**
  * @author gbx
- * 设备状态1
+ * 设备状态
  * @date 2023-02-28
  **/
 @Data
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/ProductionStatisticsDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/ProductionStatisticsDto.java
index 76d924d..6c3ec15 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/ProductionStatisticsDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/ProductionStatisticsDto.java
@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 
 /**
  * @author gbx
- * 成品完成情况1
+ * 成品完成情况
  * @since 2023/2/27
  */
 @Data
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
index 1c88724..402f036 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import cn.hutool.core.util.ObjectUtil;
 
 /**
- * 大屏服务实现1
+ * 大屏服务实现
  *
  * @author gbx
  * @date 2023-02-27
@@ -281,8 +281,9 @@ public class CockpitServiceImpl implements CockpitService{
           runningStatusList.add(DeviceStatisticsDto.builder().workorder_procedure("包装").deviceQty(9).faultyDevice(3).build());
           //近一个月故障次数
           List<DeviceStatisticsDto> faultyStatusList = new ArrayList<>();
-          faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机4").faultyFrequency(91).build());
-          faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机9").faultyFrequency(82).build());
+          faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机4").faultyFrequency(90).build());
+          faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机9").faultyFrequency(85).build());
+          faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机11").faultyFrequency(83).build());
           faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("混料机5").faultyFrequency(71).build());
           faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机3").faultyFrequency(33).build());
           //最近5个故障设备