diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 7dad93c..13ebe89 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -18,10 +18,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.ReturnUtil;
@@ -125,6 +122,17 @@
     }
 
 
+    @ApiOperation("耗电分析")
+    @PostMapping("/cellAnalysis")
+    @ResponseBody
+    public ReturnDTO cellAnalysis(@RequestBody CommonRequestDTO requestDTO) {
+        Assert.isFalse(ObjectUtil.isEmpty(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusDeviceService.cellAnalysis(requestDTO));
+    }
+
+
     @ApiOperation("批量导入")
     @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
     @ResponseBody

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 7dad93c..13ebe89 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -18,10 +18,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.ReturnUtil;
@@ -125,6 +122,17 @@
     }
 
 
+    @ApiOperation("耗电分析")
+    @PostMapping("/cellAnalysis")
+    @ResponseBody
+    public ReturnDTO cellAnalysis(@RequestBody CommonRequestDTO requestDTO) {
+        Assert.isFalse(ObjectUtil.isEmpty(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusDeviceService.cellAnalysis(requestDTO));
+    }
+
+
     @ApiOperation("批量导入")
     @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 9e21e3e..0e884a7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
 import com.casic.missiles.modular.device.dto.BusDeviceDTO;
+import com.casic.missiles.modular.device.dto.CommonRequestDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,4 +40,11 @@
 
     List<Map<String, Object>> alarmRecords(@Param("request") AlarmRecordsRequestDTO request);
 
+    List<Map<String, Object>> cellAnalysis(@Param("tableName") String tableName,
+                                           @Param("cell") String cell,
+                                           @Param("devcode") String devcode,
+                                           @Param("uptime") String uptime,
+                                           @Param("orderColumn") String orderColumn,
+                                           @Param("request") CommonRequestDTO request);
+
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 7dad93c..13ebe89 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -18,10 +18,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.ReturnUtil;
@@ -125,6 +122,17 @@
     }
 
 
