20230605

okc/src/main/java/com/ruoyi/okc/service/IOkcVideoProService.java

@@ -75,7 +75,7 @@ public interface IOkcVideoProService
 
     public List<double[]> getRcValue(String id);
 
-    public List<double[]> getRcCurve(String id);
+    public List<Map<String, Object>> getRcCurve(String id);
 
     public List<Arc> getArc(String id);
 

okc/src/main/java/com/ruoyi/okc/service/impl/OkcVideoProServiceImpl.java

@@ -103,8 +103,9 @@ public class OkcVideoProServiceImpl implements IOkcVideoProService
         return res;
     }
 
-    public List<double[]> getRcCurve(String id) {
-        List<double[]> res = new ArrayList<>();
+    public List<Map<String, Object>> getRcCurve(String id) {
+        List<Map<String, Object>> res = new ArrayList<>();
+        List<double[]> list = new ArrayList<>();
         OkcVideoPro pro = okcVideoProMapper.selectOkcVideoProById(id);
         if (ObjectUtils.isNotEmpty(pro)) {
             OkcVideoRec recQuery = new OkcVideoRec();
@@ -114,10 +115,20 @@ public class OkcVideoProServiceImpl implements IOkcVideoProService
                 throw new ServiceException("暂无数据!");
             }
             try {
-                res = RCUtils.getRcCharts(recList);
+                list = RCUtils.getRcCharts(recList);
             } catch(Exception e) {
                 throw new ServiceException("暂无数据!");
             }
+            for (int i = 0; i < 35; i++) {
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("behavior", RCEnum.getKeyByCode(i + 1));
+                if (!CollectionUtils.isEmpty(list)) {
+                    for (int j = 0; j < list.size(); j++) {
+                        map.put(String.valueOf(j + 1), list.get(j)[i]);
+                    }
+                }
+                res.add(map);
+            }
         }
         return res;
     }