Commit b0eb6018 authored by tangwei's avatar tangwei

提交数据

parents 331e2efe f6aac893
...@@ -16,10 +16,13 @@ import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TestServiceImpl; ...@@ -16,10 +16,13 @@ import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TestServiceImpl;
import com.yeejoin.amos.component.influxdb.InfluxDbConnection; import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.aspectj.apache.bcel.classfile.Module;
import org.influxdb.dto.QueryResult; import org.influxdb.dto.QueryResult;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
...@@ -39,7 +42,7 @@ public class MonitoringMapController extends BaseController { ...@@ -39,7 +42,7 @@ public class MonitoringMapController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取监盘全国地图数据") @ApiOperation(value = "获取监盘全国地图数据")
@GetMapping("/nationwide") @GetMapping("/nationwide")
public ResponseModel<List<RegionNationWideDto>> getNationWideInfo() { public ResponseModel<List<RegionNationWideDto>> getNationWideInfo(@RequestParam (value = "provinceName", required = false)String provinceName) {
return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo()); return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo(provinceName));
} }
} }
...@@ -4,6 +4,8 @@ import com.sun.javafx.font.PrismFontFactory; ...@@ -4,6 +4,8 @@ import com.sun.javafx.font.PrismFontFactory;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.HashMap;
@Data @Data
public class RegionNationWideDto { public class RegionNationWideDto {
@ApiModelProperty(value = "省份名称") @ApiModelProperty(value = "省份名称")
...@@ -18,4 +20,14 @@ public class RegionNationWideDto { ...@@ -18,4 +20,14 @@ public class RegionNationWideDto {
private String fengdianMV = "0" ; private String fengdianMV = "0" ;
@ApiModelProperty(value = "是否已接入数据") @ApiModelProperty(value = "是否已接入数据")
private Boolean jsJoin = false; 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 ;
} }
...@@ -2,14 +2,20 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl; ...@@ -2,14 +2,20 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.Region;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationCoordinate;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper; 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.api.mapper.StationBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationCoordinateMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto; import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@Service @Service
public class MonitoringServiceImpl { public class MonitoringServiceImpl {
...@@ -19,16 +25,48 @@ public class MonitoringServiceImpl { ...@@ -19,16 +25,48 @@ public class MonitoringServiceImpl {
@Autowired @Autowired
StationBasicMapper stationBasicMapper; StationBasicMapper stationBasicMapper;
public List<RegionNationWideDto> getNationWideInfo(){ @Autowired
List<RegionNationWideDto> regionNationWideDtoList= new ArrayList<>(); StationCoordinateMapper stationCoordinateMapper;
List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level",1)); public List<RegionNationWideDto> getNationWideInfo(String provinceName){
for (int i = 0; i < regionList.size(); i++) { List<RegionNationWideDto> regionNationWideDtoList= new ArrayList<>();
RegionNationWideDto regionNationWideDto = new RegionNationWideDto(); if(ObjectUtils.isEmpty(provinceName)||provinceName.equals("")){
Region region = regionList.get(i); 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");
StationCoordinate stationCoordinate = stationCoordinateMapper.selectOne(new QueryWrapper<StationCoordinate>().eq("station_id",stationBasic.getSequenceNbr()).eq("is_main_coordinate",0));
hashMap.put("lng", Double.valueOf(stationCoordinate.getLongitude()));
hashMap.put("lat", Double.valueOf(stationCoordinate.getLaitude()));
regionNationWideDto.setPosition(hashMap);
regionNationWideDtoList.add(regionNationWideDto);
}
regionNationWideDto.setName(region.getRegionName());
regionNationWideDtoList.add(regionNationWideDto);
} }
return regionNationWideDtoList; return regionNationWideDtoList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment