增加app 我的相关警情

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -171,9 +171,33 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "警情列表查询", notes = "警情列表查询")
     public ResponseModel<Page<AlertCalledZhDto>> listhistoryPage(Integer pageNum, Integer pageSize, RequestData par) {
 
-        if (par.getStatus() == null) {
-            par.setStatus(1);
+
+        if(par.getStatus() != null&&par.getStatus() == -1 ){
+
+            AgencyUserModel agencyUserModel = getUserInfo();
+            Long id = null;
+            //获取用户已绑定车辆id、
+            UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
+            //获取正在进行的灾情null
+            if (userCar != null) {
+                AlertCalled alertCalled = powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
+                if(alertCalled!=null){
+                    par.setAlertId(alertCalled.getSequenceNbr());
+                    par.setStatus(null);
+                }else{
+                    return ResponseHelper.buildResponse(null);
+                }
+
+            }else{
+                return ResponseHelper.buildResponse(null);
+            }
+        }else{
+            if (par.getStatus() == null) {
+                par.setStatus(1);
+            }
         }
+
+
         if (null == pageNum || null == pageSize) {
             pageNum = 1;
             pageSize = Integer.MAX_VALUE;