feat: 完善逻辑

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.kms.yg.cz.dto.CharInfoDto;
 import com.kms.yg.cz.dto.MonitorQueDto;
 import com.shuili.common.utils.DateUtils;
+import com.shuili.common.utils.StringUtils;
 import lombok.Getter;
 import org.apache.commons.collections4.KeyValue;
 import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
@@ -104,6 +105,7 @@ public enum MonitorComposeEnum {
             right.setSeries(getCollect(this.rightElements, this.rightName, dataMap, charInfoDto));
             yAxis.add(right);
         }
+        charInfoDto.setYAxis(yAxis);
         return charInfoDto;
     }
 
@@ -125,11 +127,11 @@ public enum MonitorComposeEnum {
                                 return null;
                             })
                             .filter(Objects::nonNull)
-                            .collect(Collectors.toMap(KeyValue::getKey, KeyValue::getValue));
+                            .collect(Collectors.toMap(KeyValue::getKey, KeyValue::getValue, (v1, v2) -> v2));
                     series.setData(charInfoDto.getXAxis().stream()
                             .map(time -> {
                                 Object value = values.get(time);
-                                return value == null ? "0" : value.toString();
+                                return value == null || StringUtils.isEmpty(value.toString()) ? "0" : value.toString();
                             }).collect(Collectors.toList()));
                     return series;
                 }).collect(Collectors.toList());

shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yg.cz.domain.MonitorConfig;
 import com.kms.yg.cz.dto.CharInfoDto;
 import com.kms.yg.cz.dto.CurrentWaterMonitorDto;
@@ -188,7 +187,8 @@ public class MonitorService {
         if (path == null) {
             resultWrapper.setResultJson(source.getMockData());
             log.error("未找到对应的路径配置, table:{}", source);
-            return new Page<>();
+            IPage<Object> page = source.getMockData(queDto);
+            return (IPage<T>) page;
         }
         String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto);
         resultWrapper.setResultJson(json);