diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml
index ccc7352f..292d2cbd 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml
@@ -20,6 +20,6 @@
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
index 466a471a..f8099eba 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
@@ -1864,7 +1864,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl ListPi(String code,Short eipType);
+ BsEpciuPatrolInspectionEntity ListPi(String code,Short eipType);
void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java
index a4dd1343..7f8ee0f1 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java
@@ -25,6 +25,7 @@
*/
package org.springblade.desk.energy.service.impl;
+import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.annotation.Resource;
@@ -119,11 +120,18 @@ public class BsDosingRecServiceImpl extends BaseServiceImpl bsTowers = iBsTowerService.list(code);
List towerIds = bsTowers.stream().map(BsTowerEntity::getId).toList();
-
- return list(Wrappers.lambdaQuery(BsDosingRecEntity.class)
- .in(BsDosingRecEntity::getBtId,towerIds)
- .orderByDesc(BsDosingRecEntity::getDosingTime)
- .last("limit 1"));
+ if (CollUtil.isEmpty(towerIds)){
+ throw new RuntimeException("未查询到有酸雾塔报警点配置");
+ }
+ List bsDosingRecEntities = list(Wrappers.lambdaQuery(BsDosingRecEntity.class)
+ .in(BsDosingRecEntity::getBtId, towerIds)
+ .eq(BsDosingRecEntity::getHandleResult, HANDLE_RESULT_WAIT)
+ .orderByDesc(BsDosingRecEntity::getDosingTime));
+ if (bsDosingRecEntities.size() > 0) {
+ return bsDosingRecEntities.get(0);
+ } else {
+ throw new RuntimeException("未查询到有效数据");
+ }
}
}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
index c044092f..63a2a7ac 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
@@ -155,7 +155,7 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl ListPi(String code, Short eipType) {
+ public BsEpciuPatrolInspectionEntity ListPi(String code, Short eipType) {
//String sql = "select*from(SELECT a.* FROM EP_PATROL_INSPECTION a INNER join " +
// "EP_INSPECTION_POINT b ON a.ip_id = b.eip_id WHERE b.patrol_register =:code AND a.task_status =:taskStatus AND b.eip_type =:eipType " +
// "ORDER BY a.launch_time DESC )where rownum<2 ";
@@ -167,13 +167,21 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl safeInspectionPointList = bsEpciuInspectionPointService.listByCode(code);
List safeInspectionPointIdList = safeInspectionPointList.stream().map(BsEpciuInspectionPointEntity::getId).toList();
- return list(Wrappers.lambdaQuery(BsEpciuPatrolInspectionEntity.class)
+ if (safeInspectionPointIdList.isEmpty()) {
+ throw new RuntimeException("未查询到有效的巡检点数据");
+ }
+ List list = list(Wrappers.lambdaQuery(BsEpciuPatrolInspectionEntity.class)
.in(BsEpciuPatrolInspectionEntity::getEpcId, safeInspectionPointIdList)
.eq(BsEpciuPatrolInspectionEntity::getInsType, eipType)
//旧mes中查询待检状态任务
.eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString())
- .orderByDesc(BsEpciuPatrolInspectionEntity::getLaunchTime)
- .last("rownum<2"));
+ .orderByDesc(BsEpciuPatrolInspectionEntity::getLaunchTime));
+ if (list.size() > 0) {
+ return list.get(0);
+ } else {
+ throw new RuntimeException("未查询到有效数据");
+ }
+
}
@Override
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index 100da143..f7e2ed92 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -388,6 +388,21 @@ public class YieldOrderServiceImpl extends BaseServiceImpl(Comparator.comparing(BsSafePatrolInspectionEntity::getIpId))), ArrayList::new));
if (piList == null || piList.size() == 0) {
if (flag) {
- throw new RuntimeException("product.noPatrolCheckTask", null);
+ throw new RuntimeException("未查询到安全巡检任务,product.noPatrolCheckTask");
}
}
return piList;