微调

This reverts commit a48dad40f6.

detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java

@@ -33,6 +33,8 @@ import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
 import com.njcn.gather.script.pojo.po.SourceIssue;
 import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
+import com.njcn.gather.source.pojo.po.SourceInitialize;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.storage.pojo.param.StorageParam;
 import com.njcn.gather.storage.pojo.po.SimAndDigHarmonicResult;
 import com.njcn.gather.storage.pojo.po.SimAndDigNonHarmonicResult;
@@ -76,6 +78,7 @@ public class SocketDevResponseService {
     private final SimAndDigHarmonicService adHarmonicService;
     private final IAdPlanService adPlanService;
     private final IDictDataService dictDataService;
+    private final IPqSourceService pqSourceService;
 
     /**
      * 存储的装置相序数据
@@ -391,6 +394,8 @@ public class SocketDevResponseService {
         if (param.getTestItemList().get(2)) {
             //如果后续做正式检测
             PqScriptIssueParam issueParam = new PqScriptIssueParam();
+            SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+            issueParam.setSourceId(sourceInitialize.getSourceId());
             issueParam.setPlanId(param.getPlanId());
             issueParam.setSourceId(param.getSourceId());
             issueParam.setDevIds(param.getDevIds());
@@ -893,10 +898,9 @@ public class SocketDevResponseService {
 
                             //开始下源控制脚本
                             PqScriptIssueParam issueParam = new PqScriptIssueParam();
+                            SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+                            issueParam.setSourceId(sourceInitialize.getSourceId());
                             issueParam.setPlanId(param.getPlanId());
-                            issueParam.setSourceId(param.getSourceId());
-                            issueParam.setDevIds(param.getDevIds());
-                            issueParam.setScriptId(param.getScriptId());
 
                             socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
                             List<SourceIssue> sourceIssues;
@@ -1162,8 +1166,9 @@ public class SocketDevResponseService {
                             } else if (param.getTestItemList().get(2)) {
                                 // 后续做正式检测
                                 PqScriptIssueParam issueParam = new PqScriptIssueParam();
+                                SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+                                issueParam.setSourceId(sourceInitialize.getSourceId());
                                 issueParam.setPlanId(param.getPlanId());
-                                issueParam.setSourceId(param.getSourceId());
                                 issueParam.setDevIds(param.getDevIds());
                                 issueParam.setScriptId(param.getScriptId());
 
@@ -1816,8 +1821,9 @@ public class SocketDevResponseService {
         XiNumberManager.devParameterList.add(devParameterSmall);
 
         PqScriptIssueParam issueParam = new PqScriptIssueParam();
+        SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+        issueParam.setSourceId(sourceInitialize.getSourceId());
         issueParam.setPlanId(param.getPlanId());
-        issueParam.setSourceId(param.getSourceId());
         issueParam.setDevIds(param.getDevIds());
         issueParam.setScriptId(param.getScriptId());
         issueParam.setIsPhaseSequence(CommonEnum.COEFFICIENT_TEST.getValue());

detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterDevService.java

@@ -275,6 +275,9 @@ public class SocketFreqConverterDevService {
 
             if (DetectionCodeEnum.MAG.getCode().equalsIgnoreCase(sqlDataDTO.getDesc())) {
                 residualVoltage = value;
+                if (residualVoltage <= 6) {
+                    return;
+                }
             } else if (DetectionCodeEnum.DUR.getCode().equalsIgnoreCase(sqlDataDTO.getDesc())) {
                 durationMs = (int) Math.round(value * 1000);
             }

detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java

@@ -228,14 +228,15 @@ public class SocketFreqConverterService {
     }
 
     private void handleCloseSerial(String converterChannelTag, FreqConverterRespDTO respDTO) {
-        if (respDTO.getCode() == 0 && respDTO.getSuccess()) {
-            if (FormalTestManager.currentFreqConverterId != null) {
-                pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
-            }
-            cleanup(converterChannelTag);
-        } else {
-            this.sendClose(converterChannelTag);
+        if (FormalTestManager.currentFreqConverterId != null) {
+            pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
         }
+        cleanup(converterChannelTag);
+//        if (respDTO.getCode() == 0 && respDTO.getSuccess()) {
+//
+//        } else {
+//            this.sendClose(converterChannelTag);
+//        }
     }
 
 

detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java

@@ -25,6 +25,7 @@ import com.njcn.gather.detection.util.socket.websocket.WebServiceManager;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.freqConverter.service.IPqFreqConverterConfigService;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.po.AdPlanSource;
@@ -79,6 +80,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
     private final SocketManager socketManager;
     private final ISysTestConfigService sysTestConfigService;
+    private final IPqFreqConverterConfigService pqFreqConverterConfigService;
 
 
     @Value("${report.reportDir}")
@@ -289,7 +291,8 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         }
         //组装源控制脚本
         PqScriptIssueParam issueParam = new PqScriptIssueParam();
-        issueParam.setSourceId(param.getSourceId());
+        SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+        issueParam.setSourceId(sourceInitialize.getSourceId());
         issueParam.setScriptId(param.getScriptId());
         issueParam.setType(1);
         issueParam.setIsPhaseSequence(SourceOperateCodeEnum.SIMULATE_TEST.getValue());
@@ -421,6 +424,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
 
     @Override
     public void stopFreqConverter(String converterTag, String devTag) {
+        pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
         socketFreqConverterService.stopTest(converterTag, devTag);
         socketFreqConverterDevService.stopTest(converterTag, devTag);
     }

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java

@@ -34,6 +34,8 @@ import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
 import com.njcn.gather.script.util.ScriptDtlsDesc;
 import com.njcn.gather.script.util.ThreePhaseUnbalance;
+import com.njcn.gather.source.pojo.po.SourceInitialize;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import com.njcn.gather.system.dictionary.service.IDictTreeService;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
@@ -68,13 +70,13 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     private final static String INHARM_I = "InHarm_I";
     private final static String DIP = "Dip";
     private final static String FLICKER = "Flicker";
-//    @Value("${Dip.fPreTime}")
+    //    @Value("${Dip.fPreTime}")
 //    private Double fPreTime;
     @Value("${Dip.fRampIn}")
     private Double fRampIn;
     @Value("${Dip.fRampOut}")
     private Double fRampOut;
-//    @Value("${Dip.fAfterTime}")
+    //    @Value("${Dip.fAfterTime}")
 //    private Double fAfterTime;
     @Value("${Flicker.waveFluType}")
     private String waveFluType;
@@ -91,6 +93,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     private final IDevTypeService devTypeService;
     private final IDictTreeService dictTreeService;
     private final AdPlanMapper adPlanMapper;
+    private final IPqSourceService pqSourceService;
 
     @Override
     @Transactional
@@ -781,7 +784,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     @Override
     public Set<String> getScriptToIcdCheckInfo(PreDetectionParam param) {
         PqScriptIssueParam issueParam = new PqScriptIssueParam();
-        issueParam.setSourceId(param.getSourceId());
+        SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+        issueParam.setSourceId(sourceInitialize.getSourceId());
         issueParam.setDevIds(param.getDevIds());
         issueParam.setScriptId(param.getScriptId());
         issueParam.setIsPhaseSequence(CommonEnum.FORMAL_TEST.getValue());
@@ -974,7 +978,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             for (int i = 0; i < pqScriptDtls.size(); i++) {
                 PqScriptDtls scriptDtls = pqScriptDtls.get(i);
                 // 注意此处scriptDtls.getValue() < 1.0,考虑到有些已经投入运行的地方，可能没有改库，避免不必要的异常
-                if(scriptDtls.getValueType().equalsIgnoreCase("CUR") && scriptDtls.getValue() < 1.0){
+                if (scriptDtls.getValueType().equalsIgnoreCase("CUR") && scriptDtls.getValue() < 1.0) {
                     scriptDtls.setValue(devCurr * scriptDtls.getValue());
                 }
             }