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
2025-09-10 08:26:35 +08:00
parent 2121a293cb
commit 694f12bc29
24 changed files with 245 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java
View File

@@ -175,7 +175,7 @@ public class AdPlanController extends BaseController {
public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) {
String methodDescribe = getMethodDescribe("getBigTestItem");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam);
List<Map<String, String>> result = adPlanService.getBigTestItem(checkParam.getReCheckType(), checkParam.getPlanId(), checkParam.getDevIds(), checkParam.getPatternId());
List<Map<String, String>> result = adPlanService.getBigTestItem(checkParam.getReCheckType(), checkParam.getPlanId(), checkParam.getDevIds(), checkParam.getPatternId(),checkParam.getScriptType());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

1
detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java
View File

@@ -128,5 +128,6 @@ public class AdPlanParam {
private String planId;
private List<String> devIds;
private String patternId;
private String scriptType;
}
}

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

@@ -73,9 +73,10 @@ public interface IAdPlanService extends IService<AdPlan> {
* @param planId 检测计划Id
* @param devIds 设备Id列表
* @param patternId 模式Id
* @param scriptType 脚本类型
* @return
*/
List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, List<String> devIds, String patternId);
List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, List<String> devIds, String patternId, String scriptType);
/**
* 修改计划状态
@@ -214,5 +215,4 @@ public interface IAdPlanService extends IService<AdPlan> {
*/
boolean mergePlanCheckData(String planId);
}

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

@@ -591,7 +591,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
}
@Override
public List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, List<String> devIds, String patternId) {
public List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, List<String> devIds, String patternId, String scriptType) {
List<Map<String, String>> result = new ArrayList<>();
AdPlan adPlan = this.getById(planId);
if (ObjectUtil.isNull(adPlan)) {
@@ -609,14 +609,15 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
map.put("scriptName", dictTree.getName());
result.add(map);
}
if (adPlan.getDatasourceId().contains(DataSourceEnum.WAVE_DATA.getValue())) {
Map<String, String> map = new HashMap<>();
map.put("id", "wave_data");
map.put("code", DataSourceEnum.WAVE_DATA.getValue());
map.put("scriptName", DataSourceEnum.WAVE_DATA.getMsg());
result.add(map);
if (StrUtil.isBlank(scriptType)) {
if (adPlan.getDatasourceId().contains(DataSourceEnum.WAVE_DATA.getValue())) {
Map<String, String> map = new HashMap<>();
map.put("id", DataSourceEnum.WAVE_DATA.getValue());
map.put("code", DataSourceEnum.WAVE_DATA.getValue());
map.put("scriptName", DataSourceEnum.WAVE_DATA.getMsg());
result.add(map);
}
}
} else {
String scriptId = adPlan.getScriptId();
List<PqScriptDtls> scriptDtlsList = pqScriptDtlsService.listPqScriptDtlByScriptId(scriptId);