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-01 11:07:20 +08:00
parent 061b65be1b
commit de83f98845
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -1853,7 +1853,7 @@ public class SocketDevResponseService {
if (ObjectUtil.isNotNull(dipData)) { if (ObjectUtil.isNotNull(dipData)) {
Double fTransValue = dipData.getFTransValue(); Double fTransValue = dipData.getFTransValue();
if (ObjectUtil.isNotNull(fTransValue) && ObjectUtil.isNotNull(fAmp)) { if (ObjectUtil.isNotNull(fTransValue) && ObjectUtil.isNotNull(fAmp)) {
if (maxVoltage.compareTo(BigDecimal.valueOf(fTransValue).max(BigDecimal.valueOf(fAmp))) < 0) { if (maxVoltage.compareTo(BigDecimal.valueOf(fTransValue / 100).max(BigDecimal.valueOf(fAmp))) < 0) {
return 1; return 1;
} }
} }
@@ -1862,7 +1862,7 @@ public class SocketDevResponseService {
// 谐波判断 // 谐波判断
if (channelListDTO.getHarmFlag()) { if (channelListDTO.getHarmFlag()) {
List<SourceIssue.ChannelListDTO.HarmModel> harmList = channelListDTO.getHarmList(); List<SourceIssue.ChannelListDTO.HarmModel> harmList = channelListDTO.getHarmList();
double sum = harmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp()).mapToDouble(x -> x).sum(); double sum = harmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp() / 10000).mapToDouble(x -> x).sum();
if (channelType.contains("U")) { if (channelType.contains("U")) {
if (maxVoltage.compareTo(BigDecimal.valueOf(Math.sqrt(1 + sum) * fAmp)) < 0) { if (maxVoltage.compareTo(BigDecimal.valueOf(Math.sqrt(1 + sum) * fAmp)) < 0) {
return 1; return 1;
@@ -1876,7 +1876,7 @@ public class SocketDevResponseService {
// 间谐波判断 // 间谐波判断
if (channelListDTO.getInHarmFlag()) { if (channelListDTO.getInHarmFlag()) {
List<SourceIssue.ChannelListDTO.InharmModel> inharmList = channelListDTO.getInharmList(); List<SourceIssue.ChannelListDTO.InharmModel> inharmList = channelListDTO.getInharmList();
double sum = inharmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp()).mapToDouble(x -> x).sum(); double sum = inharmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp() / 10000).mapToDouble(x -> x).sum();
if (channelType.contains("U")) { if (channelType.contains("U")) {
if (maxVoltage.compareTo(BigDecimal.valueOf(Math.sqrt(1 + sum) * fAmp)) < 0) { if (maxVoltage.compareTo(BigDecimal.valueOf(Math.sqrt(1 + sum) * fAmp)) < 0) {
return 1; return 1;

29
detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
View File

@@ -389,19 +389,22 @@ public class SocketSourceResponseService {
overloadSocketDataMsg.setRequestId("overloadTest"); overloadSocketDataMsg.setRequestId("overloadTest");
overloadSocketDataMsg.setCode(FormalTestManager.overload); overloadSocketDataMsg.setCode(FormalTestManager.overload);
sendWebSocketMessage(param.getUserPageId(), overloadSocketDataMsg); sendWebSocketMessage(param.getUserPageId(), overloadSocketDataMsg);
if (FormalTestManager.overload != 4) {
//todo 前端推送收到的消息暂未处理好 CnSocketUtil.quitSendSource(param);
sendWebSocketMessage(param.getUserPageId(), socketDataMsg); } else {
//开始设备通讯检测(发送设备初始化) //todo 前端推送收到的消息暂未处理好
Map<String, List<PreDetection>> map = new HashMap<>(1); sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
map.put("deviceList", FormalTestManager.devList); //开始设备通讯检测(发送设备初始化)
String jsonString = JSON.toJSONString(map); Map<String, List<PreDetection>> map = new HashMap<>(1);
socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue()); map.put("deviceList", FormalTestManager.devList);
socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue()); String jsonString = JSON.toJSONString(map);
socketMsg.setData(jsonString); socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
String json = JSON.toJSONString(socketMsg); socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
// 使用智能发送工具类，自动管理设备连接 socketMsg.setData(jsonString);
socketManager.smartSendToDevice(param, json); String json = JSON.toJSONString(socketMsg);
// 使用智能发送工具类，自动管理设备连接
socketManager.smartSendToDevice(param, json);
}
} }
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS: