Browse Source

在线诊参数

chenminghua 2 years ago
parent
commit
3b8f10a7d6

+ 9 - 2
gyee-sample-impala/src/main/java/com/gyee/impala/controller/diagnose/AutoFaultController.java

@@ -21,6 +21,7 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -87,7 +88,10 @@ public class AutoFaultController {
         dataInfo.setStationId(fi.getStationId());
 
         Map<String, List<PointData>> data = dataService.getData(dataInfo);
-        return JsonResult.successData(ResultCode.SUCCESS, data);
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", data);
+        map.put("info", fi);
+        return JsonResult.successData(ResultCode.SUCCESS, map);
     }
 
 
@@ -120,7 +124,10 @@ public class AutoFaultController {
         List<Diagnosepoint> uniforms = InitialRunner.mapPoint.get(fi.getStationId()).get(fi.getModelId());
         dataPointService.formatUniformcode(uniforms);
         Map<String, List<PointData>> data = dataPointService.getData(dataInfo);
-        return JsonResult.successData(ResultCode.SUCCESS, data);
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", data);
+        map.put("info", fi);
+        return JsonResult.successData(ResultCode.SUCCESS, map);
     }