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