代码优化

project-admin/src/main/resources/application-dev.yml

@@ -23,50 +23,32 @@ apiurl:
   #serviceUrl: http://25.39.79.244:18080/zhhq_app/zhhq_large_screen/queryByAppOrg
   serviceUrl: http://192.168.1.189/fxkj/php/public/home/Wechat/test
 
-
   # 楼宇运行监控 接口前缀
-  buildPrefix: http://113.44.175.227:8081
-
+  buildPrefix: http://113.44.175.227:8081/psbims
   # 楼宇运行监控 巡更次数统计(近6月)
-  jsonFrequency: /psbims/screen/patrol/frequency/statistics
+  jsonFrequency: /screen/patrol/frequency/statistics
   # 办公能耗情况接口 巡更及时率
-  jsonPatrol: /psbims/screen/patrol/timeliness
+  jsonPatrol: /screen/patrol/timeliness
   # 办公能耗情况接口 巡更点统计
-  jsonPatrolPoint: /psbims/logistics/base/patrolPoint/countPoint
+  jsonPatrolPoint: /logistics/base/patrolPoint/countPoint
   # 办公能耗情况接口 近一月楼宇能耗信息
-  jsonPowerWaterMonth: /psbims/screen/synthetical/power/water/year/total?timeType=month
+  jsonPowerWaterMonth: /screen/synthetical/power/water/year/total?timeType=month
   # 办公能耗情况接口 空气概况
-  jsonAir: /psbims/screen/environment/air/overview
+  jsonAir: /screen/environment/air/overview
   # 办公能耗情况接口 定额指标
-  jsonTarget: /psbims/screen/synthetical/target/build/person
+  jsonTarget: /screen/synthetical/target/build/person
   # 办公能耗情况接口 用电分项(月)
-  jsonUseElectricity: /psbims/logistics/base/patrolPoint/usePowerStatistics
+  jsonUseElectricity: /logistics/base/patrolPoint/usePowerStatistics
   # 办公能耗情况接口 绿电比例
-  jsonGreenElectricity: /psbims/logistics/base/patrolPoint/greenElectricityAnalysis
+  jsonGreenElectricity: /logistics/base/patrolPoint/greenElectricityAnalysis
   # 办公能耗情况接口 碳排放量月度变化趋势图
-  jsonCarbon: /psbims/screen/carbon/carbonEmissionCurve
+  jsonCarbon: /screen/carbon/carbonEmissionCurve
   # 办公能耗情况接口 年度累计综合能粍
-  jsonEnergyYear: /psbims/office/energy/integrationEnergyForYear
+  jsonEnergyYear: /office/energy/integrationEnergyForYear
   # 办公能耗情况接口 年度累计电耗
-  jsonPowerYear: /psbims/office/energy/integrationPowerForYear
+  jsonPowerYear: /office/energy/integrationPowerForYear
   # 办公能耗情况接口 年度累计水耗
-  jsonWaterYear: /psbims/office/energy/integrationWaterForYear
-
-
-  # 数据中心机房信息接口
-  buildDataCenterRoom: dataCenterRoom
-  # 供暖能耗信息接口
-  buildHeatingEnergy: heatingEnergy
-  # 燃气用量信息接口
-  buildGasInfo: gasInfo
-  # 资源信息接口
-  buildResourceInfo: resourceInfo
-  # 可再生电力信息接口
-  buildGreenPowerInfo: greenPowerInfo
-  # 办公碳排放情况接口
-  buildOfficeCarbonForYear: officeCarbonForYear
-  # 各单位年度累计办公碳排放量统计接口
-  buildOfficeCarbonForFloor: officeCarbonForFloor
+  jsonWaterYear: /office/energy/integrationWaterForYear
 
 znhqcamera:
   path: /usr/local/ffmpeg/bin/ffmpeg # ffmpeg安装的位置

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

@@ -132,66 +132,4 @@ public class ApiUrlConfig {
         ApiUrlConfig.jsonWaterYear = jsonWaterYear;
     }
 
