From c43c5b434202b666bbbdd5d7be56032caab7390a Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Fri, 14 Mar 2025 10:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../script/pojo/param/PqScriptParam.java      | 20 +++++++++----------
 .../njcn/gather/script/pojo/po/PqScript.java  |  4 ++--
 .../service/impl/PqScriptDtlsServiceImpl.java | 18 ++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java
index 99ee02aa..c99634a6 100644
--- a/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java
+++ b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java
@@ -57,20 +57,20 @@ public class PqScriptParam {
     /**
      * 额定电压
      */
-    @ApiModelProperty("额定电压")
-    @NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
-    @Min(value = 0, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
-    @Max(value = 380, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
-    private Double ratedVolt;
+//    @ApiModelProperty("额定电压")
+//    @NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
+//    @Min(value = 0, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
+//    @Max(value = 380, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
+//    private Double ratedVolt;
 
     /**
      * 额定电流
      */
-    @ApiModelProperty("额定电流")
-    @NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
-    @Min(value = 0, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
-    @Max(value = 20, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
-    private Double ratedCurr;
+//    @ApiModelProperty("额定电流")
+//    @NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
+//    @Min(value = 0, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
+//    @Max(value = 20, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
+//    private Double ratedCurr;
 
 
     @Data
diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java
index 9a06053c..cafd9647 100644
--- a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java
+++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java
@@ -66,12 +66,12 @@ public class PqScript extends BaseEntity implements Serializable {
     /**
      * 额定电压
      */
-    private Double ratedVolt;
+//    private Double ratedVolt;
 
     /**
      * 额定电流
      */
-    private Double ratedCurr;
+//    private Double ratedCurr;
 
     /**
      * 状态：0-删除 1-正常
diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
index deea5595..cbfdb2a0 100644
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
@@ -9,9 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
-import com.njcn.gather.detection.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.device.pojo.enums.CommonEnum;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.service.IPqDevService;
@@ -133,15 +131,17 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         boolean devFly = CollUtil.isNotEmpty(param.getDevIds());
         if (devFly) {
             //校验终端额定电压电流是否相同
-            PqScript pqScript = pqScriptMapper.selectOne(new LambdaQueryWrapper<PqScript>()
-                    .eq(PqScript::getId, param.getScriptId()));
-            if(ObjectUtil.isNull(pqScript)){
-                throw new BusinessException(DetectionResponseEnum.SCRIPT_PATTERN_NOT);
-            }
+            List<PqDev> list = pqDevService.list(new LambdaQueryWrapper<PqDev>()
+                    .eq(StrUtil.isNotBlank(param.getPlanId()), PqDev::getPlanId, param.getPlanId())
+                    .in(PqDev::getId, param.getDevIds())
+                    .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+            );
+            Set<String> devTypeSet = list.stream().map(PqDev::getDevType).collect(Collectors.toSet());
+            List<DevType> devTypes = devTypeService.listByIds(devTypeSet);
             //额定电压信息
-            voltSet.add(pqScript.getRatedVolt());
+            voltSet = devTypes.stream().map(DevType::getDevVolt).collect(Collectors.toSet());
             //额定电流信息
-            currSet.add(pqScript.getRatedCurr());
+            currSet = devTypes.stream().map(DevType::getDevCurr).collect(Collectors.toSet());
         } else {
             if (param.getType() == 0) {
                 voltSet.add(1.0);