server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -563,8 +563,21 @@ SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm"); SimpleDateFormat format1 = new SimpleDateFormat("HH:mm"); IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper); String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode(); Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120; result.getRecords().stream().forEach(s -> { if(Constants.equalsInteger(s.getStatus(),Constants.ZERO)&&Constants.equalsInteger(s.getMeetingStatus(),Constants.ONE)){ //开始前120分钟 大于当前时间 则显示即将开始 if( DateUtil.afterMinutesDate(s.getStartTime(),-minute).getTime()<=System.currentTimeMillis() ){ s.setMeetingStatus(4); } } if(s.getMeetingStatus().equals(Constants.ZERO)){ if(s.getMeetingStatus()==Constants.ONE){ //开始前120分钟 大于当前时间 则显示即将开始 server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -178,7 +178,7 @@ queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType()); // queryWrapper.eq(Objects.nonNull(noticesDTO.getMemberId()),Notices::getUserId,noticesDTO.getMemberId()); queryWrapper.like(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle()); queryWrapper.orderByDesc(Notices::getCreateDate); queryWrapper.orderByDesc(Notices::getId); PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper)); if(noticesDTO.getQueryType().equals(Constants.ZERO)){ for (Notices notices:pageData.getRecords()) { server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -66,6 +66,9 @@ <if test="dto.status != null "> AND usr.`status` = #{dto.status} </if> <if test="dto.memberType != null "> AND usr.`type` = #{dto.memberType} </if> <if test="dto.workStatus != null "> AND m.WORK_STATUS = #{dto.workStatus} </if> server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -110,7 +110,7 @@ ,Constants.PlatformJobStatus.WORKING.getKey() ,Constants.PlatformJobStatus.TRANSFERING.getKey() ,Constants.PlatformJobStatus.EXCEPTION.getKey() ,Constants.PlatformJobStatus.DONE.getKey() // ,Constants.PlatformJobStatus.DONE.getKey() ) .orderByDesc(PlatformJob::getSignNum) .last(" limit 20 ") server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
@@ -100,6 +100,7 @@ WholeProvinceZXTVO list = boardService.inventoryUseRate(); return ApiResponse.success(list); } @LoginNoRequired @ApiOperation("运力资源利用率") @GetMapping("/tranportAbilityUseRate") server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
@@ -106,7 +106,7 @@ public ApiResponse<PageData<PlatformBooks>> findPage (@RequestBody PageWrap<PlatformBooks> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { LoginUserInfo loginUserInfo = this.getLoginUser(token); pageWrap.getModel().setQueryDate(DateUtil.getBeforDay(new Date(),30)); pageWrap.getModel().setDriverPhone(loginUserInfo.getMobile()); pageWrap.getModel().setDriverId(loginUserInfo.getMemberId()); return ApiResponse.success(platformBooksService.findPage(pageWrap)); }
@@ -8,6 +8,7 @@ import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Http; import com.doumee.core.utils.HttpsUtil; import com.doumee.dao.business.MemberMapper; import com.doumee.dao.business.VisitsMapper; import com.doumee.dao.business.WxNoticeConfigMapper; import com.doumee.dao.business.model.*; @@ -353,6 +354,7 @@ paramMap.put("touser", openId); paramMap.put("data", dataMap); String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap)); log.warn("·==++--·推送微信模板信息：{}", jumpUrl); if(StringUtils.isBlank(response)){ log.warn("·==++--·推送微信模板信息：{}·--++==·", "失败"); }else{ @@ -394,7 +396,6 @@ } String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(), wxUrlParams,platformBooks.getId().toString()); String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token; //整体参数map Map<String, Object> paramMap = new HashMap<String, Object>(); server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
@@ -44,6 +44,7 @@ @ApiModelProperty(value = "在园访客数量") private int visitTotal; @ApiModelProperty(value = "当前在园车辆总数") private int inParkCarTotal;
@@ -246,9 +246,4 @@ PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser); void wholeProvinceCenterData(WholeProvinceBoardVO data); void centerDataForInOut(WholeProvinceBoardVO data); void centerDataOutInRata(WholeProvinceBoardVO data); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -302,6 +302,7 @@ .eq(SystemUser::getDeleted, Constants.ZERO) .eq(SystemUser::getType, Constants.ZERO) .eq(SystemUser::getMobile,platformBooks.getDriverPhone()) .isNotNull(SystemUser::getOpenid) .last(" limit 1 ")); if(Objects.nonNull(driver)&&StringUtils.isNotBlank(driver.getOpenid())){ @@ -416,7 +417,6 @@ public void revoke(RevokeDTO revokeDTO, LoginUserInfo loginUserInfo){ if(Objects.isNull(revokeDTO) || Objects.isNull(revokeDTO.getId()) || StringUtils.isBlank(revokeDTO.getInfo()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -2203,164 +2203,5 @@ } /** * 累计出库量统计 - 大屏 * @param data */ @Override public void wholeProvinceCenterData(WholeProvinceBoardVO data){ // //累计本年度出库量 // List<PlatformJob> platformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>() // .lambda() // .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE // ,Constants.PlatformJobStatus.AUTHED_LEAVE // ,Constants.PlatformJobStatus.LEAVED) // .isNotNull(PlatformJob::getDoneDate) // .in(PlatformJob::getType,Constants.platformJobType.wxczh,Constants.platformJobType.zyczh) // .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy")) // ); // data.setYearOutTotal(platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add)); // data.setYearOutTimes(platformJobList.size()); // // // List<PlatformJob> platformJobsMonthList = platformJobList.stream().filter(i->DateUtil.getFomartDate(i.getDoneDate(),"yyyy-MM").equals(DateUtil.getFomartDate(new Date(),"yyyy-MM"))).collect(Collectors.toList()); // data.setMonthOutTotal(platformJobsMonthList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add)); // data.setMonthOutTimes(platformJobsMonthList.size()); // String beforYear = DateUtil.getBeforYear(new Date(),1); // // //累计本年度出库量 // List<PlatformJob> beforYearPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>() // .lambda() // .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE // ,Constants.PlatformJobStatus.AUTHED_LEAVE // ,Constants.PlatformJobStatus.LEAVED) // .isNotNull(PlatformJob::getDoneDate) // .in(PlatformJob::getType,Constants.platformJobType.wxczh,Constants.platformJobType.zyczh) // .like( PlatformJob::getDoneDate, beforYear.substring(0,4)) // ); // // List<PlatformJob> beforPlatformJobsMonthList = platformJobList.stream().filter(i->DateUtil.getFomartDate(i.getDoneDate(),"yyyy-MM").equals(beforYear.substring(0,7))).collect(Collectors.toList()); // //同比数据 // data.setYearOutTotalOnYear(beforYearPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add)); // data.setMonthOutTotalOnYear(beforPlatformJobsMonthList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add)); // } @Override public void centerDataForInOut(WholeProvinceBoardVO data){ // //今日完成的出入库所有数据 // List<PlatformJob> platformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>() // .lambda() // .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE // ,Constants.PlatformJobStatus.AUTHED_LEAVE // ,Constants.PlatformJobStatus.LEAVED) // .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd")) // ); // //今日之前 所有未完成的出入库数据 - WMS推送 // List<PlatformJob> wmsPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>() // .lambda() // .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE // ,Constants.PlatformJobStatus.AUTHED_LEAVE // ,Constants.PlatformJobStatus.LEAVED // ,Constants.PlatformJobStatus.CANCEL) // .eq(PlatformJob::getOrigin ,Constants.ONE) // .le(PlatformJob::getCreateDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") +" 23:59:59") // ); // //今日之前 所有未完成的出入库数据 - 预约数据 // List<PlatformJob> bookPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>() // .lambda() // .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE // ,Constants.PlatformJobStatus.AUTHED_LEAVE // ,Constants.PlatformJobStatus.LEAVED // ,Constants.PlatformJobStatus.CANCEL) // .eq(PlatformJob::getOrigin ,Constants.ONE) // .le(PlatformJob::getArriveDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") +" 23:59:59") // ); // // BigDecimal finishOutTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // BigDecimal unFinishWmsOutTotal = wmsPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // BigDecimal unFinishBookOutTotal = bookPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // // BigDecimal finishInTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // BigDecimal unFinishWmsInTotal = wmsPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // BigDecimal unFinishBookInTotal = bookPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // // data.setOutTotal(finishOutTotal); // data.setOutPlanTotal(finishOutTotal.add(unFinishWmsOutTotal).add(unFinishBookOutTotal)); // // data.setInTotal(finishInTotal); // data.setInPlanTotal(finishInTotal.add(unFinishWmsInTotal).add(unFinishBookInTotal)); } @Override public void centerDataOutInRata(WholeProvinceBoardVO data){ // //累计本月度所有操作量 // List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>() // .selectAll(PlatformJob.class) // .select(" ( select ifnull(sum(p.param3),0) from platform_log p where p.obj_id = platform_job.id ) ",PlatformJob::getWorkTime) // .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE // ,Constants.PlatformJobStatus.AUTHED_LEAVE // ,Constants.PlatformJobStatus.LEAVED) // .isNotNull(PlatformJob::getDoneDate) // .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy-MM")) // ); // // //获取本月所有出库量 // BigDecimal monthOutTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // Long monthOutWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum); // BigDecimal monthInTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // Long monthInWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum); // // data.setMonthOutRata(BigDecimal.ZERO); // //月度出库效率 // if(Objects.nonNull(monthOutTotal) && Objects.nonNull(monthOutWorkTotal) && monthOutWorkTotal>0L && monthOutTotal.compareTo(BigDecimal.ZERO) > 0){ // BigDecimal workTotal = new BigDecimal(monthOutWorkTotal); // data.setMonthOutRata(monthOutTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP)); // } // // //月度入库效率 // // data.setMonthInRata(BigDecimal.ZERO); // if(Objects.nonNull(monthInTotal) && Objects.nonNull(monthInWorkTotal) && monthInWorkTotal>0L && monthInTotal.compareTo(BigDecimal.ZERO) > 0){ // BigDecimal workTotal = new BigDecimal(monthInWorkTotal); // data.setMonthInRata(monthInTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP)); // } // // // // List<PlatformJob> dayPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>() // .lambda() // .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE // ,Constants.PlatformJobStatus.AUTHED_LEAVE // ,Constants.PlatformJobStatus.LEAVED) // .isNotNull(PlatformJob::getDoneDate) // .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd")) // ); // // BigDecimal dayOutTotal = dayPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // Long dayOutWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum); // BigDecimal dayInTotal = dayPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add); // Long dayInWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum); // // data.setDayOutRata(BigDecimal.ZERO); // //日出库效率 // if(Objects.nonNull(dayOutTotal) && Objects.nonNull(dayOutWorkTotal) && dayOutWorkTotal>0L && dayOutTotal.compareTo(BigDecimal.ZERO) > 0){ // BigDecimal workTotal = new BigDecimal(dayOutWorkTotal); // data.setDayOutRata(dayOutTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP)); // } // //日入库效率 // data.setDayInRata(BigDecimal.ZERO); // if(Objects.nonNull(dayInTotal) && Objects.nonNull(dayInWorkTotal) && dayInWorkTotal>0L && dayInTotal.compareTo(BigDecimal.ZERO) > 0){ // BigDecimal workTotal = new BigDecimal(dayInWorkTotal); // data.setMonthInRata(dayInTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP)); // } } } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -137,7 +137,10 @@ .apply("to_days(done_date) = to_days(now())") ); if(jobs!=null){ for(PlatformJob j :jobs){ if(Objects.nonNull(j)&&Objects.nonNull(j.getTotalNum())){ num =num.add(Constants.formatBigdecimal(j.getTotalNum())); } } } }else{ @@ -151,7 +154,9 @@ , Constants.PlatformJobStatus.LEAVED.getKey()) ); if(jobs!=null){ for(PlatformJob j :jobs){ if(Objects.nonNull(j)&&Objects.nonNull(j.getTotalNum())){ num = num.add(Constants.formatBigdecimal(j.getTotalNum())); } } } } @@ -534,7 +539,6 @@ BaseResponse<CamerasPreviewURLsResponse> result = HKService.cameraPreviewURLs(request); if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){ return result.getData().getUrl(); } return null; } @@ -709,6 +713,7 @@ .selectAs(PlatformJob::getId,PlatformJob::getId) .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate) .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum) .selectAs(PlatformJob::getStatus,PlatformJob::getStatus) // .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .apply(queryType==0,"to_days(create_date) >= to_days(now()) -7") @@ -1369,8 +1374,14 @@ } if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){ //计算用气同比环比 data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""); data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""); data.getGasQuantity().setSameRate( (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum()).doubleValue()*100 +"" /*Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum() .divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""*/); data.getGasQuantity().setRingRate( (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getRingNum())).divide(data.getGasQuantity().getRingNum()).doubleValue()*100 +"" //Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"" ); } if( data.getWaterQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){ // //计算用水同比环比 @@ -1407,7 +1418,7 @@ * @param data */ private void getLastMonthElectricityData(EnergyModelDataVO data) { BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1"); // BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1"); // if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){ // data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0")); // data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0")); @@ -1470,23 +1481,31 @@ * @param data */ private void getCurrentDateElectircityData(EnergyModelDataVO data,int days) { EnergyTrendRequest param = new EnergyTrendRequest(); param.setDate(DateUtil.getFomartDate(DateUtil.addDaysToDate(new Date(),days),"yyyy-MM-dd"));//日期 param.setMeterType(1); param.setShowType("4"); param.setNodeType(2); param.setNodeId("root000000"); // EnergyTrendRequest param = new EnergyTrendRequest(); // param.setDate(DateUtil.getFomartDate(DateUtil.addDaysToDate(new Date(),days),"yyyy-MM-dd"));//日期 // param.setMeterType(1); // param.setShowType("4"); // param.setNodeType(2); // param.setNodeId("root000000"); // param.setPeriodType("day"); // BigDecimal total = new BigDecimal(0); // BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param); // if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) // && response.getData()!=null&& response.getData().getYvalues()!=null ){ // for (int i = 0; i < response.getData().getYvalues().get(0).getValue().length; i++) { // total = total.add(new BigDecimal(StringUtils.defaultString( response.getData().getYvalues().get(0).getValue()[i],"0"))); // } // // } // data.setTotal(Constants.formatBigdecimal2Float(total).toString()); EnergyTotalDataRequest param = new EnergyTotalDataRequest(); param.setPeriodType("day"); BigDecimal total = new BigDecimal(0); BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param); if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){ for (int i = 0; i < response.getData().getYvalues().get(0).getValue().length; i++) { total = total.add(new BigDecimal(StringUtils.defaultString( response.getData().getYvalues().get(0).getValue()[i],"0"))); param.setDate(DateUtil.getFomartDate(DateUtil.addDaysToDate(new Date(),days),"yyyy-MM-dd")); BaseResponse<EnergyTotalDataResponse> beforMonthResponse = HKService.energyTotal(param); if(beforMonthResponse != null && StringUtils.equals(beforMonthResponse.getCode(), HKConstants.RESPONSE_SUCCEE) && beforMonthResponse.getData()!=null ){ data.setTotal(beforMonthResponse.getData().getElectricity()); data.setTotalNum(new BigDecimal(beforMonthResponse.getData().getElectricity())); } } data.setTotal(Constants.formatBigdecimal2Float(total).toString()); } private EnergyModelDataVO getDefaultData() { @@ -1689,7 +1708,7 @@ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count() ); //在园车辆 data.setInternalCarTotal( data.setInParkCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count() ); //在园相关方车辆 @@ -1974,6 +1993,7 @@ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum())); data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum())); data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum())); data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum())); } // 作业完成（预约车、签到数、已叫号、作业车、已完成） if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){ @@ -1999,7 +2019,7 @@ } // 已离园 if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())){ data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum())); // data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum())); } // 已过号（预约车、签到数、排队车） if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.OVER_NUMBER.getKey())){ @@ -2044,7 +2064,16 @@ } BaseResponse<List<RegionDataRankingDataResponse>> response = HKService.regionDataRanking(request); if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){ return response.getData(); List<RegionDataRankingDataResponse> regionDataRankingDataResponseList = new ArrayList<>(); for (RegionDataRankingDataResponse regionDataRankingDataResponse:response.getData()) { if(StringUtils.isNotBlank(regionDataRankingDataResponse.getPercent())){ if(Constants.equalsInteger(Integer.valueOf(new BigDecimal(regionDataRankingDataResponse.getPercent()).intValue()),Constants.ONE)){ continue; } regionDataRankingDataResponseList.add(regionDataRankingDataResponse); } } return regionDataRankingDataResponseList; }else{ return null; }
