BJ_ZTEITS-Developers / zteits-gcp-portal

Commit 754529b25e58a88360298d8cebaa4e267995fdcd

Authored by llw
1 parent a7acf7e1

提交

Inline Side-by-side
Showing 1 changed file with 18 additions and 17 deletions
src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
  View file @754529b
... ... @@ -5,6 +5,7 @@ import java.util.List;
5 5 import java.util.Map;
6 6 import java.util.Map.Entry;
7 7  
  8 +import org.apache.commons.collections.functors.AllPredicate;
8 9 import org.apache.poi.util.StringUtil;
9 10 import org.slf4j.Logger;
10 11 import org.slf4j.LoggerFactory;
... ... @@ -416,22 +417,27 @@ public class DataGeneralizeController {
416 417 @ApiOperation(value="获取停车场设备和PDA在线离线总数")
417 418 @PostMapping("queryParkEqpAndPDACount")
418 419 @ResponseBody
419   - public BizResultVO<Map<String,ParkEqpAndPDACountDTO>> queryParkEqpAndPDACount(@RequestBody QueryParkEqpAndPDACountRequest request){
  420 + public BizResultVO<ParkEqpAndPDACountDTO> queryParkEqpAndPDACount(@RequestBody QueryParkEqpAndPDACountRequest request){
420 421 if(null == request.getEqpType() || null == request.getPdaType() || CollectionUtils.isEmpty(request.getPlNos())){
421 422 throw new BizException(ErrorType.PARAMM_NULL, "入参不能为空");
422 423 }
423 424 logger.info("调用dubbo服务,请求入参: request={}", JSONObject.toJSONString(request));
424   - Map<String,ParkEqpAndPDACountDTO> parkEqpAndPDACountMap = Maps.newHashMap();
  425 + ParkEqpAndPDACountDTO parkEqpAndPDACountDTO=new ParkEqpAndPDACountDTO();
425 426 //查询停车场设备
426 427 BizResult<List<ParkEqpAndPDACountDTO>> result = parkingLotEqpService.queryParkEqpCountByPlNosAndEqpType(request);
427 428 logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(result));
428 429 List<ParkEqpAndPDACountDTO> parkEqpList=result.getData();
429 430 //PDA
  431 + int onlineEqpCountSum=0;
  432 + int allEqpCountSum=0;
  433 + int onlinePDACountSum=0;
  434 + int allPDACountSum=0;
  435 +
430 436 if(CollectionUtils.isNotEmpty(parkEqpList)){
431 437 for (ParkEqpAndPDACountDTO dto : parkEqpList) {
432 438 if(null != dto){
433   - String plNo = StringUtils.isEmpty(dto.getPlNo())?"":dto.getPlNo();
434   - parkEqpAndPDACountMap.put(plNo, dto);
  439 + onlineEqpCountSum=onlineEqpCountSum+(null==dto.getOnlineEqpCount()?0:dto.getOnlineEqpCount());
  440 + allEqpCountSum=allEqpCountSum+(null==dto.getAllEqpCount()?0:dto.getAllEqpCount());
435 441 }
436 442 }
437 443 }
... ... @@ -444,22 +450,17 @@ public class DataGeneralizeController {
444 450 if(CollectionUtils.isNotEmpty(parkPDACountList)){
445 451 for (ParkEqpAndPDACountDTO dto : parkPDACountList) {
446 452 if(null != dto){
447   - String plNo = StringUtils.isEmpty(dto.getPlNo())?"":dto.getPlNo();
448   - if(parkEqpAndPDACountMap.containsKey(plNo)){
449   - parkEqpAndPDACountMap.get(plNo).setOnlinePDACount(null==dto.getOnlinePDACount()?0:dto.getOnlinePDACount());
450   - parkEqpAndPDACountMap.get(plNo).setAllPDACount(null==dto.getAllPDACount()?0:dto.getAllPDACount());
451   - }else{
452   - parkEqpAndPDACountMap.put(plNo, dto);
453   - }
  453 + onlinePDACountSum=onlinePDACountSum+(null==dto.getOnlinePDACount()?0:dto.getOnlinePDACount());
  454 + allPDACountSum=allPDACountSum+(null==dto.getAllPDACount()?0:dto.getAllPDACount());
454 455 }
455 456 }
456 457 }
457   - for (String plNo : request.getPlNos()) {
458   - if(!parkEqpAndPDACountMap.containsKey(plNo)){
459   - parkEqpAndPDACountMap.put(plNo, new ParkEqpAndPDACountDTO());
460   - }
461   - }
  458 + parkEqpAndPDACountDTO.setAllEqpCount(allEqpCountSum);
  459 + parkEqpAndPDACountDTO.setAllPDACount(allPDACountSum);
  460 + parkEqpAndPDACountDTO.setOnlineEqpCount(onlineEqpCountSum);
  461 + parkEqpAndPDACountDTO.setOnlinePDACount(onlinePDACountSum);
  462 +
462 463  
463   - return new BizResultVO<Map<String,ParkEqpAndPDACountDTO>>().setData(parkEqpAndPDACountMap);
  464 + return new BizResultVO<ParkEqpAndPDACountDTO>().setData(parkEqpAndPDACountDTO);
464 465 }
465 466 }
... ...