diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 3117e09..20dd07d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -150,6 +150,7 @@
                 alarmRecordsService.cancelDeviceAlarm(devCode);
                 //4.存报警
                 //若没绑定井，则不产生报警
+                boolean alarmFlag = false;
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     //获取报警规则
                     List<AlarmRuleResponseDTO> alarmRuleResponseDTOList = alarmRuleService.getByDevCode(devCode);
@@ -159,7 +160,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
+                                alarmFlag =alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -167,8 +168,8 @@
                 }
                 //5.清数据报警
                 alarmRecordsService.cancelDataAlarm(devCode);
-                //6.更新电量
-                alarmRecordsService.updateCell(devCode,cell);
+                //6.更新电量及状态 (1:正常，2：报警)
+                alarmRecordsService.updateCell(devCode,alarmFlag?"2":"1",cell);
 
             } catch (Exception e) {
                 e.printStackTrace();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 3117e09..20dd07d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -150,6 +150,7 @@
                 alarmRecordsService.cancelDeviceAlarm(devCode);
                 //4.存报警
                 //若没绑定井，则不产生报警
+                boolean alarmFlag = false;
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     //获取报警规则
                     List<AlarmRuleResponseDTO> alarmRuleResponseDTOList = alarmRuleService.getByDevCode(devCode);
@@ -159,7 +160,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
+                                alarmFlag =alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -167,8 +168,8 @@
                 }
                 //5.清数据报警
                 alarmRecordsService.cancelDataAlarm(devCode);
-                //6.更新电量
-                alarmRecordsService.updateCell(devCode,cell);
+                //6.更新电量及状态 (1:正常，2：报警)
+                alarmRecordsService.updateCell(devCode,alarmFlag?"2":"1",cell);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index b57bf3f..4b6c5fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 3117e09..20dd07d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -150,6 +150,7 @@
                 alarmRecordsService.cancelDeviceAlarm(devCode);
                 //4.存报警
                 //若没绑定井，则不产生报警
+                boolean alarmFlag = false;
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     //获取报警规则
                     List<AlarmRuleResponseDTO> alarmRuleResponseDTOList = alarmRuleService.getByDevCode(devCode);
@@ -159,7 +160,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
+                                alarmFlag =alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -167,8 +168,8 @@
                 }
                 //5.清数据报警
                 alarmRecordsService.cancelDataAlarm(devCode);
-                //6.更新电量
-                alarmRecordsService.updateCell(devCode,cell);
+                //6.更新电量及状态 (1:正常，2：报警)
+                alarmRecordsService.updateCell(devCode,alarmFlag?"2":"1",cell);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index b57bf3f..4b6c5fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 472fff7..f9cf228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -141,6 +141,7 @@
         </if>
         ORDER BY bl.TS DESC
     </select>
+
     <select id="getWatchData" resultType="java.util.Map">
             select
                 ${tableColumns}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 3117e09..20dd07d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -150,6 +150,7 @@
                 alarmRecordsService.cancelDeviceAlarm(devCode);
                 //4.存报警
                 //若没绑定井，则不产生报警
+                boolean alarmFlag = false;
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     //获取报警规则
                     List<AlarmRuleResponseDTO> alarmRuleResponseDTOList = alarmRuleService.getByDevCode(devCode);
@@ -159,7 +160,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
+                                alarmFlag =alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -167,8 +168,8 @@
                 }
                 //5.清数据报警
                 alarmRecordsService.cancelDataAlarm(devCode);
-                //6.更新电量
-                alarmRecordsService.updateCell(devCode,cell);
+                //6.更新电量及状态 (1:正常，2：报警)
+                alarmRecordsService.updateCell(devCode,alarmFlag?"2":"1",cell);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index b57bf3f..4b6c5fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 472fff7..f9cf228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -141,6 +141,7 @@
         </if>
         ORDER BY bl.TS DESC
     </select>
