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

正式检测检测增加回退状态，推送消息优化

Browse Source
This commit is contained in:
wr
2025-01-14 13:27:37 +08:00
parent ec6e90e37a
commit 8fa69a6876
8 changed files with 88 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
View File

@@ -96,9 +96,18 @@ public interface IAdPlanService extends IService<AdPlan> {
/**
* 修改计划状态
* @param planId
* @param devIds
* @return
*/
boolean updateTestState(String planId);
boolean updateTestState(String planId,List<String> devIds);
/**
* 数据状态回退
* @param planId
* @param devIds
* @return
*/
boolean updateBackTestState(String planId,List<String> devIds);
void finishPlan(String planId);
}

29
detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
View File

@@ -1,9 +1,11 @@
package com.njcn.gather.plan.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -331,10 +333,31 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
}
@Override
public boolean updateTestState(String planId) {
public boolean updateTestState(String planId, List<String> devIds) {
if (CollUtil.isNotEmpty(devIds)) {
pqDevService.update(new LambdaUpdateWrapper<PqDev>()
.set(PqDev::getCheckState, CheckStateEnum.CHECKING.getValue())
.in(PqDev::getId, devIds));
}
return this.update(new LambdaUpdateWrapper<AdPlan>()
.set(AdPlan::getTestState,CheckStateEnum.CHECKING.getValue())
.eq(AdPlan::getId,planId));
.set(AdPlan::getTestState, CheckStateEnum.CHECKING.getValue())
.eq(AdPlan::getId, planId));
}
@Override
public boolean updateBackTestState(String planId, List<String> devIds) {
pqDevService.update(new LambdaUpdateWrapper<PqDev>()
.set(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue())
.in(PqDev::getId, devIds));
List<PqDev> list = pqDevService.list(new LambdaQueryWrapper<PqDev>().in(PqDev::getPlanId, planId));
List<PqDev> collect = list.stream().filter(x -> !x.getCheckState().equals(CheckStateEnum.UNCHECKED.getValue())).collect(Collectors.toList());
if (CollUtil.isEmpty(collect)) {
return this.update(new LambdaUpdateWrapper<AdPlan>()
.set(AdPlan::getTestState, CheckStateEnum.UNCHECKED.getValue())
.eq(AdPlan::getId, planId));
}
return false;
}
@Override