diff --git a/aucma-report/src/main/java/com/aucma/report/controller/BoxTemperatureHistoryController.java b/aucma-report/src/main/java/com/aucma/report/controller/BoxTemperatureHistoryController.java
index afea20d..c4382ba 100644
--- a/aucma-report/src/main/java/com/aucma/report/controller/BoxTemperatureHistoryController.java
+++ b/aucma-report/src/main/java/com/aucma/report/controller/BoxTemperatureHistoryController.java
@@ -95,4 +95,13 @@ public class BoxTemperatureHistoryController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] objIds) {
         return toAjax(boxTemperatureHistoryService.deleteBoxTemperatureHistoryByObjIds(objIds));
     }
+
+    /**
+     * 查看测试折线图
+     * */
+
+    @PostMapping("/testTemp")
+    public TableDataInfo getTestTemp(@RequestBody BoxTemperatureHistory boxTemperatureHistory){
+        return getDataTable(boxTemperatureHistoryService.getTestTemp(boxTemperatureHistory));
+    }
 }
diff --git a/aucma-report/src/main/java/com/aucma/report/service/IBoxTemperatureHistoryService.java b/aucma-report/src/main/java/com/aucma/report/service/IBoxTemperatureHistoryService.java
index bcf9591..39edd8a 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/IBoxTemperatureHistoryService.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/IBoxTemperatureHistoryService.java
@@ -1,19 +1,21 @@
 package com.aucma.report.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.aucma.report.domain.BoxTemperatureHistory;
 
 /**
  * 测温记录报表Service接口
- * 
+ *
  * @author Yinq
  * @date 2024-03-13
  */
-public interface IBoxTemperatureHistoryService 
+public interface IBoxTemperatureHistoryService
 {
     /**
      * 查询测温记录报表
-     * 
+     *
      * @param objId 测温记录报表主键
      * @return 测温记录报表
      */
@@ -21,7 +23,7 @@ public interface IBoxTemperatureHistoryService
 
     /**
      * 查询测温记录报表列表
-     * 
+     *
      * @param boxTemperatureHistory 测温记录报表
      * @return 测温记录报表集合
      */
@@ -29,7 +31,7 @@ public interface IBoxTemperatureHistoryService
 
     /**
      * 新增测温记录报表
-     * 
+     *
      * @param boxTemperatureHistory 测温记录报表
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IBoxTemperatureHistoryService
 
     /**
      * 修改测温记录报表
-     * 
+     *
      * @param boxTemperatureHistory 测温记录报表
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IBoxTemperatureHistoryService
 
     /**
      * 批量删除测温记录报表
-     * 
+     *
      * @param objIds 需要删除的测温记录报表主键集合
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface IBoxTemperatureHistoryService
 
     /**
      * 删除测温记录报表信息
-     * 
+     *
      * @param objId 测温记录报表主键
      * @return 结果
      */
     public int deleteBoxTemperatureHistoryByObjId(Long objId);
+
+    public List<String[]> getTestTemp(BoxTemperatureHistory boxTemperatureHistory);
 }
diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java
index 8e3665d..7c76520 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java
@@ -1,6 +1,9 @@
 package com.aucma.report.service.impl;
 
-import java.util.List;
+import java.lang.reflect.Array;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.aucma.report.mapper.BoxTemperatureHistoryMapper;
@@ -9,19 +12,19 @@ import com.aucma.report.service.IBoxTemperatureHistoryService;
 
 /**
  * 测温记录报表Service业务层处理
- * 
+ *
  * @author Yinq
  * @date 2024-03-13
  */
 @Service
-public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryService 
+public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryService
 {
     @Autowired
     private BoxTemperatureHistoryMapper boxTemperatureHistoryMapper;
 
     /**
      * 查询测温记录报表
-     * 
+     *
      * @param objId 测温记录报表主键
      * @return 测温记录报表
      */
@@ -33,7 +36,7 @@ public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryS
 
     /**
      * 查询测温记录报表列表
-     * 
+     *
      * @param boxTemperatureHistory 测温记录报表
      * @return 测温记录报表
      */
@@ -45,7 +48,7 @@ public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryS
 
     /**
      * 新增测温记录报表
-     * 
+     *
      * @param boxTemperatureHistory 测温记录报表
      * @return 结果
      */
@@ -57,7 +60,7 @@ public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryS
 
     /**
      * 修改测温记录报表
-     * 
+     *
      * @param boxTemperatureHistory 测温记录报表
      * @return 结果
      */
@@ -69,7 +72,7 @@ public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryS
 
     /**
      * 批量删除测温记录报表
-     * 
+     *
      * @param objIds 需要删除的测温记录报表主键
      * @return 结果
      */
@@ -81,7 +84,7 @@ public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryS
 
     /**
      * 删除测温记录报表信息
-     * 
+     *
      * @param objId 测温记录报表主键
      * @return 结果
      */
@@ -90,4 +93,64 @@ public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryS
     {
         return boxTemperatureHistoryMapper.deleteBoxTemperatureHistoryByObjId(objId);
     }
+
+    @Override
+    public List<String[]> getTestTemp(BoxTemperatureHistory boxTemperatureHistory) {
+//        BoxTemperatureHistory boxTemperatureHistory = new BoxTemperatureHistory();
+//        cpno = "B24051383025017990384";
+//        boxTemperatureHistory.setCpno(cpno);
+//        boxTemperatureHistory.setCpno("B24051383025017990384");
+        List<BoxTemperatureHistory> boxTemperatureHistories = boxTemperatureHistoryMapper.selectBoxTemperatureHistoryList(boxTemperatureHistory);
+        BoxTemperatureHistory boxTemp = boxTemperatureHistories.get(0);
+
+        //获取数据
+        String tempMes = boxTemp.getTempMes();
+        String powerMes = boxTemp.getPowerMes();
+        Date begindatetime = boxTemp.getBegindatetime();
+
+        List<String[]> stringList = getStringList(tempMes, begindatetime);
+        List<String[]> stringList1 = getStringList(powerMes, begindatetime);
+
+
+        return stringList;
+    }
+
+
+    public List<String[]> getStringList(String MesStream,Date beginTime){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //通过分号 转成多个数组
+        String xaxis[] = MesStream.split(";");
+        String yaxis[] = xaxis[0].split(",");
+        //将数组转为二维数组，方便存入集合
+        String[][] twoArray = getTwoArray(xaxis);
+        List<String[]> tempList = new ArrayList<String[]>();
+        //根据二维数组每一贴获取所需的数组
+        for (int i=0;i<yaxis.length;i++){
+            String strings[] = new String[twoArray.length];
+            for (int j=0;j<twoArray.length;j++){
+                //转换时间
+                if (i==0){
+                    long l = beginTime.getTime() + (j * 30 * 1000);
+                    //获取后八位 不要年月
+                    strings[j] =  "\""+sdf.format(l).substring(sdf.format(l).length()-8,sdf.format(l).length())+"\"";
+                }else{
+                    strings[j] = twoArray[j][i];
+                }
+            }
+            tempList.add(strings);
+        }
+        for (int i=0;i< yaxis.length;i++){
+            System.out.println(Arrays.toString(tempList.get(i)));
+        }
+        return tempList;
+    }
+    //根据分号转为二维数组
+    public String[][] getTwoArray(String[] strings){
+        String[][] arrTwo = new String[strings.length][12];
+        for (int i=0;i<strings.length;i++){
+                arrTwo[i] = strings[i].split(",");
+
+        }
+        return  arrTwo;
+    }
 }