Kaynağa Gözat

同步服务 修改

zhanghao 1 ay önce
ebeveyn
işleme
a25b81df42
18 değiştirilmiş dosya ile 410 ekleme ve 128 silme
  1. 0 1
      src/main/java/com/sckj/project/domain/building/LargeBuilding.java
  2. 1 0
      src/main/java/com/sckj/project/domain/engineering/LargeCamera.java
  3. 5 0
      src/main/java/com/sckj/project/domain/engineering/LargeIssue.java
  4. 1 0
      src/main/java/com/sckj/project/domain/engineering/LargeProject.java
  5. 43 0
      src/main/java/com/sckj/project/domain/logistics/LargeBuildingAssetDirs.java
  6. 5 0
      src/main/java/com/sckj/project/domain/logistics/LargeHousingLand.java
  7. 3 2
      src/main/java/com/sckj/project/domain/logistics/LargeOfficeAssetDirs.java
  8. 43 0
      src/main/java/com/sckj/project/domain/logistics/LargeServiceAssetDirs.java
  9. 2 2
      src/main/java/com/sckj/project/mapper/logistics/LargePlatLogisticsBuildingAssetMapper.java
  10. 16 0
      src/main/java/com/sckj/project/mapper/logistics/LargePlatLogisticsOfficeAssetMapper.java
  11. 16 0
      src/main/java/com/sckj/project/mapper/logistics/LargePlatLogisticsServiceAssetMapper.java
  12. 8 8
      src/main/java/com/sckj/project/service/impl/logistics/LargePlatLogisticsBuildingAssetServiceImpl.java
  13. 43 0
      src/main/java/com/sckj/project/service/impl/logistics/LargePlatLogisticsOfficeAssetServiceImpl.java
  14. 43 0
      src/main/java/com/sckj/project/service/impl/logistics/LargePlatLogisticsServiceAssetServiceImpl.java
  15. 3 3
      src/main/java/com/sckj/project/service/logistics/ILargePlatLogisticsBuildingAssetService.java
  16. 17 0
      src/main/java/com/sckj/project/service/logistics/ILargePlatLogisticsOfficeAssetService.java
  17. 17 0
      src/main/java/com/sckj/project/service/logistics/ILargePlatLogisticsServiceAssetService.java
  18. 144 112
      src/main/java/com/sckj/project/task/ProjectTaskController.java

+ 0 - 1
src/main/java/com/sckj/project/domain/building/LargeBuilding.java

