diff --git a/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java b/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java index da832704..40ee7c24 100644 --- a/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java +++ b/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java @@ -125,8 +125,8 @@ public class AdPlanController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD) @PostMapping("/downloadTemplate") @ApiOperation("下载检测计划导出模板") - public void downloadTemplate(@RequestBody String patternId) { - adPlanService.downloadTemplate(patternId); + public void downloadTemplate(@RequestBody AdPlanParam.QueryParam queryParam) { + adPlanService.downloadTemplate(queryParam.getPatternId()); } @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) diff --git a/detection/src/main/java/com/njcn/gather/plan/pojo/enums/DataSourceEnum.java b/detection/src/main/java/com/njcn/gather/plan/pojo/enums/DataSourceEnum.java index 8e96a418..7e9a0462 100644 --- a/detection/src/main/java/com/njcn/gather/plan/pojo/enums/DataSourceEnum.java +++ b/detection/src/main/java/com/njcn/gather/plan/pojo/enums/DataSourceEnum.java @@ -8,13 +8,13 @@ import lombok.Getter; */ @Getter public enum DataSourceEnum { - THREE_SENSE_ACTUAL_TIME_DATA("0", "3s实时数据"), + THREE_SENSE_ACTUAL_TIME_DATA("real", "3s实时数据"), - MINUTE_STATISTICS_MAX("1", "分钟统计数据-最大"), - MINUTE_STATISTICS_MIN("2", "分钟统计数据-最小"), - MINUTE_STATISTICS_AVG("3", "分钟统计数据-平均"), - MINUTE_STATISTICS_CP95("4", "分钟统计数据-CP95"), - RECORDED_DATA("5", "录播数据"); + MINUTE_STATISTICS_MAX("max", "分钟统计数据-最大"), + MINUTE_STATISTICS_MIN("min", "分钟统计数据-最小"), + MINUTE_STATISTICS_AVG("avg", "分钟统计数据-平均"), + MINUTE_STATISTICS_CP95("cp95", "分钟统计数据-CP95"), + RECORDED_DATA("Recorded_data", "录播数据"); private String value; private String msg; diff --git a/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java b/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java index c156674d..4184af0a 100644 --- a/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java +++ b/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java @@ -25,11 +25,11 @@ public class AdPlanExcel { @NotBlank(message = DetectionValidMessage.DATASOURCE_NOT_BLANK) private String datasourceId; - @Excel(name = "脚本*", width = 100, needMerge = true, orderNum = "3") + @Excel(name = "脚本*", width = 40, needMerge = true, orderNum = "3") @NotBlank(message = DetectionValidMessage.SCRIPT_NOT_BLANK) private String scriptId; - @Excel(name = "误差体系*", width = 30, needMerge = true, orderNum = "4") + @Excel(name = "误差体系*", width = 40, needMerge = true, orderNum = "4") @NotBlank(message = DetectionValidMessage.ERRORSYS_NOT_BLANK) private String errorSysId; diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 7d9151db..6ce1c74b 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -1032,14 +1032,14 @@ public class AdPlanServiceImpl extends ServiceImpl impleme List pullDowns = new ArrayList<>(); PullDown pullDown = null; -// List> maps = pqSourceService.listAllPqSource(patternId); -// if (ObjectUtil.isNotEmpty(maps)) { -// pullDown = new PullDown(); -// pullDown.setFirstCol(1); -// pullDown.setLastCol(1); -// pullDown.setStrings(maps.stream().map(m -> (String) m.get("name")).collect(Collectors.toList())); -// pullDowns.add(pullDown); -// } + List> maps = pqSourceService.listAllPqSource(patternId); + if (ObjectUtil.isNotEmpty(maps)) { + pullDown = new PullDown(); + pullDown.setFirstCol(1); + pullDown.setLastCol(1); + pullDown.setStrings(maps.stream().map(m -> (String) m.get("name")).collect(Collectors.toList())); + pullDowns.add(pullDown); + } // 数据源 DictType dictType = dictTypeService.getByCode("Datasource");