From 2fc4ea61cb5b51a03ac2e396486effad51eba449 Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Fri, 8 Mar 2024 18:02:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=A7=E5=B1=8F=E3=80=81=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E3=80=81=E5=BC=B9=E7=AA=97=E6=8E=A5=E5=8F=A3=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/application-prod.yml | 2 +- .../service/impl/CockpitServiceImpl.java | 43 +++++++++++++++---- .../cockpit/service/mapper/CockPitMapper.java | 4 ++ .../cockpit/service/mapper/CockPitMapper.xml | 16 +++++++ .../resources/config/application-prod.yml | 2 +- 5 files changed, 56 insertions(+), 11 deletions(-) diff --git a/acs/nladmin-system/src/main/resources/config/application-prod.yml b/acs/nladmin-system/src/main/resources/config/application-prod.yml index 2ffea4b..9a998a9 100644 --- a/acs/nladmin-system/src/main/resources/config/application-prod.yml +++ b/acs/nladmin-system/src/main/resources/config/application-prod.yml @@ -7,7 +7,7 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nd_hh_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:123456} # 初始连接数 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 d373b52..38a81ff 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 @@ -294,17 +294,17 @@ public class CockpitServiceImpl implements CockpitService { && ObjectUtil.isNotEmpty(jsonObject.getInteger("encoder_qty")) && jsonObject.getInteger("encoder_qty") > 0) { // 绿色 - jsonObject.put("color_status", ColorEnum.GREEN.getIndex()); + jsonObject.put("device_status", ColorEnum.GREEN.getIndex()); } else if (jsonObject.getInteger("move") != 0 && ObjectUtil.isNotEmpty(jsonObject.getInteger("encoder_qty")) && jsonObject.getInteger("encoder_qty") == 0) { // 黄色 - jsonObject.put("color_status", ColorEnum.YELLOW.getIndex()); + jsonObject.put("device_status", ColorEnum.YELLOW.getIndex()); } else if (jsonObject.getInteger("move") == 0) { // 红色 - jsonObject.put("color_status", ColorEnum.RED.getIndex()); + jsonObject.put("device_status", ColorEnum.RED.getIndex()); } else { // 有托盘人工 - jsonObject.put("color_status", ColorEnum.GREEN.getIndex()); + jsonObject.put("device_status", ColorEnum.GREEN.getIndex()); } } return data; @@ -427,17 +427,17 @@ public class CockpitServiceImpl implements CockpitService { && ObjectUtil.isNotEmpty(jsonObject.getInteger("encoder_qty")) && jsonObject.getInteger("encoder_qty") > 0) { // 绿色 - jsonObject.put("color_status", ColorEnum.GREEN.getIndex()); + jsonObject.put("device_status", ColorEnum.GREEN.getIndex()); } else if (jsonObject.getInteger("move") != 0 && ObjectUtil.isNotEmpty(jsonObject.getInteger("encoder_qty")) && jsonObject.getInteger("encoder_qty") == 0) { // 黄色 - jsonObject.put("color_status", ColorEnum.YELLOW.getIndex()); + jsonObject.put("device_status", ColorEnum.YELLOW.getIndex()); } else if (jsonObject.getInteger("move") == 0) { // 红色 - jsonObject.put("color_status", ColorEnum.RED.getIndex()); + jsonObject.put("device_status", ColorEnum.RED.getIndex()); } else { // 有托盘人工 - jsonObject.put("color_status", ColorEnum.GREEN.getIndex()); + jsonObject.put("device_status", ColorEnum.GREEN.getIndex()); } } return fjcmdData; @@ -449,6 +449,29 @@ public class CockpitServiceImpl implements CockpitService { map.put("SortAndPalletizingList", e); return null; }); + + // 出窑缓存货架 + CompletableFuture> outKilnHchjTask = CompletableFuture.supplyAsync(() -> { + return cockPitMapper.selectHchjList(); + }, pool); + outKilnHchjTask.thenAccept(result -> { + map.put("hchjList", result); + }).exceptionally((e) -> { + log.error("出窑缓存货架显示: {}", e.getMessage(), e); + map.put("hchjList", null); + return null; + }); + // 人工分拣拆垛 + CompletableFuture> manualSortingTask = CompletableFuture.supplyAsync(() -> { + return cockPitMapper.selecManualSortingList(); + }, pool); + manualSortingTask.thenAccept(result -> { + map.put("manualSortingList", result); + }).exceptionally((e) -> { + log.error("人工分拣拆垛位显示: {}", e.getMessage(), e); + map.put("manualSortingList", null); + return null; + }); CompletableFuture allQuery = CompletableFuture.allOf( stackingPositionTask, pressMachineTask, @@ -456,7 +479,9 @@ public class CockpitServiceImpl implements CockpitService { mixMachineTask, sortAndPalletizingTask, manipulatorInfoTask, - mixBlankingTask + mixBlankingTask, + outKilnHchjTask, + manualSortingTask ); CompletableFuture> future = allQuery.thenApply((result) -> map).exceptionally((e) -> { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java index 66647b1..642699b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java @@ -51,4 +51,8 @@ public interface CockPitMapper { List selectJxsPoints(); List queryRecord(); + + List selectHchjList(); + + List selecManualSortingList(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml index 8c04bac..209f057 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml @@ -265,5 +265,21 @@ LEFT JOIN sch_base_point p ON r.device_code = p.point_code ORDER BY r.record_time desc limit 100 + + diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index 14091fd..ea2f515 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml @@ -10,7 +10,7 @@ spring: datasource: mysql: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nnhh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:123456} # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rtmg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true