Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_business_back into zhc

data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/CommonController.java

@@ -9,20 +9,18 @@ import com.techsor.datacenter.business.dto.common.RepostRoidParams;
 import com.techsor.datacenter.business.dto.common.api.*;
 import com.techsor.datacenter.business.dto.common.roidproblemreport.ProblemReportsSummariesSearchParams;
 import com.techsor.datacenter.business.service.ApiAuthService;
-import com.techsor.datacenter.business.service.schedule.ScheduleSyncSalesforceInfo;
+import com.techsor.datacenter.business.schedule.ScheduleSyncSalesforceInfo;
 import com.techsor.datacenter.business.util.ApiContext;
 import com.techsor.datacenter.business.vo.common.ApiTokenVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import com.alibaba.fastjson.JSONObject;
 import com.techsor.datacenter.business.common.response.SimpleDataResponse;
 import com.techsor.datacenter.business.dto.asset.ApiAssetSearchByClassParams;
-import com.techsor.datacenter.business.dto.asset.GetAssetFileTemporaryParams;
 import com.techsor.datacenter.business.dto.asset.MonitoringAssetSearchParams;
 import com.techsor.datacenter.business.dto.assetclass.ApiAssetClassSearchParams;
 import com.techsor.datacenter.business.dto.common.AddBuildingParams;

data-center-business-service/src/main/java/com/techsor/datacenter/business/service/schedule/ScheduleSyncSalesforceInfo.java → data-center-business-service/src/main/java/com/techsor/datacenter/business/schedule/ScheduleSyncSalesforceInfo.java

@@ -1,4 +1,4 @@
-package com.techsor.datacenter.business.service.schedule;
+package com.techsor.datacenter.business.schedule;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -143,13 +143,13 @@ public class ScheduleSyncSalesforceInfo {
         entity.setFacilityIdC(root.get("FacilityId__c").asText());
 
         // 删除指定字段
-        ((ObjectNode) root).remove(Arrays.asList(
+//        ((ObjectNode) root).remove(Arrays.asList(
-                "Id",
+//                "Id",
-                "OwnerId",
+//                "OwnerId",
-                "IsDeleted",
+//                "IsDeleted",
-                "Name",
+//                "Name",
-                "FacilityId__c"
+//                "FacilityId__c"
-        ));
+//        ));
 
         entity.setExtraJson(root.toString());