访客系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liukangdong
2024-12-17 04bf59bbc3fad774c57a2ee5ebf07db24b476bf2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java


@@ -5,6 +5,7 @@


import com.doumee.core.constants.ResponseStatus;


import com.doumee.core.exception.BusinessException;


import com.doumee.core.haikang.model.HKConstants;


import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;


import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;


import com.doumee.core.haikang.model.param.BaseListPageRequest;


import com.doumee.core.haikang.model.param.BaseListPageResponse;


@@ -19,7 +20,7 @@


import com.doumee.core.utils.DateUtil;


import com.doumee.core.utils.Utils;


import com.doumee.core.wms.model.response.WmsBaseResponse;


import com.doumee.core.wms.model.response.WmsInventoryDataResponse;


import com.doumee.core.wms.model.response.WmsBaseDataResponse;


import com.doumee.core.wms.model.response.WmsInventoryJsonResponse;


import com.doumee.dao.business.*;


import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;


@@ -66,6 +67,8 @@


    @Autowired


    private PlatformJobMapper platformJobMapper;


    @Autowired


    private PlatformBooksMapper platformBooksMapper;


    @Autowired


    private PlatformWmsDetailMapper platformWmsDetailMapper;


    @Autowired


    private PlatformWmsJobMapper platformWmsJobMapper;


@@ -82,7 +85,75 @@


     * @return


     */


    @Override


    public BoardStockListVO stockList( ){


    public     List<GeneralVO> todayTotalInList(){


        /**


         * 1市公司：根据预约的入园原因为市公司卸货的任务为市公司入库的统计；


         * 2集散中心：WMS推送的入库单据；


         * 3加工入库：预约入园为重庆加工入库的（作业月台为安泰物流卸货月台）；


         */


        String[] names = new String[]{"市公司","集散中心","加工入库"};


        String reason =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CITY_XH_REASON_ID).getCode();


        String platformGroupId =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ATWL_XH_PLATFORM_ID).getCode();;


        List<GeneralVO> list = new ArrayList<>();


        for (int i = 0; i < 3; i++) {


            Random random = new Random();


            GeneralVO data = new GeneralVO();


            data.setName(names[i]);


            BigDecimal num =new BigDecimal(0);


            if(i == 0){


                List<PlatformBooks> jobs = platformBooksMapper.selectJoinList(PlatformBooks.class, new MPJLambdaWrapper<PlatformBooks>()


                        .select(PlatformJob::getTotalNum)


                         .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformBooks::getJobId)


                        .eq(PlatformBooks::getIsdeleted,Constants.ZERO)


                        .eq(PlatformBooks::getReasonId,reason)


                        .apply("to_days(t1.done_date) = to_days(now())")


                        .eq(PlatformBooks::getStatus,Constants.TWO));


                if(jobs!=null){


                    for(PlatformBooks j :jobs){


                        num =num.add(Constants.formatBigdecimal(j.getTotalNum()));


                    }


                }


            }else if(i ==1){


                List<PlatformJob> jobs = platformJobMapper.selectList (new MPJLambdaWrapper<PlatformJob>()


                        .select(PlatformJob::getTotalNum)


                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                        .eq(PlatformJob::getOrigin,Constants.ONE)


                        .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()


                                , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()


                                , Constants.PlatformJobStatus.LEAVED.getKey())


                        .apply("to_days(done_date) = to_days(now())") );


                if(jobs!=null){


                    for(PlatformJob j :jobs){


                        num =num.add(Constants.formatBigdecimal(j.getTotalNum()));


                    }


                }


            }else{


                List<PlatformJob> jobs = platformJobMapper.selectList (new MPJLambdaWrapper<PlatformJob>()


                        .select(PlatformJob::getTotalNum)


                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                        .eq(PlatformJob::getPlatformGroupId,platformGroupId)


                        .apply("to_days(done_date) = to_days(now())")


                        .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()


                                , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()


                                , Constants.PlatformJobStatus.LEAVED.getKey()) );


                if(jobs!=null){


                    for(PlatformJob j :jobs){


                        num = num.add(Constants.formatBigdecimal(j.getTotalNum()));


                    }


                }


            }


            data.setNum(num);


            list.add(data);


        }


        return list;




    }


    /**


     * 获取区域树形结构数据


     * @return


     */


    @Override


    public BoardStockListVO stockList(){


        BoardStockListVO data = new BoardStockListVO();


        double toatalNum = 1d;


        BigDecimal num = new BigDecimal(0);


@@ -90,17 +161,16 @@


        try {


            toatalNum =Double.parseDouble(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_TOTAL_STOCK_NUM).getCode()) ;


        }catch (Exception e){




        }


        WmsBaseResponse<WmsInventoryDataResponse> response =  wmsService.getInventoryList();


        if(response!=null && response.getData()!=null && response.getData().size()>=0){


        WmsBaseResponse<WmsBaseDataResponse> response =  wmsService.getInventoryList();


        if(response!=null && response.getData()!=null && response.getData().size()>0){


            List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();


            if(t!=null &&t.size()>0){


                for(WmsInventoryJsonResponse j :t){


                    num = num.add (Constants.formatBigdecimal( j.getQty()));


                    GeneralVO d = new GeneralVO();


                    d.setNum(Constants.formatBigdecimal(j.getQty()));


                    d.setName(j.getItem_name());


                    d.setName(j.getItemName());


                    list.add(d);


                }


            }


@@ -111,7 +181,7 @@


            toatalNum =1;


        }


        data.setTotalNum(new BigDecimal(toatalNum));


        data.setUseRate(data.getTotalNum().divide(data.getNum(),2,BigDecimal.ROUND_UP));


        data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_HALF_UP));


        return data;




    }


