修改接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -36,6 +36,9 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "响应级别字典code 为了过滤用（只有航空器故障有）")
     private String responseLevelCode;
 
+    @ApiModelProperty(value = "响应级别")
+    private String responseLevel;
+    
     @ApiModelProperty(value = "报警类型code")
     private String alarmTypeCode;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -175,11 +175,12 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize, AlertCalled alertCalled) {
+    public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize,String sort, AlertCalled alertCalled) {
         Page<AlertCalled> pageBean;
         IPage<AlertCalled> page;
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
-        setQueryWrapper(alertCalledQueryWrapper, alertCalled);
+        
+        setQueryWrapper(alertCalledQueryWrapper, alertCalled,sort);
 
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
@@ -222,16 +223,25 @@ public class AlertCalledController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询")
     public ResponseModel<List<AlertCalled>> list(AlertCalled alertCalled) {
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
-        setQueryWrapper(alertCalledQueryWrapper, alertCalled);
+        setQueryWrapper(alertCalledQueryWrapper, alertCalled,null);
 
         List<AlertCalled> list = iAlertCalledService.list(alertCalledQueryWrapper);
         return ResponseHelper.buildResponse(list);
     }
 
-    private QueryWrapper<AlertCalled> setQueryWrapper(QueryWrapper<AlertCalled> queryWrapper, AlertCalled alertCalled){
+    private QueryWrapper<AlertCalled> setQueryWrapper(QueryWrapper<AlertCalled> queryWrapper, AlertCalled alertCalled,String sort){
         Class<? extends AlertCalled> aClass = alertCalled.getClass();
         queryWrapper.eq("is_delete", 0);
         queryWrapper.orderByDesc("call_time");
+        if(sort!=null) {
+        	String[] date=  sort.split(",");
+        	if(date[1].equals("ascend")) {
+        		 queryWrapper.orderByAsc(date[0]);
+        	}else {
+        		 queryWrapper.orderByDesc(date[0]);
+        	}       	
+        }
+        
         if (alertCalled.getCallTimeStart() != null && alertCalled.getCallTimeEnd() != null) {
             queryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd());
         }