修复楼宇预计算的一些问题

src/main/java/com/skyversation/xjcy/counter/ParkPreCounter.java

@@ -240,7 +240,7 @@ public class ParkPreCounter {
             return true;
         }
 
-        return false;
+        return true;
     }
 
 
@@ -344,6 +344,9 @@ public class ParkPreCounter {
     }
 
     private static boolean compareRoomAndLeaseByKey(JSONObject room, JSONObject lease, ParkKey roomKey, LeaseKey leaseKey) {
+        if (room == null||lease==null) {
+            return room == null && lease == null;
+        }
         return Objects.equals(room.getString(String.valueOf(roomKey)), lease.getString(String.valueOf(leaseKey)));
     }
 
@@ -433,6 +436,7 @@ public class ParkPreCounter {
 
     //simple tool
     private LocalDate getKeyAndPackToTime(JSONObject obj, String key) {
+        if (obj == null) {return null;}
         Long time = obj.getLong(key);
         if (time == null) {
             return null;

src/main/java/com/skyversation/xjcy/dms/DMSService.java

@@ -3,6 +3,7 @@ package com.skyversation.xjcy.dms;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.skyversation.xjcy.bean.*;
 import com.skyversation.xjcy.util.HttpUtil;
 import org.springframework.beans.factory.annotation.Value;
@@ -71,7 +72,7 @@ public class DMSService {
         }
         MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
         params.add("modelId", column.getModelId());
-        params.add("json", JSON.toJSONString(objs));
+        params.add("json", JSON.toJSONString(objs, SerializerFeature.WriteMapNullValue));
         Map<String, String> headers = new HashMap<>();
         headers.put("token", token);
         HttpUtil.requestPost(path + "/content/updateContentByJson", params, headers);