@@ -599,6 +669,7 @@


        List<PlatformJob>  dataList = platformJobMapper.selectJoinList(PlatformJob.class,


                new MPJLambdaWrapper<PlatformJob>()


                        .selectAs(PlatformJob::getId,PlatformJob::getId)


                        .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate)


                        .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


//                        .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)


@@ -609,7 +680,7 @@


            TransportMeasureVO data = new TransportMeasureVO();


            data.setPlanDate(date);


            data.setPlanTimes(0);


            data.setPlanTaskNum(new BigDecimal(random.nextInt(0)));


            data.setPlanTaskNum(new BigDecimal( 0));


            data.setFinishTaskNum(new BigDecimal(0));


            for(PlatformJob job :dataList){


                if(queryType == 2){


@@ -658,7 +729,11 @@


                        .selectAll(PlatformJob.class)


                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                        .eq(PlatformJob::getCarCodeFront,param.getCarCode())


                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())


                        .in(PlatformJob::getStatus,


                                Constants.PlatformJobStatus.DONE.getKey(),


                                Constants.PlatformJobStatus.LEAVED.getKey(),


                                Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),


                                Constants.PlatformJobStatus.CALLED.getKey())


                        .last("limit 1"));


        if(job!=null){


            List<PlatformLog>  logList = platformLogMapper.selectJoinList(PlatformLog.class,


@@ -698,7 +773,7 @@


                                .orderByDesc(PlatformLog::getCreateDate));


                if(detailList!=null){


                    for(PlatformWmsDetail d : detailList){


                        if(!isNotExistIocode(d.getIocode(),data.getContractList())){


                        if(isExistIocode(d.getIocode(),data.getContractList())){


                                continue;


                        }


                        tt = new CarsContractVO();


@@ -733,7 +808,7 @@


        return list;


    }




    private boolean isNotExistIocode(String iocode, List<CarsContractVO> detailList) {


    private boolean isExistIocode(String iocode, List<CarsContractVO> detailList) {


        if(detailList!=null){


            for(CarsContractVO d :detailList){


                if(StringUtils.equals(d.getIoCode(),iocode)){


@@ -776,44 +851,50 @@


        Date lastYear = DateUtil.addYearToDate(year,-1);//去年




        List<PlatformJob>  monthNum = platformJobMapper.selectJoinList(PlatformJob.class,


                new MPJLambdaWrapper<PlatformJob>()


                .selectAs(PlatformJob::getId,PlatformJob::getId)


                .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


//                .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)


                    new MPJLambdaWrapper<PlatformJob>()


                        .selectAs(PlatformJob::getId,PlatformJob::getId)


                            .select(PlatformJob::getType,PlatformJob::getType)


                        .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


                        .select(PlatformJob::getStatus,PlatformJob::getStatus)


                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)


//                        .in(PlatformJob::getType,Constants.ONE,Constants.THREE)


                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())


                        .apply("year(create_date) = year("+DateUtil.getPlusTime2(month)+") and month(create_date) = month("+DateUtil.getPlusTime2(month)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(month)));


                        .apply("year(done_date) = year('"+DateUtil.getPlusTime2(month)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(month)+"') "));


        List<PlatformJob>  monthLastNum = platformJobMapper.selectJoinList(PlatformJob.class,


                new MPJLambdaWrapper<PlatformJob>()


                        .selectAs(PlatformJob::getId,PlatformJob::getId)


                        .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


                        .select(PlatformJob::getType,PlatformJob::getType)


                        .select(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)


                        .in(PlatformJob::getType,Constants.ONE,Constants.THREE)


                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())


                        .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastMonth)+") and month(create_date) = month("+DateUtil.getPlusTime2(lastMonth)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastMonth)));


                        .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastMonth)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(lastMonth)+"') and  done_date<= '"


                                +DateUtil.getPlusTime2(lastMonth)+"'"));


        List<PlatformJob>  yearNum = platformJobMapper.selectJoinList(PlatformJob.class,


                new MPJLambdaWrapper<PlatformJob>()


                        .selectAs(PlatformJob::getId,PlatformJob::getId)


                        .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


                        .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)


