接口代码优化

project-zcustom/src/main/java/com/project/zcustom/controller/crontab/PlatCrontabTaskController.java

@@ -1,28 +1,20 @@
 package com.project.zcustom.controller.crontab;
 
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
 import com.project.common.core.controller.BaseController;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.service.basics.IPlatAppOrgService;
-import com.project.zcustom.tools.DataTools;
-import com.project.zcustom.tools.ProcessCache;
-import com.project.zcustom.tools.ProcessConstant;
+import com.project.zcustom.tools.BuildingService;
+import com.project.zcustom.tools.GuaranteeService;
+import com.project.zcustom.tools.LogisticsService;
 import lombok.RequiredArgsConstructor;
 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.stereotype.Component;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.http.*;
 
 
 /**
@@ -36,15 +28,14 @@ import org.springframework.http.*;
 public class PlatCrontabTaskController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(PlatCrontabTaskController.class);
     @Resource
-    private DataTools dataTools;
+    private GuaranteeService guaranteeService;
     @Resource
     private IPlatAppOrgService iPlatAppOrgService;
-
     @Resource
-    private RestTemplate restTemplate;
+    private BuildingService buildingService;
+    @Resource
+    private LogisticsService logisticsService;
 
-    @Value("${znhqcamera.stat}")
-    private String videoStat;
 
 
     /**
@@ -59,7 +50,7 @@ public class PlatCrontabTaskController extends BaseController {
             List<PlatAppOrg> platAppOrgList = iPlatAppOrgService.selectPlatAppOrgList(new PlatAppOrg());
             if(!platAppOrgList.isEmpty()){
                 for (PlatAppOrg platAppOrg : platAppOrgList){
-                    dataTools.getServiceData(platAppOrg.getAppOrg(),platAppOrg.getAppName());
+                    guaranteeService.getServiceData(platAppOrg.getAppOrg(),platAppOrg.getAppName());
                 }
             }
             logger.info("获取接口数据完成");
@@ -73,7 +64,7 @@ public class PlatCrontabTaskController extends BaseController {
     public void logisticsData() {
         synchronized (this) {
             logger.info("开始后勤运行监控中心获取接口数据");
-            dataTools.getLogisticsData();
+            logisticsService.getLogisticsData();
             logger.info("后勤运行监控中心获取接口数据完成");
         }
     }
@@ -85,7 +76,7 @@ public class PlatCrontabTaskController extends BaseController {
     public void buildingDataFirstHalf() {
         synchronized (this) {
             logger.info("开始楼宇运行获取接口数据");
-            dataTools.getBuildingDataFirstHalf();
+            buildingService.getBuildingDataFirstHalf();
             logger.info("楼宇运行获取接口数据完成");
         }
     }
@@ -96,55 +87,11 @@ public class PlatCrontabTaskController extends BaseController {
     public void buildingDataSecondHalf() {
         synchronized (this) {
             logger.info("开始楼宇运行获取接口数据");
-            dataTools.getBuildingDataSecondHalf();
+            buildingService.getBuildingDataSecondHalf();
             logger.info("楼宇运行获取接口数据完成");
         }
     }
 
-    /**
-     * 摄像头关流
-     */
-    public void doWork() {
-        logger.info("摄像头残留进程清理开始======>");
-        ConcurrentHashMap<String, ProcessCache> processConcurrentHashMap = ProcessConstant.processConcurrentHashMap;
-        logger.info("定时任务、清理之前：processConcurrentHashMap:" + processConcurrentHashMap);
-        //发送http请求获取到stat.json文件，就是刘媒体服务器的状态文件
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(null, headers);
-        ResponseEntity<String> response = restTemplate.exchange(videoStat, HttpMethod.GET, httpEntity, String.class);
-        if (response.getBody() != null) {
-            JSONObject jsonObject = JSONObject.parseObject(response.getBody());
-            JSONArray servers = jsonObject.getJSONObject("http-flv").getJSONArray("servers");
-            JSONArray applications = servers.getJSONObject(0).getJSONArray("applications");
-            JSONObject live = applications.getJSONObject(0).getJSONObject("live");
-            if (live != null) {
-                JSONArray streams = live.getJSONArray("streams");
-                if (streams.size() > 0) {
-                    streams.stream().forEach(stream -> {
-                        JSONObject streamObj = JSONObject.parseObject(stream.toString());
-                        boolean publishing = streamObj.getBooleanValue("publishing");
-                        String videoCode = streamObj.getString("name");
-                        JSONArray clients = streamObj.getJSONArray("clients");
-                        if (publishing && clients.size() == 1) {
-                            //说明没有接收客户端
-                            ProcessCache processCache = processConcurrentHashMap.get(videoCode);
-                            if (processCache != null) {
-                                Set<String> userIds = processCache.getUserIds();
-                                userIds.clear();
-                                Process process = processCache.getProcess();
-                                process.destroyForcibly();
-                                //从缓存对象中移除当前摄像头的缓存信息
-                                ProcessConstant.processConcurrentHashMap.remove(videoCode);
-                            }
-                            logger.info("定时任务、清理之后：processConcurrentHashMap:" + processConcurrentHashMap);
-                        }
-                    });
-                }
-            }
-        }
-        logger.info("摄像头残留进程清理结束======>");
-    }
 
 
 }

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatBasicsController.java

