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

监测计划导出bug

Browse Source
This commit is contained in:
caozehui
2025-05-23 16:33:04 +08:00
parent 1380af6d50
commit 53548aec32
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,8 +125,8 @@ public class AdPlanController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD) @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
@PostMapping("/downloadTemplate") @PostMapping("/downloadTemplate")
@ApiOperation("下载检测计划导出模板") @ApiOperation("下载检测计划导出模板")
public void downloadTemplate(@RequestBody String patternId) { public void downloadTemplate(@RequestBody AdPlanParam.QueryParam queryParam) {
adPlanService.downloadTemplate(patternId); adPlanService.downloadTemplate(queryParam.getPatternId());
} }
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)

12
detection/src/main/java/com/njcn/gather/plan/pojo/enums/DataSourceEnum.java
View File

@@ -8,13 +8,13 @@ import lombok.Getter;
*/ */
@Getter @Getter
public enum DataSourceEnum { public enum DataSourceEnum {
THREE_SENSE_ACTUAL_TIME_DATA("0", "3s实时数据"), THREE_SENSE_ACTUAL_TIME_DATA("real", "3s实时数据"),
MINUTE_STATISTICS_MAX("1", "分钟统计数据-最大"), MINUTE_STATISTICS_MAX("max", "分钟统计数据-最大"),
MINUTE_STATISTICS_MIN("2", "分钟统计数据-最小"), MINUTE_STATISTICS_MIN("min", "分钟统计数据-最小"),
MINUTE_STATISTICS_AVG("3", "分钟统计数据-平均"), MINUTE_STATISTICS_AVG("avg", "分钟统计数据-平均"),
MINUTE_STATISTICS_CP95("4", "分钟统计数据-CP95"), MINUTE_STATISTICS_CP95("cp95", "分钟统计数据-CP95"),
RECORDED_DATA("5", "录播数据"); RECORDED_DATA("Recorded_data", "录播数据");
private String value; private String value;
private String msg; private String msg;

4
detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java
View File

@@ -25,11 +25,11 @@ public class AdPlanExcel {
@NotBlank(message = DetectionValidMessage.DATASOURCE_NOT_BLANK) @NotBlank(message = DetectionValidMessage.DATASOURCE_NOT_BLANK)
private String datasourceId; 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) @NotBlank(message = DetectionValidMessage.SCRIPT_NOT_BLANK)
private String scriptId; 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) @NotBlank(message = DetectionValidMessage.ERRORSYS_NOT_BLANK)
private String errorSysId; private String errorSysId;

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

@@ -1032,14 +1032,14 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
List<PullDown> pullDowns = new ArrayList<>(); List<PullDown> pullDowns = new ArrayList<>();
PullDown pullDown = null; PullDown pullDown = null;
// List<Map<String, Object>> maps = pqSourceService.listAllPqSource(patternId); List<Map<String, Object>> maps = pqSourceService.listAllPqSource(patternId);
// if (ObjectUtil.isNotEmpty(maps)) { if (ObjectUtil.isNotEmpty(maps)) {
// pullDown = new PullDown(); pullDown = new PullDown();
// pullDown.setFirstCol(1); pullDown.setFirstCol(1);
// pullDown.setLastCol(1); pullDown.setLastCol(1);
// pullDown.setStrings(maps.stream().map(m -> (String) m.get("name")).collect(Collectors.toList())); pullDown.setStrings(maps.stream().map(m -> (String) m.get("name")).collect(Collectors.toList()));
// pullDowns.add(pullDown); pullDowns.add(pullDown);
// } }
// 数据源 // 数据源
DictType dictType = dictTypeService.getByCode("Datasource"); DictType dictType = dictTypeService.getByCode("Datasource");