From 49c5107d383ec31583528daf8d78ef193cb6eaf8 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 29 Jul 2024 10:32:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A9=AC=E9=92=A2=E7=9C=8B=E6=9D=BFv2,?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8E=8B=E6=9C=BA=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/controller/CockPitController.java |  1 +
 .../service/impl/CockpitServiceImpl.java      | 25 +++---
 .../src/main/resources/logback-spring.xml     | 77 +++++++++++++++++--
 3 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java
index 7e00099..86852d4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java
@@ -32,6 +32,7 @@ public class CockPitController {
     }
     @PostMapping("/v2/press")
     @Log("压制看板")
+    @SaIgnore
     public ResponseEntity<Object> PressedMonitorV2() {
         return new ResponseEntity<>(cockpitService.PressedMonitorV2(), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
index 1379e7a..1e97649 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
@@ -132,18 +132,21 @@ public class CockpitServiceImpl implements CockpitService {
                             .stream()
                             .map(p -> DeviceInfoDto.buildDevice(p.getPoint_code()))
                             .collect(Collectors.toList());
-//                    AcsResponse statusByCode = wmsToAcsService.getDeviceStatusByCode(deviceCodes);
+                    AcsResponse statusByCode = wmsToAcsService.getDeviceStatusByCode(deviceCodes);
                     List<PressDeviceInfoVo> allPressInfo = cockPitMapper.getAllPressInfo(dayShift);
                     // 便利allPressInfo 赋值
-//                    if (HttpStatus.HTTP_OK == statusByCode.getCode()) {
-//                        JSONArray datas = statusByCode.getData();
-//                        JSONObject data = datas.getJSONObject(0);
-//                        // 赋值
-//                        allPressInfo.forEach(pi -> {
-//                            pi.setPoint_status(data.getString("status"));
-//                            pi.setBlj_weight(data.getString("remainingweight"));
-//                        });
-//                    }
+                    if (HttpStatus.HTTP_OK == statusByCode.getCode()) {
+                        JSONArray datas = statusByCode.getData();
+                        // 赋值
+                        allPressInfo.forEach(pi -> {
+                            // 根据code从datas获取数据
+                            JSONObject data = (JSONObject) datas.stream()
+                                    .filter(o -> ((JSONObject) o).getString("device_code").equals(pi.getPoint_code()))
+                                    .findFirst().orElse(new JSONObject());
+                            pi.setPoint_status(data.getString("status"));
+                            pi.setBlj_weight(data.getString("remainingweight"));
+                        });
+                    }
                     return allPressInfo;
                 }, pool);
         pressDeviceInfoVoListFuture.thenAccept(result -> {
@@ -194,7 +197,7 @@ public class CockpitServiceImpl implements CockpitService {
             // 泥料数据
             List<LoamInfoVo> loamInfoVos = cockPitMapper.getAllDayLoamsInfo();
             // 泥料种类
-            long count = loamInfoVos.stream().distinct().count();
+            long count = loamInfoVos.stream().map(LoamInfoVo::getRedundance_material_code).distinct().count();
             // 重量之和
             double sum = loamInfoVos.stream().mapToDouble(p -> Double.parseDouble(p.getMaterial_weight())).sum();
             res.put("dataInfo", loamInfoVos);
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index 2ce2f11..295ac12 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -227,22 +227,87 @@ https://juejin.cn/post/6844903775631572999
 
     <!--测试环境:打印控制台-->
     <springProfile name="test">
-        <root level="INFO">
+        <root level="info">
+            <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="CONSOLE"/>
         </root>
-        <logger name="jdbc.audit" level="ERROR" additivity="true">
+        <logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="ERROR" additivity="false">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.redisson.command.RedisExecutor" level="ERROR" additivity="false">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.reflections.Reflections" level="ERROR" additivity="false">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.redisson.connection.ClientConnectionsEntry" level="ERROR" additivity="false">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.mybatis.spring.mapper.ClassPathMapperScanner" level="ERROR" additivity="false">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.nl.config.thread.ThreadMonitorCollector" level="ERROR" additivity="false">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultset" level="ERROR" additivity="true">
+        <logger name="com.baomidou.dynamic.datasource.DynamicRoutingDataSource" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="springfox.documentation" level="ERROR" additivity="true">
+        <logger name="org.redisson.connection.pool.MasterPubSubConnectionPool" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="true">
+        <logger name="org.redisson.connection.pool.MasterConnectionPool" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqlonly" level="ERROR" additivity="true">
+        <logger name="org.redisson.Version" level="INFO" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="com.alibaba.druid.pool.DruidDataSource" level="INFO" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.nl.config.RedisConfig" level="INFO" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.apache" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.hibernate" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="io.netty" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="io.lettuce" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="com.fasterxml" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="springfox" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="log4jdbc" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="nl.basjes" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>