//                        .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)


                        .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


                        .select(PlatformJob::getStatus,PlatformJob::getStatus)


                        .select(PlatformJob::getType,PlatformJob::getType)


//                        .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)


                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                        .in(PlatformJob::getType,Constants.ONE,Constants.THREE)


                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())


                        .apply("year(create_date) = year("+DateUtil.getPlusTime2(year)+")   and to_days(create_date)<= "+DateUtil.getPlusTime2(year)));


                        .apply("year(done_date) = year('"+DateUtil.getPlusTime2(year)+"')   and done_date<= '"+DateUtil.getPlusTime2(year)+"'"));


        List<PlatformJob> yearLastNum = platformJobMapper.selectJoinList(PlatformJob.class,


                new MPJLambdaWrapper<PlatformJob>()


                        .selectAs(PlatformJob::getId,PlatformJob::getId)


                        .selectAs(PlatformJob::getType,PlatformJob::getId)


                        .select(PlatformJob::getStatus,PlatformJob::getStatus)


                        .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


//                        .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)


                        .in(PlatformJob::getType,Constants.ONE,Constants.THREE)


                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())


                        .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+")  and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));


                        .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastYear)+"')  and done_date<= '"+DateUtil.getPlusTime2(lastYear)+"'"));




        data.setMonthOutTotal(getSumTotalByList(monthNum,0,null));//本月出库量


        data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//上有出库量


        data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//上月出库量


        data.setYearOutTotal(getSumTotalByList(yearNum,null,null)  );//本年出库量


        data.setYearLastOutTotal(getSumTotalByList(yearLastNum,null,null) );//去年出库量


        data.setMonthOutTimes(monthNum!=null?monthNum.size():0);


@@ -829,19 +910,30 @@


//                        .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)


                        .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())


                        .apply(" and to_days(create_date) <to_days(now())"));


                        .apply("   to_days(create_date) <to_days(now())"));




        //==========今天出入库任务


        List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,


        //==========今天出入库完成量


        List<PlatformJob> currentDoneNum = platformJobMapper.selectJoinList(PlatformJob.class,


                new MPJLambdaWrapper<PlatformJob>()


                        .selectAs(PlatformJob::getId,PlatformJob::getId)


                        .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)


                        .selectAs(PlatformJob::getType,PlatformJob::getType)


                        .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)


                        .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


//                        .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)


                        .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())


                        .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+")  and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));


                        .apply(" to_days(done_date) = to_days(now())"));


        //==========今天下发出入库任务----


        List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,


                new MPJLambdaWrapper<PlatformJob>()


                        .selectAs(PlatformJob::getId,PlatformJob::getId)


                        .selectAs(PlatformJob::getType,PlatformJob::getType)


                        .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)


                        .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)


//                        .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)


                        .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())


                        .apply(" to_days(create_date) = to_days(now())"));




        BigDecimal beforeOutNum = (getSumTotalByList(beforeJobNum,0,null));//今天之前未完成出库任务


        BigDecimal currentOutNum = (getSumTotalByList(currentNum,0,null));//今天下发出库任务


@@ -849,12 +941,12 @@


        BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//今天下发入库任务


        data.setCurrentInNum(beforeInNum.add(currentInNum));//当前入库总任务成量


        data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//当前出库总任务成量


        data.setCurrentInDoneNum(getSumTotalByList(currentNum,0,1));//今日完成量


        data.setCurrentOutDoneNum(getSumTotalByList(currentNum,1,1));//今日完成量


        data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,1,1));//今日完成量


        data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,0,1));//今日完成量




        //------------今日出入库效率----------------


        BigDecimal outHours = getTotalDoneTimes(currentNum,0);//


        BigDecimal inHours = getTotalDoneTimes(currentNum,1);//


        BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);//


        BigDecimal inHours = getTotalDoneTimes(currentDoneNum,1);//


        if(outHours.compareTo(new BigDecimal(0))>0){


            data.setTodayOutRate(data.getCurrentOutDoneNum().divide(outHours,2));//当前入库总任务成量


        }


@@ -862,15 +954,15 @@


            data.setTodayInRate(data.getCurrentInDoneNum().divide(inHours,2));//当前入库总任务成量


        }


        //------------本月出入库效率----------------


        BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());


