diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index 52449a6..672c9d3 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -941,13 +942,16 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         CsLinePO finalCsLinePO = csLineFeignClient.getById(fittingDataQueryParam.getLineId()).getData();
         CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePO.getDataSetId()));
         if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
-            throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
+            throw new BusinessException("当前测点数据集主要信息缺失，请联系管理员排查(测点表里面数据集id缺失)");
         }
         Double ct = finalCsLinePO.getCtRatio();
         Double pt = finalCsLinePO.getPtRatio();
        // String position = finalCsLinePO.getPosition();
         Overlimit overlimit = overlimitMapper.selectById(finalCsLinePO.getLineId());
-        JSONObject entries = JSONUtil.parseObj(overlimit);
+        if (Objects.isNull(overlimit)) {
+            throw new BusinessException("当前测点限值信息缺失，请联系管理员排查");
+        }
+        JSONObject entries = JSONUtil.parseObj(overlimit, new JSONConfig().setIgnoreNullValue(false));
         if(CollectionUtil.isNotEmpty(fittingDataQueryParam.getList())) {
             for (FittingDataQueryParam param : fittingDataQueryParam.getList()) {
                 String dictCode = dictTreeFeignClient.queryById(param.getStatisticalId()).getData().getCode();
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
index fca68c5..1d22723 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
@@ -34,7 +34,6 @@ import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.constant.UserType;
 import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.pojo.param.BaseParam;
-import com.njcn.web.pojo.vo.LineDataVO;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -44,7 +43,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**