From a3ff160ff0e25bf0802aa5f14d651776b6652cdc Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 04 八月 2025 16:03:17 +0800
Subject: [PATCH] feat(dry): 更新干燥设备接口和实时数据处理
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 9 +++++++++
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java | 6 ++++++
jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml | 2 +-
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java | 2 ++
4 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 198ddd0..b5be9f6 100755
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -153,6 +153,8 @@
// 骞茬嚗娴嬭瘯
filterChainDefinitionMap.put("/dry/dryResult/**", "anon");
filterChainDefinitionMap.put("/dry/real/**", "anon");
+ filterChainDefinitionMap.put("/dry/dryEquipment/listAll", "anon");
+ filterChainDefinitionMap.put("/dry/dryEqpFault/queryByOrderId", "anon");
// 娣诲姞鑷繁鐨勮繃婊ゅ櫒骞朵笖鍙栧悕涓簀wt
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
index 0f4fb91..291bfda 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
@@ -31,6 +31,8 @@
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private DryEqpTypeServiceImpl dryEqpTypeServiceImpl;
@Override
@@ -74,7 +76,11 @@
if (dryEquipment.getEnable()!=null){
queryWrapper.lambda().eq(DryEquipment::getEnable,dryEquipment.getEnable());
}
+ queryWrapper.lambda().orderByAsc(DryEquipment::getCode);
List<DryEquipment> equipmentList = this.list(queryWrapper);
+ equipmentList.stream().forEach(item -> {
+ item.setType(dryEqpTypeServiceImpl.getById(item.getType()).getName());
+ });
return equipmentList;
}
}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index 7812901..56d34b9 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
@@ -230,6 +230,15 @@
orderVo.setTrendVo(trendVo);
orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2());
+ if (realTimeDataParentVo.getFault() != null) {
+ if (realTimeDataParentVo.getFault().getError() != null) {
+ orderVo.setFault(realTimeDataParentVo.getFault().getError());
+ }
+ if (realTimeDataParentVo.getFault().getWarning() != null) {
+ orderVo.setWarning(realTimeDataParentVo.getFault().getWarning());
+ }
+ }
+
// 2.3 鏇存柊鍒皉edis缂撳瓨
redisUtil.hset(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(),
realTimeDataVo.getTenantid() + "_" + realTimeDataVo.getMachineid(), orderVo, 60 * 60);
diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml
index 8ffe3bc..d8737c6 100755
--- a/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml
@@ -12,7 +12,7 @@
db:
num: 1
password:
- '0': ${MYSQL-PWD:123456}
+ '0': ${MYSQL-PWD:123456} # 鍚屾祹鍫俶ysql瀵嗙爜锛歍jt123456!
url:
'0': jdbc:mysql://${MYSQL-HOST:localhost}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
user:
--
Gitblit v1.9.3