//        BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());


        BigDecimal inMonthNum = getSumTotalByList(monthNum,1,null).add(data.getCurrentInDoneNum());


        BigDecimal outYearHours = getTotalDoneTimes(yearNum,0).add(outHours);//


        BigDecimal inYearHours = getTotalDoneTimes(yearNum,1).add(inHours);//


        if(outYearHours.compareTo(new BigDecimal(0))>0){


            data.setMonthOutRate(outMonthNum.divide(outYearHours,2));//本月入库效率


        BigDecimal outMonthHours = getTotalDoneTimes(monthNum,0).add(outHours);//


        BigDecimal inMonthHours = getTotalDoneTimes(monthNum,1).add(inHours);//


        if(outMonthHours.compareTo(new BigDecimal(0))>0){


            data.setMonthOutRate(data.getMonthOutTotal().divide(outMonthHours,0,BigDecimal.ROUND_HALF_UP));//本月入库效率


        }


        if(inYearHours.compareTo(new BigDecimal(0))>0){


            data.setMonthInRate(inMonthNum.divide(inYearHours,2));//本月入库效率


        if(inMonthHours.compareTo(new BigDecimal(0))>0){


            data.setMonthInRate(inMonthNum.divide(inMonthHours,0,BigDecimal.ROUND_HALF_UP));//本月入库效率


        }


        return data;


    }


@@ -944,31 +1036,43 @@


//            if(Constants.formatBigdecimal(job.getIoQty()).compareTo(new BigDecimal(0)) >0){


//                r.add( job.getIoQty());


//            }else{


                r.add(Constants.formatBigdecimal(job.getTotalNum()));


            r =  r.add(Constants.formatBigdecimal(job.getTotalNum()));


//            }


        }


        return Constants.formatBigdecimal0Float(r);


    }




    @Override


    public     List<CarsAlarmResultListResponse> carsEventList(){




        if(HKCarOpenService.HK_CARS_LIST == null){


            HKCarOpenService.HK_CARS_LIST =   HKCarOpenService.getAllCarsDetais();


        }


        return  HKCarOpenService.getAlarmEvemtList(  HKCarOpenService.HK_CARS_LIST,new Date());


    }


    @Override


    public     BoardCarsListVO platformJobCarsList(){


        BoardCarsListVO data = new BoardCarsListVO();


        List<CarsDeviceDetaisResponse> detaisResponses = HKCarOpenService.getAllCarsDetais();


        data.setCarsList(detaisResponses);


         data.setCarsList(detaisResponses);


        if(data.getCarsList()!=null && data.getCarsList().size()>0){


            List<String> codes = new ArrayList<>();


            //设备状态 0：离线；1：在线；2：休眠


            int online = 0;


            for(CarsDeviceDetaisResponse model:detaisResponses){


                if(Constants.equalsInteger(model.getStatus(),Constants.ONE) ||Constants.equalsInteger(model.getStatus(),Constants.TWO)){


                   //如果是在线或者休眠，查询在途还是空闲


                if(Constants.equalsInteger(model.getStatus(),Constants.ONE)


                        ||Constants.equalsInteger(model.getStatus(),Constants.TWO)){


                   //如果是在线或者休眠，查询在途还是空闲ty


                    codes.add(model.getPlateNum());


                    model.setJobStatus(Constants.ZERO);


                }else


                    model.setJobStatus(Constants.TWO);


                    data.setOfflineNum(data.getOfflineNum()+1);


                }


            if(codes.size()>0){


                //状态 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号  12取消（WMS）


                long busyNum = platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()


                List<PlatformJob> busyNum = platformJobMapper.selectList(new QueryWrapper<PlatformJob>() .lambda()


                                .select(PlatformJob::getCarCodeFront)


                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                        .in(PlatformJob::getCarCodeFront,codes)


                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()


@@ -980,8 +1084,21 @@


                                ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()


                                ,Constants.PlatformJobStatus.EXCEPTION.getKey())


                        .groupBy(PlatformJob::getCarCodeFront));


                data.setBusyNum((int)busyNum);//在途有任务数量


                data.setBusyNum( busyNum!=null ?busyNum.size():0);//在途有任务数量


                data.setIdleNum(codes.size() -data.getBusyNum());//无任务空闲数量


                HKCarOpenService.HK_CARS_LIST = detaisResponses;


//                data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));


                if(busyNum != null){


                  FLAG:  for(CarsDeviceDetaisResponse model:detaisResponses){


                        for(PlatformJob job : busyNum){


                            if(StringUtils.equals(job.getCarCodeFront(),model.getPlateNum())){


                                model.setJobStatus(Constants.ONE);


                                continue FLAG;


                            }


                        }


                    }




                }


            }


        }




@@ -1269,7 +1386,8 @@


        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 ){


        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")));


            }