-    // 数据中心机房信息接口
-    private static String buildDataCenterRoom;
-    public static String getBuildDataCenterRoom() {
-        return ApiUrlConfig.buildPrefix + buildDataCenterRoom;
-    }
-    public void setBuildDataCenterRoom(String buildDataCenterRoom) {
-        ApiUrlConfig.buildDataCenterRoom = buildDataCenterRoom;
-    }
-
-    // 供暖能耗信息接口
-    private static String buildHeatingEnergy;
-    public static String getBuildHeatingEnergy() {
-        return ApiUrlConfig.buildPrefix + buildHeatingEnergy;
-    }
-    public void setBuildHeatingEnergy(String buildHeatingEnergy) {
-        ApiUrlConfig.buildHeatingEnergy = buildHeatingEnergy;
-    }
-
-    // 燃气用量信息接口
-    private static String buildGasInfo;
-    public static String getBuildGasInfo() {
-        return ApiUrlConfig.buildPrefix + buildGasInfo;
-    }
-    public void setBuildGasInfo(String buildGasInfo) {
-        ApiUrlConfig.buildGasInfo = buildGasInfo;
-    }
-
-    // 资源信息接口
-    private static String buildResourceInfo;
-    public static String getBuildResourceInfo() {
-        return ApiUrlConfig.buildPrefix + buildResourceInfo;
-    }
-    public void setBuildResourceInfo(String buildResourceInfo) {
-        ApiUrlConfig.buildResourceInfo = buildResourceInfo;
-    }
-
-    // 可再生电力信息接口
-    private static String buildGreenPowerInfo;
-    public static String getBuildGreenPowerInfo() {
-        return ApiUrlConfig.buildPrefix + buildGreenPowerInfo;
-    }
-    public void setBuildGreenPowerInfo(String buildGreenPowerInfo) {
-        ApiUrlConfig.buildGreenPowerInfo = buildGreenPowerInfo;
-    }
-
-    // 办公碳排放情况接口
-    private static String buildOfficeCarbonForYear;
-    public static String getBuildOfficeCarbonForYear() {
-        return ApiUrlConfig.buildPrefix + buildOfficeCarbonForYear;
-    }
-    public void setBuildOfficeCarbonForYear(String buildOfficeCarbonForYear) {
-        ApiUrlConfig.buildOfficeCarbonForYear = buildOfficeCarbonForYear;
-    }
-
-    // 各单位年度累计办公碳排放量统计接口
-    private static String buildOfficeCarbonForFloor;
-    public static String getBuildOfficeCarbonForFloor() {
-        return ApiUrlConfig.buildPrefix + buildOfficeCarbonForFloor;
-    }
-    public void setBuildOfficeCarbonForFloor(String buildOfficeCarbonForFloor) {
-        ApiUrlConfig.buildOfficeCarbonForFloor = buildOfficeCarbonForFloor;
-    }
 }

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

@@ -8,15 +8,11 @@ import com.project.common.enums.BusinessType;
 import com.project.common.enums.EmployeeTypeEnum;
 import com.project.common.utils.StringUtils;
 import com.project.common.utils.http.HttpUtils;
-import com.project.zcustom.domain.build.PlatBuildParams;
-import com.project.zcustom.domain.build.PlatBuildYearTrend;
 import com.project.zcustom.domain.plat.PlatApiRecord;
 import com.project.zcustom.domain.unit.LargeBuilding;
 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.build.IPlatBuildParamsService;
-import com.project.zcustom.service.build.IPlatBuildYearTrendService;
 import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
 import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
 import com.project.zcustom.service.plat.IPlatApiRecordService;
