From e1310d24b502fea752afb403b080aa4eda4046b0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十一月 2024 17:40:34 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java |  821 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 788 insertions(+), 33 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index b88eca5..05fef7f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2,36 +2,40 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
 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.param.BaseListPageResponse;
 import com.doumee.core.haikang.model.param.BaseResponse;
 import com.doumee.core.haikang.model.param.BaseListPageRequest;
-import com.doumee.core.haikang.model.param.request.SensorStatusListRequest;
-import com.doumee.core.haikang.model.param.respose.PageCameraInfoResponse;
-import com.doumee.core.haikang.model.param.respose.PageFireChannelInfoResponse;
-import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
-import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
+import com.doumee.core.haikang.model.param.request.*;
+import com.doumee.core.haikang.model.param.respose.*;
 import com.doumee.core.haikang.service.HKService;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.PlatformJobMapper;
-import com.doumee.dao.business.PlatformLogMapper;
-import com.doumee.dao.business.PlatformMapper;
-import com.doumee.dao.business.model.Platform;
-import com.doumee.dao.business.model.PlatformJob;
-import com.doumee.dao.web.response.platformReport.CarmeraListVO;
-import com.doumee.dao.web.response.platformReport.OnSitDispatchBoardVO;
-import com.doumee.dao.web.response.platformReport.RegionTreeVO;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.VisitsJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
+import com.doumee.dao.web.response.platformReport.*;
+import com.doumee.service.business.impl.PlatformJobServiceImpl;
+import com.doumee.service.business.impl.VisitsServiceImpl;
 import com.doumee.service.business.third.BoardService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -45,9 +49,23 @@
     @Autowired
     private PlatformLogMapper platformLogMapper;
     @Autowired
+    private PlatformWaterGasMapper platformWaterGasMapper;
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+    @Autowired
+    private PlatformWarnEventMapper platformWarnEventMapper;
+    @Autowired
     private PlatformJobMapper platformJobMapper;
     @Autowired
+    private PlatformWmsDetailMapper platformWmsDetailMapper;
+    @Autowired
     private PlatformMapper platformMapper;