@@ -2,17 +2,16 @@ package com.project.zcustom.controller.service;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.domain.basics.PlatAppOrg;
-import com.project.zcustom.service.basics.*;
-import com.project.zcustom.service.video.IZnhqWebcamService;
-import com.project.zcustom.tools.DataTools;
+import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
+import com.project.zcustom.service.basics.IPlatBasicsServerService;
+import com.project.zcustom.service.basics.IPlatBasicsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 基础运行数据Controller
@@ -29,9 +28,6 @@ public class PlatBasicsController extends BaseController {
     private final IPlatBasicsService platBasicsService;
     private final IPlatBasicsCompanyService platBasicsCompanyService;
     private final IPlatBasicsServerService platBasicsServerService;
-    private final IPlatAppOrgService iPlatAppOrgService;
-    private final DataTools dataTools;
-    private final IZnhqWebcamService znhqWebcamService;
 
 
     @ApiOperation("数据概况")
@@ -46,17 +42,6 @@ public class PlatBasicsController extends BaseController {
         return AjaxResult.success("查询成功", platBasicsCompanyService.getTopTenCompany(appOrg));
     }
 
-//    @ApiOperation("系统运行报警信息")
-//    @RequestMapping("/getSystemRunErrData/{appOrg}")
-//    public AjaxResult getSystemRunErrData(@PathVariable String appOrg) {
-//        return AjaxResult.success("查询成功", platBasicsService.getSystemRunErrData(appOrg));
-//    }
-//
-//    @ApiOperation("系统运行峰值情况分析")
-//    @RequestMapping("/getSystemRunData/{appOrg}")
-//    public AjaxResult getSystemRunData(@PathVariable String appOrg) {
-//        return AjaxResult.success("查询成功", platBasicsSystemService.getSystemRunData(appOrg));
-//    }
 
     @ApiOperation("服务器")
     @RequestMapping("/getServerListData")
@@ -64,23 +49,4 @@ public class PlatBasicsController extends BaseController {
         return AjaxResult.success("查询成功", platBasicsServerService.selectServerListByAppOrg(appOrg));
     }
 
-
-    @ApiOperation("接口测试")
-    @RequestMapping("/testApi")
-    public AjaxResult testApi() {
-        synchronized (this) {
-            logger.info("开始获取接口数据");
-//            dataTools.getServiceData("1E001","国网晋城供电公司");
-
-            List<PlatAppOrg> platAppOrgList = iPlatAppOrgService.selectPlatAppOrgList(new PlatAppOrg());
-            if(!platAppOrgList.isEmpty()){
-                for (PlatAppOrg platAppOrg : platAppOrgList){
-                    dataTools.getServiceData(platAppOrg.getAppOrg(),platAppOrg.getAppName());
-                }
-            }
-            logger.info("获取接口数据完成");
-        }
-        return AjaxResult.success("查询成功", 1);
-    }
-
 }

project-zcustom/src/main/java/com/project/zcustom/controller/video/PlatVideoController.java

@@ -4,15 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.utils.StringUtils;
-import com.project.zcustom.controller.crontab.PlatCrontabTaskController;
 import com.project.zcustom.domain.video.ZnhqWebcam;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
-import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
-import com.project.zcustom.service.basics.IPlatBasicsServerService;
-import com.project.zcustom.service.basics.IPlatBasicsService;
 import com.project.zcustom.service.video.IScreenUnifiedVideoService;
 import com.project.zcustom.service.video.IZnhqWebcamService;