+
     <select id="getWatchData" resultType="java.util.Map">
             select
                 ${tableColumns}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7836600..26efdf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -32,5 +32,4 @@
 
     List<BusDeviceLog> repairLog(DeviceMonitorRequestDTO requestDTO);
 
-
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 3117e09..20dd07d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -150,6 +150,7 @@
                 alarmRecordsService.cancelDeviceAlarm(devCode);
                 //4.存报警
                 //若没绑定井，则不产生报警
+                boolean alarmFlag = false;
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     //获取报警规则
                     List<AlarmRuleResponseDTO> alarmRuleResponseDTOList = alarmRuleService.getByDevCode(devCode);
@@ -159,7 +160,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
+                                alarmFlag =alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -167,8 +168,8 @@
                 }
                 //5.清数据报警
                 alarmRecordsService.cancelDataAlarm(devCode);
-                //6.更新电量
-                alarmRecordsService.updateCell(devCode,cell);
+                //6.更新电量及状态 (1:正常，2：报警)
+                alarmRecordsService.updateCell(devCode,alarmFlag?"2":"1",cell);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index b57bf3f..4b6c5fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 472fff7..f9cf228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -141,6 +141,7 @@
         </if>
         ORDER BY bl.TS DESC
     </select>
+
     <select id="getWatchData" resultType="java.util.Map">
             select
                 ${tableColumns}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7836600..26efdf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -32,5 +32,4 @@
 
     List<BusDeviceLog> repairLog(DeviceMonitorRequestDTO requestDTO);
 
-
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index fc65471..7a1a075 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -58,7 +58,7 @@
             //添加设备操作日志
             iBusDeviceLogService.saveBusDeviceLog(busDevice.getDevcode(), "1", busDevice.getTagNumber());
         } catch (DataAccessException dax) {
-            throw new BusinessException(2011, dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "设备编号重复");
+            throw new BusinessException(2011, dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号已存在" : "设备编号已存在");
 //            throw new BusinessException(BusinessExceptionEnum.DEVICE_DUPLICATE);
         }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 3117e09..20dd07d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -150,6 +150,7 @@
                 alarmRecordsService.cancelDeviceAlarm(devCode);
                 //4.存报警
                 //若没绑定井，则不产生报警
+                boolean alarmFlag = false;
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     //获取报警规则
                     List<AlarmRuleResponseDTO> alarmRuleResponseDTOList = alarmRuleService.getByDevCode(devCode);
@@ -159,7 +160,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
+                                alarmFlag =alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -167,8 +168,8 @@
                 }
                 //5.清数据报警
                 alarmRecordsService.cancelDataAlarm(devCode);
-                //6.更新电量
-                alarmRecordsService.updateCell(devCode,cell);
+                //6.更新电量及状态 (1:正常，2：报警)
+                alarmRecordsService.updateCell(devCode,alarmFlag?"2":"1",cell);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index b57bf3f..4b6c5fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 472fff7..f9cf228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -141,6 +141,7 @@
         </if>
         ORDER BY bl.TS DESC
     </select>
+
     <select id="getWatchData" resultType="java.util.Map">
             select
                 ${tableColumns}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7836600..26efdf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -32,5 +32,4 @@
 
     List<BusDeviceLog> repairLog(DeviceMonitorRequestDTO requestDTO);
 
-
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index fc65471..7a1a075 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -58,7 +58,7 @@
             //添加设备操作日志
             iBusDeviceLogService.saveBusDeviceLog(busDevice.getDevcode(), "1", busDevice.getTagNumber());
         } catch (DataAccessException dax) {
-            throw new BusinessException(2011, dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "设备编号重复");
+            throw new BusinessException(2011, dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号已存在" : "设备编号已存在");
 //            throw new BusinessException(BusinessExceptionEnum.DEVICE_DUPLICATE);
         }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index 88aada8..690ca85 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -9,10 +9,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 0949b51..e004832 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,14 +16,9 @@
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.RemindDTO;
-import com.casic.missiles.modular.alarm.dto.SuspendDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
-import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +79,7 @@
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
 
-        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request,dataScope);
+        List<AlarmRecordExportDTO> dtoList = iAlarmRecordsService.allList(request, dataScope);
 
         try {
             iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName());
