0918优化-综合查询显示曲线最大最小平均值和差值

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsGeneralQueryController.java

@@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -29,12 +31,15 @@ public class EmsGeneralQueryController extends BaseController{
     @GetMapping("/getAllDeviceCategory")
     public AjaxResult getDeviceCategory()
     {
-        // 获取所有枚举的中文信息
-        List<String> deviceCategoryName = new ArrayList<>();
+        // 获取所有枚举的信息
+        List<Map<String, String>> deviceCategoryList = new ArrayList<>();
         for (DeviceCategory category : DeviceCategory.values()) {
-            deviceCategoryName.add(category.getInfo());
+            Map<String, String> categoryMap = new HashMap<>();
+            categoryMap.put("name", category.getInfo());
+            categoryMap.put("code", category.getCode());
+            deviceCategoryList.add(categoryMap);
         }
-        return success(deviceCategoryName);
+        return success(deviceCategoryList);
     }
 
     /**
@@ -56,6 +61,7 @@ public class EmsGeneralQueryController extends BaseController{
         try {
             result = iGeneralQueryService.getPointValueList(request);
         } catch (Exception e) {
+            logger.error("<UNK>",e);
             return error("报错请重试！");
         }
         return success(result);

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java

@@ -142,7 +142,7 @@ public class EmsSiteConfigController extends BaseController{
     }
 
     /**
-     * 单个站点单个设备点位查询
+     * 单个站点单个设备点位查询-点位清单
      */
     @GetMapping("/getDevicePointList")
     public TableDataInfo getDevicePointList(@Validated PointDataRequest request)