From 3bc68018a84fc34e14f2c92e7446158489153774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Wed, 22 Apr 2026 19:43:16 +0800 Subject: [PATCH] =?UTF-8?q?PDA=20=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IBsEpciuPatrolInspectionService.java | 2 +- .../service/impl/BsDosingRecServiceImpl.java | 18 +++++++++++++----- .../BsEpciuPatrolInspectionServiceImpl.java | 16 ++++++++++++---- .../produce/controller/PdaSaveController.java | 5 ++--- .../service/impl/PdaLoadServiceImpl.java | 2 +- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java index 06c3195d..8fec1dc4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java @@ -62,7 +62,7 @@ public interface IBsEpciuPatrolInspectionService extends BaseService 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/produce/controller/PdaSaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java index e648144d..23e46fff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java @@ -137,8 +137,7 @@ public class PdaSaveController { @Operation(summary = "安全巡检处理，修改安全巡检任务", description = "") @PostMapping(value = "/saveByInspection") - public ResultInfo saveSafetyInspection(HttpServletRequest request) throws Exception { - JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS); + public ResultInfo saveSafetyInspection(@RequestBody JSONObject params) throws Exception { if (params == null || params.size() == 0) { throw new BusinessException("参数传递异常!"); } @@ -157,7 +156,7 @@ public class PdaSaveController { @Operation(summary = "环保巡检检验", description = "") @RequestMapping(value = "/savePatrolIns", method = RequestMethod.POST) - public ResultInfo savePatrolIns(@RequestBody BsEpciuPatrolInspectionEntity epPatrolInspection, HttpServletRequest request) { + public ResultInfo savePatrolIns(@RequestBody BsEpciuPatrolInspectionEntity epPatrolInspection) { pdaSaveService.savePatrolIns(epPatrolInspection); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java index 02c6336a..d0289f6a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java @@ -455,7 +455,7 @@ public class PdaLoadServiceImpl 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;