@@ -152,5 +147,26 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
     }
+
+    @ApiOperation("轨迹查询")
+    @PostMapping("/tracksList")
+    @ResponseBody
+    public ReturnDTO<TrackResponseDTO> tracksList(@RequestBody TrackRequestDTO requestDTO) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        Page<TrackResponseDTO> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope)));
+
+    }
+
+    @ApiOperation("查看位置,需传设备编号")
+    @PostMapping("/viewPlace")
+    @ResponseBody
+    public ReturnDTO viewPlace(@RequestBody TrackRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevCode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
+
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 25a27eb..6c24763 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.dto.StateDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.service.IAlarmEventProductService;
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
@@ -48,16 +49,10 @@
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<AlarmRule> listPage() {
+    public ReturnDTO<AlarmRule> listPage(@RequestBody AlarmRuleRequestDTO requestDTO) {
         Page<AlarmRule> page = PageFactory.defaultPage();
-        iAlarmRuleService.page(page);
-        List<AlarmRule> alarmTypeList = page.getRecords();
-//        alarmTypeList.forEach(alarmType -> {
-//            alarmType.setAlarmCategoryName(dictService.getDictNameByCode("alarmCategory", alarmType.getAlarmCategory()));
-//            BaseDeviceType baseDeviceType = iBaseDeviceTypeService.getById(alarmType.getDeviceType());
-//            alarmType.setDeviceTypeName(ObjectUtil.isNotEmpty(baseDeviceType) ? baseDeviceType.getTypeName() : "");
-//        });
-        return ReturnUtil.success(super.packForBT(page));
+
+        return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO)));
     }
 
     @ApiOperation("新增")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 48039dc..1d50155 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdsDTO;
@@ -36,6 +37,7 @@
 public class AlarmRuleDeviceController extends ExportController {
 
     private final IAlarmRuleDeviceService iAlarmRuleDeviceService;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询分页接口")
     @PostMapping("/listPage")
@@ -43,7 +45,7 @@
     public ReturnDTO<AlarmRuleDevice> listPage(@RequestBody AlarmRuleDeviceDTO request) {
         Page<AlarmRuleDevice> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page,request)));
+        return ReturnUtil.success(super.packForBT(iAlarmRuleDeviceService.listPage(page, request)));
     }
 
     @ApiOperation("新增")
@@ -51,6 +53,10 @@
     @ResponseBody
     public ReturnDTO add(@RequestBody List<AlarmRuleDevice> alarmRuleDeviceList) {
 
+        String createUser = permissionContext.getAuthService().getLoginUser().getName();
+        alarmRuleDeviceList.forEach(alarmRuleDevice -> {
+            alarmRuleDevice.setCreateUser(createUser);
+        });
         return ReturnUtil.success(iAlarmRuleDeviceService.saveBatch(alarmRuleDeviceList));
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 690ac14..c73fd6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -3,14 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmRecordExportDTO;
-import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,6 +24,8 @@
 
     Page<AlarmRecords> pageList(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
+
     Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr);
@@ -33,11 +34,13 @@
 
     AlarmRecords view(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("cell") String cell);
+    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr);
 
+    List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
+    List<Map<String, Object>> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
index 33c6b03..c498a4b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +44,7 @@
             " AND ar.ALARM_JUDGE_METHOD = 1")
     List<AlarmDeviceRuleResponseDTO> getDeviceAlarmRuleByCode(@Param("devCode") String devCode);
 
+    Page<AlarmRule> pageList(Page<AlarmRule> page, @Param("request") AlarmRuleRequestDTO request);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 6ea0b48..307c921 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.alarm.dao;
 
