ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2026-06-08 08:43:42 +08:00
parent 4afcec7fb9
commit 0787901d60
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
View File

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

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

@@ -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.po.PqDev;
import com.njcn.gather.device.pojo.vo.PreDetection; import com.njcn.gather.device.pojo.vo.PreDetection;
import com.njcn.gather.device.service.IPqDevService; 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.enums.DataSourceEnum;
import com.njcn.gather.plan.pojo.po.AdPlan; import com.njcn.gather.plan.pojo.po.AdPlan;
import com.njcn.gather.plan.pojo.po.AdPlanSource; import com.njcn.gather.plan.pojo.po.AdPlanSource;
@@ -79,6 +80,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
private final IPqScriptCheckDataService iPqScriptCheckDataService; private final IPqScriptCheckDataService iPqScriptCheckDataService;
private final SocketManager socketManager; private final SocketManager socketManager;
private final ISysTestConfigService sysTestConfigService; private final ISysTestConfigService sysTestConfigService;
private final IPqFreqConverterConfigService pqFreqConverterConfigService;
@Value("${report.reportDir}") @Value("${report.reportDir}")
@@ -422,6 +424,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
@Override @Override
public void stopFreqConverter(String converterTag, String devTag) { public void stopFreqConverter(String converterTag, String devTag) {
pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
socketFreqConverterService.stopTest(converterTag, devTag); socketFreqConverterService.stopTest(converterTag, devTag);
socketFreqConverterDevService.stopTest(converterTag, devTag); socketFreqConverterDevService.stopTest(converterTag, devTag);
} }