|
|
@ -191,6 +191,11 @@ public class BaseSensorInfoController extends BaseController {
|
|
|
|
baseAlarmInfo.setAlarmtypeId(baseSensorInfo.getParamCode()[i]);
|
|
|
|
baseAlarmInfo.setAlarmtypeId(baseSensorInfo.getParamCode()[i]);
|
|
|
|
baseAlarmInfo.setMaxValue(baseSensorInfo.getMaxValue()[i]);
|
|
|
|
baseAlarmInfo.setMaxValue(baseSensorInfo.getMaxValue()[i]);
|
|
|
|
baseAlarmInfo.setMinValue(baseSensorInfo.getMinValue()[i]);
|
|
|
|
baseAlarmInfo.setMinValue(baseSensorInfo.getMinValue()[i]);
|
|
|
|
|
|
|
|
int flag = baseSensorInfo.getMinValue()[i].compareTo(baseSensorInfo.getMaxValue()[i]);
|
|
|
|
|
|
|
|
if(flag == 1){
|
|
|
|
|
|
|
|
return AjaxResult.error("添加失败:阈值中最大值小于最小值");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
baseAlarmInfo.setEnableFlag(baseSensorInfo.getEnableFlag());
|
|
|
|
baseAlarmInfo.setEnableFlag(baseSensorInfo.getEnableFlag());
|
|
|
|
|
|
|
|
|
|
|
|
List<BaseAlarmInfoDto> baseAlarmInfoDtos = baseAlarmInfoService.selectBaseAlarmInfoList(baseAlarmInfo);
|
|
|
|
List<BaseAlarmInfoDto> baseAlarmInfoDtos = baseAlarmInfoService.selectBaseAlarmInfoList(baseAlarmInfo);
|
|
|
|