diff --git a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java index a2ea329..5ada95d 100644 --- a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java +++ b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java @@ -3,6 +3,7 @@ package com.inspect.statistics.controller; import cn.hutool.poi.excel.ExcelWriter; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import com.inspect.base.core.constant.AlgConstants; import com.inspect.base.core.exception.ServiceException; import com.inspect.base.core.utils.StringUtils; @@ -57,7 +58,15 @@ public class PatrolStatisticsController extends BaseController { ) @GetMapping({"/listMulti"}) public TableDataInfo queryPatrolResultMulti(StatisticsPatrolResult result) { - this.statisticsService.verifyParam(result); + try { + this.statisticsService.verifyParam(result); + } catch (ServiceException e) { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(500); + rspData.setMsg(e.getMessage()); + return rspData; + } + this.startPage(); if (StringUtils.isNotEmpty(result.getRecognitionType())) { if ("4".equals(result.getRecognitionType())) { @@ -81,7 +90,12 @@ public class PatrolStatisticsController extends BaseController { @GetMapping({"/chartsMulti"}) public AjaxResult chartsMulti(StatisticsPatrolResult result) { - this.statisticsService.verifyParam(result); + try { + this.statisticsService.verifyParam(result); + } catch (ServiceException e) { + return AjaxResult.error(e.getMessage()); + } + if (StringUtils.isNotEmpty(result.getRecognitionType())) { if ("4".equals(result.getRecognitionType())) { List arrayList = new ArrayList();