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-07-08 15:50:38 +08:00
parent 75bc44172b
commit da08271f76
4 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -958,15 +958,17 @@ public class SocketDevResponseService {
//告诉前端当前项开始了 //告诉前端当前项开始了
WebSocketVO<Object> webSocketVO = new WebSocketVO<>(); WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
String type = sourceIssues.get(0).getType();
if (StrUtil.isNotBlank(sourceIssues.get(0).getOtherType())) { if (StrUtil.isNotBlank(sourceIssues.get(0).getOtherType())) {
sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode()); sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
webSocketVO.setRequestId(sourceIssues.get(0).getOtherType() + CnSocketUtil.START_TAG); webSocketVO.setRequestId(sourceIssues.get(0).getOtherType() + CnSocketUtil.START_TAG);
type = sourceIssues.get(0).getOtherType();
} else { } else {
webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG); webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
} }
FormalTestManager.currentIssue = sourceIssues.get(0); FormalTestManager.currentIssue = sourceIssues.get(0);
socketMsg.setData(JSON.toJSONString(sourceIssues.get(0))); socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + sourceIssues.get(0).getOtherType()); socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue()); socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.SOURCE_TAG, JSON.toJSONString(socketMsg)); SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.SOURCE_TAG, JSON.toJSONString(socketMsg));
@@ -1215,13 +1217,16 @@ public class SocketDevResponseService {
//告诉前端当前项开始了 //告诉前端当前项开始了
WebSocketVO<Object> webSocketVO = new WebSocketVO<>(); WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
String type = sourceIssues.get(0).getType(); String type = sourceIssues.get(0).getType();
if (ResultUnitEnum.P.getCode().equals(type)) { if (StrUtil.isNotBlank(sourceIssues.get(0).getOtherType())) {
sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode()); sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
webSocketVO.setRequestId(ResultUnitEnum.P.getCode() + CnSocketUtil.START_TAG); webSocketVO.setRequestId(sourceIssues.get(0).getOtherType() + CnSocketUtil.START_TAG);
type = sourceIssues.get(0).getOtherType();
} else { } else {
webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG); webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
} }
FormalTestManager.currentIssue = sourceIssues.get(0); FormalTestManager.currentIssue = sourceIssues.get(0);
socketMsg.setData(JSON.toJSONString(sourceIssues.get(0))); socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type); socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
@@ -1361,15 +1366,16 @@ public class SocketDevResponseService {
List<SourceIssue> sourceIssueList = SocketManager.getSourceList(); List<SourceIssue> sourceIssueList = SocketManager.getSourceList();
if (CollUtil.isNotEmpty(sourceIssueList)) { if (CollUtil.isNotEmpty(sourceIssueList)) {
SourceIssue sourceIssues = SocketManager.getSourceList().get(0); SourceIssue sourceIssues = SocketManager.getSourceList().get(0);
// 如果上一个大项检测完成，则检测下一个大项，并向前端推送消息
if (residueCount == 0) {
WebServiceManager.sendDetectionMessage(param.getUserPageId(), sourceIssues.getType() + CnSocketUtil.START_TAG, null, new ArrayList<>(), null);
}
String type = sourceIssues.getType(); String type = sourceIssues.getType();
if (StrUtil.isNotBlank(sourceIssues.getOtherType())) { if (StrUtil.isNotBlank(sourceIssues.getOtherType())) {
sourceIssues.setType(ResultUnitEnum.V_ABSOLUTELY.getCode()); sourceIssues.setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
type = sourceIssues.getOtherType(); type = sourceIssues.getOtherType();
} }
// 如果上一个大项检测完成，则检测下一个大项，并向前端推送消息
if (residueCount == 0) {
WebServiceManager.sendDetectionMessage(param.getUserPageId(), type + CnSocketUtil.START_TAG, null, new ArrayList<>(), null);
}
//控源下发下一个小项脚本 //控源下发下一个小项脚本
SocketMsg<String> xuMsg = new SocketMsg<>(); SocketMsg<String> xuMsg = new SocketMsg<>();

12
detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java
View File

@@ -104,6 +104,18 @@ public class PqScriptDtls implements Serializable {
@TableField("FAfterTime") @TableField("FAfterTime")
private Double fAfterTime; private Double fAfterTime;
/**
* 暂态写入时间（S）
*/
@TableField("FRampIn")
private Double fRampIn;
/**
* 暂态写出时间（S）
*/
@TableField("FRampOut")
private Double fRampOut;
/** /**
* 变动频度（次/min） * 变动频度（次/min）
*/ */

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

@@ -69,13 +69,13 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
private final static String INHARM_I = "InHarm_I"; private final static String INHARM_I = "InHarm_I";
private final static String DIP = "Dip"; private final static String DIP = "Dip";
private final static String FLICKER = "Flicker"; private final static String FLICKER = "Flicker";
// @Value("${Dip.fPreTime}") // @Value("${Dip.fPreTime}")
// private Double fPreTime; // private Double fPreTime;
@Value("${Dip.fRampIn}") // @Value("${Dip.fRampIn}")
private Double fRampIn; // private Double fRampIn;
@Value("${Dip.fRampOut}") // @Value("${Dip.fRampOut}")
private Double fRampOut; // private Double fRampOut;
// @Value("${Dip.fAfterTime}") // @Value("${Dip.fAfterTime}")
// private Double fAfterTime; // private Double fAfterTime;
private static final String waveFluType = "CPM"; private static final String waveFluType = "CPM";
private static final String waveType = "SQU"; private static final String waveType = "SQU";
@@ -386,6 +386,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
dip.setRetainTime(dipData.getRetainTime()); dip.setRetainTime(dipData.getRetainTime());
dip.setFPreTime(dipData.getFPreTime()); dip.setFPreTime(dipData.getFPreTime());
dip.setFAfterTime(dipData.getFAfterTime()); dip.setFAfterTime(dipData.getFAfterTime());
dip.setFRampIn(dipData.getFRampIn());
dip.setFRampOut(dipData.getFRampOut());
info.add(dip); info.add(dip);
} }
} }
@@ -1315,8 +1317,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
dipDataDTO.setFRetainTime(0.0); dipDataDTO.setFRetainTime(0.0);
// dipDataDTO.setFPreTime(fPreTime); // dipDataDTO.setFPreTime(fPreTime);
dipDataDTO.setFRampIn(fRampIn); // dipDataDTO.setFRampIn(fRampIn);
dipDataDTO.setFRampOut(fRampOut); // dipDataDTO.setFRampOut(fRampOut);
// dipDataDTO.setFAfterTime(fAfterTime); // dipDataDTO.setFAfterTime(fAfterTime);
@@ -1373,6 +1375,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
dipDataDTO.setFTransValue(dip.getTransValue()); dipDataDTO.setFTransValue(dip.getTransValue());
dipDataDTO.setFPreTime(dip.getFPreTime()); dipDataDTO.setFPreTime(dip.getFPreTime());
dipDataDTO.setFAfterTime(dip.getFAfterTime()); dipDataDTO.setFAfterTime(dip.getFAfterTime());
dipDataDTO.setFRampIn(dip.getFRampIn());
dipDataDTO.setFRampOut(dip.getFRampOut());
if (devFly) { if (devFly) {
// if (isValueType) { // if (isValueType) {
dipDataDTO.setFTransValue(dip.getTransValue()); dipDataDTO.setFTransValue(dip.getTransValue());

6
entrance/src/main/resources/application.yml
View File

@@ -6,7 +6,7 @@ spring:
datasource: datasource:
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.1.24:13306/pqs91001?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true url: jdbc:mysql://192.168.1.24:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
# username: root # username: root
# password: njcnpqs # password: njcnpqs
# url: jdbc:mysql://127.0.0.1:3306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # url: jdbc:mysql://127.0.0.1:3306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
@@ -70,9 +70,9 @@ Dip:
# 暂态前时间（s） # 暂态前时间（s）
# fPreTime: 2f # fPreTime: 2f
#写入时间（s） #写入时间（s）
fRampIn: 0.001f # fRampIn: 0.001f
#写出时间（s） #写出时间（s）
fRampOut: 0.001f # fRampOut: 0.001f
# 暂态后时间（s） # 暂态后时间（s）
# fAfterTime: 3f # fAfterTime: 3f