-import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -27,4 +27,8 @@
             "WHERE  al.ALARM_ID = #{alarmId}")
     List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
 
+
+
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index dee090f..4fa4e01 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -69,6 +69,9 @@
             <if test="request.alarmLevel != null and request.alarmLevel !='' ">
                 and rd.ALARM_LEVEL =#{request.alarmLevel}
             </if>
+            <if test="request.alarmCategory != null and request.alarmCategory !='' ">
+                and ay.ALARM_CATEGORY =#{request.alarmCategory}
+            </if>
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
@@ -241,25 +244,26 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             rd.POSITION,
-            rd.LEDGER_NUMBER as tagNumber,
+            rd.LEDGER_NUMBER AS tagNumber,
             lr.DEPTID,
-            lr.LNG_GAODE as lngGaode,
-            lr.LAT_GAODE as latGaode,
-            lr.MANAGE_TYPE as manageType,
-            sd.full_name as deptName,
-            sd1.full_name as responsibleDeptName
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner
         FROM
             alarm_records rd
-            LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
-            LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
-            LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
-            AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
-            AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN sys_dept sd1  ON sd1.id = lr.RESPONSIBLE_DEPT
-        where rd.STATUS = 1 and  rd.ID=#{id}
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
 
     </select>
 
@@ -334,10 +338,104 @@
         ORDER BY rd.ALARM_TIME DESC
     </select>
 
