diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
index 98b4129..16daca6 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
@@ -110,7 +110,7 @@ public class AlgorithmDeviceServiceImpl extends ServiceImpl<AlgorithmDeviceMappe
             }
         }
         if (signalIdList != null && signalIdList.size() > 0) {
-            List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurveList(signalIdList);
+            List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurveList(signalIdList,type);
             Map<String, List<DeviceWorkData>> collect =
                     deviceWorkDataList.stream().collect(Collectors.groupingBy(DeviceWorkData::getSignalId));
 
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
index 4a0895b..4a28401 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
@@ -221,7 +221,7 @@ public class DeviceWorkDataController {
     @GetMapping("/getHistoricalCurve")
     @ApiOperation("查询历史曲线")
     public ResponseResult getHistoricalCurve(String signalId, String type) {
-        List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurve(signalId);
+        List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurve(signalId,type);
         type = StrUtil.isBlank(type) ? "1" : type;
         Map<String, Object> map = processDeviceData(deviceWorkDataList, signalId, type);
         return ResponseResult.successData(map);
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java
index 9e8475a..c5f9b11 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java
@@ -34,11 +34,11 @@ public interface DeviceWorkDataMapper extends BaseMapper<DeviceWorkData> {
      * 参数说明 signalId 信号id
      * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
      ***********************************/
-    List<DeviceWorkData> getHistoricalCurve(String signalId);
+    List<DeviceWorkData> getHistoricalCurve(String signalId, String type);
 
 
     List<Map<String, Object>> getDeviceWorkData(String stationId);
 
-    List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList);
+    List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList,String type);
 
 }
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java
index eda217b..7e95bbe 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java
@@ -46,14 +46,14 @@ public interface IDeviceWorkDataService extends IService<DeviceWorkData> {
     * 参数说明 signalId 信号id
     * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
     ***********************************/
-    List<DeviceWorkData> getHistoricalCurve(String signalId);
+    List<DeviceWorkData> getHistoricalCurve(String signalId, String type);
 
     /**********************************
      * 用途说明: 查询历史曲线
      * 参数说明 signalList 信号id集合
      * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
      ***********************************/
-    List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList);
+    List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList,String type);
 
     List<Map<String, Object>> getDeviceWorkData(String stationId);
 
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java
index 5c41b54..d47f9d7 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java
@@ -94,13 +94,13 @@ public class DeviceWorkDataServiceImpl extends ServiceImpl<DeviceWorkDataMapper,
      * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
      ***********************************/
     @Override
-    public List<DeviceWorkData> getHistoricalCurve(String signalId) {
-        return deviceWorkDataMapper.getHistoricalCurve(signalId);
+    public List<DeviceWorkData> getHistoricalCurve(String signalId, String type) {
+        return deviceWorkDataMapper.getHistoricalCurve(signalId,type);
     }
 
     @Override
-    public List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList) {
-        return deviceWorkDataMapper.getHistoricalCurveList(signalIdList);
+    public List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList,String type) {
+        return deviceWorkDataMapper.getHistoricalCurveList(signalIdList,type);
     }
 
     @Override
diff --git a/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml b/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
index 39bb521..0cd7b8e 100644
--- a/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
+++ b/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
@@ -38,7 +38,12 @@
         fk_device_work_data
         WHERE
         signal_id=#{signalId}
-        AND start_time >= NOW() - INTERVAL 1 HOUR
+        <if test="type == 1">
+            AND start_time >= NOW() - INTERVAL 1 HOUR
+        </if>
+        <if test="type == 2">
+            AND start_time >= NOW() - INTERVAL 1 DAY
+        </if>
         ORDER BY
         start_time
     </select>
@@ -108,7 +113,12 @@
                  close=")">
             #{signalId}
         </foreach>
-        AND start_time >= NOW() - INTERVAL 1 HOUR
+        <if test="type == 1">
+            AND start_time >= NOW() - INTERVAL 1 HOUR
+        </if>
+        <if test="type == 2">
+            AND start_time >= NOW() - INTERVAL 1 DAY
+        </if>
         ORDER BY
         start_time
     </select>