-import com.project.zcustom.tools.DataTools;
 import com.project.zcustom.tools.ProcessCache;
 import com.project.zcustom.tools.ProcessConstant;
 import io.swagger.annotations.Api;
@@ -73,7 +67,7 @@ public class PlatVideoController extends BaseController {
     }
 
     @ApiOperation("拉取视频流接口")
-    @RequestMapping("/openCamera")
+    //@RequestMapping("/openCamera")
     public AjaxResult openCamera(@RequestParam("videoCode") String videoCode) {
         try {
             List<ZnhqWebcam> list = znhqWebcamService.selectVideoList(videoCode);

project-zcustom/src/main/java/com/project/zcustom/tools/BuildingService.java

@@ -0,0 +1,84 @@
+package com.project.zcustom.tools;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.project.common.utils.StringUtils;
+import com.project.common.utils.http.HttpUtils;
+import com.project.zcustom.domain.addional.LargeBuilding;
+import com.project.zcustom.mapper.unit.PlatBuildingMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 楼宇运行监控接口
+ * @Author bqyang
+ * @Date 2025/2/10 16:58
+ * @Version 1.0
+ */
+@Service
+public class BuildingService {
+
+    @Autowired
+    private PlatBuildingMapper platBuildingMapper;
+
+    /**
+     *  办公能耗 / 大楼安防 接口数据同步
+     */
+    public void getBuildingDataFirstHalf(){
+        LargeBuilding largeBuilding = new LargeBuilding();
+        largeBuilding.setJsonFrequency(repeat(ApiUrlConfig.getJsonFrequency(), null));
+        largeBuilding.setJsonPatrol(repeat(ApiUrlConfig.getJsonPatrol(), null));
+        largeBuilding.setJsonPatrolPoint(repeat(ApiUrlConfig.getJsonPatrolPoint(), null));
+        largeBuilding.setJsonPowerWaterMonth((repeat(ApiUrlConfig.getJsonPowerWaterMonth(), null)));
+        largeBuilding.setJsonTarget(repeat(ApiUrlConfig.getJsonTarget(), null));
+        largeBuilding.setJsonUseElectricity(repeat(ApiUrlConfig.getJsonUseElectricity(), null));
+        largeBuilding.setJsonGreenElectricity(repeat(ApiUrlConfig.getJsonGreenElectricity(), null));
+        largeBuilding.setJsonCarbon(repeat(ApiUrlConfig.getJsonCarbon(), null));
+        largeBuilding.setJsonEnergyYear(repeat(ApiUrlConfig.getJsonEnergyYear(), null));
+        largeBuilding.setJsonPowerYear(repeat(ApiUrlConfig.getJsonPowerYear(), null));
+        largeBuilding.setJsonWaterYear(repeat(ApiUrlConfig.getJsonWaterYear(), null));
+        if (platBuildingMapper.getCount() > 0){
+            platBuildingMapper.updateBuilding(largeBuilding);
+        }
+        else {
+            platBuildingMapper.insertBuilding(largeBuilding);
+        }
+    }
+
+    /**
+     * 办公能耗 空气概况
+     *  该接口请求频率 5分钟一次
+     */
+    public void getBuildingDataSecondHalf(){
+        LargeBuilding largeBuilding = new LargeBuilding();
+        largeBuilding.setJsonAir(repeat(ApiUrlConfig.getJsonAir(), null));
+        if (platBuildingMapper.getCount() > 0){
+            platBuildingMapper.updateBuilding(largeBuilding);
+        }
+        else {
+            platBuildingMapper.insertBuilding(largeBuilding);
+        }
+    }
+
+    public String repeat(String url, String params){
+        String result = null;
+        try {
+            if (StringUtils.isNotBlank(params)){
+                String res = HttpUtils.sendGet(url, params);
+                if (StringUtils.isNotBlank(res)){
+                    JSONObject jsonObject = JSONObject.parseObject(res);
+                    result = jsonObject.getString("data");
+                }
+            }
+            else {
+                String res = HttpUtils.sendGet(url);
+                if (StringUtils.isNotBlank(res)){
+                    JSONObject jsonObject = JSONObject.parseObject(res);
+                    result = jsonObject.getString("data");
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return result;
+    }
+}

project-zcustom/src/main/java/com/project/zcustom/tools/GuaranteeService.java

@@ -0,0 +1,108 @@
+package com.project.zcustom.tools;
+
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.project.common.enums.EmployeeTypeEnum;
+import com.project.common.utils.StringUtils;
+import com.project.common.utils.http.HttpUtils;
+import com.project.zcustom.domain.plat.PlatApiRecord;
+import com.project.zcustom.service.access.IPlatAccessService;
+import com.project.zcustom.service.basics.IPlatBasicsService;
+import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
+import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
+import com.project.zcustom.service.plat.IPlatApiRecordService;
+import com.project.zcustom.service.post.IPlatPostStationService;
+import com.project.zcustom.service.property.IPlatPropertyService;
+import com.project.zcustom.service.smart.IPlatGreenSmartOtherService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
+import java.util.Objects;
+
+
+/**
+ * 数据获取
+ *
+ * @author change
+ * @date 2024-10-21
+ */
+@Service
+public class GuaranteeService {
+
+    @Resource
+    IPlatEmployeeTypeService platEmployeeTypeService;
+    @Resource
+    IPlatEmployeeHealthService platEmployeeHealthService;
+    @Resource
+    IPlatBasicsService platBasicsService;
+    @Resource
+    IPlatPostStationService postStationService;
+    @Resource
+    IPlatPropertyService platPropertyService;
+    @Resource
+    IPlatGreenSmartOtherService iPlatGreenSmartOtherService;
+    @Resource
+    IPlatAccessService iPlatAccessService;
+    @Resource
+    IPlatApiRecordService iPlatApiRecordService;
+
+
+    /**
+     * 获取服务保障中心的数据
+     */
+    public void getServiceData(String appOrg, String appName) {
+        String url = ApiUrlConfig.getServiceUrl();
+        System.out.printf("------------服务保障中心：%s", url);
+        JSONObject params = new JSONObject();
+        params.put("appOrg", appOrg);
+        String result = HttpUtils.sendPost(url, params.toJSONString());
+        // 添加接口请求记录
+        PlatApiRecord platApiRecord = new PlatApiRecord();
+        platApiRecord.setApiUrl(url);
+        platApiRecord.setApiResult(result);
+        platApiRecord.setAppOrg(appOrg);
+        iPlatApiRecordService.save(platApiRecord);
+
+        System.out.printf("------------接口返回：%s", result);
+        if (StringUtils.isNotBlank(result)) {
+            Map<String, Object> resultMap = JSONObject.parseObject(result, Map.class);
+            if (Objects.equals(resultMap.get("code").toString(), "200") && resultMap.containsKey("entity")) {
+                JSONArray data = JSONArray.parseArray(resultMap.get("entity").toString());
+                for (Object o : data) {
+                    Map<String, Object> temp = JSONObject.parseObject(o.toString(), Map.class);
+                    if (temp.containsKey("dataType")) {
+                        if (temp.containsKey("dataResult")) {
+                            Map<String, Object> dataResult = JSONObject.parseObject(temp.get("dataResult").toString(), Map.class);
+                            if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.EMPLOYEE_TYPE.getCode())) {
+                                platEmployeeTypeService.addPlatEmployeeType(appOrg, dataResult);
+                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.EMPLOYEE_HEALTH.getCode())) {
+                                platEmployeeHealthService.addPlatEmployeeHealth(appOrg, dataResult);
+                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.GREEN_SMART.getCode())) {
+                                iPlatGreenSmartOtherService.addPlatGreenSmartOther(appOrg, dataResult);
+                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.POST_STATION.getCode())) {
+                                postStationService.addPlatPostStation(appOrg, dataResult);
+                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.PROPERTY.getCode())) {
+                                platPropertyService.addPlatProperty(appOrg, dataResult);
+                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.BASICS.getCode())) {
+                                platBasicsService.addPlatBasics(appOrg, appName, dataResult);
+                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.ACCESS.getCode())) {
+                                iPlatAccessService.addPlatAccess(appOrg, dataResult);
+                            }
+                        }
+                    }
+                }
+            } else {
+                throw new RuntimeException("接口返回失败：" + result);
+            }
+        } else {
+            throw new RuntimeException("接口请求失败：" + result);
+        }
+    }
+
+
+
+
+
+}