+
+    <select id="tracksList" resultType="com.casic.missiles.modular.alarm.dto.TrackResponseDTO">
+
+        WITH alarm_temp AS ( SELECT ar.DEVCODE, ar.LONGITUDE_LATITUDE, ar.ALARM_TIME, ar.LEDGER_CODE FROM `alarm_records` ar
+        WHERE ar.LONGITUDE_LATITUDE > 0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and ar.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.begTime != null and request.begTime !='' ">
+            and ar.ALARM_TIME >= #{request.begTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !='' ">
+            and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+        </if>) SELECT
+        ap.DEVCODE,
+        ap.LONGITUDE_LATITUDE AS startPosition,
+        ap.ALARM_TIME AS createTime,
+        bv.lngGaode,
+        bv.latGaode,
+        bv.DEPTID,
+        bt.TYPE_NAME AS typeName
+        FROM
+        bus_device bd
+        JOIN alarm_temp ap ON ap.DEVCODE = bd.DEVCODE
+        AND bd.valid > 0
+        JOIN base_device_type bt ON bt.id = bd.DEVICE_TYPE
+        JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE
+        <where>
+
+            <if test="request.devTypeId != null and request.devTypeId !='' ">
+                and bd.DEVICE_TYPE =#{request.devTypeId}
+            </if>
+
+            <if test="deptIdStr != null and deptIdStr !='' ">
+                and bv.DEPTID in (${deptIdStr})
+            </if>
+        </where>
+
+        ORDER BY ap.ALARM_TIME DESC
+    </select>
+
+    <select id="viewPlace" resultType="java.util.Map">
+        SELECT
+            ar.DEVCODE,
+            ar.LONGITUDE_LATITUDE,
+            ar.ALARM_TIME
+        FROM
+            `alarm_records` ar
+        WHERE
+            ar.LONGITUDE_LATITUDE > 0
+         AND  ar.DEVCODE = #{request.devCode}
+            <if test="request.begTime != null and request.begTime !='' ">
+                and ar.ALARM_TIME >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and ar.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+        ORDER BY ar.ALARM_TIME ASC
+    </select>
+
+
+    <select id="getOfflineDevices" resultType="java.util.Map">
+        WITH device_temp AS (
+            SELECT
+                bd.id,
+                bd.DEVCODE,
+                bd.DEVICE_TYPE,
+                bd.WATCH_OBJECT
+            FROM
+                bus_device bd
+            WHERE
+                bd.VALID = 1
+              AND bd.ONLINE_STATE > 0
+                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+                or bd.LOGTIME is null)
+        ), device_off as (SELECT
+                              dt.DEVCODE,
+                              dt.DEVICE_TYPE,
+                              bv.tagNumber,
+                              bv.ledgerCode,
+                              bdt.TYPE_NAME,
+                              bv.place
+                          FROM
+                              device_temp dt
+                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+                                  AND bl.type = dt.WATCH_OBJECT
+                                  AND bl.valid = 1
+                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+                                  AND bv.type = bl.type
+                                  AND bv.valid = 1
+                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+    </select>
     <update id="updateCell" flushCache="true">
         update bus_device set
         CELL = #{cell},
-        ONLINE_STATE = 1,
+        ONLINE_STATE = #{onLineStatus},
         LOGTIME = now()
         where DEVCODE = #{devCode} and valid >0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
index 6050a9c..b6c5595 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleMapper.xml
@@ -4,19 +4,50 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRule">
-        <id column="ID" property="id" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_LEVEL" property="alarmLevel" />
-        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod" />
-        <result column="ALARM_RULE" property="alarmRule" />
-        <result column="STATE" property="state" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_NOTE_METHOD" property="alarmNoteMethod"/>
+        <result column="ALARM_RULE" property="alarmRule"/>
+        <result column="STATE" property="state"/>
+        <result column="DESCRIPTION" property="description"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
+        ID
+        , ALARM_TYPE, ALARM_LEVEL, ALARM_NOTE_METHOD, ALARM_RULE, STATE, DESCRIPTION, TS
     </sql>
 
+    <select id="pageList" resultType="com.casic.missiles.modular.alarm.entity.AlarmRule">
+        SELECT
+        ar.*,
+        ac.ALARM_LEVEL AS alarmLevelName,
+        CONCAT(
+        IF
+        ( ac.IS_SEND = 1, '弹窗提醒', '' ),
+        ',',
+        IF
+        ( ac.IS_SOUND = 1, '报警音效', '' ),
+        ',',
+        IF
+        ( ac.IS_TEXT = 1, '消息提醒', '' )) AS alarmNote,
+        ay.ALARM_TYPE AS alarmTypeName
+        FROM
+        `alarm_rule` ar
+        LEFT JOIN alarm_level_control ac ON ar.ALARM_LEVEL_ID = ac.ID
+        LEFT JOIN alarm_type ay ON ar.ALARM_TYPE_ID = ay.ID
+        <where>
+            <if test="request.alarmName != null and request.alarmName !='' ">
+                and ar.ALARM_NAME like concat('%', #{request.alarmName}, '%')
+            </if>
+            <if test="request.alarmLevelId != null and request.alarmLevelId !='' ">
+                and ac.ID =#{request.alarmLevelId}
+            </if>
+        </where>
+
+        ORDER BY ar.TS desc
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
index b16e158..844036d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java
@@ -15,6 +15,9 @@
     @ApiModelProperty("报警类型id")
     private Long alarmTypeId;
 
+    @ApiModelProperty("报警类别传code")
+    private String alarmCategory;
+
     @ApiModelProperty("报警等级")
     private String alarmLevel;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
new file mode 100644
index 0000000..4896273
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleRequestDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleRequestDTO implements Cloneable{
+
+    @ApiModelProperty("报警名称")
+    private String alarmName;
+
+    @ApiModelProperty("产品类型id")
+    private Long productId;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
index 0e822a5..07917e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -12,6 +12,15 @@
     @ApiModelProperty("提醒人员")
     private String remindPerson;
 
+    @ApiModelProperty("提醒人员id")
+    private Long remindPersonId;
+
+    @ApiModelProperty("其他")
+    private String remindPersonOther;
+
+    @ApiModelProperty("其他id")
+    private Long remindPersonOtherId;
+
     @ApiModelProperty("联系方式")
     private String telephone;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
new file mode 100644
index 0000000..1fbb986
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackRequestDTO.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackRequestDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devCode;
+
+    @ApiModelProperty("设备类型id")
+    private Long devTypeId;
+
+    @ApiModelProperty("管理单位id")
+    private Long deptId;
+
+    @ApiModelProperty("上报开始时间")
+    private String begTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String endTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
new file mode 100644
index 0000000..1ce601c
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/TrackResponseDTO.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TrackResponseDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String devcode;
+
+    @ApiModelProperty("设备类型名称")
+    private String typeName;
+
+    @ApiModelProperty("原始位置")
+    private String startPosition;
+
+    @ApiModelProperty("当前位置")
+    private String currentPosition;
+
+    private Long deptid;
+
+    @ApiModelProperty("管理单位")
+    private String deptName;
+
+    @ApiModelProperty("上报时间")
+    private String createTime;
+
+    private String lngGaode;
+
+    private String latGaode;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index e6484b1..9ce5af3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -105,7 +105,7 @@
 
     @ApiModelProperty("产权单位")
     @TableField(exist = false)
-    private String responsibleDeptName;
+    private String propertyOwner;
 
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
@@ -144,6 +144,7 @@
     private String devTypeName;
 
     @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
     private String alarmLevelName;
 
     @ApiModelProperty("解除时长")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
index 516a100..1ed316f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRule.java
@@ -73,6 +73,20 @@
     @TableField("TS")
     private Date ts;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警等级名称")
+    @TableField(exist = false)
+    private String alarmLevelName;
+
+    @ApiModelProperty("消息提醒方式")
+    @TableField(exist = false)
+    private String alarmNote;
+
+
+
 //    @ApiModelProperty("报警规则list")
 //    @TableField(exist = false)
 //    private List<AlarmRuleDetail> alarmRuleDetailList;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index adab538..e577203 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,4 +73,8 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 1e6043a..8a7c9d3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<TrackResponseDTO>  tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope);
+
     Page<DeviceAlarmResponseDTO>  deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope);
 
     Page<AlarmRecords>  pop();
@@ -46,13 +48,17 @@
 
     List<Map<String,Object>> nodeDetail(Long alarmId);
 
+    List<Map<String,Object>> viewPlace(TrackRequestDTO requestDTO);
+
     List<AlarmRecordExportDTO>  allList(AlarmRecordDTO request, DataScope dataScope);
 
     void cancelDeviceAlarm(String devCode);
 
     void cancelDataAlarm(String devCode);
 
-    void updateCell(String devCode,String cell);
+    void processOffline();
+
+    void updateCell(String devCode,String onLineStatus,String cell);
 
     boolean isDataAlarmByCode(String devCode,Float alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
index 3f3e588..08cc100 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.alarm.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 
@@ -25,4 +27,6 @@
     List<AlarmRuleResponseDTO> getByDevCode(String devCode);
 
     List<AlarmDeviceRuleResponseDTO>  getDeviceAlarmRuleByCode(String devCode);
+
+    Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO requestDTO);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2c57afd..4563049 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -73,6 +73,17 @@
     }
 
     @Override
+    public Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, TrackRequestDTO request, DataScope dataScope) {
+        Page<TrackResponseDTO> responseDTOPage = this.baseMapper.tracksList(page, request, dataScope, getDeptIds(request.getDeptId()));
+        List<TrackResponseDTO> trackResponseDTOList = responseDTOPage.getRecords();
+        trackResponseDTOList.forEach(trackResponseDTO -> {
+            trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid()));
+            trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode());
+        });
+        return responseDTOPage;
+    }
+
+    @Override
     public Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<DeviceAlarmResponseDTO> deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId()));
         List<DeviceAlarmResponseDTO> deviceAlarmList = deviceAlarmListPage.getRecords();
