From e8c507fe111055b48c78d45455344843ce8ff4bf Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Fri, 11 Oct 2024 21:42:05 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E7=A7=92=E7=BA=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/quartz/task/SyncDeviceStatus.java | 2 +- .../resources/config/application-prod.yml | 7 +- .../src/main/resources/logback-spring.xml | 14 +- acs/nladmin-ui/.env.development | 4 +- .../service/impl/CockpitServiceImpl.java | 174 +++++++++++------- .../resources/config/application-prod.yml | 9 +- .../src/main/resources/config/application.yml | 4 +- 7 files changed, 122 insertions(+), 92 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java index 79904b5..f5e8287 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java @@ -88,7 +88,7 @@ public class SyncDeviceStatus { String deviceStatus = StringUtils.isNotBlank(Item.getString("status")) ? AcsDefineEnum.RGV_STATUS.check1(Item.getString("status")) : "4"; Item.put("device_status", deviceStatus); }); - redisUtils.set("RGV", jsonArray); + redisUtils.set("rgv", jsonArray); } catch (Exception e) { // log.error("自动上报驱动状态，查询浙大RGV设备状态失败{}{}", e, e.getMessage()); } diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index f094a0e..e247274 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/acs/nladmin-system/nlsso-server/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:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3307}/${DB_NAME: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:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} # password: ${DB_PWD:Root.123456} password: ${DB_PWD:123456} @@ -72,7 +72,8 @@ spring: redis: #数据库索引 database: ${REDIS_DB:2} - host: ${REDIS_HOST:127.0.0.1} + host: ${REDIS_HOST:10.44.101.19} + # host: ${REDIS_HOST:127.0.0.1} port: ${REDIS_PORT:6379} # password: ${REDIS_PWD:} @@ -171,7 +172,7 @@ sa-token: # Redis数据库索引（默认为0） database: 2 # Redis服务器地址 - host: 127.0.0.1 + host: 10.44.101.19 # Redis服务器连接端口 port: 6379 # Redis服务器连接密码（默认为空） diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 9ec783b..76414a1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -44,7 +44,7 @@ https://juejin.cn/post/6844903775631572999 15 - 100MB + 50MB 20GB @@ -71,46 +71,36 @@ https://juejin.cn/post/6844903775631572999 - + - - - - - - - - - - diff --git a/acs/nladmin-ui/.env.development b/acs/nladmin-ui/.env.development index e37a9a4..db4730d 100644 --- a/acs/nladmin-ui/.env.development +++ b/acs/nladmin-ui/.env.development @@ -1,8 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8011' -VUE_APP_WS_API = 'ws://localhost:8011' +VUE_APP_BASE_API = 'http://127.0.0.1:8011' +VUE_APP_WS_API = 'ws://127.0.0.1:8011' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true 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 9067495..cc0e0b6 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 @@ -501,38 +501,52 @@ public class CockpitServiceImpl implements CockpitService { return item; }; // AGV - JSONArray agvInfos = (JSONArray) redisUtils.get("AGV1"); - int agvFaultNum = (int) agvInfos.stream() - .map(object -> (JSONObject) object) - .filter(jsonObject -> AcsDefineEnum.AGV_STATUS.code("故障中").equals(jsonObject.getString("device_status"))) - .count(); - int agvNormalNum = agvInfos.size() - agvFaultNum; + JSONArray agvInfos = (JSONArray) redisUtils.get("agv"); + int agvFaultNum = 0; + int agvNormalNum = 0; + if (ObjectUtil.isNotEmpty(agvInfos)) { + agvFaultNum = (int) agvInfos.stream() + .map(object -> (JSONObject) object) + .filter(jsonObject -> AcsDefineEnum.AGV_STATUS.code("故障中").equals(jsonObject.getString("device_status"))) + .count(); + agvNormalNum = agvInfos.size() - agvFaultNum; + } List> agv_info = Arrays.asList( createItem.apply("0").apply(agvNormalNum), createItem.apply("1").apply(agvFaultNum) ); // RGV - JSONArray rgvInfos = (JSONArray) redisUtils.get("RGV1"); - int rgvFaultNum = (int) rgvInfos.stream() - .map(object -> (JSONObject) object) - .filter(jsonObject -> StringUtils.isNotBlank(jsonObject.getString("Error"))) - .count(); - int rgvNormalNum = rgvInfos.size() - rgvFaultNum; + int rgvFaultNum = 0; + int rgvNormalNum = 0; + JSONArray rgvInfos = (JSONArray) redisUtils.get("rgv"); + if (ObjectUtil.isNotEmpty(rgvInfos)) { + rgvFaultNum = (int) rgvInfos.stream() + .map(object -> (JSONObject) object) + .filter(jsonObject -> StringUtils.isNotBlank(jsonObject.getString("Error"))) + .count(); + rgvNormalNum = rgvInfos.size() - rgvFaultNum; + } List> rgv_info = Arrays.asList( createItem.apply("0").apply(rgvNormalNum), createItem.apply("1").apply(rgvFaultNum) ); // 输送线 - JSONArray conveyorInfos = (JSONArray) redisUtils.get("site1"); - int ptConveyorNum = (int) conveyorInfos.stream() - .map(object -> (JSONObject) object) - .filter(jsonObject -> AcsDefineEnum.VEHICLE_TYPE.code("普涂").equals(jsonObject.getString("pallet_type"))) - .count(); - int ltConveyorNum = (int) conveyorInfos.stream() - .map(object -> (JSONObject) object) - .filter(jsonObject -> AcsDefineEnum.VEHICLE_TYPE.code("连涂").equals(jsonObject.getString("pallet_type"))) - .count(); - int emptyConveyorNum = conveyorInfos.size() - ptConveyorNum - ltConveyorNum; + int ptConveyorNum = 0; + int ltConveyorNum = 0; + int emptyConveyorNum = 0; + + JSONArray conveyorInfos = (JSONArray) redisUtils.get("site"); + if (ObjectUtil.isNotEmpty(conveyorInfos)) { + ptConveyorNum = (int) conveyorInfos.stream() + .map(object -> (JSONObject) object) + .filter(jsonObject -> AcsDefineEnum.VEHICLE_TYPE.code("普涂").equals(jsonObject.getString("pallet_type"))) + .count(); + ltConveyorNum = (int) conveyorInfos.stream() + .map(object -> (JSONObject) object) + .filter(jsonObject -> AcsDefineEnum.VEHICLE_TYPE.code("连涂").equals(jsonObject.getString("pallet_type"))) + .count(); + emptyConveyorNum = conveyorInfos.size() - ptConveyorNum - ltConveyorNum; + } List> conveyor_info = Arrays.asList( createItem.apply("2").apply(ltConveyorNum), createItem.apply("3").apply(ptConveyorNum), @@ -543,7 +557,7 @@ public class CockpitServiceImpl implements CockpitService { device_status.put("conveyor_info", conveyor_info); //实时故障告警 List> fault_alarm = cockpitMapper.faultAlarm(); - faultAlarmDefault(fault_alarm, "AGV08"); + //faultAlarmDefault(fault_alarm, "AGV08"); //近30日故障统计 JSONArray monthly_fault_statistics = cockpitMapper.monthlyFaultStatistics(); //测试数据，上线后删除 @@ -576,7 +590,7 @@ public class CockpitServiceImpl implements CockpitService { switch (type) { case RegionCodeConstant.COATED_PLATE_LINE_AREA: // 涂板线区域，涂板线是作为一整台设备显示，point：设备点 - JSONArray baoshijian = (JSONArray) redisUtils.get("baoshijian1"); + JSONArray baoshijian = (JSONArray) redisUtils.get("baoshijian"); points = pointService.getSubSites(deviceCode); res.put("device_code", deviceCode); //todo 运行状态，信号缺失 @@ -653,7 +667,7 @@ public class CockpitServiceImpl implements CockpitService { case RegionCodeConstant.CURING_ZONE: //固化室，需要显示整个设备+内部位置明细 points = pointService.getSubSites(deviceCode); // 小固化位置以及进出口（入口是不管的） - JSONArray guhuashi = (JSONArray) redisUtils.get("guhuashi1"); + JSONArray guhuashi = (JSONArray) redisUtils.get("guhuashi"); for (Object object : guhuashi) { res.put("device_code", deviceCode); res.put("device_name", point.getPoint_name()); @@ -707,7 +721,7 @@ public class CockpitServiceImpl implements CockpitService { res.put("device_name", point.getPoint_name()); res.put("material_type", ObjectUtil.isNotEmpty(point.getVehicle_type()) ? point.getVehicle_type() : "-"); res.put("end_time", "-"); - JSONArray ssxInfos = (JSONArray) redisUtils.get("site1"); + JSONArray ssxInfos = (JSONArray) redisUtils.get("site"); JSONArray ssxArray = new JSONArray(); for (int i = 0; i < points.size(); i++) { SchBasePoint pointObj = points.get(i); @@ -748,8 +762,11 @@ public class CockpitServiceImpl implements CockpitService { } break; case RegionCodeConstant.VEHICLEINFO: - JSONArray agvInfos = (JSONArray) redisUtils.get("AGV1"); - JSONArray rgvInfos = (JSONArray) redisUtils.get("RGV1"); + JSONArray agvInfos = (JSONArray) redisUtils.get("agv"); + JSONArray rgvInfos = (JSONArray) redisUtils.get("rgv"); + if (ObjectUtil.isEmpty(agvInfos)) { + return res; + } JSONObject vehicleInfo = agvInfos.stream() .map(object -> (JSONObject) object) .filter(jsonObject -> deviceCode.equals(jsonObject.getString("device_code"))) @@ -758,6 +775,9 @@ public class CockpitServiceImpl implements CockpitService { if (ObjectUtil.isNotEmpty(vehicleInfo)) { vehicleInfo.put("type", "AGV"); } else { + if (ObjectUtil.isEmpty(rgvInfos)) { + return res; + } vehicleInfo = rgvInfos.stream() .map(object -> (JSONObject) object) .filter(jsonObject -> deviceCode.equals(jsonObject.getString("vehicle"))) @@ -893,8 +913,10 @@ public class CockpitServiceImpl implements CockpitService { if (ObjectUtil.isNotEmpty(result)) { JSONObject ghsDetailInfo = new JSONObject(); JSONArray ghsDetails = new JSONArray(); - JSONArray guHuaShi = (JSONArray) redisUtils.get("guhuashi1"); - array.add(guHuaShi); + JSONArray guHuaShi = (JSONArray) redisUtils.get("guhuashi"); + if(ObjectUtil.isNotEmpty(guHuaShi)) { + array.add(guHuaShi); + } // for (Object object : result) { // //设备状态 按照lms点位管理来 1-无货；2-有货；3-进料；4固化；5出料，6故障 // JSONObject d = (JSONObject) object; @@ -917,13 +939,17 @@ public class CockpitServiceImpl implements CockpitService { }); //查询保湿间信息 CompletableFuture>> task2 = CompletableFuture.supplyAsync(() -> { - JSONArray baoShiJian = (JSONArray) redisUtils.get("baoshijian1"); + JSONArray baoShiJian = (JSONArray) redisUtils.get("baoshijian"); //todo 设备状态待补充信号逻辑 - for (Object object : baoShiJian) { - JSONObject jsonObject = (JSONObject) object; - if (StringUtils.isBlank(jsonObject.getString("device_status"))) { - jsonObject.put("device_status", "1"); + if (ObjectUtil.isNotEmpty(baoShiJian)) { + for (Object object : baoShiJian) { + JSONObject jsonObject = (JSONObject) object; + if (StringUtils.isBlank(jsonObject.getString("device_status"))) { + jsonObject.put("device_status", "1"); + } } + } else { + array.add(new JSONArray()); } array.add(baoShiJian); return null; @@ -934,14 +960,18 @@ public class CockpitServiceImpl implements CockpitService { }); //查询检测站点数据 CompletableFuture>> task3 = CompletableFuture.supplyAsync(() -> { - JSONArray site = (JSONArray) redisUtils.get("site1"); + JSONArray site = (JSONArray) redisUtils.get("site"); //todo 待补充信号逻辑 - for (Object object : site) { - JSONObject jsonObject = (JSONObject) object; - if (StringUtils.isBlank(jsonObject.getString("device_status"))) { - //0故障1正常 - jsonObject.put("device_status", "1"); + if (ObjectUtil.isNotEmpty(site)) { + for (Object object : site) { + JSONObject jsonObject = (JSONObject) object; + if (StringUtils.isBlank(jsonObject.getString("device_status"))) { + //0故障1正常 + jsonObject.put("device_status", "1"); + } } + } else { + array.add(new JSONArray()); } array.add(site); return null; @@ -952,19 +982,23 @@ public class CockpitServiceImpl implements CockpitService { }); //查询AGV数据 CompletableFuture>> task4 = CompletableFuture.supplyAsync(() -> { - JSONArray agv = (JSONArray) redisUtils.get("AGV1"); - //todo 待补充信号逻辑 - for (Object object : agv) { - JSONObject jsonObject = (JSONObject) object; - if (StringUtils.isBlank(jsonObject.getString("move"))) { - jsonObject.put("move", "0"); - } - if (StringUtils.isBlank(jsonObject.getString("full"))) { - jsonObject.put("full", "0"); - } - if (StringUtils.isBlank(jsonObject.getString("vehicle_type"))) { - jsonObject.put("vehicle_type", "0"); + JSONArray agv = (JSONArray) redisUtils.get("agv"); + if (ObjectUtil.isNotEmpty(agv)) { + //todo 待补充信号逻辑 + for (Object object : agv) { + JSONObject jsonObject = (JSONObject) object; + if (StringUtils.isBlank(jsonObject.getString("move"))) { + jsonObject.put("move", "0"); + } + if (StringUtils.isBlank(jsonObject.getString("full"))) { + jsonObject.put("full", "0"); + } + if (StringUtils.isBlank(jsonObject.getString("vehicle_type"))) { + jsonObject.put("vehicle_type", "0"); + } } + } else { + agv = new JSONArray(); } array.add(agv); return null; @@ -975,22 +1009,26 @@ public class CockpitServiceImpl implements CockpitService { }); //查询RGV设备信息 CompletableFuture>> task5 = CompletableFuture.supplyAsync(() -> { - JSONArray rgv = (JSONArray) redisUtils.get("RGV1"); - //todo 待补充信号逻辑 - for (Object object : rgv) { - JSONObject jsonObject = (JSONObject) object; - //todo 正式环境可以去除，在ACS端处理运行状态 - String device_status = StringUtils.isNotBlank(jsonObject.getString("status")) ? AcsDefineEnum.RGV_STATUS.check1(jsonObject.getString("status")) : "4"; - jsonObject.put("device_status", device_status); - if (StringUtils.isBlank(jsonObject.getString("move"))) { - jsonObject.put("move", "0"); - } - if (StringUtils.isBlank(jsonObject.getString("full"))) { - jsonObject.put("full", "0"); - } - if (StringUtils.isBlank(jsonObject.getString("vehicle_type"))) { - jsonObject.put("vehicle_type", "0"); + JSONArray rgv = (JSONArray) redisUtils.get("rgv"); + if (ObjectUtil.isNotEmpty(rgv)) { + //todo 待补充信号逻辑 + for (Object object : rgv) { + JSONObject jsonObject = (JSONObject) object; + //todo 正式环境可以去除，在ACS端处理运行状态 + String device_status = StringUtils.isNotBlank(jsonObject.getString("status")) ? AcsDefineEnum.RGV_STATUS.check1(jsonObject.getString("status")) : "4"; + jsonObject.put("device_status", device_status); + if (StringUtils.isBlank(jsonObject.getString("move"))) { + jsonObject.put("move", "0"); + } + if (StringUtils.isBlank(jsonObject.getString("full"))) { + jsonObject.put("full", "0"); + } + if (StringUtils.isBlank(jsonObject.getString("vehicle_type"))) { + jsonObject.put("vehicle_type", "0"); + } } + } else { + rgv = new JSONArray(); } array.add(rgv); return null; 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 df16fe9..bcdbea9 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 @@ -6,7 +6,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3307}/${DB_NAME: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:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:123456} @@ -55,7 +55,8 @@ spring: redis: #数据库索引 database: ${REDIS_DB:2} - host: ${REDIS_HOST:127.0.0.1} + # host: ${REDIS_HOST:10.44.101.112} + host: ${REDIS_HOST:10.44.101.19} port: ${REDIS_PORT:6379} password: ${REDIS_PWD:} @@ -152,9 +153,9 @@ sa-token: token-session-check-login: false alone-redis: # Redis数据库索引（默认为0） - database: 2 + database: 5 # Redis服务器地址 - host: 127.0.0.1 + host: 10.44.101.19 # Redis服务器连接端口 port: 6379 # Redis服务器连接密码（默认为空） diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 3fd024d..ce9b539 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -112,6 +112,6 @@ mybatis-plus: id-type: INPUT lucene: index: - path: C:\lucene\index + path: D:\lucene\index tlog: - enable-invoke-time-print: true \ No newline at end of file + enable-invoke-time-print: true