报警分析

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/controller/TpmMessageAlarmController.java

@@ -188,7 +188,7 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	@ApiOperation(value="报警信息-分析统计", notes="报警信息-分析统计")
 	//@RequiresPermissions("org.jeecg.modules:tpm_message_alarm:edit")
 	@RequestMapping(value = "/getalarminfo", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<HashMap> getAlarmInfo(@RequestParam(name = "ids",required = true) List<String> ids, String yearmonth) {
+	public Result<HashMap> getAlarmInfo(@RequestParam(name = "ids",required = false) List<String> ids, String yearmonth) {
 		HashMap map = tpmMessageAlarmService.getAlarmInfo(ids,yearmonth);
 		return Result.OK(map);
 	}

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/service/impl/TpmMessageAlarmServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.tpmMessageAlarm.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.modules.tpmMessageAlarm.entity.TpmMessageAlarm;
 import org.jeecg.modules.tpmMessageAlarm.entity.TpmMessageAlarmStatistics;
 import org.jeecg.modules.tpmMessageAlarm.entity.TpmMessageAlarmVo;
@@ -69,7 +71,9 @@ public class TpmMessageAlarmServiceImpl extends ServiceImpl<TpmMessageAlarmMappe
         }
 
         TpmMessageAlarmStatistics alarmStatistics = new TpmMessageAlarmStatistics();
-        alarmStatistics.setIds(ids);
+        if (ObjectUtil.isNotNull(ids)){
+            alarmStatistics.setIds(ids);
+        }
         alarmStatistics.setYear(year);
         alarmStatistics.setMonth(month);