amos-boot-module-jxiop-monitor-biz全国接口与省份接口改用同一个接口

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

@@ -16,10 +16,13 @@ import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TestServiceImpl;
 import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.aspectj.apache.bcel.classfile.Module;
 import org.influxdb.dto.QueryResult;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -39,7 +42,7 @@ public class MonitoringMapController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取监盘全国地图数据")
     @GetMapping("/nationwide")
-    public ResponseModel<List<RegionNationWideDto>> getNationWideInfo() {
-      return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo());
+    public ResponseModel<List<RegionNationWideDto>> getNationWideInfo(@RequestParam (value = "provinceName", required = false)String provinceName) {
+      return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo(provinceName));
     }
 }

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

@@ -4,6 +4,8 @@ import com.sun.javafx.font.PrismFontFactory;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.HashMap;
+
 @Data
 public class RegionNationWideDto {
     @ApiModelProperty(value = "省份名称")
@@ -18,4 +20,14 @@ public class RegionNationWideDto {
     private String fengdianMV = "0" ;
     @ApiModelProperty(value = "是否已接入数据")
     private Boolean jsJoin = false;
+    @ApiModelProperty(value = "场站名称")
+    private String staitionName ;
+    @ApiModelProperty(value = "场站类型")
+    private String staitionType ;
+    @ApiModelProperty(value = "场站容量")
+    private String stationCapacity ;
+    @ApiModelProperty(value = "场站容量")
+    private String speendOrirradiate ;
+    @ApiModelProperty(value = "坐标")
+    private HashMap<String,Double> position ;
 }

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

@@ -2,14 +2,18 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 @Service
 public class MonitoringServiceImpl {
@@ -19,17 +23,45 @@ public class MonitoringServiceImpl {
     @Autowired
     StationBasicMapper stationBasicMapper;
 
-   public List<RegionNationWideDto> getNationWideInfo(){
+   public List<RegionNationWideDto> getNationWideInfo(String provinceName){
         List<RegionNationWideDto> regionNationWideDtoList= new ArrayList<>();
-
+        if(ObjectUtils.isEmpty(provinceName)||provinceName.equals("")){
             List<Region> regionList  = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level",1));
             for (int i = 0; i < regionList.size(); i++) {
                 RegionNationWideDto regionNationWideDto  = new RegionNationWideDto();
+                AtomicReference<Integer> guangfu = new AtomicReference<>(0);
+                AtomicReference<Integer> fengdian = new AtomicReference<>(0);
                 Region region = regionList.get(i);
-
+                List<StationBasic> list = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area",region.getRegionCode()));
+                list.forEach(stationBasic -> {
+                    if(stationBasic.getStationType().equals("FDZ")){
+                        fengdian.getAndSet(fengdian.get() + 1);
+                    }else {
+                        guangfu.getAndSet(guangfu.get() + 1);
+                    }
+                });
+                regionNationWideDto.setFengdian(fengdian.toString());
+                regionNationWideDto.setGuangfu(guangfu.toString());
                 regionNationWideDto.setName(region.getRegionName());
                 regionNationWideDtoList.add(regionNationWideDto);
             }
+        }else {
+            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.setStaitionName(stationBasic.getStationName());
+                regionNationWideDto.setStaitionType(stationBasic.getStationType());
+                regionNationWideDto.setSpeendOrirradiate("222.22");
+                hashMap.put("lng",118.763563);
+                hashMap.put("lat",32.061377);
+                regionNationWideDto.setPosition(hashMap);
+                regionNationWideDtoList.add(regionNationWideDto);
+            }
+
+        }
         return regionNationWideDtoList;
     }
 }