@@ -28,7 +24,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.Map;
+import java.util.Objects;
 
 
 /**
@@ -58,10 +55,6 @@ public class DataTools {
     IPlatAccessService iPlatAccessService;
     @Resource
     IPlatApiRecordService iPlatApiRecordService;
-    @Resource
-    IPlatBuildYearTrendService iPlatBuildYearTrendService;
-    @Resource
-    IPlatBuildParamsService iPlatBuildParamsService;
 
 
     /**
@@ -145,14 +138,14 @@ public class DataTools {
         String result = null;
         if (!StringUtils.isEmpty(params)){
             String res = HttpUtils.sendGet(url, params);
-            if (!StringUtils.isEmpty(res)){
+            if (StringUtils.isNotBlank(res)){
                 JSONObject jsonObject = JSONObject.parseObject(res);
                 result = jsonObject.getString("data");
             }
         }
         else {
             String res = HttpUtils.sendGet(url);
-            if (!StringUtils.isEmpty(res)){
+            if (StringUtils.isNotBlank(res)){
                 JSONObject jsonObject = JSONObject.parseObject(res);
                 result = jsonObject.getString("data");
             }
@@ -160,230 +153,4 @@ public class DataTools {
         return result;
     }
 
-
-
-    /**
-     * 数据中心机房信息接口
-     */
-    public void getDataCenterRoom() {
-        String url = ApiUrlConfig.getBuildDataCenterRoom();
-        String params = "";
-        String result = HttpUtils.sendGet(url, params);
-
-        // 添加接口请求记录
-        PlatApiRecord platApiRecord = new PlatApiRecord();
-        platApiRecord.setApiUrl(url);
-        platApiRecord.setApiResult(result);
-        platApiRecord.setAppOrg("");
-        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("data")) {
-                List<Map<String, Object>> dataList = StringUtils.getListMap(resultMap.get("data").toString());
-                if (!dataList.isEmpty()) {
-                    List<String> keyList = Arrays.asList("name","key","num","value1","value2","value3");
-                    for (Map<String, Object> map : dataList) {
-                        PlatBuildParams platBuildParams = new PlatBuildParams();
-                        iPlatBuildParamsService.setBuildParamsData(platBuildParams,keyList,map,6,"");
-                        iPlatBuildParamsService.addPlatBuildParams(platBuildParams,"");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 供暖能耗信息接口
-     */
-    public void getHeatingEnergy(String appOrg) {
-        String url = ApiUrlConfig.getBuildHeatingEnergy();
-        String params = "appOrg=" + appOrg;
-        String result = HttpUtils.sendGet(url, params);
-
-        // 添加接口请求记录
-        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("data")) {
-                List<Map<String, Object>> dataList = StringUtils.getListMap(resultMap.get("data").toString());
-                if (!dataList.isEmpty()) {
-                    List<String> keyList = Arrays.asList("name","key","num","value1","value2","value3");
-                    for (Map<String, Object> map : dataList) {
-                        PlatBuildParams platBuildParams = new PlatBuildParams();
-                        iPlatBuildParamsService.setBuildParamsData(platBuildParams,keyList,map,7,"");
-                        iPlatBuildParamsService.addPlatBuildParams(platBuildParams,"");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 燃气用量信息接口
-     */
-    public void getGasInfo(String appOrg) {
-        String url = ApiUrlConfig.getBuildGasInfo();
-        String params = "appOrg=" + appOrg;
-        String result = HttpUtils.sendGet(url, params);
-
-        // 添加接口请求记录
-        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("data")) {
-                List<Map<String, Object>> dataList = StringUtils.getListMap(resultMap.get("data").toString());
-                if (!dataList.isEmpty()) {
-                    List<String> keyList = Arrays.asList("name","key","num","value1","value2","value3");
-                    for (Map<String, Object> map : dataList) {
-                        PlatBuildParams platBuildParams = new PlatBuildParams();
-                        iPlatBuildParamsService.setBuildParamsData(platBuildParams,keyList,map,8,"");
-                        iPlatBuildParamsService.addPlatBuildParams(platBuildParams,"");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 资源信息接口
-     */
-    public void getResourceInfo(String appOrg) {
-        String url = ApiUrlConfig.getBuildResourceInfo();
-        String params = "appOrg=" + appOrg;
-        String result = HttpUtils.sendGet(url, params);
-
-        // 添加接口请求记录
-        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("data")) {
-                List<Map<String, Object>> dataList = StringUtils.getListMap(resultMap.get("data").toString());
-                if (!dataList.isEmpty()) {
-                    List<String> keyList = Arrays.asList("name","key","num","value1","value2","value3");
-                    for (Map<String, Object> map : dataList) {
-                        PlatBuildParams platBuildParams = new PlatBuildParams();
-                        iPlatBuildParamsService.setBuildParamsData(platBuildParams,keyList,map,9,"");
-                        iPlatBuildParamsService.addPlatBuildParams(platBuildParams,"");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 可再生电力信息接口
-     */
-    public void getGreenPowerInfo(String appOrg) {
-        String url = ApiUrlConfig.getBuildGreenPowerInfo();
-        String params = "appOrg=" + appOrg;
-        String result = HttpUtils.sendGet(url, params);
-
-        // 添加接口请求记录
-        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("data")) {
-                List<Map<String, Object>> dataList = StringUtils.getListMap(resultMap.get("data").toString());
-                if (!dataList.isEmpty()) {
-                    List<String> keyList = Arrays.asList("name","key","num","value1","value2","value3");
-                    for (Map<String, Object> map : dataList) {
-                        PlatBuildParams platBuildParams = new PlatBuildParams();
-                        iPlatBuildParamsService.setBuildParamsData(platBuildParams,keyList,map,10,"");
-                        iPlatBuildParamsService.addPlatBuildParams(platBuildParams,"");
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**
-     * 办公碳排放情况
-     */
-    public void getOfficeCarbonForYear(String appOrg) {
-        String url = ApiUrlConfig.getBuildOfficeCarbonForYear();
-        String params = "";
-        String result = HttpUtils.sendGet(url, params);
-
-       // 添加接口请求记录
-        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("data")) {
-                Map<String, Object> mapData = JSONObject.parseObject(resultMap.get("data").toString(), Map.class);
-                PlatBuildParams platBuildParams = new PlatBuildParams();
-                List<String> keyList = Arrays.asList("name","key","value","value1","value2","value3");
-                iPlatBuildParamsService.setBuildParamsData(platBuildParams,keyList,mapData,11,"");
-                iPlatBuildParamsService.addPlatBuildParams(platBuildParams,"");
-
-            }
-        }
-    }
-
-
-    /**
-     * 各单位年度累计办公碳排放量统计接口
-     */
-    public void getOfficeCarbon() {
-        String url = ApiUrlConfig.getBuildOfficeCarbonForFloor();
-        String params = "";
-        String result = HttpUtils.sendGet(url, params);
-
-        // 添加接口请求记录
-        PlatApiRecord platApiRecord = new PlatApiRecord();
-        platApiRecord.setApiUrl(url);
-        platApiRecord.setApiResult(result);
-        platApiRecord.setAppOrg("");
-        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("data")) {
-                List<Map<String, Object>> dataList = StringUtils.getListMap(resultMap.get("data").toString());
-                if (!dataList.isEmpty()) {
-                    List<String> keyList = Arrays.asList("name","key","num","value1","value2","value3");
-                    for (Map<String, Object> map : dataList) {
-                        PlatBuildParams platBuildParams = new PlatBuildParams();
-                        iPlatBuildParamsService.setBuildParamsData(platBuildParams,keyList,map,12,"");
-                        iPlatBuildParamsService.addPlatBuildParams(platBuildParams,"");
-                    }
-                }
-            }
-        }
-    }
-
-
 }