增加层级转化

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWeightController.java

@@ -63,7 +63,29 @@ public class IdxBizFanWeightController extends BaseController {
         //PageHelper.startPage(current, size);
         List<IdxBizFanWeight> list = idxBizFanWeightMapper.selectList(qu);
 
-        List<IdxBizFanWeight> formattedDates =  list.stream().map(e->  e.setValue(Float.parseFloat(new DecimalFormat("0.000").format(e.getValue())))).collect(Collectors.toList());
+        List<IdxBizFanWeight> formattedDates =  list.stream().map(e-> {
+            e.setValue(e.getValue()!=null?Float.parseFloat(new DecimalFormat("0.000").format(e.getValue())):null);
+                    switch(e.getType()){
+                        case "1":
+                            e.setType("片区");
+                            break;
+                        case "2":
+                            e.setType("场站");
+                            break;
+                        case "3":
+                            e.setType("设备");
+                            break;
+                        case "4":
+                            e.setType("子系统");
+                            break;
+                        case "5":
+                            e.setType("变量");
+                            break;
+                    }
+
+                    return e;
+                }
+        ).collect(Collectors.toList());
 
         //PageInfo<IdxBizFanWeight> page = new PageInfo(list);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<IdxBizFanWeight> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<IdxBizFanWeight>();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWeightController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,7 +71,28 @@ public class IdxBizPvWeightController extends BaseController {
         List<IdxBizPvWeight> list = idxBizPvWeightMapper.selectList(qu);
        // PageInfo<IdxBizPvWeight> page = new PageInfo(list);
 
-        List<IdxBizPvWeight> formattedDates =  list.stream().map(e->  e.setValue(Float.parseFloat(new DecimalFormat("0.000").format(e.getValue())))).collect(Collectors.toList());
+        List<IdxBizPvWeight> formattedDates =  list.stream().map(e-> {
+            e.setValue(e.getValue()!=null?Float.parseFloat(new DecimalFormat("0.000").format(e.getValue())):null);
+            switch(e.getType()){
+                case "1":
+                    e.setType("片区");
+                    break;
+                case "2":
+                    e.setType("场站");
+                    break;
+                case "3":
+                    e.setType("设备");
+                    break;
+                case "4":
+                    e.setType("子阵");
+                    break;
+                case "5":
+                    e.setType("变量");
+                    break;
+            }
+
+            return e;
+        } ).collect(Collectors.toList());
 
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<IdxBizPvWeight> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<IdxBizPvWeight>();
         pagenew.setCurrent(current);