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-15 10:45:40 +08:00
parent 55fe1fe05f
commit 31a956a1fc
6 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java
View File

@@ -356,6 +356,7 @@ public class SocketContrastResponseService {
FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_SBTXJY;
FormalTestManager.checkStartTime = LocalDateTime.now();
}
public void deal(PreDetectionParam param, String msg) throws Exception {

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

@@ -1805,6 +1805,7 @@ public class SocketDevResponseService {
}
FormalTestManager.overload = getOverloadResult(param);
FormalTestManager.checkStartTime = LocalDateTime.now();
}

6
detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java
View File

@@ -13,6 +13,7 @@ import com.njcn.gather.plan.pojo.po.AdPlanTestConfig;
import com.njcn.gather.script.pojo.po.SourceIssue;
import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -213,4 +214,9 @@ public class FormalTestManager {
* 过载信息，如果检测到电压过载，overload=1；如果检测到电流过载，overload=2；如果检测到电压&&电流过载，overload=3；反之，overload=4
*/
public static int overload;
/**
* 检测开始时间
*/
public static LocalDateTime checkStartTime;
}

12
detection/src/main/java/com/njcn/gather/device/pojo/po/PqDevSub.java
View File

@@ -56,10 +56,16 @@ public class PqDevSub {
private String checkBy;
/**
* 检测时间
* 检测开始时间
*/
@TableField("Check_Time")
private LocalDateTime checkTime;
@TableField("Check_Start_Time")
private LocalDateTime checkStartTime;
/**
* 检测开始时间
*/
@TableField("Check_End_Time")
private LocalDateTime checkEndTime;
/**
* 预检测耗时

9
detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
View File

@@ -26,6 +26,7 @@ import com.njcn.common.pojo.poi.PullDown;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.EncryptionUtil;
import com.njcn.db.mybatisplus.constant.DbConstant;
import com.njcn.gather.detection.util.socket.FormalTestManager;
import com.njcn.gather.device.mapper.PqDevMapper;
import com.njcn.gather.device.pojo.enums.*;
import com.njcn.gather.device.pojo.param.PqDevParam;
@@ -505,7 +506,8 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
LambdaUpdateWrapper<PqDevSub> wrapper = new LambdaUpdateWrapper<PqDevSub>()
.set(PqDevSub::getCheckResult, result.get(pqDevVo.getId()))
.set(StrUtil.isNotBlank(userId), PqDevSub::getCheckBy, userId)
.set(updateCheckNum, PqDevSub::getCheckTime, LocalDateTime.now())
.set(updateCheckNum, PqDevSub::getCheckEndTime, LocalDateTime.now())
.set(updateCheckNum && ObjectUtil.isNotNull(FormalTestManager.checkStartTime), PqDevSub::getCheckStartTime, FormalTestManager.checkStartTime)
.eq(PqDevSub::getDevId, pqDevVo.getId());
String currrentScene = sysTestConfigService.getCurrrentScene();
if (SceneEnum.PROVINCE_PLATFORM.getValue().equals(currrentScene)) {
@@ -595,8 +597,9 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
.eq(PqDevSub::getDevId, devId);
// 只有当checkTime为空时，才设置为当前时间
if (currentDevSub != null && currentDevSub.getCheckTime() == null) {
w.set(PqDevSub::getCheckTime, LocalDateTime.now());
if (currentDevSub != null && currentDevSub.getCheckEndTime() == null) {
w.set(PqDevSub::getCheckEndTime, LocalDateTime.now());
w.set(ObjectUtil.isNotNull(FormalTestManager.checkStartTime), PqDevSub::getCheckStartTime, currentDevSub.getCheckStartTime());
}
if (ObjectUtil.isNotNull(user)) {

6
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -2234,9 +2234,9 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
// 检测日期
PqDevSub devSub = iPqDevSubService.lambdaQuery().eq(PqDevSub::getDevId, pqDevVO.getId()).one();
if (Objects.nonNull(devSub)) {
LocalDateTime checkTime = devSub.getCheckTime();
if (Objects.nonNull(checkTime)) {
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), DateUtil.format(checkTime, DatePattern.NORM_DATE_PATTERN));
LocalDateTime checkEndTime = devSub.getCheckEndTime();
if (Objects.nonNull(checkEndTime)) {
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), DateUtil.format(checkEndTime, DatePattern.NORM_DATE_PATTERN));
} else {
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), StrPool.TAB);
}