处理权限

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerByFieldVo.java

@@ -39,6 +39,10 @@ public class AnemometerTowerByFieldVo {
     @ApiModelProperty("测风塔高度集合字符串")
     private String anemometerHeightStrings;
 
+    @ApiModelProperty("经纬度拼接")
+    private String longitudeAndLatitudeString;
+
+
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/cockpit/CompanyFieldTreeRoleVo.java

@@ -38,6 +38,8 @@ public class CompanyFieldTreeRoleVo {
     private String batchName;
     @ApiModelProperty("")
     private Integer analysisState = -1;
+    @ApiModelProperty("经纬度拼接")
+    private String longitudeAndLatitudeString;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupVo.java

@@ -86,4 +86,7 @@ public class WindEngineGroupVo {
     @ApiModelProperty("切出风速")
     private Double ratedCutOutWindspeed;
 
+    @ApiModelProperty("经纬度拼接")
+    private String longitudeAndLatitudeString;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysOrganizationAuthServiceImpl.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.service.system.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.energy.manage.common.enums.TypeRelationEnum;
 import com.energy.manage.common.po.powerwordcriterion.PowerWordCriterionPO;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.entity.Example;
 
+import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +72,14 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
     public List<Map<String, Object>> getSysOrganizationAuthTreeByRoleId(Integer roleId) {
 
         List<CompanyFieldTreeRoleVo> list = sysOrganizationAuthMapper.selectSysOrganizationAuthTreeByRoleId(roleId);
+        for (CompanyFieldTreeRoleVo vo : list) {
+            if (vo.getLongitude() != null && vo.getLatitude() != null) {
+                DecimalFormat df = new DecimalFormat("#.00000");
+                String longitude = df.format(vo.getLongitude());
+                String latitude = df.format(vo.getLatitude());
+                vo.setLongitudeAndLatitudeString(longitude + "," + latitude);
+            }
+        }
         // 转化为Map集合
         List<Map<String, Object>> mapList = BeanMapUtils.listBeanToListMap(list);
         // 获取树形结构

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/impl/WindEngineGroupServiceImpl.java

@@ -44,6 +44,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
 
+import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -224,11 +225,24 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         for (WindEngineGroupPO po : engineGroupPOS) {
             windEngineGroupVo = new WindEngineGroupVo();
             BeanUtil.copyProperties(po,windEngineGroupVo);
+            if (windEngineGroupVo.getLongitude() != null && windEngineGroupVo.getLatitude() != null) {
+                DecimalFormat df = new DecimalFormat("#.00000");
+                String longitude = df.format(windEngineGroupVo.getLongitude());
+                String latitude = df.format(windEngineGroupVo.getLatitude());
+                windEngineGroupVo.setLongitudeAndLatitudeString(longitude + "," + latitude);
+            }
             engineGroupVoArrayList.add(windEngineGroupVo);
         }
-
         // 处理测风塔信息
         List<AnemometerTowerByFieldVo> anemometerTowerByFields = anemometerTowerService.getAnemometerTowerByField(fieldCode);
+        for(AnemometerTowerByFieldVo vo : anemometerTowerByFields){
+            if (vo.getLongitude() != null && vo.getLatitude() != null) {
+                DecimalFormat df = new DecimalFormat("#.00000");
+                String longitude = df.format(vo.getLongitude());
+                String latitude = df.format(vo.getLatitude());
+                vo.setLongitudeAndLatitudeString(longitude + "," + latitude);
+            }
+        }
         windFieldGroupTowerVo.setWindEngineGroupVoList(engineGroupVoArrayList);
         windFieldGroupTowerVo.setAnemometerTowerList(anemometerTowerByFields);