修改

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java

@@ -523,6 +523,8 @@ public class SjDjjcController extends BaseController
                 String sjdcs=new DataFormatter().formatCellValue(  row.getCell(5));
                 String sjdcs=new DataFormatter().formatCellValue(  row.getCell(5));
                 if(StringUtils.isNotEmpty(sjdcs)){
                 if(StringUtils.isNotEmpty(sjdcs)){
                     sjDzfc.setSjdcs(Double.parseDouble(sjdcs));
                     sjDzfc.setSjdcs(Double.parseDouble(sjdcs));
+                }else {
+                    continue;
                 }
                 }
 
 
 
 

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java

@@ -8,10 +8,7 @@ import java.util.stream.Collectors;
 
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpRequest;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import com.zjsgfa.common.utils.DateUtils;
 import com.zjsgfa.common.utils.DateUtils;
 import com.zjsgfa.common.utils.StringUtils;
 import com.zjsgfa.common.utils.StringUtils;
 import com.zjsgfa.framework.util.HttpsPostUtil;
 import com.zjsgfa.framework.util.HttpsPostUtil;
@@ -333,8 +330,9 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
             String url = "https://10.68.249.59:12001/api/ljzjymd";
             String url = "https://10.68.249.59:12001/api/ljzjymd";
             System.out.println(json);
             System.out.println(json);
             String result = HttpRequest.post(url).body(json).execute().body();
             String result = HttpRequest.post(url).body(json).execute().body();
-//            String result = HttpsSkipVerifyUtil.doPost(url, json);
             System.out.println(result);
             System.out.println(result);
+            JsonObject jsonObject = safeParseJsonObject(result);
+            if(jsonObject!=null){
                 JsonObject root = gson.fromJson(result, JsonObject.class);
                 JsonObject root = gson.fromJson(result, JsonObject.class);
                 JsonObject outerData = root.getAsJsonObject("data");
                 JsonObject outerData = root.getAsJsonObject("data");
                 List<String> dcylmsList=new ArrayList<>();
                 List<String> dcylmsList=new ArrayList<>();
@@ -354,6 +352,8 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
 //                dcylmsList.add("邻井"+ljh+dcylms);
 //                dcylmsList.add("邻井"+ljh+dcylms);
                     }
                     }
                 }
                 }
+            }
+
 //
 //
 //
 //
 ////
 ////
@@ -1009,4 +1009,34 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
         stat.setQycsMax(qycsMax); // 取样垂深最大值
         stat.setQycsMax(qycsMax); // 取样垂深最大值
         list.add(stat);
         list.add(stat);
     }
     }
+
+
+
+    /**
+     * 安全解析 JSON 字符串为 JsonObject，避免解析异常
+     * @param jsonStr 待解析的字符串
+     * @return 解析后的 JsonObject（非 JSON 对象返回 null）
+     */
+    public static JsonObject safeParseJsonObject(String jsonStr) {
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        // 第一步：空值校验
+        if (jsonStr == null || jsonStr.trim().isEmpty()) {
+            return null;
+        }
+
+        String trimmedStr = jsonStr.trim();
+        // 第二步：格式初步校验（JSON 对象必须以 { 开头，} 结尾）
+        if (!trimmedStr.startsWith("{") || !trimmedStr.endsWith("}")) {
+            return null;
+        }
+
+        // 第三步：尝试解析，捕获解析异常
+        try {
+            return gson.fromJson(trimmedStr, JsonObject.class);
+        } catch (JsonParseException e) {
+            // 解析失败（比如格式不合法的 JSON），返回 null
+            System.out.println("JSON 解析失败：" + e.getMessage());
+            return null;
+        }
+    }
 }
 }

src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java

@@ -1726,6 +1726,9 @@ public class DjdcServiceImpl implements DjdcService {
                             sjDcfxTsyx.setJh(param.getJh());
                             sjDcfxTsyx.setJh(param.getJh());
                             sjDcfxTsyx.setCw(ljDcyx.getDcmc());
                             sjDcfxTsyx.setCw(ljDcyx.getDcmc());
                             sjDcfxTsyx.setTsyx(ljDcyx.getYxmc());
                             sjDcfxTsyx.setTsyx(ljDcyx.getYxmc());
+                            System.out.println(item);
+                            System.out.println(ljDcyx);
+                            System.out.println(bb);
                             Double cc=item.getSjdcs()+(item.getSjhd()*bb);
                             Double cc=item.getSjdcs()+(item.getSjhd()*bb);
                             sjDcfxTsyx.setJds(Double.parseDouble(String.format("%.2f",cc)));
                             sjDcfxTsyx.setJds(Double.parseDouble(String.format("%.2f",cc)));
                             sjDcfxTsyx.setWt(ljDcyx.getWt());
                             sjDcfxTsyx.setWt(ljDcyx.getWt());