监盘地图优化提交

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/utils/MapUtils.java

@@ -19,9 +19,9 @@ public class MapUtils {
         double radLat = Math.toRadians(latitude);
 
         // 计算x、y、z坐标值
-        double x = EARTH_RADIUS * Math.cos(radLat) * Math.cos(radLng)+ Math.random()*1000 ;
-        double y = EARTH_RADIUS * Math.cos(radLat) * Math.sin(radLng)-Math.random()*1000;
-        double z = EARTH_RADIUS * Math.sin(radLat)+Math.random()*1000;
+        double x = EARTH_RADIUS * Math.cos(radLat) * Math.cos(radLng)+ 100 ;
+        double y = EARTH_RADIUS * Math.cos(radLat) * Math.sin(radLng)+10;
+        double z = EARTH_RADIUS * Math.sin(radLat)+2;
         arrayList.add(x);
         arrayList.add(y);
         arrayList.add(z);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java

@@ -41,14 +41,14 @@ public class MonitoringMapController extends BaseController {
     @Autowired
     MonitoringServiceImpl monitoringServiceImpl;
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取监盘全国地图数据")
     @GetMapping("/nationwide")
     public ResponseModel<List<RegionNationWideDto>> getNationWideInfo(@RequestParam (value = "provinceName", required = false)String provinceName) {
       return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo(provinceName));
     }
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取区域电量指标完成情况")
     @GetMapping("/getCompletionOfPowerIndicatorsByProvinceName")
     public ResponseModel<ResultsData> getCompletionOfPowerIndicatorsByProvinceName(@RequestParam(required = true) int current, @RequestParam(required = true) int size, @RequestParam(required = true) String provinceName) {

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/RegionNationWideDto.java

@@ -10,6 +10,8 @@ import java.util.HashMap;
 public class RegionNationWideDto {
     @ApiModelProperty(value = "省份名称")
     private String name;
+    @ApiModelProperty(value = "省份名称")
+    private String staitionId;
     @ApiModelProperty(value = "光伏电站数量")
     private String guangfu = "0";
     @ApiModelProperty(value = "风机电站数量")

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceIMQTTmpl.java

@@ -94,7 +94,7 @@ public class MonitoringServiceIMQTTmpl {
         Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
         logger.error("--------------------------区域实时数据消息开始发送----------------------------------------------");
         List<SocialContributionDto> socialContributionDtoList = new ArrayList<>();
-        Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level", 1).eq("region_name", "江苏省"));
+        Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level", 1).eq("region_name", "江西省"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
         //日发电量
         AtomicReference<Double> dailyPower = new AtomicReference<>(0.0);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -106,15 +107,24 @@ public class MonitoringServiceImpl {
                 regionNationWideDtoList.add(regionNationWideDto);
             }
         } else {
+            if(provinceName.contains("%")){
+                try {
+                    provinceName = URLDecoder.decode(provinceName,"UTF-8");
+                }catch (Exception e){
+
+                }
+            }
             Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level", 1).eq("region_name", provinceName));
             List<StationBasic> list = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
             HashMap<String, Double> hashMap = new HashMap<>();
             for (int i = 0; i < list.size(); i++) {
                 StationBasic stationBasic = list.get(i);
                 RegionNationWideDto regionNationWideDto = new RegionNationWideDto();
+                regionNationWideDto.setStaitionId(String.valueOf(stationBasic.getSequenceNbr()));
                 regionNationWideDto.setStaitionName(stationBasic.getStationName());
                 regionNationWideDto.setStaitionType(stationBasic.getStationType());
                 String speendOrirradiate = "";
+                regionNationWideDto.setStationCapacity(String.valueOf(getStationCaPACITYL(stationBasic.getStationNumber())));
                 if (stationBasic.getStationType().equals("FDZ")) {
                     speendOrirradiate = String.valueOf(commonServiceImpl.getAvgvalueByIndicatior(stationBasic.getFanGatewayId(), "30秒平均风速"));
                     regionNationWideDto.setSpeendOrirradiate(speendOrirradiate);
@@ -125,6 +135,7 @@ public class MonitoringServiceImpl {
                 hashMap.put("lng", Double.valueOf(stationCoordinate.getLongitude()));
                 hashMap.put("lat", Double.valueOf(stationCoordinate.getLaitude()));
                 regionNationWideDto.setPosition(hashMap);
+
                 regionNationWideDtoList.add(regionNationWideDto);
             }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationDataTaskImpl.java

@@ -78,7 +78,7 @@ public class StationDataTaskImpl {
         return deviceDtoList;
     }
 
-    @Async("jxiopAsyncExecutor")
+//    @Async("jxiopAsyncExecutor")
     public List<IndexDto> getIndexDto(DeviceDto deviceDto) {
         String querysql ="SELECT createdTime ,gatewayId,address,valueLabel ,equipmentsIdx   FROM iot_data WHERE equipmentSpecificName=~/.*"+deviceDto.getNumberName()+"风机"+".*/  and  gatewayId='"+deviceDto.getGateway()+"'   ORDER BY time  desc  LIMIT 600";
         //每个分机的指标数据