@@ -258,6 +269,11 @@
     }
 
     @Override
+    public List<Map<String, Object>> viewPlace(TrackRequestDTO requestDTO) {
+        return this.baseMapper.viewPlace(requestDTO);
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
@@ -453,7 +469,30 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String cell) {
-        this.baseMapper.updateCell(devCode, cell);
+    public void updateCell(String devCode, String onLineStatus, String cell) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell);
+    }
+
+    /**
+     * 更新离线异常
+     */
+    @Override
+    public void processOffline() {
+        //todo:等报警类型调试完后 完善
+        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        List<AlarmRecords> alarmRecordsList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
+//                    map.get("ledgerCode").toString(),
+//                    map.get("tagNumber").toString(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
+//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
+//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
+//                    new Date(),
+//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
+//                    map.get("place").toString(), "1");
+//            alarmRecordsList.add(alarmRecords);
+        }
+        this.saveBatch(alarmRecordsList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 82dbdf5..fdade51 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmDeviceRuleResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
@@ -43,6 +45,12 @@
         return true;
     }
 
+    @Override
+    public Page<AlarmRule> pageList(Page<AlarmRule> page, AlarmRuleRequestDTO request) {
+
+        return this.baseMapper.pageList(page, request);
+    }
+
     @Transactional
     @Override
     public boolean batchDelete(List<Long> ids) {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 3117e09..20dd07d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -150,6 +150,7 @@
                 alarmRecordsService.cancelDeviceAlarm(devCode);
                 //4.存报警
                 //若没绑定井，则不产生报警
+                boolean alarmFlag = false;
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     //获取报警规则
                     List<AlarmRuleResponseDTO> alarmRuleResponseDTOList = alarmRuleService.getByDevCode(devCode);
@@ -159,7 +160,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
+                                alarmFlag =alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO,DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -167,8 +168,8 @@
                 }
                 //5.清数据报警
                 alarmRecordsService.cancelDataAlarm(devCode);