+    @ApiOperation("耗电分析")
+    @PostMapping("/cellAnalysis")
+    @ResponseBody
+    public ReturnDTO cellAnalysis(@RequestBody CommonRequestDTO requestDTO) {
+        Assert.isFalse(ObjectUtil.isEmpty(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusDeviceService.cellAnalysis(requestDTO));
+    }
+
+
     @ApiOperation("批量导入")
     @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 9e21e3e..0e884a7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
 import com.casic.missiles.modular.device.dto.BusDeviceDTO;
+import com.casic.missiles.modular.device.dto.CommonRequestDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,4 +40,11 @@
 
     List<Map<String, Object>> alarmRecords(@Param("request") AlarmRecordsRequestDTO request);
 
+    List<Map<String, Object>> cellAnalysis(@Param("tableName") String tableName,
+                                           @Param("cell") String cell,
+                                           @Param("devcode") String devcode,
+                                           @Param("uptime") String uptime,
+                                           @Param("orderColumn") String orderColumn,
+                                           @Param("request") CommonRequestDTO request);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 7fc8052..1017129 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -85,9 +85,9 @@
 
     <select id="monitorData" resultType="java.util.Map">
         select
-        ${tableColumns}
+            ${tableColumns}
         FROM
-        ${tableName}
+            ${tableName}
         <where>
             <if test="devcode != null and devcode !='' ">
                 and   ${devcode} =#{request.devcode}
@@ -114,16 +114,59 @@
     </select>
 
     <select id="alarmRecords" resultType="java.util.Map">
-        SELECT * FROM `alarm_records` ar where ar.ALARM_TYPE_ID=11 and ar.ALARM_TIME>='2024-08-15 11:31:20' and  (ar.`STATUS`=0  or (ar.`STATUS`=1 and ar.PROCESS_STATUS>3)
-        <if test="request.cell != null and request.cell !='' ">
-            and bd.CELL <![CDATA[  <=  ]]> #{request.cell}
-        </if>
-        <if test="request.logTime1 != null and request.logTime1 !='' ">
-            and bd.LOGTIME <![CDATA[  >=  ]]> #{request.logTime1}
-        </if>
-        <if test="request.logTime2 != null and request.logTime2 !='' ">
-            and bd.LOGTIME <![CDATA[  <=  ]]> #{request.logTime2}
-        </if>
-        ORDER BY bd.INSTALL_DATE DESC
+        WITH approval_log_temp as (
+        SELECT
+        t1.approval_person,t1.alarm_id,t1.APPROVAL_TIME,t1.DESCN,t1.FLOW_STATUS,t1.APPROVAL_PERSON_ID
+        FROM
+        approval_log t1
+        INNER JOIN ( SELECT max( id ) As id from approval_log t2 group by alarm_id ) t2 oN t1.id = t2.id
+        )
+        SELECT
+        ar.*, alt.approval_person,alt.DESCN
+        FROM
+        `alarm_records` ar
+        left JOIN approval_log_temp alt on alt.alarm_id=ar.id
+        <where>
+
+            <if test="request.alarmType != null and request.alarmType !='' ">
+                and  ar.ALARM_TYPE_ID =#{request.alarmType}
+            </if>
+            <if test="request.devcode != null and request.devcode !='' ">
+                and  ar.DEVCODE =#{request.devcode}
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
+            </if>
+            AND (
+            ar.`STATUS` = 0
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+        </where>
+        ORDER BY ar.ALARM_TIME DESC
+    </select>
+
+
+    <select id="cellAnalysis" resultType="java.util.Map">
+        select
+            ${cell}
+        FROM
+            ${tableName}
+        <where>
+            <if test="devcode != null and devcode !='' ">
+                and   ${devcode} =#{request.devcode}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.begTime != null and request.begTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.begTime}
+                </if>
+                <if test="request.endTime != null and request.endTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.endTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
     </select>
 </mapper>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 7dad93c..13ebe89 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -18,10 +18,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.ReturnUtil;
@@ -125,6 +122,17 @@
     }
 
 
+    @ApiOperation("耗电分析")
+    @PostMapping("/cellAnalysis")
+    @ResponseBody
+    public ReturnDTO cellAnalysis(@RequestBody CommonRequestDTO requestDTO) {
+        Assert.isFalse(ObjectUtil.isEmpty(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusDeviceService.cellAnalysis(requestDTO));
+    }
+
+
     @ApiOperation("批量导入")
     @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 9e21e3e..0e884a7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
 import com.casic.missiles.modular.device.dto.BusDeviceDTO;
+import com.casic.missiles.modular.device.dto.CommonRequestDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,4 +40,11 @@
 
     List<Map<String, Object>> alarmRecords(@Param("request") AlarmRecordsRequestDTO request);
 
+    List<Map<String, Object>> cellAnalysis(@Param("tableName") String tableName,
+                                           @Param("cell") String cell,
+                                           @Param("devcode") String devcode,
+                                           @Param("uptime") String uptime,
+                                           @Param("orderColumn") String orderColumn,
+                                           @Param("request") CommonRequestDTO request);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 7fc8052..1017129 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -85,9 +85,9 @@
 
     <select id="monitorData" resultType="java.util.Map">
         select
-        ${tableColumns}
+            ${tableColumns}
         FROM
-        ${tableName}
+            ${tableName}
         <where>
             <if test="devcode != null and devcode !='' ">
                 and   ${devcode} =#{request.devcode}
@@ -114,16 +114,59 @@
     </select>
 
     <select id="alarmRecords" resultType="java.util.Map">
-        SELECT * FROM `alarm_records` ar where ar.ALARM_TYPE_ID=11 and ar.ALARM_TIME>='2024-08-15 11:31:20' and  (ar.`STATUS`=0  or (ar.`STATUS`=1 and ar.PROCESS_STATUS>3)
-        <if test="request.cell != null and request.cell !='' ">
-            and bd.CELL <![CDATA[  <=  ]]> #{request.cell}
-        </if>
-        <if test="request.logTime1 != null and request.logTime1 !='' ">
-            and bd.LOGTIME <![CDATA[  >=  ]]> #{request.logTime1}
-        </if>
-        <if test="request.logTime2 != null and request.logTime2 !='' ">
-            and bd.LOGTIME <![CDATA[  <=  ]]> #{request.logTime2}
-        </if>
-        ORDER BY bd.INSTALL_DATE DESC
+        WITH approval_log_temp as (
+        SELECT
+        t1.approval_person,t1.alarm_id,t1.APPROVAL_TIME,t1.DESCN,t1.FLOW_STATUS,t1.APPROVAL_PERSON_ID
+        FROM
+        approval_log t1
+        INNER JOIN ( SELECT max( id ) As id from approval_log t2 group by alarm_id ) t2 oN t1.id = t2.id
+        )
+        SELECT
+        ar.*, alt.approval_person,alt.DESCN
+        FROM
+        `alarm_records` ar
+        left JOIN approval_log_temp alt on alt.alarm_id=ar.id
+        <where>
+
+            <if test="request.alarmType != null and request.alarmType !='' ">
+                and  ar.ALARM_TYPE_ID =#{request.alarmType}
+            </if>
+            <if test="request.devcode != null and request.devcode !='' ">
+                and  ar.DEVCODE =#{request.devcode}
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
+            </if>
+            AND (
+            ar.`STATUS` = 0
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+        </where>
+        ORDER BY ar.ALARM_TIME DESC
+    </select>
+
+
+    <select id="cellAnalysis" resultType="java.util.Map">
+        select
+            ${cell}
+        FROM
+            ${tableName}
+        <where>
+            <if test="devcode != null and devcode !='' ">
+                and   ${devcode} =#{request.devcode}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.begTime != null and request.begTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.begTime}
+                </if>
+                <if test="request.endTime != null and request.endTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.endTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
     </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java
new file mode 100644
index 0000000..67124fc
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CommonRequestDTO {
+
+    @ApiModelProperty(value="设备编号",required = true)
+    private String devcode;
+
+    @ApiModelProperty(value = "设备类型名称",required = true)
+    private String typeName;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 7dad93c..13ebe89 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -18,10 +18,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.ReturnUtil;
@@ -125,6 +122,17 @@
     }
 
 
+    @ApiOperation("耗电分析")
+    @PostMapping("/cellAnalysis")
+    @ResponseBody
+    public ReturnDTO cellAnalysis(@RequestBody CommonRequestDTO requestDTO) {
+        Assert.isFalse(ObjectUtil.isEmpty(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusDeviceService.cellAnalysis(requestDTO));
+    }
+
+
     @ApiOperation("批量导入")
     @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 9e21e3e..0e884a7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
 import com.casic.missiles.modular.device.dto.BusDeviceDTO;
+import com.casic.missiles.modular.device.dto.CommonRequestDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,4 +40,11 @@
 
     List<Map<String, Object>> alarmRecords(@Param("request") AlarmRecordsRequestDTO request);
 
+    List<Map<String, Object>> cellAnalysis(@Param("tableName") String tableName,
+                                           @Param("cell") String cell,
+                                           @Param("devcode") String devcode,
+                                           @Param("uptime") String uptime,
+                                           @Param("orderColumn") String orderColumn,
+                                           @Param("request") CommonRequestDTO request);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 7fc8052..1017129 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -85,9 +85,9 @@
 
     <select id="monitorData" resultType="java.util.Map">
         select
-        ${tableColumns}
+            ${tableColumns}
         FROM
-        ${tableName}
+            ${tableName}
         <where>
             <if test="devcode != null and devcode !='' ">
                 and   ${devcode} =#{request.devcode}
@@ -114,16 +114,59 @@
     </select>
 
     <select id="alarmRecords" resultType="java.util.Map">
-        SELECT * FROM `alarm_records` ar where ar.ALARM_TYPE_ID=11 and ar.ALARM_TIME>='2024-08-15 11:31:20' and  (ar.`STATUS`=0  or (ar.`STATUS`=1 and ar.PROCESS_STATUS>3)
-        <if test="request.cell != null and request.cell !='' ">
-            and bd.CELL <![CDATA[  <=  ]]> #{request.cell}
-        </if>
-        <if test="request.logTime1 != null and request.logTime1 !='' ">
-            and bd.LOGTIME <![CDATA[  >=  ]]> #{request.logTime1}
-        </if>
-        <if test="request.logTime2 != null and request.logTime2 !='' ">
-            and bd.LOGTIME <![CDATA[  <=  ]]> #{request.logTime2}
-        </if>
-        ORDER BY bd.INSTALL_DATE DESC
+        WITH approval_log_temp as (
+        SELECT
+        t1.approval_person,t1.alarm_id,t1.APPROVAL_TIME,t1.DESCN,t1.FLOW_STATUS,t1.APPROVAL_PERSON_ID
+        FROM
+        approval_log t1
+        INNER JOIN ( SELECT max( id ) As id from approval_log t2 group by alarm_id ) t2 oN t1.id = t2.id
+        )
+        SELECT
+        ar.*, alt.approval_person,alt.DESCN
+        FROM
+        `alarm_records` ar
+        left JOIN approval_log_temp alt on alt.alarm_id=ar.id
+        <where>
+
+            <if test="request.alarmType != null and request.alarmType !='' ">
+                and  ar.ALARM_TYPE_ID =#{request.alarmType}
+            </if>
+            <if test="request.devcode != null and request.devcode !='' ">
+                and  ar.DEVCODE =#{request.devcode}
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
+            </if>
+            AND (
+            ar.`STATUS` = 0
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+        </where>
+        ORDER BY ar.ALARM_TIME DESC
+    </select>
+
+
+    <select id="cellAnalysis" resultType="java.util.Map">
+        select
+            ${cell}
+        FROM
+            ${tableName}
+        <where>
+            <if test="devcode != null and devcode !='' ">
+                and   ${devcode} =#{request.devcode}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.begTime != null and request.begTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.begTime}
+                </if>
+                <if test="request.endTime != null and request.endTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.endTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
     </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java
new file mode 100644
index 0000000..67124fc
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CommonRequestDTO {
+
+    @ApiModelProperty(value="设备编号",required = true)
+    private String devcode;
+
+    @ApiModelProperty(value = "设备类型名称",required = true)
+    private String typeName;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 13eaaa0..47482eb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -3,10 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 
 import java.util.List;
@@ -36,6 +33,8 @@
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
 
+    List<Map<String,Object>> cellAnalysis(CommonRequestDTO requestDTO);
+
     List<String> addDeviceBatch(List<BusDeviceImportDTO> results);
 
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 7dad93c..13ebe89 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -18,10 +18,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.ReturnUtil;
@@ -125,6 +122,17 @@
     }
 
 
+    @ApiOperation("耗电分析")
+    @PostMapping("/cellAnalysis")
+    @ResponseBody
+    public ReturnDTO cellAnalysis(@RequestBody CommonRequestDTO requestDTO) {
+        Assert.isFalse(ObjectUtil.isEmpty(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusDeviceService.cellAnalysis(requestDTO));
+    }
+
+
     @ApiOperation("批量导入")
     @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 9e21e3e..0e884a7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
 import com.casic.missiles.modular.device.dto.BusDeviceDTO;
+import com.casic.missiles.modular.device.dto.CommonRequestDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusDevice;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,4 +40,11 @@
 
     List<Map<String, Object>> alarmRecords(@Param("request") AlarmRecordsRequestDTO request);
 
+    List<Map<String, Object>> cellAnalysis(@Param("tableName") String tableName,
+                                           @Param("cell") String cell,
+                                           @Param("devcode") String devcode,
+                                           @Param("uptime") String uptime,
+                                           @Param("orderColumn") String orderColumn,
+                                           @Param("request") CommonRequestDTO request);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 7fc8052..1017129 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -85,9 +85,9 @@
 
     <select id="monitorData" resultType="java.util.Map">
         select
-        ${tableColumns}
+            ${tableColumns}
         FROM
-        ${tableName}
+            ${tableName}
         <where>
             <if test="devcode != null and devcode !='' ">
                 and   ${devcode} =#{request.devcode}
@@ -114,16 +114,59 @@
     </select>
 
     <select id="alarmRecords" resultType="java.util.Map">
-        SELECT * FROM `alarm_records` ar where ar.ALARM_TYPE_ID=11 and ar.ALARM_TIME>='2024-08-15 11:31:20' and  (ar.`STATUS`=0  or (ar.`STATUS`=1 and ar.PROCESS_STATUS>3)
-        <if test="request.cell != null and request.cell !='' ">
-            and bd.CELL <![CDATA[  <=  ]]> #{request.cell}
-        </if>
-        <if test="request.logTime1 != null and request.logTime1 !='' ">
-            and bd.LOGTIME <![CDATA[  >=  ]]> #{request.logTime1}
-        </if>
-        <if test="request.logTime2 != null and request.logTime2 !='' ">
-            and bd.LOGTIME <![CDATA[  <=  ]]> #{request.logTime2}
-        </if>
-        ORDER BY bd.INSTALL_DATE DESC
+        WITH approval_log_temp as (
+        SELECT
+        t1.approval_person,t1.alarm_id,t1.APPROVAL_TIME,t1.DESCN,t1.FLOW_STATUS,t1.APPROVAL_PERSON_ID
+        FROM
+        approval_log t1
+        INNER JOIN ( SELECT max( id ) As id from approval_log t2 group by alarm_id ) t2 oN t1.id = t2.id
+        )
+        SELECT
+        ar.*, alt.approval_person,alt.DESCN
+        FROM
+        `alarm_records` ar
+        left JOIN approval_log_temp alt on alt.alarm_id=ar.id
+        <where>
+
+            <if test="request.alarmType != null and request.alarmType !='' ">
+                and  ar.ALARM_TYPE_ID =#{request.alarmType}
+            </if>
+            <if test="request.devcode != null and request.devcode !='' ">
+                and  ar.DEVCODE =#{request.devcode}
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
+            </if>
+            AND (
+            ar.`STATUS` = 0
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+        </where>
+        ORDER BY ar.ALARM_TIME DESC
+    </select>
+
+
+    <select id="cellAnalysis" resultType="java.util.Map">
+        select
+            ${cell}
+        FROM
+            ${tableName}
+        <where>
+            <if test="devcode != null and devcode !='' ">
+                and   ${devcode} =#{request.devcode}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.begTime != null and request.begTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.begTime}
+                </if>
+                <if test="request.endTime != null and request.endTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.endTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
     </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java
new file mode 100644
index 0000000..67124fc
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/CommonRequestDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CommonRequestDTO {
+
+    @ApiModelProperty(value="设备编号",required = true)
+    private String devcode;
+
+    @ApiModelProperty(value = "设备类型名称",required = true)
+    private String typeName;
+
+    @ApiModelProperty("开始时间")
+    private String begTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 13eaaa0..47482eb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -3,10 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDevice;
 
 import java.util.List;
@@ -36,6 +33,8 @@
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
 
+    List<Map<String,Object>> cellAnalysis(CommonRequestDTO requestDTO);
+
     List<String> addDeviceBatch(List<BusDeviceImportDTO> results);
 
 
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 cb5abe3..9d488e3 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
@@ -11,10 +11,7 @@
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
-import com.casic.missiles.modular.device.dto.AlarmRecordsRequestDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceDTO;
-import com.casic.missiles.modular.device.dto.BusDeviceImportDTO;
-import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import lombok.RequiredArgsConstructor;
@@ -107,6 +104,23 @@
         return this.baseMapper.alarmRecords(requestDTO);
     }
 
+
+    @Override
+    public List<Map<String, Object>> cellAnalysis(CommonRequestDTO request) {
+        List<Map<String, Object>> resultMap = new ArrayList<>();
+        DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
+        if(null!=deviceDataEnum){
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",",3);
+            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                    "cell,uptime",
+                    queryColumns[0],
+                    queryColumns[1],
+                    deviceDataEnum.getOrderColumn(),
+                    request);
+        }
+        return resultMap;
+    }
+
     @Transactional
     @Override
     public boolean batchDeleteDevice(List<Long> ids) {