project-zcustom/src/main/java/com/project/zcustom/tools/DataTools.java → project-zcustom/src/main/java/com/project/zcustom/tools/LogisticsService.java

@@ -1,121 +1,30 @@
 package com.project.zcustom.tools;
 
-
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.project.common.enums.EmployeeTypeEnum;
-import com.project.common.utils.StringUtils;
-import com.project.common.utils.http.HttpUtils;
 import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
-import com.project.zcustom.domain.plat.PlatApiRecord;
-import com.project.zcustom.domain.addional.LargeBuilding;
 import com.project.zcustom.mapper.logistics.PlatLogisticsMapper;
-import com.project.zcustom.mapper.unit.PlatBuildingMapper;
-import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.basics.IPlatBasicsService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
-import com.project.zcustom.service.plat.IPlatApiRecordService;
-import com.project.zcustom.service.post.IPlatPostStationService;
-import com.project.zcustom.service.property.IPlatPropertyService;
-import com.project.zcustom.service.smart.IPlatGreenSmartOtherService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
 
 /**
- * 数据获取
- *
- * @author change
- * @date 2024-10-21
+ * @Description 后勤资源监控服务
+ * @Author bqyang
+ * @Date 2025/2/10 17:23
+ * @Version 1.0
  */
 @Service
-public class DataTools {
-    @Autowired
-    private PlatBuildingMapper platBuildingMapper;
+public class LogisticsService {
 
     @Autowired
     private PlatLogisticsMapper platLogisticsMapper;
 
-    @Resource
-    IPlatEmployeeTypeService platEmployeeTypeService;
-    @Resource
-    IPlatEmployeeHealthService platEmployeeHealthService;
-    @Resource
-    IPlatBasicsService platBasicsService;
-    @Resource
-    IPlatPostStationService postStationService;
-    @Resource
-    IPlatPropertyService platPropertyService;
-    @Resource
-    IPlatGreenSmartOtherService iPlatGreenSmartOtherService;
-    @Resource
-    IPlatAccessService iPlatAccessService;
-    @Resource
-    IPlatApiRecordService iPlatApiRecordService;
-
-
-    /**
-     * 获取服务保障中心的数据
-     */
-    public void getServiceData(String appOrg, String appName) {
-        String url = ApiUrlConfig.getServiceUrl();
-        System.out.printf("------------服务保障中心：%s", url);
-        JSONObject params = new JSONObject();
-        params.put("appOrg", appOrg);
-        String result = HttpUtils.sendPost(url, params.toJSONString());
-        // 添加接口请求记录
-        PlatApiRecord platApiRecord = new PlatApiRecord();
-        platApiRecord.setApiUrl(url);
-        platApiRecord.setApiResult(result);
-        platApiRecord.setAppOrg(appOrg);
-        iPlatApiRecordService.save(platApiRecord);
-
-        System.out.printf("------------接口返回：%s", result);
-        if (StringUtils.isNotBlank(result)) {
-            Map<String, Object> resultMap = JSONObject.parseObject(result, Map.class);
-            if (Objects.equals(resultMap.get("code").toString(), "200") && resultMap.containsKey("entity")) {
-                JSONArray data = JSONArray.parseArray(resultMap.get("entity").toString());
-                for (Object o : data) {
-                    Map<String, Object> temp = JSONObject.parseObject(o.toString(), Map.class);
-                    if (temp.containsKey("dataType")) {
-                        if (temp.containsKey("dataResult")) {
-                            Map<String, Object> dataResult = JSONObject.parseObject(temp.get("dataResult").toString(), Map.class);
-                            if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.EMPLOYEE_TYPE.getCode())) {
-                                platEmployeeTypeService.addPlatEmployeeType(appOrg, dataResult);
-                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.EMPLOYEE_HEALTH.getCode())) {
-                                platEmployeeHealthService.addPlatEmployeeHealth(appOrg, dataResult);
-                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.GREEN_SMART.getCode())) {
-                                iPlatGreenSmartOtherService.addPlatGreenSmartOther(appOrg, dataResult);
-                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.POST_STATION.getCode())) {
-                                postStationService.addPlatPostStation(appOrg, dataResult);
-                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.PROPERTY.getCode())) {
-                                platPropertyService.addPlatProperty(appOrg, dataResult);
-                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.BASICS.getCode())) {
-                                platBasicsService.addPlatBasics(appOrg, appName, dataResult);
-                            } else if (Objects.equals(temp.get("dataType").toString(), EmployeeTypeEnum.ACCESS.getCode())) {
-                                iPlatAccessService.addPlatAccess(appOrg, dataResult);
-                            }
-                        }
-                    }
-                }
-            } else {
-                throw new RuntimeException("接口返回失败：" + result);
-            }
-        } else {
-            throw new RuntimeException("接口请求失败：" + result);
-        }
-    }
-
     public void getLogisticsData(){
         String json = "{\n" +
                 "    \"code\": \"200\",\n" +
@@ -269,6 +178,8 @@ public class DataTools {
         List<LargeAssetDirs> serviceAssetList = new ArrayList<>();
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
+            LargeLogistics largeLogistics2 = JSON.parseObject(dataItem.toString(), LargeLogistics.class);
+
             LargeLogistics largeLogistics = new LargeLogistics(
                     dataItem.getString("orgId"),
                     dataItem.getString("parentOrgId"),
@@ -293,7 +204,7 @@ public class DataTools {
                     Long.valueOf(dataItem.getString("inspectionAnomalyRecordNum")),
                     Long.valueOf(dataItem.getString("repairRecordNum")),
                     Long.valueOf(dataItem.getString("maintenanceRecordNum"))
-                    );
+            );
             JSONArray officeAssetArray = dataItem.getJSONArray("officeAssetDistrs");
             for (int j = 0; j < dataArray.size(); j++) {
                 LargeAssetDirs largeAssetDirs = new LargeAssetDirs();
@@ -333,56 +244,4 @@ public class DataTools {
         platLogisticsMapper.deleteServiceAssetDirs();
         platLogisticsMapper.insertServiceAssetDirs(serviceAssetList);
     }
-
-    public void getBuildingDataFirstHalf(){
-        LargeBuilding largeBuilding = new LargeBuilding();
-        largeBuilding.setJsonFrequency(repeat(ApiUrlConfig.getJsonFrequency(), null));
-        largeBuilding.setJsonPatrol(repeat(ApiUrlConfig.getJsonPatrol(), null));
-        largeBuilding.setJsonPatrolPoint(repeat(ApiUrlConfig.getJsonPatrolPoint(), null));
-        largeBuilding.setJsonPowerWaterMonth((repeat(ApiUrlConfig.getJsonPowerWaterMonth(), null)));
-        largeBuilding.setJsonTarget(repeat(ApiUrlConfig.getJsonTarget(), null));
-        largeBuilding.setJsonUseElectricity(repeat(ApiUrlConfig.getJsonUseElectricity(), null));
-        largeBuilding.setJsonGreenElectricity(repeat(ApiUrlConfig.getJsonGreenElectricity(), null));
-        largeBuilding.setJsonCarbon(repeat(ApiUrlConfig.getJsonCarbon(), null));
-        largeBuilding.setJsonEnergyYear(repeat(ApiUrlConfig.getJsonEnergyYear(), null));
-        largeBuilding.setJsonPowerYear(repeat(ApiUrlConfig.getJsonPowerYear(), null));
-        largeBuilding.setJsonWaterYear(repeat(ApiUrlConfig.getJsonWaterYear(), null));
-        if (platBuildingMapper.getCount() > 0){
-            platBuildingMapper.updateBuilding(largeBuilding);
-        }
-        else {
-            platBuildingMapper.insertBuilding(largeBuilding);
-        }
-    }
-
-    public void getBuildingDataSecondHalf(){
-        LargeBuilding largeBuilding = new LargeBuilding();
-        largeBuilding.setJsonAir(repeat(ApiUrlConfig.getJsonAir(), null));
-        if (platBuildingMapper.getCount() > 0){
-            platBuildingMapper.updateBuilding(largeBuilding);
-        }
-        else {
-            platBuildingMapper.insertBuilding(largeBuilding);
-        }
-    }
-
-    public String repeat(String url, String params){
-        String result = null;
-        if (StringUtils.isNotBlank(params)){
-            String res = HttpUtils.sendGet(url, params);
-            if (StringUtils.isNotBlank(res)){
-                JSONObject jsonObject = JSONObject.parseObject(res);
-                result = jsonObject.getString("data");
-            }
-        }
-        else {
-            String res = HttpUtils.sendGet(url);
-            if (StringUtils.isNotBlank(res)){
-                JSONObject jsonObject = JSONObject.parseObject(res);
-                result = jsonObject.getString("data");
-            }
-        }
-        return result;
-    }
-
 }