+    @Autowired
+    private VisitsJoinMapper visitsJoinMapper;
+    @Autowired
+    private RetentionMapper retentionMapper;
+    @Autowired
+    private PlatformGroupMapper platformGroupMapper;
     /**
      * 鑾峰彇鍖哄煙鏍戝舰缁撴瀯鏁版嵁
      * @return
@@ -87,11 +105,13 @@
         return  data;
     }
     private void initReginCameralList(List<PageRegionInfoResponse> allList,String name) {
-        List<CarmeraListVO> carmeraListVOList = cameraList(null);
+        CarmeraListVO re = new CarmeraListVO();
+        re.setName(name);
+        List<CarmeraListVO> carmeraListVOList = cameraList(re);
         if(carmeraListVOList!=null && carmeraListVOList.size()>0){
             for(PageRegionInfoResponse p : allList){
                 for(CarmeraListVO c : carmeraListVOList){
-                    if(StringUtils.equals(p.getRegionIndexCode(),c.getReginCode())
+                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
                             && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
                         if(p.getCarmeraList()==null){
                             p.setCarmeraList(new ArrayList<>());
@@ -170,13 +190,15 @@
 
         List<CarmeraListVO> data = new ArrayList<>();
         for(PageCameraInfoResponse p : allList){
-            CarmeraListVO t = new CarmeraListVO();
-            t.setIndexCode(p.getCameraIndexCode());
-            t.setReginCode(p.getRegionIndexCode());
-            t.setName(p.getCameraName());
-            t.setStatus(p.getStatus());
-            t.setStatusName(p.getStatusName());
-            data.add(t);
+            if(StringUtils.isBlank(req.getName()) ||StringUtils.contains(p.getCameraName(),req.getName())){
+                CarmeraListVO t = new CarmeraListVO();
+                t.setIndexCode(p.getCameraIndexCode());
+                t.setReginCode(p.getRegionIndexCode());
+                t.setName(p.getCameraName());
+                t.setStatus(p.getStatus());
+                t.setStatusName(p.getStatusName());
+                data.add(t);
+            }
         }
         return  data;
     }
@@ -242,6 +264,684 @@
         return  allList;
     }
     @Override
+    public  List<PlatformGroupFinishVO> platformGroupFinish(){
+        List<PlatformGroupFinishVO> data = new ArrayList<>();
+        List<PlatformGroup> groups = platformGroupMapper.selectJoinList(PlatformGroup.class, new MPJLambdaWrapper<PlatformGroup>()
+                .select("(select sum(a.TOTAL_NUM) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0   and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)
+                .selectAll(PlatformGroup.class)
+                .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+        );
+        if(groups!=null && groups.size()>0){
+            List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
+                    .selectSum( PlatformWmsDetail::getIoQty)
+                    .selectAs(PlatformGroup::getId, PlatformWmsDetail::getGroupId)
+                    .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
+                    .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
+                    .eq(PlatformJob::getIsdeleted, Constants.ZERO)
+                    .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
+                            , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+                            , Constants.PlatformJobStatus.LEAVED.getKey())
+                    .apply("to_days(t1.create_date) = to_days(now())")
+                    .groupBy(PlatformJob::getPlatformGroupId)
+            );
+            for(PlatformGroup d : groups){
+                PlatformGroupFinishVO t = new PlatformGroupFinishVO();
+                if(jobList!=null){
+                    for(PlatformWmsDetail dd : jobList){
+                      if(Constants.equalsInteger(dd.getGroupId(),d.getId())){
+                          d.setTotalNum(dd.getIoQty());
+                      }
+                    }
+                }
+                t.setFinishData(Constants.formatBigdecimal(d.getTotalNum()).intValue()+Constants.formatBigdecimal(d.getOrtherTotalNum()).intValue());
+                t.setPlatformGroupName(d.getName());
+                data.add(t);
+            }
+        }
+
+        return data;
+    }
+
+    @Override
+    public  CarWorkSituationVO carWorkSituation(int limit){
+        CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
+        List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+                .orderByDesc(PlatformLog::getCreateDate)
+                .last(" limit "+limit)
+        );
+        carWorkSituationVO.setPlatformLogList(platformLogList);
+        return carWorkSituationVO;
+    }
+    @Override
+    public  List<SecurityDeviceDataVO> securityDeviceData(){
+        List<SecurityDeviceDataVO> list = new ArrayList<>();
+        SecureDevStatusTotalRequest request =new SecureDevStatusTotalRequest();
+        request.setIncludeBool("");
+        request.setRegionIds(new String[]{});
+        BaseResponse<List<SecureDevStatusListResponse>> result = HKService.getSecureDevStatusList(request) ;
+        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+            List<SecureDevStatusListResponse> rlist = result.getData();
+            for(SecureDevStatusListResponse r :rlist){
+                SecurityDeviceDataVO data = new SecurityDeviceDataVO();
+                data.setDeviceType(r.getDevTypeName());
+                data.setOnlineNum(r.getOnlineCount());
+                data.setOfflineDeviceNum(r.getOfflineCount());
+                data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
+                list.add(data);
+            }
+        }
+        /*
+        Random random = new Random();
+        for (int i = 1; i <= 3; i++) {
+            SecurityDeviceDataVO data = new SecurityDeviceDataVO();
+            data.setDeviceType("璁惧绫诲瀷_"+i);
+            data.setOnlineNum(random.nextInt(10));
+            data.setOfflineDeviceNum(random.nextInt(10));
+            data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
+            list.add(data);
+        }*/
+        return list;
+    }
+    @Override
+    public  WaningEventDataVO warningEventData(Integer type){
+        WaningEventDataVO lastResult = new WaningEventDataVO();
+        List<WaningEventDataListVO> list = new ArrayList<>();
+        RuleEventSearchRequest request = new RuleEventSearchRequest();
+        request.setPageNo(1);
+        request.setPageSize(10);
+        request.setFiledOptions(new ArrayList<>());
+        request.setSorts(new ArrayList<>());
+        RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
+        file.setFieldName("event_type");
+        file.setFieldValue("131588");//瀹夐槻鍛婅
+        file.setType("in");
+        request.getFiledOptions().add(file);
+        SortRequest sort = new SortRequest();
+        sort.setSortField("happen_time");
+        sort.setSortType("desc");
+        request.getSorts().add(sort);
+        BaseResponse<BaseListPageResponse< RuleEventSearchDataResponse>> result = HKService.ruleEventSearch(request);
+        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+            List<RuleEventSearchDataResponse> rlist = result.getData().getList();
+            lastResult.setTotal(result.getData().getTotal());
+            if(rlist!=null){
+                String privateIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PRIVATE_DOMAIN).getCode();
+                String publicIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PUBLIC_DOMAIN).getCode();
+                for(RuleEventSearchDataResponse r :rlist){
+                    WaningEventDataListVO data = new WaningEventDataListVO();
+                    data.setAddr(r.getSrc_name());
+                    data.setImg(r.getImage_url());
+                    if(data.getImg()!=null){
+                        data.setImg(data.getImg().replace(privateIp,publicIp));
+                    }
+                    data.setTitle(r.getEvent_type_name());
+                    data.setCreateDate(DateUtil.getPlusTime(DateUtil.getISO8601DateByStr(r.getHappen_time())));
+//                data.setContent(r.get);
+                    list.add(data);
+                }
+            }
+
+        }
+        lastResult.setList(list);
+        return lastResult;
+    }
+    @Override
+    public  String getCarmeraPreviemUrl(CarmeraListVO param){
+        CameraPreviewURLsRequest request = new CameraPreviewURLsRequest();
+        request.setCameraIndexCode(param.getIndexCode());
+        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;
+    }
+    @Override
+    public   List<EnergyDataVO>  loadEnergyCurve(){
+        List<EnergyDataVO> loadCurveList = new ArrayList<>();
+        try {
+            BaseResponse<List<EnergyTodayLoadDataResponse>>  response = HKService.energyTodayLoadData();
+            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null ){
+                for (EnergyTodayLoadDataResponse model :response.getData()) {
+                    EnergyDataVO data = new EnergyDataVO();
+                    data.setTimeData(model.getName());
+                    data.setEnergy(new BigDecimal(model.getName()));
+                    loadCurveList.add(data);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return loadCurveList;
+    }
+    @Override
+    public     List<OilDataVO> energyLastMonthOilSort(){
+        List<OilDataVO> oilDataVOList = new ArrayList<>();
+        //涓婃湀娌硅��
+       List<PlatformWaterGas> list =  platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
+                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+                .eq(PlatformWaterGas::getType,Constants.TWO)
+                .apply("DATE_FORMAT(time_info, '%Y-%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')")
+                .orderByDesc(PlatformWaterGas::getNum)
+                .last("limit 30" )
+        );
+        for (PlatformWaterGas model :list) {
+            OilDataVO oilDataVO = new OilDataVO();
+            oilDataVO.setCarNo(model.getCarCode());
+            oilDataVO.setQuantity(model.getNum());
+            oilDataVOList.add(oilDataVO);
+        }
+        return oilDataVOList;
+    }
+
+    /**
+     * 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
+     * @return
+     */
+    @Override
+    public  EnergyBoardVO centerEnergyData(){
+        EnergyBoardVO data = new EnergyBoardVO();
+        Random random = new Random();
+       PlatformWaterGas smoke=  platformWaterGasMapper.selectOne(new QueryWrapper<PlatformWaterGas>()
+                 .select("sum(num) as num")
+                .lambda()
+                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+                .eq(PlatformWaterGas::getType,Constants.THREE)
+                .apply("year(time_info) = year(now())")
+                .last("limit 1 " ));
+
+        data.setSmokeBoxTotal(0);
+        if(smoke!=null){
+            data.setSmokeBoxTotal(Constants.formatBigdecimal(smoke.getNum()).intValue());//褰撳勾鐑熺鏁�
+        }
+        BigDecimal carbonGas = new BigDecimal(0);//鏈湀鐢ㄦ皵
+        BigDecimal carbonWater = new BigDecimal(0);//鏈湀鐢ㄦ按
+        BigDecimal carbonElec = new BigDecimal(0);//鐢ㄧ數
+
+        data.setTodayElectricity(getDefaultData());//浠婃棩鐢ㄧ數
+        data.setElectricityQuantity(getDefaultData());//涓婃湀鐢ㄧ數
+        data.setWaterQuantity(getDefaultData());//涓婃湀鐢ㄦ按
+        data.setGasQuantity(getDefaultData());//涓婃湀鐢ㄦ皵
+        data.setMonthElectricity(getDefaultData());//鏈湀鐢ㄧ數
+        data.setYesterdayElectricity(getDefaultData());//鏄ㄦ棩鐢ㄧ數
+        getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堟暟鎹�
+        carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
+        getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堟暟鎹�
+        String firstDate = DateUtil.getFirstDayOfThisMonth() +" 00:00:00";
+        Date month0 = DateUtil.getDateFromString(firstDate);
+        Date month1 = DateUtil.increaseMonth(month0,-1);//涓婃湀
+        Date month2 = DateUtil.increaseMonth(month0,-2);//涓婁笂鏈�
+        Date month3 = DateUtil.increaseMonth(month0,-12);//鍘诲勾鍚屾湀
+
+        List<PlatformWaterGas> list =  platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
+                .lambda()
+                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+                .in(PlatformWaterGas::getType,Constants.ZERO,Constants.ONE)
+                .in(PlatformWaterGas::getTimeInfo,month0,month1,month3,month2)
+        );
+
+        if(list!=null){
+            //绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补
+            for(PlatformWaterGas model : list){
+                if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+                    if(model.getTimeInfo().getTime() == month0.getTime()){
+                        carbonGas = Constants.formatBigdecimal(model.getNum());
+                    }
+                    if(model.getTimeInfo().getTime() == month1.getTime()){
+                        data.getGasQuantity().setTotalNum(Constants.formatBigdecimal(model.getNum()) );
+                        data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
+                    }
+                    if(model.getTimeInfo().getTime() == month2.getTime()){
+                        data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+                    }
+                    if(model.getTimeInfo().getTime() == month3.getTime()){
+                        data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+                    }
+
+                }else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
+                    if(model.getTimeInfo().getTime() == month0.getTime()){
+                        carbonWater = Constants.formatBigdecimal(model.getNum());
+                    }
+                    if(model.getTimeInfo().getTime() == month1.getTime()){
+                        data.getWaterQuantity().setTotalNum(Constants.formatBigdecimal(model.getNum()) );
+                        data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
+                    }
+                    if(model.getTimeInfo().getTime() == month2.getTime()){
+                        data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+                    }
+                    if(model.getTimeInfo().getTime() == month3.getTime()){
+                        data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+                    }
+                }
+            }
+        }
+        if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
+            //璁$畻鐢ㄦ皵鍚屾瘮鐜瘮
+            data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
+            data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
+        }
+        if( data.getWaterQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
+            // //璁$畻鐢ㄦ按鍚屾瘮鐜瘮
+            data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
+            data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
+        }
+
+        /*璁$畻纰虫帓閲忥紝浠ヤ笅涓変釜鍥犵礌涔嬪拰
+        1)鐢ㄧ數鐨勪簩姘у寲纰虫帓鏀鹃噺(kg)=鑰楃數閲�(kWh)x0.785锛�
+        2) 澶╃劧姘斾簩姘у寲纰虫帓鏀鹃噺(kg)=澶╃劧姘斾娇鐢ㄩ噺(m3)脳0.19锛�
+        3) 鑷潵姘翠簩姘у寲纰虫帓鏀鹃噺(kg)=鑷潵姘翠娇鐢ㄩ噺(m3)脳0.91锛�*/
+        data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
+                .add(carbonGas.multiply(new BigDecimal(0.19)))
+                .add(carbonWater.multiply(new BigDecimal(0.91)))));
+        return data;
+
+    }
+
+    /**
+     * 閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堟暟鎹�
+     * @param data
+     */
+    private void getMonthElectricityData(EnergyModelDataVO data) {
+        BaseResponse<MonthDataByMeterTypeResponse> response = HKService.getCurrentMonthDataByMeterType("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"));
+           data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
+        }
+    }
+
+    /**
+     * 閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堟暟鎹�
+     * @param data
+     */
+    private void getLastMonthElectricityData(EnergyModelDataVO data) {
+        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"));
+           data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
+        }
+    }
+
+    private EnergyModelDataVO getDefaultData() {
+        EnergyModelDataVO data = new EnergyModelDataVO();
+        data.setTotal("0");
+        data.setSameRate("0");
+        data.setRingRate("0");
+        data.setTotalNum(new BigDecimal(0));
+        data.setSameNum(new BigDecimal(0));
+        data.setRingNum(new BigDecimal(0));
+        return data;
+    }
+
+    /**
+     * 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
+     * @return
+     */
+    @Override
+    public   RegionEnergyListResponse energyRegionData(){
+        RegionEnergyListResponse data = null;
+        BaseResponse<RegionEnergyListResponse> response = HKService.regionEnergyList("1");
+        if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+            data = response.getData();
+        }
+        if(data == null){
+            data = new RegionEnergyListResponse();
+            data.setSecondRegionDataList(new ArrayList<>());
+            data.setRootValue("0");
+            data.setSamePercent("0");
+            data.setRingPercent("0");
+            data.setSecondRegionDataList(new ArrayList<>());
+        }
+        return data;
+
+    }
+    /**
+     * 杩�12涓按鐢垫皵娌硅�楁暟鎹粺璁�
+     * @param type
+     * @return
+     */
+    @Override
+    public   List<EnergyDataVO> energyDataList(Integer type){
+        List<EnergyDataVO> energyDataVOList = new ArrayList<>();
+        List<OilDataVO> oilDataVOList = new ArrayList<>();
+        Date lastMonth = DateUtil.increaseMonth(new Date(),-11);
+        if(type >=0 && type <=2){
+            //鐢ㄦ按鐢ㄧ數鐢ㄦ皵
+            List<PlatformWaterGas> list =  platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
+                            .select("DATE_FORMAT(TIME_INFO,'yyyy-MM') as time_info_str,sum(num) as num")
+                    .lambda()
+                    .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+                    .eq(PlatformWaterGas::getType,type)
+                    .apply("time_info BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND CURDATE()")//杩�12涓湀
+                    .last(" groupby DATE_FORMAT(TIME_INFO,'yyyy-MM')")
+            );
+            for (int i = 0; i < 12; i++) {
+                Date tempDate = DateUtil.increaseMonth(lastMonth,i);
+                EnergyDataVO data = new EnergyDataVO();
+                data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
+                data.setEnergy(new BigDecimal(0));
+                if(list!=null){
+                    for(PlatformWaterGas m : list){
+                        if(StringUtils.equals(m.getTimeInfoStr(),data.getTimeData())){
+                            data.setEnergy(Constants.formatBigdecimal(m.getNum()));
+                        }
+                    }
+                }
+                energyDataVOList.add(data);
+            }
+        }else{
+            for (int i = 0; i < 12; i++) {
+                Date tempDate = DateUtil.increaseMonth(lastMonth,i);
+                EnergyDataVO data = new EnergyDataVO();
+                data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"鏈�"));
+                data.setEnergy(new BigDecimal(0));
+                energyDataVOList.add(data);
+            }
+            //濡傛灉鏄敤鐢垫暟鎹�
+            EnergyTrendRequest param = new EnergyTrendRequest();
+            param.setDate(DateUtil.getFomartDate(new Date(),"yyyy"));//骞翠唤
+            param.setMeterType(1);
+            param.setNodeType(2);
+            param.setNodeId("root000000");
+            param.setPeriodType("year");
+            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 < 12; i++) {
+                    if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){
+                        //鍙栫浉搴旂殑鍙傛暟鍊�
+                        energyDataVOList.get(0).setEnergy(new BigDecimal(response.getData().getYvalues().get(0).getValue()[i]));
+                    }
+                }
+
+            }
+        }
+        return energyDataVOList;
+    }
+    @Override
+    public  VisitDataVO visitSecurityData(){
+        //寰呰闂�佸凡鐧昏銆佸凡绂诲紑
+
+        VisitDataVO result = new VisitDataVO();
+        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+                .eq(Visits::getIsdeleted,Constants.ZERO)
+                .in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
+        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+                .eq(Visits::getIsdeleted,Constants.ZERO)
+                .in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁�
+        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+                .eq(Visits::getIsdeleted,Constants.ZERO)
+                .in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂�
+        PageWrap<Visits> pageWrap = new PageWrap<>();
+        pageWrap.setCapacity(10);
+        pageWrap.setPage(1);
+        pageWrap.setModel(new Visits());
+        pageWrap.getModel().setLevelStatus(Constants.ZERO);
+        pageWrap.getModel().setStatus(Constants.TWO);
+        PageData<Visits> visitsPageData =    VisitsServiceImpl.retentionPageBiz(pageWrap,visitsJoinMapper,systemDictDataBiz);
+        List<VisitRetentionDataVO> list = new ArrayList<>();
+        if(visitsPageData !=null && visitsPageData.getRecords() !=null && visitsPageData.getRecords().size()>0){
+            for (Visits model : visitsPageData.getRecords()) {
+                VisitRetentionDataVO data = new VisitRetentionDataVO();
+                data.setName(model.getName());
+                data.setCompanyName(model.getCompanyName());
+                data.setTimeOutMinute(Constants.formatIntegerNum(model.getTimeOut()));
+                list.add(data);
+            }
+            result.setRetentionNum(visitsPageData.getTotal());
+        }
+        result.setVisitRetentionDataList(list);//璁垮婊炵暀鏁版嵁闆嗗悎
+        return result;
+
+    }
+    @Override
+    public  SecurityBoardVO centerSecurityData(){
+
+
+        SecurityBoardVO data = new SecurityBoardVO();
+        getParkingCarsNum(data);//鑾峰彇杞︿綅鏁版嵁
+        List<Retention> retentionList = retentionMapper.selectJoinList(Retention.class,
+                new MPJLambdaWrapper<Retention>()
+                        .selectAll(Retention.class)
+                        .selectAs(Company::getType,Retention::getCompanyType)
+                        .leftJoin(Company.class,Company::getId,Retention::getCompanyId)
+        );
+
+        //浠婃棩鍦ㄥ洯浜烘暟
+        data.setInParkTotal(
+                (int) retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
+        );
+        //鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
+        data.setInternalTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+        );
+        //鍦ㄥ洯璁垮鏁伴噺
+        data.setVisitTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
+        );
+        //鍦ㄥ洯杞﹁締
+        data.setInternalCarTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
+        );
+        //鍦ㄥ洯鐩稿叧鏂硅溅杈�
+        data.setRelatedCarTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.relation)).count()
+        );
+        //鍐呴儴杞﹁締
+        data.setInternalCarTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.internal)).count()
+        );
+        //鏉ヨ杞﹁締
+        data.setVisitCarTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.visitor)).count()
+        );
+        //鑷敱鐗╂祦杞︽暟閲�
+        data.setVisitCarTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.selfTruck)).count()
+        );
+        //甯傚叕鍙稿嵏璐ц溅鏁伴噺
+        data.setInternalJobCarTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.cityComTruck)).count()
+        );
+        //澶栧崗杞︽暟閲�
+        data.setRelatedJobCarTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
+        );
+        return data;
+    }
+
+    private void getParkingCarsNum(SecurityBoardVO data) {
+        try {
+            BaseResponse<ParkingStatisticResponse> response = HKService.getParkingStatistics();
+            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null
+            ||response.getData().getTodayParkingDataDto() == null){
+                 return;
+            }
+            data.setParkingLotTotal(Constants.formatIntegerNum(response.getData().getTodayParkingDataDto().getTotalPlace()));//鎬昏溅浣�
+            data.setFreeParkingLot(Constants.formatIntegerNum(response.getData().getTodayParkingDataDto().getLeftPlace()));//鍓╀綑杞︿綅
+            data.setParkingUseRate(Constants.formatBigdecimal(response.getData().getTodayParkingDataDto().getUseRate()));//杞︿綅浣跨敤鐜�
+        }catch (Exception e){
+
+        }
+    }
+
+    @Override
+    public  List<PlatformWorkDataVO> platformWorkData(){
+
+        List<PlatformWorkDataVO> platformWorkDataVOList = new ArrayList<>();
+        List<Platform> platformList = platformMapper.selectJoinList(Platform.class, new MPJLambdaWrapper<Platform>()
+                .selectAll( Platform.class)
+                .eq(Platform::getIsdeleted, Constants.ZERO)
+                .orderByAsc(Platform::getSortnum)
+        );
+        if(platformList!=null && platformList.size()>0){
+            List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
+                    .selectAll( PlatformJob.class)
+                    .select("( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+"  order by pl.CREATE_DATE desc  limit 1  ) as newStartDate")
+                    .select(" (select sum(ifnull(pl.IO_QTY , 0 ))   from platform_wms_detail pl  where   pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
+                    .apply("to_days(t.create_date) = to_days(now())")
+                    .eq(Platform::getIsdeleted, Constants.ZERO)
+                    .in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() })
+                    .orderByDesc(PlatformJob::getStatus ));
+            //鏈堝彴鐘舵�侊細0=浣滀笟涓紱1=绌洪棽涓紱2=浣滀笟瓒呮椂;3=鍙彿
+            for(Platform model : platformList){
+                PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO();
+                platformDurationVO.setPlatformName(model.getName());
+                platformDurationVO.setPlatformId(model.getId());
+                platformDurationVO.setPlatformSort(model.getSortnum());
+                PlatformJob job = getJobFromListById(model.getId(),jobList);
+                if(job != null){
+                    if(Constants.equalsInteger(job.getType(),Constants.ONE) || Constants.equalsInteger(job.getType(),Constants.THREE)){
+                        platformDurationVO.setWorkType(Constants.ONE);//濡傛灉鏄璐�
+                    }else{
+                        platformDurationVO.setWorkType(Constants.ZERO);//濡傛灉鏄嵏璐�
+                    }
+                    Integer workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+                    Date overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//棰勮瀹屾垚鏃堕棿
+                    platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
+
+                    platformDurationVO.setWorkNum(Constants.formatBigdecimal(job.getWorkNum()).intValue());
+                    platformDurationVO.setCarNo(job.getCarCodeFront());//杞︾墝鍙�
+                    if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.CALLED.getKey() )){
+                        platformDurationVO.setStatus(Constants.THREE); //鍙彿涓�
+                    }else{
+                        platformDurationVO.setStatus(Constants.ZERO); //浣滀笟涓�
+                        platformDurationVO.setWorkTime(PlatformJobServiceImpl.getWorkTime(job,platformLogMapper));//宸插伐浣滄椂闂�
+                        if(overDate.getTime() < System.currentTimeMillis() ){
+                            model.setStatus(Constants.TWO); //浣滀笟宸茶秴鏃�
+                        }
+                    }
+                }else{
+                    platformDurationVO.setStatus(Constants.ONE);//绌洪棽涓�
+                }
+                platformWorkDataVOList.add(platformDurationVO);
+            }
+        }
+        return  platformWorkDataVOList;
+    }
+
+    private PlatformJob getJobFromListById(Integer id, List<PlatformJob> jobList) {
+        if(jobList!=null){
+            for(PlatformJob job :jobList){
+                if(Constants.equalsInteger(job.getPlatformId(),id)){
+                    return  job;
+                }
+            }
+
+        }
+
+        return null;
+    }
+
+    /**
+     *
+     * @param type 鏌ヨ绫诲瀷锛�0=鍏ュ簱锛�1=鍑哄簱
+     * @return
+     */
+    @Override
+    public   List<WorkEfficiencyVO> workEfficiency(Integer type){
+        //浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
+        List<WorkEfficiencyVO> workEfficiencyVOList = new ArrayList<>();
+        List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
+                .selectAll( PlatformJob.class)
+                .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", PlatformJob::getIoQty)
+                .apply("to_days(t.create_date) = to_days(now())")
+                .eq(Platform::getIsdeleted, Constants.ZERO)
+                .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
+                        , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+                        , Constants.PlatformJobStatus.LEAVED.getKey())
+                .in(Constants.equalsInteger(type,Constants.ZERO),PlatformJob::getType,new Integer[]{0,2,4})
+                .in(Constants.equalsInteger(type,Constants.ONE),PlatformJob::getType,new Integer[]{1,3})
+
+        );
+        if(jobList==null || jobList.size()==0){
+            return workEfficiencyVOList;
+        }
+  /*      List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
+                .selectAll( PlatformWmsDetail.class)
+                .selectAs( PlatformJob::getDoneDate,PlatformWmsDetail::getDoneDate)
+                .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
+                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
+                .eq(PlatformJob::getIsdeleted, Constants.ZERO)
+                .in(Constants.equalsInteger(type,Constants.ZERO),PlatformJob::getType,new Integer[]{0,2,4})
+                .in(Constants.equalsInteger(type,Constants.ONE),PlatformJob::getType,new Integer[]{1,3})
+                .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
+                        , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+                        , Constants.PlatformJobStatus.LEAVED.getKey())
+                .apply("to_days(t1.create_date) = to_days(now())")
+        );*/
+        int curtotalNum = 0;
+        Date today =  Utils.Date.getStart(new Date());
+        long curTime=0, lastTime=0;
+        for (int i = 0; i < 8; i++) {
+            lastTime = curTime;//涓婃鐨勬椂闂�
+            int curHour = 8+(i*2);
+            curTime = curHour*60*60*1000 + today.getTime();
+            WorkEfficiencyVO workEfficiencyVO = new WorkEfficiencyVO();
+            workEfficiencyVO.setWorkTime(curHour+":00");
+            workEfficiencyVO.setTotalWorkNum(0);
+            workEfficiencyVO.setWorkNum(0);
+            if(jobList!=null && jobList.size()>0){
+                for(PlatformJob detail : jobList){
+                    if(detail.getDoneDate()!=null && detail.getDoneDate().getTime()<= curTime){
+                        //褰撳墠閲�
+                        if(detail.getDoneDate()!=null && detail.getDoneDate().getTime() > lastTime){
+                            //鍖洪棿鍊� 鍙栧疄杩�2灏忔椂鍐呯殑绱鍊�
+                            workEfficiencyVO.setWorkNum(Constants.formatIntegerNum(workEfficiencyVO.getWorkNum())+Constants.formatBigdecimal(detail.getIoQty()).intValue() +Constants.formatBigdecimal(detail.getTotalNum()).intValue());
+                            //绱Н閲�
+                        }
+                    }
+                }
+                curtotalNum += Constants.formatIntegerNum(workEfficiencyVO.getWorkNum()) ;
+            }
+            workEfficiencyVO.setTotalWorkNum(curtotalNum);//绱鍊�
+            workEfficiencyVOList.add(workEfficiencyVO);
+        }
+        return workEfficiencyVOList;
+    }
+    @Override
+    public List<PlatformDurationVO> platformDuration(){
+        List<PlatformDurationVO> platformDurationList = new ArrayList<>();
+        List<Platform> jobList = platformMapper.selectJoinList(Platform.class, new MPJLambdaWrapper<Platform>()
+                .selectAll( Platform.class)
+                .select(" (select ROUND( SUM(ifnull(pl.PARAM3,0)/60 ) , 2 )   from platform_log pl  where   pl.remark = t.id and to_days(pl.CREATE_DATE) =to_days(now()))",Platform::getWorkCountTime)
+                .eq(Platform::getIsdeleted, Constants.ZERO)
+        );
+        if(jobList!=null){
+            //鎸夊伐浣滄椂闀跨疮璁″�掑簭鎺掑簭
+            Collections.sort(jobList, new Comparator<Platform>() {
+                @Override
+                public int compare(Platform o1, Platform o2) {
+                    return Constants.formatBigdecimal(o2.getWorkCountTime()).intValue() - Constants.formatBigdecimal(o1.getWorkCountTime()).intValue();
+                }
+            });
+            for(Platform model : jobList){
+                PlatformDurationVO data = new PlatformDurationVO();
+                data.setPlatformId(model.getId());
+                data.setPlatformName(model.getName());
+                data.setWorkTotalTime(Constants.formatBigdecimal(model.getWorkCountTime()).intValue());
+                platformDurationList.add(data);
+            }
+        }
+
+        return platformDurationList;
+    }
+    @Override
+    public      List<PlatformWarnEvent> warningList(int limit){
+        List<PlatformWarnEvent> platformLogList = platformWarnEventMapper.selectList(new QueryWrapper<PlatformWarnEvent>().lambda()
+                .eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO)
+                .orderByDesc(PlatformWarnEvent::getCreateDate)
+                .last(" limit "+limit)
+        );
+        return platformLogList;
+    }
+    @Override
     public OnSitDispatchBoardVO getCnddCenterData(){
         OnSitDispatchBoardVO data = new OnSitDispatchBoardVO();
         //鏈堝彴鎬绘暟
@@ -260,7 +960,7 @@
                 .selectAll(PlatformJob.class)
                 .select("count(id)" ,PlatformJob::getCountum)
                 .eq(PlatformJob::getIsdeleted,Constants.ZERO)
-                .apply("to_days(create_data) = to_days(now())" )
+                .apply("to_days(create_date) = to_days(now())" )
                 .groupBy(PlatformJob::getStatus )
         );
         if(jobList!=null){
@@ -268,20 +968,75 @@
             //-------------TODO----------銆愮湅鏉裤�戠埍纭闇�姹�--------------
             //     * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12宸插彇娑�
             for(PlatformJob model : jobList){
-                //棰勭害杞﹁締
-                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
-                ||Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
+                //寰呯‘璁� 锛堥绾﹁溅锛�
+                if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())){
                     data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                 }
-                // 浣滀笟杞﹁締
+                //寰呯鍒帮紙棰勭害杞︼級
+                if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                //绛夊緟鍙彿锛堥绾﹁溅銆佺鍒版暟銆佹帓闃熻溅锛�
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                //鍏ュ洯绛夊緟锛堥绾﹁溅銆佺鍒版暟锛�
+                if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                //宸插彨鍙凤紙棰勭害杞︺�佺鍒版暟銆佸凡鍙彿锛�
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CALLED.getKey()) ){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                // 浣滀笟杞﹁締锛堥绾﹁溅銆佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅锛�
                 if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                // 浣滀笟瀹屾垚锛堥绾﹁溅銆佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅銆佸凡瀹屾垚锛�
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    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.setDoneNum(data.getDoneNum()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                // 杞Щ涓紙棰勭害杞︺�佺鍒版暟銆佹帓闃熻溅锛�
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                // 宸叉巿鏉冪鍥紙棰勭害杞︺�佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅銆佸凡瀹屾垚锛�
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    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.setDoneNum(data.getDoneNum()+Constants.formatIntegerNum(model.getCountum()));
+                }
+                // 宸茬鍥�
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())){
                     data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum()));
                 }
-                //鎺掗槦杞﹁締
-                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
-                        ||Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
-                     data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
+                // 宸茶繃鍙凤紙棰勭害杞︺�佺鍒版暟銆佹帓闃熻溅锛�
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.OVER_NUMBER.getKey())){
+                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
                 }
+                // 宸插彇娑�(棰勭害杞︼級
+                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CANCEL.getKey())){
+                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+                }
+
             }
         }
 

--
Gitblit v1.9.3