@@ -19,7 +19,6 @@ public class LargeBuilding {
     /**
      * 楼宇数据id
      */
-    @TableId(value = "楼宇数据id")
 
     private Long id;
 

+ 1 - 0
src/main/java/com/sckj/project/domain/engineering/LargeCamera.java

@@ -79,4 +79,5 @@ public class LargeCamera {
 
     private String connectFlag;
 
+    private String delFlag;
 }

+ 5 - 0
src/main/java/com/sckj/project/domain/engineering/LargeIssue.java

@@ -84,4 +84,9 @@ public class LargeIssue {
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private String delFlag;
 }

+ 1 - 0
src/main/java/com/sckj/project/domain/engineering/LargeProject.java

@@ -91,4 +91,5 @@ public class LargeProject {
     @TableField(exist = false)
     private Long num;
 
+    private String delFlag;
 }

+ 43 - 0
src/main/java/com/sckj/project/domain/logistics/LargeBuildingAssetDirs.java

@@ -0,0 +1,43 @@
+package com.sckj.project.domain.logistics;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("large_plat_logistics_building_asset")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeBuildingAssetDirs {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+
+    private Long id;
+
+    /**
+     * 地区编码(后勤资产)
+     */
+
+    private String appCode;
+
+    /**
+     * 小类名称
+     */
+
+    private String categoryName;
+
+    /**
+     * 小类资产数量
+     */
+
+    private Long assetNum;
+
+}

+ 5 - 0
src/main/java/com/sckj/project/domain/logistics/LargeHousingLand.java

@@ -54,6 +54,11 @@ public class LargeHousingLand {
     private String typeName;
 
     /**
+     * 所属单位编码
+     */
+    private String appOrg;
+
+    /**
      * 施工时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

+ 3 - 2
src/main/java/com/sckj/project/domain/logistics/LargeAssetDirs.java → src/main/java/com/sckj/project/domain/logistics/LargeOfficeAssetDirs.java

@@ -1,6 +1,7 @@
 package com.sckj.project.domain.logistics;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,9 +12,9 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-
+@TableName("large_plat_logistics_office_asset")
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class LargeAssetDirs {
+public class LargeOfficeAssetDirs {
     /**
      * id
      */

+ 43 - 0
src/main/java/com/sckj/project/domain/logistics/LargeServiceAssetDirs.java

@@ -0,0 +1,43 @@
+package com.sckj.project.domain.logistics;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("large_plat_logistics_service_asset")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeServiceAssetDirs {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+
+    private Long id;
+
+    /**
+     * 地区编码(后勤资产)
+     */
+
+    private String appCode;
+
+    /**
+     * 小类名称
+     */
+
+    private String categoryName;
+
+    /**
+     * 小类资产数量
+     */
+
+    private Long assetNum;
+
+}

+ 2 - 2
src/main/java/com/sckj/project/mapper/logistics/LargePlatLogisticsBuildingAssetMapper.java

@@ -1,7 +1,7 @@
 package com.sckj.project.mapper.logistics;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckj.project.domain.logistics.LargeAssetDirs;
+import com.sckj.project.domain.logistics.LargeBuildingAssetDirs;
 
 
 /**
@@ -10,7 +10,7 @@ import com.sckj.project.domain.logistics.LargeAssetDirs;
  * @author change
  * @date 2025-03-05
  */
-public interface LargePlatLogisticsBuildingAssetMapper extends BaseMapper<LargeAssetDirs>
+public interface LargePlatLogisticsBuildingAssetMapper extends BaseMapper<LargeBuildingAssetDirs>
 {
 
 }

+ 16 - 0
src/main/java/com/sckj/project/mapper/logistics/LargePlatLogisticsOfficeAssetMapper.java

@@ -0,0 +1,16 @@
+package com.sckj.project.mapper.logistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckj.project.domain.logistics.LargeOfficeAssetDirs;
+
+
+/**
+ * 楼宇设备Mapper接口
+ *
+ * @author change
+ * @date 2025-03-05
+ */
+public interface LargePlatLogisticsOfficeAssetMapper extends BaseMapper<LargeOfficeAssetDirs>
+{
+
+}

+ 16 - 0
src/main/java/com/sckj/project/mapper/logistics/LargePlatLogisticsServiceAssetMapper.java

@@ -0,0 +1,16 @@
+package com.sckj.project.mapper.logistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckj.project.domain.logistics.LargeServiceAssetDirs;
+
+
+/**
+ * 楼宇设备Mapper接口
+ *
+ * @author change
+ * @date 2025-03-05
+ */
+public interface LargePlatLogisticsServiceAssetMapper extends BaseMapper<LargeServiceAssetDirs>
+{
+
+}

+ 8 - 8
src/main/java/com/sckj/project/service/impl/logistics/LargePlatLogisticsBuildingAssetServiceImpl.java

@@ -3,7 +3,7 @@ package com.sckj.project.service.impl.logistics;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sckj.project.domain.logistics.LargeAssetDirs;
+import com.sckj.project.domain.logistics.LargeBuildingAssetDirs;
 import com.sckj.project.mapper.logistics.LargePlatLogisticsBuildingAssetMapper;
 import com.sckj.project.service.logistics.ILargePlatLogisticsBuildingAssetService;
 import org.springframework.stereotype.Service;
@@ -17,19 +17,19 @@ import java.util.List;
  * @date 2025-03-05
  */
 @Service
-public class LargePlatLogisticsBuildingAssetServiceImpl extends ServiceImpl<LargePlatLogisticsBuildingAssetMapper, LargeAssetDirs> implements ILargePlatLogisticsBuildingAssetService {
+public class LargePlatLogisticsBuildingAssetServiceImpl extends ServiceImpl<LargePlatLogisticsBuildingAssetMapper, LargeBuildingAssetDirs> implements ILargePlatLogisticsBuildingAssetService {
 
-    public void saveOrUpdate(List<LargeAssetDirs> list){
+    public void saveOrUpdate(List<LargeBuildingAssetDirs> list){
         try {
             if (list.size() < 1){
                 return;
             }
-            for (LargeAssetDirs it : list){
-                LambdaQueryWrapper<LargeAssetDirs> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(LargeAssetDirs::getAppCode, it.getAppCode());
+            for (LargeBuildingAssetDirs it : list){
+                LambdaQueryWrapper<LargeBuildingAssetDirs> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(LargeBuildingAssetDirs::getAppCode, it.getAppCode());
                 if (count(queryWrapper) > 0){
-                    LambdaUpdateWrapper<LargeAssetDirs> updateWrapper = new LambdaUpdateWrapper<>();
-                    updateWrapper.eq(LargeAssetDirs::getAppCode, it.getAppCode());
+                    LambdaUpdateWrapper<LargeBuildingAssetDirs> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(LargeBuildingAssetDirs::getAppCode, it.getAppCode());
                     update(it, updateWrapper);
                 }
                 else {

+ 43 - 0
src/main/java/com/sckj/project/service/impl/logistics/LargePlatLogisticsOfficeAssetServiceImpl.java

@@ -0,0 +1,43 @@
+package com.sckj.project.service.impl.logistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckj.project.domain.logistics.LargeOfficeAssetDirs;
+import com.sckj.project.mapper.logistics.LargePlatLogisticsOfficeAssetMapper;
+import com.sckj.project.service.logistics.ILargePlatLogisticsOfficeAssetService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 楼宇设备Service业务层处理
+ *
+ * @author change
+ * @date 2025-03-05
+ */
+@Service
+public class LargePlatLogisticsOfficeAssetServiceImpl extends ServiceImpl<LargePlatLogisticsOfficeAssetMapper, LargeOfficeAssetDirs> implements ILargePlatLogisticsOfficeAssetService {
+
+    public void saveOrUpdate(List<LargeOfficeAssetDirs> list){
+        try {
+            if (list.size() < 1){
+                return;
+            }
+            for (LargeOfficeAssetDirs it : list){
+                LambdaQueryWrapper<LargeOfficeAssetDirs> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(LargeOfficeAssetDirs::getAppCode, it.getAppCode());
+                if (count(queryWrapper) > 0){
+                    LambdaUpdateWrapper<LargeOfficeAssetDirs> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(LargeOfficeAssetDirs::getAppCode, it.getAppCode());
+                    update(it, updateWrapper);
+                }
+                else {
+                    save(it);
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

+ 43 - 0
src/main/java/com/sckj/project/service/impl/logistics/LargePlatLogisticsServiceAssetServiceImpl.java

@@ -0,0 +1,43 @@
+package com.sckj.project.service.impl.logistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckj.project.domain.logistics.LargeServiceAssetDirs;
+import com.sckj.project.mapper.logistics.LargePlatLogisticsServiceAssetMapper;
+import com.sckj.project.service.logistics.ILargePlatLogisticsServiceAssetService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 楼宇设备Service业务层处理
+ *
+ * @author change
+ * @date 2025-03-05
+ */
+@Service
+public class LargePlatLogisticsServiceAssetServiceImpl extends ServiceImpl<LargePlatLogisticsServiceAssetMapper, LargeServiceAssetDirs> implements ILargePlatLogisticsServiceAssetService {
+
+    public void saveOrUpdate(List<LargeServiceAssetDirs> list){
+        try {
+            if (list.size() < 1){
+                return;
+            }
+            for (LargeServiceAssetDirs it : list){
+                LambdaQueryWrapper<LargeServiceAssetDirs> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(LargeServiceAssetDirs::getAppCode, it.getAppCode());
+                if (count(queryWrapper) > 0){
+                    LambdaUpdateWrapper<LargeServiceAssetDirs> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(LargeServiceAssetDirs::getAppCode, it.getAppCode());
+                    update(it, updateWrapper);
+                }
+                else {
+                    save(it);
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

+ 3 - 3
src/main/java/com/sckj/project/service/logistics/ILargePlatLogisticsBuildingAssetService.java

@@ -1,7 +1,7 @@
 package com.sckj.project.service.logistics;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckj.project.domain.logistics.LargeAssetDirs;
+import com.sckj.project.domain.logistics.LargeBuildingAssetDirs;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * @author change
  * @date 2025-03-05
  */
-public interface ILargePlatLogisticsBuildingAssetService extends IService<LargeAssetDirs> {
+public interface ILargePlatLogisticsBuildingAssetService extends IService<LargeBuildingAssetDirs> {
 
-    void saveOrUpdate(List<LargeAssetDirs> list);
+    void saveOrUpdate(List<LargeBuildingAssetDirs> list);
 }

+ 17 - 0
src/main/java/com/sckj/project/service/logistics/ILargePlatLogisticsOfficeAssetService.java

@@ -0,0 +1,17 @@
+package com.sckj.project.service.logistics;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sckj.project.domain.logistics.LargeOfficeAssetDirs;
+
+import java.util.List;
+
+/**
+ * 楼宇设备Service接口
+ *
+ * @author change
+ * @date 2025-03-05
+ */
+public interface ILargePlatLogisticsOfficeAssetService extends IService<LargeOfficeAssetDirs> {
+
+    void saveOrUpdate(List<LargeOfficeAssetDirs> list);
+}

+ 17 - 0
src/main/java/com/sckj/project/service/logistics/ILargePlatLogisticsServiceAssetService.java

@@ -0,0 +1,17 @@
+package com.sckj.project.service.logistics;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sckj.project.domain.logistics.LargeServiceAssetDirs;
+
+import java.util.List;
+
+/**
+ * 楼宇设备Service接口
+ *
+ * @author change
+ * @date 2025-03-05
+ */
+public interface ILargePlatLogisticsServiceAssetService extends IService<LargeServiceAssetDirs> {
+
+    void saveOrUpdate(List<LargeServiceAssetDirs> list);
+}

+ 144 - 112
src/main/java/com/sckj/project/task/ProjectTaskController.java

@@ -13,9 +13,7 @@ import com.sckj.project.domain.car.LargeWarnDetail;
 import com.sckj.project.domain.engineering.LargeCamera;
 import com.sckj.project.domain.engineering.LargeIssue;
 import com.sckj.project.domain.engineering.LargeProject;
-import com.sckj.project.domain.logistics.LargeAssetDirs;
-import com.sckj.project.domain.logistics.LargeHousingLand;
-import com.sckj.project.domain.logistics.LargeLogistics;
+import com.sckj.project.domain.logistics.*;
 import com.sckj.project.domain.service.*;
 import com.sckj.project.service.building.ILargePlatBuildingAmmeterDetailService;
 import com.sckj.project.service.building.ILargePlatBuildingControlService;
@@ -27,9 +25,7 @@ import com.sckj.project.service.car.ILargeWarnDetailService;
 import com.sckj.project.service.engineering.ILargeCameraService;
 import com.sckj.project.service.engineering.ILargePlatIssueService;
 import com.sckj.project.service.engineering.ILargePlatProjectService;
-import com.sckj.project.service.logistics.ILargePlatHousingLandService;
-import com.sckj.project.service.logistics.ILargePlatLogisticsBuildingAssetService;
-import com.sckj.project.service.logistics.ILargePlatLogisticsService;
+import com.sckj.project.service.logistics.*;
 import com.sckj.project.service.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -118,6 +114,12 @@ public class ProjectTaskController {
     @Autowired
     private ILargePlatLogisticsBuildingAssetService largePlatLogisticsBuildingAssetService;
 
+    @Autowired
+    private ILargePlatLogisticsOfficeAssetService largePlatLogisticsOfficeAssetService;
+
+    @Autowired
+    private ILargePlatLogisticsServiceAssetService largePlatLogisticsServiceAssetService;
+
 
 
 
@@ -175,9 +177,8 @@ public class ProjectTaskController {
         }
     }
 
-    @Scheduled(cron = "*/20 * * * * ?")
-    public void taskService()
-    {
+//    @Scheduled(cron = "*/20 * * * * ?")
+    public void taskService() {
         largePlatAccessService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getAccessUrl())).getJSONArray("data").toList(PlatAccess.class));
         largePlatBasicsService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBasicsApiUrl())).getJSONArray("data").toList(PlatBasics.class));
         largePlatBasicsCompanyService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBasicsCompanyUrl())).getJSONArray("data").toList(PlatBasicsCompany.class));
@@ -247,109 +248,140 @@ public class ProjectTaskController {
     }
 
 
-//    @Scheduled(cron = "*/5 * * * * ?")
-//    public void taskLogistics(){
-//        try {
-//            List<LargeHousingLand> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsHousingUrl())).getJSONArray("data").toList(LargeHousingLand.class);
-//            if (list.size() < 1){
-//                return;
-//            }
-//            largePlatHousingLandService.remove(new LambdaQueryWrapper<>());
-//            largePlatHousingLandService.saveBatch(list);
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//        largePlatLogisticsService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsUrl())).getJSONArray("data").toList(LargeLogistics.class));
-//        largePlatLogisticsBuildingAssetService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsBuildingAssetUrl())).getJSONArray("data").toList(LargeAssetDirs.class));
-//        largePlatLogisticsBuildingAssetService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsOfficeAssetUrl())).getJSONArray("data").toList(LargeAssetDirs.class));
-//        largePlatLogisticsBuildingAssetService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsServiceAssetUrl())).getJSONArray("data").toList(LargeAssetDirs.class));
-//
-//        System.out.println("后勤资源同步完成");
-//    }
-
-
-//    @Scheduled(cron = "*/5 * * * * ?")
-//    public void taskBuilding(){
-//        try {
-//            List<LargeBuilding> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBuildingUrl())).getJSONArray("data").toList(LargeBuilding.class);
-//            if (list.size() < 1){
-//                return;
-//            }
-//            largePlatBuildingService.remove(new LambdaQueryWrapper<>());
-//            largePlatBuildingService.saveBatch(list);
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//        try {
-//            List<LargeBuildingControl> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBuildingControlUrl())).getJSONArray("data").toList(LargeBuildingControl.class);
-//            if (list.size() < 1){
-//                return;
-//            }
-//            largePlatBuildingControlService.remove(new LambdaQueryWrapper<>());
-//            largePlatBuildingControlService.saveBatch(list);
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//        try {
-//            List<LargeBuildingControlAmmeterDetail> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBuildingAmmeterDetailUrl())).getJSONArray("data").toList(LargeBuildingControlAmmeterDetail.class);
-//            if (list.size() < 1){
-//                return;
-//            }
-//            largePlatBuildingAmmeterDetailService.remove(new LambdaQueryWrapper<>());
-//            largePlatBuildingAmmeterDetailService.saveBatch(list);
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//
-//        System.out.println("楼宇运行同步完成");
-//    }
-
-//    @Scheduled(cron = "*/5 * * * * ?")
-//    public void taskEngineering(){
-//
-//        try {
-//            List<LargeCamera> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerCameraUrl())).getJSONArray("data").toList(LargeCamera.class);
-//            if (list.size() < 1){
-//                return;
-//            }
-//            largeCameraService.remove(new LambdaQueryWrapper<>());
-//            largeCameraService.saveBatch(list);
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//        try {
-//            List<LargeIssue> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerIssueUrl())).getJSONArray("data").toList(LargeIssue.class);
-//            if (list.size() < 1){
-//                return;
-//            }
-//            largePlatIssueService.remove(new LambdaQueryWrapper<>());
-//            largePlatIssueService.saveBatch(list);
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-////        JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerPlanUrl())).getJSONArray("data").toList(LargePlan.class);
-//
-//        try {
-//            List<LargeProject> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerProjectUrl())).getJSONArray("data").toList(LargeProject.class);
-//            if (list.size() < 1){
-//                return;
-//            }
-//            largePlatProjectService.remove(new LambdaQueryWrapper<>());
-//            largePlatProjectService.saveBatch(list);
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//        System.out.println("工程现场同步完成");
-//    }
-
-    @Scheduled(cron = "0 */5 * * * ?")
+//    @Scheduled(cron = "*/20 * * * * ?")
+    public void taskLogistics(){
+        try {
+            List<LargeHousingLand> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsHousingUrl())).getJSONArray("data").toList(LargeHousingLand.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatHousingLandService.remove(new LambdaQueryWrapper<>());
+            largePlatHousingLandService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        largePlatLogisticsService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsUrl())).getJSONArray("data").toList(LargeLogistics.class));
+
+        try {
+            List<LargeBuildingAssetDirs> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsBuildingAssetUrl())).getJSONArray("data").toList(LargeBuildingAssetDirs.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatLogisticsBuildingAssetService.remove(new LambdaQueryWrapper<>());
+            largePlatLogisticsBuildingAssetService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        try {
+            List<LargeOfficeAssetDirs> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsOfficeAssetUrl())).getJSONArray("data").toList(LargeOfficeAssetDirs.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatLogisticsOfficeAssetService.remove(new LambdaQueryWrapper<>());
+            largePlatLogisticsOfficeAssetService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        try {
+            List<LargeServiceAssetDirs> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getLogisticsServiceAssetUrl())).getJSONArray("data").toList(LargeServiceAssetDirs.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatLogisticsServiceAssetService.remove(new LambdaQueryWrapper<>());
+            largePlatLogisticsServiceAssetService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+
+        System.out.println("后勤资源同步完成");
+    }
+
+
+//    @Scheduled(cron = "*/30 * * * * ?")
+    public void taskBuilding(){
+        try {
+            List<LargeBuilding> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBuildingUrl())).getJSONArray("data").toList(LargeBuilding.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatBuildingService.remove(new LambdaQueryWrapper<>());
+            largePlatBuildingService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        try {
+            List<LargeBuildingControl> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBuildingControlUrl())).getJSONArray("data").toList(LargeBuildingControl.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatBuildingControlService.remove(new LambdaQueryWrapper<>());
+            largePlatBuildingControlService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        try {
+            List<LargeBuildingControlAmmeterDetail> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getBuildingAmmeterDetailUrl())).getJSONArray("data").toList(LargeBuildingControlAmmeterDetail.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatBuildingAmmeterDetailService.remove(new LambdaQueryWrapper<>());
+            largePlatBuildingAmmeterDetailService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+
+        System.out.println("楼宇运行同步完成");
+    }
+
+//    @Scheduled(cron = "*/20 * * * * ?")
+    public void taskEngineering(){
+
+        try {
+            List<LargeCamera> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerCameraUrl())).getJSONArray("data").toList(LargeCamera.class);
+            if (list.size() < 1){
+                return;
+            }
+            largeCameraService.remove(new LambdaQueryWrapper<>());
+            largeCameraService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        try {
+            List<LargeIssue> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerIssueUrl())).getJSONArray("data").toList(LargeIssue.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatIssueService.remove(new LambdaQueryWrapper<>());
+            largePlatIssueService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+//        JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerPlanUrl())).getJSONArray("data").toList(LargePlan.class);
+
+        try {
+            List<LargeProject> list = JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getEngineerProjectUrl())).getJSONArray("data").toList(LargeProject.class);
+            if (list.size() < 1){
+                return;
+            }
+            largePlatProjectService.remove(new LambdaQueryWrapper<>());
+            largePlatProjectService.saveBatch(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        System.out.println("工程现场同步完成");
+    }
+
+//    @Scheduled(cron = "*/25 * * * * ?")
     public void taskCar(){
         largeCarService.saveOrUpdate(JSONUtil.parseObj(callExternalApi(ApiUrlConfig.getCarUrl())).getJSONArray("data").toList(LargeCar.class));