-                //6.更新电量
-                alarmRecordsService.updateCell(devCode,cell);
+                //6.更新电量及状态 (1:正常，2：报警)
+                alarmRecordsService.updateCell(devCode,alarmFlag?"2":"1",cell);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index b57bf3f..4b6c5fe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
-import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 472fff7..f9cf228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -141,6 +141,7 @@
         </if>
         ORDER BY bl.TS DESC
     </select>
+
     <select id="getWatchData" resultType="java.util.Map">
             select
                 ${tableColumns}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7836600..26efdf2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -32,5 +32,4 @@
 
     List<BusDeviceLog> repairLog(DeviceMonitorRequestDTO requestDTO);
 
-
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index fc65471..7a1a075 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -58,7 +58,7 @@
             //添加设备操作日志
             iBusDeviceLogService.saveBusDeviceLog(busDevice.getDevcode(), "1", busDevice.getTagNumber());
         } catch (DataAccessException dax) {
-            throw new BusinessException(2011, dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "设备编号重复");
+            throw new BusinessException(2011, dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号已存在" : "设备编号已存在");
 //            throw new BusinessException(BusinessExceptionEnum.DEVICE_DUPLICATE);
         }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index 88aada8..690ca85 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -9,10 +9,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;
diff --git a/casic-job/src/main/java/com/casic/missiles/job/handler/OfflineJobHandler.java b/casic-job/src/main/java/com/casic/missiles/job/handler/OfflineJobHandler.java
new file mode 100644
index 0000000..1e6708f
--- /dev/null
+++ b/casic-job/src/main/java/com/casic/missiles/job/handler/OfflineJobHandler.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.job.handler;
+
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class OfflineJobHandler {
+
+    private final IAlarmRecordsService iAlarmRecordsService;
+
+    /**
+     * 离线判断处理
+     */
+    @XxlJob("offlineJobHandler")
+    public void offlineJobHandler() {
+        XxlJobHelper.log("check offline");
+        iAlarmRecordsService.processOffline();
+    }
+
+}