Commit 077e0cb6 authored by 赵啸非's avatar 赵啸非

添加设备告警

parent 16a3a755
package com.mortals.xhx.module.device.web; package com.mortals.xhx.module.device.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.AlarmLevelEnum; import com.mortals.xhx.common.code.AlarmLevelEnum;
...@@ -17,12 +19,10 @@ import com.mortals.xhx.module.device.model.DeviceAlarmQuery; ...@@ -17,12 +19,10 @@ import com.mortals.xhx.module.device.model.DeviceAlarmQuery;
import com.mortals.xhx.module.device.service.DeviceAlarmService; import com.mortals.xhx.module.device.service.DeviceAlarmService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
...@@ -45,6 +45,16 @@ public class DeviceAlarmController extends BaseCRUDJsonMappingController<DeviceA ...@@ -45,6 +45,16 @@ public class DeviceAlarmController extends BaseCRUDJsonMappingController<DeviceA
super.setModuleDesc( "设备告警日志"); super.setModuleDesc( "设备告警日志");
} }
@Override
protected void doListBefore(HttpServletRequest request, HttpServletResponse response, DeviceAlarmForm form, Map<String, Object> model, Context context) throws AppException {
List<OrderCol> orderColList = new ArrayList<>();
orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
form.getQuery().setOrderColList(orderColList);
super.doListBefore(request, response, form, model, context);
}
@Override @Override
protected void init(HttpServletRequest request, HttpServletResponse response, DeviceAlarmForm form, Map<String, Object> model, Context context) { protected void init(HttpServletRequest request, HttpServletResponse response, DeviceAlarmForm form, Map<String, Object> model, Context context) {
this.addDict(model, "alarmType", AlarmTypeEnum.getEnumMap()); this.addDict(model, "alarmType", AlarmTypeEnum.getEnumMap());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment