From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 1068 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 832 insertions(+), 236 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 23fe63a..ca84e17 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
@@ -14,11 +14,11 @@
 import com.doumee.core.haikang.model.param.respose.*;
 import com.doumee.core.haikang.service.HKCarOpenService;
 import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
-import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
-import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
-import com.doumee.core.tms.model.request.TmsSevenArrivalDetailsRequest;
-import com.doumee.core.tms.model.response.*;
+import com.doumee.dao.web.reqeust.CarsJobAndContractByJobIdDTO;
+import com.doumee.service.business.third.model.request.TmsFacrotyCodeListRequest;
+import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.service.business.third.model.request.TmsOutQtyAndVehicleQtyRequest;
+import com.doumee.service.business.third.model.request.TmsSevenArrivalDetailsRequest;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
@@ -36,8 +36,10 @@
 import com.doumee.service.business.third.BoardService;
 import com.doumee.service.business.third.TmsService;
 import com.doumee.service.business.third.WmsService;
+import com.doumee.service.business.third.model.response.*;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -89,7 +91,10 @@
     private PlatformGroupMapper platformGroupMapper;
     @Autowired
     private TmsService tmsService;
-
+    @Autowired
+    private PlatformDeviceMapper platformDeviceMapper;
+    @Autowired
+    private CategoryMapper categoryMapper;
     @Value("${debug_model}")
     private Boolean isDebug;
     /**
@@ -130,6 +135,7 @@
                         .select(PlatformJob::getTotalNum)
                         .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                         .eq(PlatformJob::getOrigin,Constants.ONE)
+                        .in(PlatformJob::getType,new Integer[]{0,2,4})
                         .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
                                 , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
                                 , Constants.PlatformJobStatus.LEAVED.getKey())
@@ -146,6 +152,7 @@
                 List<PlatformJob> jobs = platformJobMapper.selectList (new MPJLambdaWrapper<PlatformJob>()
                         .select(PlatformJob::getTotalNum)
                         .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                                .apply(" ( origin = 0 or origin is null)  ")
                         .eq(PlatformJob::getPlatformGroupId,platformGroupId)
                         .apply("to_days(done_date) = to_days(now())")
                         .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
@@ -184,7 +191,8 @@
             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()));
+                    //2025骞�4鏈�9鏃�16:46:40 澶勭悊 鍖呭惈鎵樼洏瀛楃溂鐨勬暟鎹� 涓嶈繘琛屽悎璁�
+                    num = num.add (j.getItemName().indexOf("鎵樼洏")<Constants.ZERO?Constants.formatBigdecimal( j.getQty()):BigDecimal.ZERO);
                     GeneralVO d = new GeneralVO();
                     d.setNum(Constants.formatBigdecimal(j.getQty()));
                     d.setName(j.getItemName());
@@ -482,52 +490,86 @@
         }*/
         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.setPageSize(1000);
         request.setFiledOptions(new ArrayList<>());
         request.setSorts(new ArrayList<>());
+        request.setFetchImg(true);
         RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
         file.setFieldName("event_type");
-        file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
+        //瀹夐槻浜嬩欢鍒掑垎鏂瑰紡锛�
+        //閲嶇偣鍖哄煙锛氶噸鐐逛汉鍛�-1644175361銆佸尯鍩熷叆渚�-1644175361銆侀檶鐢熶汉-1644171265銆佽溅杈嗚繚鍋�-1644171265
+        //鍗遍櫓琛屼负锛氫汉鍛樺�掑湴-1644171265銆佹湭甯﹀畨鍏ㄥ附-422000002銆佹娊鐑�-422000000銆佹墦鐢佃瘽-422000001銆佺潯宀�-422400001銆佺宀�-422400000
+        file.setFieldValue("131588,131593,1644171265,422000002,422000000,422000001,422400001,422400000,1644175361,1644175361,1644171265,1644171265");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
         file.setType("in");
         if(type == 1){
-            file.setFieldValue("131588");//瀹夐槻鍛婅
+            file.setFieldValue("131588,1644175361,1644175361,1644171265,1644171265");//瀹夐槻鍛婅 鍖哄煙鍏ヤ镜
         }else  if(type == 2){
-
-            file.setFieldValue("131593");//浜哄憳鍛婅
+            file.setFieldValue("131593,1644171265,422000002,422000000,422000001,422400001,422400000");//浜哄憳鍛婅 鍗遍櫓琛屼负
         }
         request.getFiledOptions().add(file);
+
+        RuleEventFiledOptionsRequest fileLte = new RuleEventFiledOptionsRequest();
+        fileLte.setFieldName("happen_time");
+        fileLte.setFieldValue(DateUtil.formatDate(Utils.Date.getEnd(new Date()),"yyyy-MM-dd HH:mm:ss"));
+        fileLte.setType("lte");
+        request.getFiledOptions().add(fileLte);
+
+        RuleEventFiledOptionsRequest fileGte = new RuleEventFiledOptionsRequest();
+        fileGte.setFieldName("happen_time");
+        fileGte.setFieldValue(DateUtil.formatDate(Utils.Date.getStart(new Date()),"yyyy-MM-dd HH:mm:ss"));
+        fileGte.setType("gte");
+        request.getFiledOptions().add(fileGte);
+
+        RuleEventFiledOptionsRequest fileStatus = new RuleEventFiledOptionsRequest();
+        fileStatus.setFieldName("handle_status");
+        fileStatus.setFieldValue("99");
+        fileStatus.setType("neq");
+        request.getFiledOptions().add(fileStatus);
+
         SortRequest sort = new SortRequest();
         sort.setSortField("happen_time");
         sort.setSortType("desc");
         request.getSorts().add(sort);
+        int total =0;
         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){
+                    try {
+                        if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() < Utils.Date.getStart(new Date()).getTime()){
+                            continue;
+                        }
+                        if(StringUtils.equals(r.getStatus(),"99")){
+                           continue;
+                        }
+                    }catch (Exception e){
+                    }
+                    total ++;
                     WaningEventDataListVO data = new WaningEventDataListVO();
+                    data.setCreateDate(DateUtil.getPlusTime(DateUtil.getISO8601DateByStr(r.getHappen_time())));
                     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.setTotal(total);
         lastResult.setList(list);
         return lastResult;
     }
@@ -588,30 +630,56 @@
     public    List<AlarmEventDataVO> fightingAdminAlertList(){
         List<AlarmEventDataVO> data = new ArrayList<>();
 
-        //鏌ヨ24灏忔椂鍐呯殑
+        List<FindHomeAlarmInfoPageResponse> allList = new ArrayList<>();
+        boolean hasNext = true;
+        int curTotal = 0;
+        int curPage = 1;
         FindHomeAlarmInfoPageRequest param = new FindHomeAlarmInfoPageRequest();
         param.setHour(24);
-        param.setPage(1);
         param.setUserId("admin");
+        while (hasNext){
+            //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+            param.setPage(curPage);
 //        param.setRegionIndexCodes("root000000");
-        param.setAlarmStartTime(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") + " 00:00:00");
-        param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
-        param.setPageSize(20);
-        BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
-        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
-                && response.getData()!=null
-                &&response.getData().getList()!=null) {
+            param.setAlarmStartTime(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") + " 00:00:00");
+            param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
+            param.setPageSize(50);
+            BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
+            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+            }
+            if(Objects.nonNull(response.getData().getList())){
+                return data;
+            }
             for(FindHomeAlarmInfoPageResponse r : response.getData().getList()){
                 AlarmEventDataVO t = new AlarmEventDataVO();
                 BeanUtils.copyProperties(r,t);
-                data.add(t);
+                try {
+                    if(DateUtil.getDateFromString(t.getAlarmTime()).getTime() >= Utils.Date.getStart(new Date()).getTime()){
+                        data.add(t);
+                    }else{
+                        hasNext =false;
+                    }
+                }catch (Exception e){
+                }
             }
+            curTotal += 50;
+            if(curTotal >= response.getData().getTotal()){
+                hasNext = false;
+            }
+            if(response.getData().getList() == null || response.getData().getList().size()==0){
+                hasNext =false;
+            }
+            curPage++;
         }
+
         return data;
 
     }
     /**
      * 銆愭秷闃茬鎺с�戠湅鏉�-瀹炴椂鐩戞祴鏁版嵁
+     * 娑插帇鍥哄畾鍊硷細254001
+     * 姘村帇鍥哄畾鍊硷細253958
      * @return
      *
      */
@@ -621,6 +689,7 @@
         MinitorDataSearchRequest param = new MinitorDataSearchRequest();
         param.setResourceTypeCodes(new String[]{});
         param.setRegionIndexCode("root000000");
+        //60-娑蹭綅 61-姘村帇
         param.setResourceTypeCodes("60,61".split(","));
         param.setIncludeDown("1");
         param.setUserId("admin");
@@ -629,6 +698,8 @@
         BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> response = HKService.minitorDataSearch(param);
         String pressure = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_PRESSURE_LEVEL).getCode();
         String liquid = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_LIQUID_LEVEL).getCode();
+        String pressureUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.PRESSURE_LEVEL_UNIT).getCode();
+        String liquidUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LIQUID_LEVEL_UNIT).getCode();
         if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
                 && response.getData()!=null ) {
             List<MonitorDataSearchResponse> r = response.getData().getList();
@@ -636,11 +707,15 @@
                 for(MonitorDataSearchResponse model : r){
                     MonitorDataVO m = new MonitorDataVO();
                     m.setName(model.getName());
-                    m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
+                    m.setType(model.getType());
+//                    m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
+                    m.setLevel(getLevelDataByDeviceName(m,model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
                     m.setDataList(new ArrayList<>());
                     if(model.getValues()!=null){
                         List<MonitorDataInfoVO> dataList = new ArrayList<>();
                         for(MonitorDataValResponse v : model.getValues()){
+                            //娑插帇鍥哄畾鍊硷細254001
+                            //姘村帇鍥哄畾鍊硷細253958
                             if(Constants.equalsInteger(model.getType(),60)){
                                 if(v.getMonitorTypeCode().equals("254001")){
                                     MonitorDataInfoVO vm = new MonitorDataInfoVO();
@@ -648,7 +723,6 @@
                                     vm.setCateName(v.getMonitorSpecificName());
                                     vm.setCateCode(v.getMonitorTypeKey());
                                     vm.setTypeCode(v.getMonitorTypeCode());
-                                    vm.setTypeName(v.getMonitorTypeName());
                                     dataList.add(vm);
                                 }
                             }else{
@@ -671,6 +745,46 @@
             }
         }
         return  list;
+    }
+
+    private String getLevelDataByDeviceName(MonitorDataVO m,String name,String unit) {
+
+        /**
+         *   {
+         *     "name":"娑�",
+         *     "regionIndexCodes": [
+         *         "root000000"
+         *     ],
+         *     "isSubRegion": true,
+         *     "resourceType": "fireSensor",
+         *     "pageNo": 1,
+         *     "pageSize": 20,
+         *     "orderBy": "name",
+         *     "orderType": "desc"
+         *     }
+         */
+        String r = "";
+
+        ResourcesByParamsRequest param = new ResourcesByParamsRequest();
+        param.setName(name);
+        param.setIsSubRegion(Boolean.TRUE);
+        param.setRegionIndexCodes(new String[]{"root000000"});
+        param.setResourceType("fireSensor");
+        param.setOrderType("desc");
+        param.setOrderBy("name");
+        param.setPageNo(1);
+        param.setPageSize(20);
+        BaseResponse<BaseListPageResponse<ResourcesByParamsResponse>> response = HKService.resourcesByParams(param);
+        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+                && response.getData()!=null ) {
+            String min  = response.getData().getList().get(0).getFireproChannelMinValue();
+            String max  = response.getData().getList().get(0).getFireproChannelMaxvalue();
+            m.setMax(max);
+            m.setMin(min);
+            r  =StringUtils.defaultString(min,"-")+"锝�"+StringUtils.defaultString(max,"-") +unit;
+        }
+        return  r;
+
     }
 
 
@@ -718,6 +832,20 @@
                         .apply(queryType==0,"to_days(create_date) >= to_days(now()) -7")
                         .apply(queryType==1,"year(create_date) = year(now()) and month(create_date) = month(now())")
                         .apply(queryType==2,"year(create_date) = year(now())"));
+
+
+        List<PlatformJob>  finishDataList = platformJobMapper.selectJoinList(PlatformJob.class,
+                new MPJLambdaWrapper<PlatformJob>()
+                        .selectAs(PlatformJob::getId,PlatformJob::getId)
+                        .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate)
+                        .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+                        .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+                        .apply(queryType==0,"to_days(done_date) >= to_days(now()) -7")
+                        .apply(queryType==1,"year(done_date) = year(now()) and month(done_date) = month(now())")
+                        .apply(queryType==2,"year(done_date) = year(now())"));
+
         for (Date date : dayList) {
             TransportMeasureVO data = new TransportMeasureVO();
             data.setPlanDate(date);
@@ -729,23 +857,34 @@
                     if(DateUtil.formatDate(date,"yyyy-MM").equals(DateUtil.formatDate(job.getCreateDate(),"yyyy-MM"))){
                         data.setPlanTimes( data.getPlanTimes() +1);
                         data.setPlanTaskNum( data.getPlanTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
-                        if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
-                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
-                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
-                            //瀹屾垚鏁�
-                            data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
-                        }
+//                        if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
+//                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
+//                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+//                            //瀹屾垚鏁�
+//                            data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
+//                        }
                     }
                 }else{
                     if(DateUtil.formatDate(date,"yyyy-MM-dd").equals(DateUtil.formatDate(job.getCreateDate(),"yyyy-MM-dd"))){
                         data.setPlanTimes( data.getPlanTimes() +1);
                         data.setPlanTaskNum( data.getPlanTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
-                        if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
-                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
-                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
-                            //瀹屾垚鏁�
+//                        if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
+//                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())
+//                                ||Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+//                            //瀹屾垚鏁�
+//                            data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
+//                        }
+                    }
+                }
+            }
+            for (PlatformJob job :finishDataList) {
+                if(queryType == 2){
+                    if(DateUtil.formatDate(date,"yyyy-MM").equals(DateUtil.formatDate(job.getDoneDate(),"yyyy-MM"))){
                             data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
-                        }
+                    }
+                }else{
+                    if(DateUtil.formatDate(date,"yyyy-MM-dd").equals(DateUtil.formatDate(job.getDoneDate(),"yyyy-MM-dd"))){
+                            data.setFinishTaskNum( data.getFinishTaskNum().add(Constants.formatBigdecimal(job.getTotalNum())));
                     }
                 }
             }
@@ -771,12 +910,44 @@
                         .selectAll(PlatformJob.class)
                         .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                         .eq(PlatformJob::getCarCodeFront,param.getCarCode())
-                        .in(PlatformJob::getStatus,
+                        .notIn(PlatformJob::getStatus,
                                 Constants.PlatformJobStatus.DONE.getKey(),
                                 Constants.PlatformJobStatus.LEAVED.getKey(),
                                 Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
-                                Constants.PlatformJobStatus.CALLED.getKey())
+                                Constants.PlatformJobStatus.CANCEL.getKey()
+                        )
+                        .orderByAsc(PlatformJob::getId)
                         .last("limit 1"));
+
+        dealJobDetailAndContractBiz(job,data);
+
+        return data;
+
+    }
+    /**
+     * 銆愬洯鍖虹墿鏂欎腑蹇冭皟搴︺�戠湅鏉�-鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎
+     *
+     * @return
+     *
+     */
+    @Override
+    public  CarsJobAndContractVO  getJobDetailsById(CarsJobAndContractByJobIdDTO param) {
+        CarsJobAndContractVO data = new CarsJobAndContractVO();
+        if(param.getId() == null){
+            return  data;
+        }
+        PlatformJob job = platformJobMapper.selectJoinOne(PlatformJob.class,
+                new MPJLambdaWrapper<PlatformJob>()
+                        .selectAll(PlatformJob.class)
+                        .eq(PlatformJob::getId,param.getId())
+                        .last("limit 1"));
+        dealJobDetailAndContractBiz(job,data);
+
+        return data;
+
+    }
+
+    private void dealJobDetailAndContractBiz(PlatformJob job, CarsJobAndContractVO data) {
         if(job!=null){
             List<PlatformLog>  logList = platformLogMapper.selectJoinList(PlatformLog.class,
                     new MPJLambdaWrapper<PlatformLog>()
@@ -816,7 +987,7 @@
                 if(detailList!=null){
                     for(PlatformWmsDetail d : detailList){
                         if(isExistIocode(d.getIocode(),data.getContractList())){
-                                continue;
+                            continue;
                         }
                         tt = new CarsContractVO();
                         tt.setIoCode(d.getIocode());
@@ -829,10 +1000,6 @@
             }
 
         }
-
-
-        return data;
-
     }
 
     private List<PlatformWmsDetail> getDetailListByCode(String iocode, List<PlatformWmsDetail> detailList,CarsContractVO tt) {
@@ -864,13 +1031,21 @@
 
     /**
      * 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅淇℃伅闆嗗悎
-     *
+     * @param type 0/null  = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾
      * @return
      *
      */
     @Override
-    public   AlarmDataVO alarmDataSumByCate(){
-        AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(DateUtil.addDaysToDate(new Date(),-1))
+    public   AlarmDataVO alarmDataSumByCate(Integer type){
+        Date startDate = Utils.Date.getStart(new Date());
+        if(Objects.nonNull(type)){
+            if(Constants.equalsInteger(type,Constants.TWO)){
+                startDate = Utils.Date.getStart(DateUtil.getFirstThisYearDate());
+            }else if(Constants.equalsInteger(type,Constants.ONE)){
+                startDate = Utils.Date.getStart(DateUtil.getFirstThisMonthDate());
+            }
+        }
+        AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(startDate)
                 ,(DateUtil.getPlusTime2(new Date())));
         return  alarmDataVO;
     }
@@ -882,25 +1057,41 @@
     @Override
     public  PlatformJobRunBoardNewVO platformJobCenterData(){
         PlatformJobRunBoardNewVO data = new PlatformJobRunBoardNewVO();
-        Random random = new Random();
-
-        data.setMonthOutTimes(random.nextInt(1000));
-        data.setYearOutTimes(random.nextInt(1000) * 11);
-
+        data.setMonthOutTimes(0);
+        data.setYearOutTimes(0);
         Date month  = Utils.Date.getStart(new Date());//鏈湀
         Date lastMonth =  DateUtil.addMonthToDate(month,-1);//涓婃湀
         Date year = Utils.Date.getStart(new Date());//浠婂勾
         Date lastYear = DateUtil.addYearToDate(year,-1);//鍘诲勾
-
+        log.error("1銆�=====================>"+DateUtil.getCurrDateTime());
         List<PlatformJob>  monthNum = platformJobMapper.selectJoinList(PlatformJob.class,
                     new MPJLambdaWrapper<PlatformJob>()
-                        .selectAs(PlatformJob::getId,PlatformJob::getId)
+                            .selectAs(PlatformJob::getId,PlatformJob::getId)
+                            .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+                            .selectAs(PlatformJob::getDoneDate,PlatformJob::getDoneDate)
+                            .select(PlatformJob::getStatus,PlatformJob::getStatus)
                             .select(PlatformJob::getType,PlatformJob::getType)
-                        .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
-                        .select(PlatformJob::getStatus,PlatformJob::getStatus)
                         .eq(PlatformJob::getIsdeleted,Constants.ZERO)
-                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+//                        .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(done_date) = year('"+DateUtil.getPlusTime2(month)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(month)+"') "));
+
+        log.error("2銆�=====================>"+DateUtil.getCurrDateTime());
+        List<PlatformJob>  yearNum = platformJobMapper.selectJoinList(PlatformJob.class,
+                new MPJLambdaWrapper<PlatformJob>()
+                        .selectAs(PlatformJob::getId,PlatformJob::getId)
+                        .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(done_date) = year('"+DateUtil.getPlusTime2(year)+"')   and done_date<=  now()  "));
+
+        log.error("3銆�=====================>"+DateUtil.getCurrDateTime());
         List<PlatformJob>  monthLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
                 new MPJLambdaWrapper<PlatformJob>()
                         .selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -913,17 +1104,8 @@
                         .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
                         .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)
-                        .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(done_date) = year('"+DateUtil.getPlusTime2(year)+"')   and done_date<= '"+DateUtil.getPlusTime2(year)+"'"));
+
+        log.error("4銆�=====================>"+DateUtil.getCurrDateTime());
         List<PlatformJob> yearLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
                 new MPJLambdaWrapper<PlatformJob>()
                         .selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -933,15 +1115,16 @@
                         .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(done_date) = year('"+DateUtil.getPlusTime2(lastYear)+"')  and done_date<= '"+DateUtil.getPlusTime2(lastYear)+"'"));
+                        .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastYear)+"')  and done_date<=  now()  "));
 
         data.setMonthOutTotal(getSumTotalByList(monthNum,0,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);
+        data.setMonthOutTimes(monthNum!=null?monthNum.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)||Constants.equalsInteger(i.getType(),Constants.THREE)).collect(Collectors.toList()).size():0);
         data.setYearOutTimes(yearNum!=null?yearNum.size():0);
 
+        log.error("5銆�=====================>"+DateUtil.getCurrDateTime());
         //==========浠婂ぉ涔嬪墠鏈畬鎴愬嚭鍏ュ簱浠诲姟
         List<PlatformJob> beforeJobNum = platformJobMapper.selectJoinList(PlatformJob.class,
                 new MPJLambdaWrapper<PlatformJob>()
@@ -949,11 +1132,15 @@
                         .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
                         .selectAs(PlatformJob::getType,PlatformJob::getType)
                         .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)
+                        // .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("   to_days(create_date) <to_days(now())"));
+                        .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),
+                                Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+                                ,Constants.PlatformJobStatus.CANCEL.getKey())
+                        .apply("   to_days(create_date) < to_days(now()) ")
+        );
 
+        log.error("6銆�=====================>"+DateUtil.getCurrDateTime());
         //==========浠婂ぉ鍑哄叆搴撳畬鎴愰噺
         List<PlatformJob> currentDoneNum = platformJobMapper.selectJoinList(PlatformJob.class,
                 new MPJLambdaWrapper<PlatformJob>()
@@ -963,9 +1150,11 @@
                         .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())
+                        .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
                         .apply(" to_days(done_date) = to_days(now())"));
-        //==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔�----
+
+        log.error("7銆�=====================>"+DateUtil.getCurrDateTime());
+        //==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔� 鏈畬鎴愮殑----
         List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
                 new MPJLambdaWrapper<PlatformJob>()
                         .selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -974,41 +1163,65 @@
                         .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())"));
+                        .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
+                        .apply(" to_days(create_date) = to_days(now()) and done_date is null   "));
 
+        log.error("8銆�=====================>"+DateUtil.getCurrDateTime());
         BigDecimal beforeOutNum = (getSumTotalByList(beforeJobNum,0,null));//浠婂ぉ涔嬪墠鏈畬鎴愬嚭搴撲换鍔�
+        log.error("9銆�=====================>"+DateUtil.getCurrDateTime());
         BigDecimal currentOutNum = (getSumTotalByList(currentNum,0,null));//浠婂ぉ涓嬪彂鍑哄簱浠诲姟
+        log.error("10銆�=====================>"+DateUtil.getCurrDateTime());
         BigDecimal beforeInNum = (getSumTotalByList(beforeJobNum,1,null));//浠婂ぉ涔嬪墠鏈畬鎴愬叆搴撲换鍔�
+        log.error("11銆�=====================>"+DateUtil.getCurrDateTime());
         BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
-        data.setCurrentInNum(beforeInNum.add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
-        data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
+        log.error("12銆�=====================>"+DateUtil.getCurrDateTime());
         data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,1,1));//浠婃棩瀹屾垚閲�
+        log.error("13銆�=====================>"+DateUtil.getCurrDateTime());
         data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,0,1));//浠婃棩瀹屾垚閲�
+        log.error("14銆�=====================>"+DateUtil.getCurrDateTime());
+        data.setCurrentInNum(beforeInNum.add(data.getCurrentInDoneNum()).add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
+        log.error("15銆�=====================>"+DateUtil.getCurrDateTime());
+        data.setCurrentOutNum(beforeOutNum.add(data.getCurrentOutDoneNum()).add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
+        log.error("16銆�=====================>"+DateUtil.getCurrDateTime());
+        data.setTodayOutRate(getDayTotalRata(data.getCurrentOutDoneNum(),DateUtil.getToday()));//褰撴棩鍑哄簱鏁堢巼
+        log.error("17銆�=====================>"+DateUtil.getCurrDateTime());
+        data.setTodayInRate(getDayTotalRata(data.getCurrentInDoneNum(),DateUtil.getToday()));//褰撴棩鍏ュ簱鏁堢巼
+        log.error("18銆�=====================>"+DateUtil.getCurrDateTime());
+        //鏌ヨ鏈湀鍏ㄩ儴鏃ュ織
+        List<PlatformLog> monthLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+                .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+                .and(i->i.isNotNull(PlatformLog::getParam1).or().isNotNull(PlatformLog::getParam2))
+                .apply("year(CREATE_DATE) = year('"+DateUtil.getPlusTime2(month)+"') and month(CREATE_DATE) = month('"+DateUtil.getPlusTime2(month)+"') ")
+        );
 
-        //------------浠婃棩鍑哄叆搴撴晥鐜�----------------
-        BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);//
-        BigDecimal inHours = getTotalDoneTimes(currentDoneNum,1);//
-        if(outHours.compareTo(new BigDecimal(0))>0){
-            data.setTodayOutRate(data.getCurrentOutDoneNum().divide(outHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
-        }
-        if(inHours.compareTo(new BigDecimal(0))>0){
-            data.setTodayInRate(data.getCurrentInDoneNum().divide(inHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
-        }
+
+        data.setMonthOutRate(getMonthRata(monthLogList,monthNum,Constants.ZERO));//鏈湀鍑哄簱鏁堢巼
+        log.error("19銆�=====================>"+DateUtil.getCurrDateTime());
+        data.setMonthInRate(getMonthRata(monthLogList,monthNum,Constants.ONE));//鏈湀鍏ュ簱鏁堢巼
+        log.error("20銆�=====================>"+DateUtil.getCurrDateTime());
+        //------------浠婃棩鍑哄叆搴撴晥鐜�---------------- 
+//        BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);//
+//        BigDecimal inHours = getTotalDoneTimes(currentDoneNum,1);//
+//
+//        if(outHours.compareTo(new BigDecimal(0))>0){
+//            data.setTodayOutRate(data.getCurrentOutDoneNum().divide(outHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
+//        }
+//        if(inHours.compareTo(new BigDecimal(0))>0){
+//            data.setTodayInRate(data.getCurrentInDoneNum().divide(inHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
+//        }
         //------------鏈湀鍑哄叆搴撴晥鐜�----------------
 //        BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());
-        BigDecimal inMonthNum = getSumTotalByList(monthNum,1,null).add(data.getCurrentInDoneNum());
-        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(inMonthHours.compareTo(new BigDecimal(0))>0){
-            data.setMonthInRate(inMonthNum.divide(inMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
-        }
+//        BigDecimal inMonthNum = getSumTotalByList(monthNum,1,null).add(data.getCurrentInDoneNum());
+//        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(inMonthHours.compareTo(new BigDecimal(0))>0){
+//            data.setMonthInRate(inMonthNum.divide(inMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
+//        }
         return data;
     }
-
 
     private BigDecimal getDoneHoursByData(String start ,String end) {
         List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
@@ -1018,10 +1231,9 @@
         if(platformLogList!=null && platformLogList.size()>0){
             return new BigDecimal((double)(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum))/(double)60);
         }
-
         return new BigDecimal(0);
-
     }
+
     private BigDecimal getTotalDoneTimes(List<PlatformJob> list, Integer type) {
         BigDecimal r = new BigDecimal(0);
         if(list==null || list.size() == 0){
@@ -1057,7 +1269,112 @@
         return r;
     }
 
-    private BigDecimal getSumTotalByList(List<PlatformJob> list,Integer type,Integer status) {
+
+    private BigDecimal getMonthRata(List<PlatformLog> monthLogList,List<PlatformJob> list, Integer type) {
+        BigDecimal r = new BigDecimal(0);
+        if(list==null || list.size() == 0){
+            return r;
+        }
+        List<PlatformJob> jobList= new ArrayList<>();
+        for(PlatformJob job : list) {
+            if (!(Constants.equalsInteger(job.getStatus(), Constants.PlatformJobStatus.DONE.getKey())
+                    || Constants.equalsInteger(job.getStatus(), Constants.PlatformJobStatus.LEAVED.getKey())
+                    || Constants.equalsInteger(job.getStatus(), Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()))) {
+                //鍙煡璇㈠畬鎴愭暟鎹�
+                continue;
+            }
+            if (type != null && type == 0 && (Constants.equalsInteger(job.getType(), Constants.ONE) || Constants.equalsInteger(job.getType(), Constants.THREE))) {
+                //鍑哄簱
+                jobList.add(job);
+            }
+            if (type != null && type == 1 && (Constants.equalsInteger(job.getType(), Constants.ZERO) || Constants.equalsInteger(job.getType(), Constants.TWO) || Constants.equalsInteger(job.getType(), Constants.FOUR))) {
+                //鍏ュ簱
+                jobList.add(job);
+            }
+        }
+        if(CollectionUtils.isNotEmpty(jobList)){
+            //鑾峰彇浠诲姟鏁版嵁
+            List<String> jobDataList = jobList.stream().filter(i->Objects.nonNull(i.getDoneDate()))
+                    .map(i->DateUtil.formatDate(i.getDoneDate(),"yyyy-MM-dd")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(jobDataList)){
+                for (String jobDate:jobDataList) {
+                    //杩囨护褰撳ぉ鐨勬暟鎹�
+                    List<PlatformJob> platformJobList = list.stream().
+                            filter(i->jobDate.equals(DateUtil.formatDate(i.getDoneDate(),"yyyy-MM-dd"))).collect(Collectors.toList());
+                    if(CollectionUtils.isNotEmpty(platformJobList)){
+                        //鑾峰彇浠婂ぉ鐨�
+                        r = r.add(this.getDayTotalForMonthRata(monthLogList,getSumTotalByList(platformJobList,type,null),jobDate));
+                    }
+                }
+                r = r.divide(new BigDecimal(Integer.toString(jobList.size())),2,BigDecimal.ROUND_HALF_UP);
+            }
+        }
+        return r;
+    }
+
+    private BigDecimal getDayTotalForMonthRata(List<PlatformLog> allList ,BigDecimal totalAmount,String today) {
+        BigDecimal r = new BigDecimal(0);
+        //鏌ヨ浠婃棩鏈�鏃�/鏈�鏅氱殑浣滀笟鏁版嵁
+        List<PlatformLog> platformLogList = allList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM-dd").equals(today)).collect(Collectors.toList());
+//                platformLogMapper.selectList(new QueryWrapper<PlatformLog>()
+//                .lambda()
+//                .apply(" (  DATE_FORMAT( param1 ,'%Y-%m-%d' ) =  '"+today+"' or DATE_FORMAT( param2 ,'%Y-%m-%d' )  =  '"+today+"' ) ")
+//        );
+        if(totalAmount.compareTo(BigDecimal.ZERO)==0||CollectionUtils.isEmpty(platformLogList)){
+            return BigDecimal.ZERO;
+        }
+        if(platformLogList!=null && platformLogList.size()>0){
+            return this.getWorkTime(totalAmount,platformLogList,today);
+        }
+        return r;
+    }
+
+
+    private BigDecimal getDayTotalRata(BigDecimal totalAmount,String today) {
+        BigDecimal r = new BigDecimal(0);
+        //鏌ヨ浠婃棩鏈�鏃�/鏈�鏅氱殑浣滀笟鏁版嵁
+        List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>()
+                .lambda()
+                .apply(" (  DATE_FORMAT( param1 ,'%Y-%m-%d' ) =  '"+today+"' or DATE_FORMAT( param2 ,'%Y-%m-%d' )  =  '"+today+"' ) ")
+        );
+        if(totalAmount.compareTo(BigDecimal.ZERO)==0||CollectionUtils.isEmpty(platformLogList)){
+            return BigDecimal.ZERO;
+        }
+        if(platformLogList!=null && platformLogList.size()>0){
+            return this.getWorkTime(totalAmount,platformLogList,today);
+        }
+        return r;
+    }
+
+    /**
+     * 鏌ヨ浣滀笟鏃堕暱锛堝皬鏃讹級
+     * @param totalAmount
+     * @param platformLogList
+     * @return
+     */
+    public BigDecimal getWorkTime(BigDecimal totalAmount,List<PlatformLog> platformLogList,String today){
+        if(CollectionUtils.isEmpty(platformLogList)){
+            return BigDecimal.ZERO;
+        }
+        //鑾峰彇寮�濮嬫椂闂�
+        List<Long> startTimeList = platformLogList.stream().filter(i->Objects.nonNull(i.getParam1()))
+                .filter(i->Objects.nonNull(i.getParam1())&&i.getParam1().indexOf(today)>=0)
+                .map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam1()).getTime()).collect(Collectors.toList());
+        Long startTime  = Collections.min(startTimeList);
+        //鑾峰彇缁撴潫鏃堕棿
+        List<Long> endTimeList = platformLogList.stream()
+                .filter(i->Objects.nonNull(i.getParam2())&&i.getParam2().indexOf(today)>=0)
+                .map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam2()).getTime()).collect(Collectors.toList());
+        Long endTime = Collections.max(endTimeList);
+        if(Objects.isNull(startTime)
+            || Objects.isNull(endTime) || (startTime>=endTime)){
+            return BigDecimal.ZERO;
+        }
+        return   totalAmount.divide(new BigDecimal(( endTime - startTime )+"").divide(new BigDecimal("3600000"),2,BigDecimal.ROUND_HALF_UP),2,BigDecimal.ROUND_HALF_UP) ;
+    }
+
+
+    private BigDecimal  getSumTotalByList(List<PlatformJob> list,Integer type,Integer status) {
         BigDecimal r = new BigDecimal(0);
         if(list==null || list.size() == 0){
             return r;
@@ -1182,7 +1499,6 @@
     @Override
     public    YearDeviceDataVO yearFightingAdminDeviceData(){
         YearDeviceDataVO data = new YearDeviceDataVO();
-
         FireStatisticRequest param = new FireStatisticRequest();
         param.setIndexCode("api_fire_statistic");
         BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
@@ -1190,7 +1506,6 @@
             data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
             data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
         }
-
         param = new FireStatisticRequest();
         param.setIndexCode("api_fire_statistic_month");
         BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
@@ -1200,7 +1515,6 @@
             data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
         }
         return data;
-
     }
 
     /**
@@ -1211,7 +1525,37 @@
     public  FightingAdminCenterDataVO centerFightingAdminData(){
         FightingAdminCenterDataVO data = new FightingAdminCenterDataVO();
         List<DeviceNumByTypeVO> list = new ArrayList<>();
-        FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
+        FindDeviceStatisticsRequest param1 = new FindDeviceStatisticsRequest();
+        param1.setRegionIndexCode("root000000");
+        BaseResponse<List<FindDeviceStatisticsResponse>> response = HKService.findDeviceStatistics(param1);
+        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+            for(FindDeviceStatisticsResponse r :response.getData()){
+                if(r.getDevices()!=null){
+                    for(FindDeviceStatisticsInfoResponse td : r.getDevices()){
+                        DeviceNumByTypeVO t = new DeviceNumByTypeVO();
+                        t.setTypeName(td.getDeviceName());
+                        //灞忚斀鏁�
+                        t.setShieldDeviceNum(Constants.formatIntegerNum(t.getShieldDeviceNum() )+ Constants.formatIntegerNum(td.getShieldSensorCount()));
+                        //鎶ヨ鏁�
+                        t.setAlarmDeviceNum(Constants.formatIntegerNum(t.getAlarmDeviceNum())+ Constants.formatIntegerNum(td.getAlarmSensorCount()));
+                        //姝ｅ父鏁�
+                        t.setOnlineDeviceNum(Constants.formatIntegerNum(t.getOnlineDeviceNum())+Constants.formatIntegerNum(td.getNormalSensorCount()));
+                        //鏁呴殰鏁�
+                        t.setErrDeviceNum(Constants.formatIntegerNum(t.getErrDeviceNum())+ Constants.formatIntegerNum(td.getFaultSensorCount()));
+                        //鎬昏澶囨暟
+                        t.setTotalDeviceNum(Constants.formatIntegerNum(t.getTotalDeviceNum())+ Constants.formatIntegerNum(td.getTotalSensorCount()));
+                        list.add(t);
+//                        data.setOfflineDeviceNum(Constants.formatIntegerNum( data.getOfflineDeviceNum())+Constants.formatIntegerNum(t.getOfflineDeviceNum()));
+                        data.setShieldDeviceNum(Constants.formatIntegerNum( data.getShieldDeviceNum())+Constants.formatIntegerNum(t.getShieldDeviceNum()));
+                        data.setAlarmDeviceNum(Constants.formatIntegerNum( data.getAlarmDeviceNum())+Constants.formatIntegerNum(t.getAlarmDeviceNum()));
+                        data.setOnlineDeviceNum(Constants.formatIntegerNum( data.getOnlineDeviceNum())+Constants.formatIntegerNum(t.getOnlineDeviceNum()));
+                        data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(t.getErrDeviceNum()));
+                        data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(t.getTotalDeviceNum()));
+                    }
+                }
+            }
+        }
+       /* FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
         param.setIncludeBool(1);
         param.setRegionIds(new String[]{"root000000"});
         BaseResponse<List<FireDevStatusListResponse>> response = HKService.getFireDevStatusList(param);
@@ -1231,16 +1575,17 @@
                 data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(r.getFaultFireDevCount()));
                 data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(r.getTotalFireDevCount()));
             }
-        }
+        }*/
         data.setDeviceTypeList(list);
         Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
                 .eq(HiddenDanger::getIsdeleted,Constants.ZERO )
-                .apply("to_days(create_date) = to_days(now())" ) );
+                .apply(" DATE_FORMAT(create_date, '%Y-%m')  = DATE_FORMAT(now(), '%Y-%m')  " ) );
         data.setDangerTotalNum(totalNum !=null?totalNum.intValue():0);//浠婃棩闅愭偅鏁伴噺
         totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
                 .eq(HiddenDanger::getIsdeleted,Constants.ZERO )
-                .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
-                .apply("to_days(check_date) = to_days(now())" ) );
+//                .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
+                .eq(HiddenDanger::getStatus,Constants.ZERO )
+                .apply(" DATE_FORMAT(create_date, '%Y-%m')  = DATE_FORMAT(now(), '%Y-%m')  " ) );
         data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
         return  data;
     }
@@ -1380,14 +1725,19 @@
         }
         if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
             //璁＄畻鐢ㄦ皵鍚屾瘮鐜瘮
-            data.getGasQuantity().setSameRate(
-                    (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum()).doubleValue()*100 +""
+            if(Constants.formatBigdecimal(data.getGasQuantity().getSameNum()).compareTo(new BigDecimal(0))!=0){
+                data.getGasQuantity().setSameRate(
+                        (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum(),4,BigDecimal.ROUND_HALF_UP).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(Constants.formatBigdecimal(data.getGasQuantity().getRingNum()).compareTo(new BigDecimal(0))!=0){
+               data.getGasQuantity().setRingRate(
+                       (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getRingNum())).divide(data.getGasQuantity().getRingNum(),4,BigDecimal.ROUND_HALF_UP).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){
             // //璁＄畻鐢ㄦ按鍚屾瘮鐜瘮
@@ -1594,27 +1944,50 @@
                 energyDataVOList.add(data);
             }
         }else{
+            String lastYear = null;
+            int lastMonths = 0,curMonths =0;
+            String curYear =DateUtil.getFomartDate(new Date(),"yyyy");
             for (int i = 0; i < 12; i++) {
                 Date tempDate = DateUtil.increaseMonth(lastMonth,i);
+                String tt =DateUtil.getFomartDate(tempDate,"yyyy");
+                if(!StringUtils.equals(curYear,tt)){
+                   lastYear = tt;
+                   lastMonths = i+1;//鍘诲勾鐨勬湀浠芥暟
+                }
                 EnergyDataVO data = new EnergyDataVO();
                 data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
 //                data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"鏈�"));
                 data.setEnergy(new BigDecimal(0));
                 energyDataVOList.add(data);
             }
-            //濡傛灉鏄敤鐢垫暟鎹�
+            curMonths = 12 - lastMonths;//浠婂勾鐨勬湀浠芥暟
             EnergyTrendRequest param = new EnergyTrendRequest();
-            param.setDate(DateUtil.getFomartDate(new Date(),"yyyy"));//骞翠唤
             param.setMeterType(1);
             param.setNodeType(2);
             param.setNodeId("root000000");
             param.setPeriodType("year");
+            if(lastYear!=null){
+                //濡傛灉鏄敤鐢垫暟鎹�
+                param.setDate(lastYear);//鏌ヨ鍘诲勾骞翠唤
+                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 < lastMonths; i++) { //0,11锛屽彇鍊�1-12
+                        if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>curMonths+i){
+                            //鍙栫浉搴旂殑鍙傛暟鍊�
+                            energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[curMonths+i],"0")));
+                        }
+                    }
+
+                }
+            }
+            //濡傛灉鏄敤鐢垫暟鎹�
+            param.setDate(curYear);//骞翠唤
             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){
+                for (int i = lastMonths; i < 12; i++) { //12 鍙栧�� 0
+                    if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i-lastMonths){
                         //鍙栫浉搴旂殑鍙傛暟鍊�
-                        energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i],"0")));
+                        energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i-lastMonths],"0")));
                     }
                 }
 
@@ -1625,17 +1998,16 @@
     @Override
     public  VisitDataVO visitSecurityData(){
         //寰呰闂�佸凡鐧昏銆佸凡绂诲紑
-
         VisitDataVO result = new VisitDataVO();
         result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
                 .eq(Visits::getIsdeleted,Constants.ZERO)
-                .apply("to_days(create_date)=to_days(now())")
+                .apply(" now() >  STARTTIME and now() < ENDTIME")
                 .in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
-        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+        result.setRegisterVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
                 .eq(Visits::getIsdeleted,Constants.ZERO)
                 .apply("to_days(create_date)=to_days(now())")
                 .in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁�
-        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+        result.setLevelNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
                 .eq(Visits::getIsdeleted,Constants.ZERO)
                 .apply("to_days(create_date)=to_days(now())")
                 .in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂�
@@ -1683,6 +2055,7 @@
                 result.getVisitRetentionDataList().add(t);
             });
         }
+        result.setRetentionNum(result.getVisitRetentionDataList().size());
         return result;
 
     }
@@ -1696,6 +2069,7 @@
                         .selectAll(Retention.class)
                         .selectAs(Company::getType,Retention::getCompanyType)
                         .leftJoin(Company.class,Company::getId,Retention::getCompanyId)
+                        .eq(Retention::getIsdeleted,Constants.ZERO)
         );
 
         //浠婃棩鍦ㄥ洯浜烘暟
@@ -1704,11 +2078,11 @@
         );
         //鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
         data.setRelatedTotal(
-                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FOUR) ).count()
         );
         //鍦ㄥ洯鍐呴儴鍛樺伐浜烘暟
         data.setInternalTotal(
-                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ONE)).count()
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) ).count()
         );
         //鍦ㄥ洯璁垮鏁伴噺
         data.setVisitTotal(
@@ -1718,7 +2092,11 @@
         data.setInParkCarTotal(
                 (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
         );
-        //鍦ㄥ洯鐩稿叧鏂硅溅杈�
+        //褰撳墠鍦ㄥ洯璐ц溅鍙告満鎬绘暟
+        data.setInParkCarUserTotal(
+                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)).count()
+        );
+       /* //鍦ㄥ洯鐩稿叧鏂硅溅杈�
         data.setRelatedCarTotal(
                 (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                         &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.relation)).count()
@@ -1727,30 +2105,66 @@
         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()
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.fkCar)).count()
         );
         //鑷敱鐗╂祦杞︽暟閲�
         data.setVisitCarTotal(
                 (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
-                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.selfTruck)).count()
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.atwlzyCar)).count()
         );
         //甯傚叕鍙稿嵏璐ц溅鏁伴噺
         data.setInternalJobCarTotal(
                 (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
-                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.cityComTruck)).count()
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.sgsxhCar)).count()
         );
         //澶栧崗杞︽暟閲�
         data.setRelatedJobCarTotal(
                 (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
-                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
+                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.wxysCar)).count()
         );
         data.setVideoPluginUrl(getVideoUrl());
+
+        data.setOutHyLotTotal(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.OUT_HY_LOT_TOTAL).getCode()));
+
+
+        data.setInParkCarList(this.getInParkCars(data));
+
         return data;
     }
+
+
+    public List<Map<String,Object>> getInParkCars(SecurityBoardVO securityBoardVO){
+        List<Map<String,Object>> mapList = categoryMapper.selectJoinMaps(new MPJLambdaWrapper<Category>()
+                .select(Category::getName)
+                .select(" ( select count(1) from retention r where r.isdeleted = 0 and  r.CATEGORY_PARENT_ID = t.id and r.TYPE = 3   ) as total ")
+                .eq(Category::getType,Constants.ONE)
+                .eq(Category::getIsdeleted,Constants.ZERO)
+                .isNull(Category::getParentId)
+                .groupBy(Category::getName)
+
+        );
+        if(CollectionUtils.isEmpty(mapList)){
+            mapList = new ArrayList<>();
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("name","鏈煡杞﹁締");
+        map.put("total", retentionMapper.selectCount(
+                new MPJLambdaWrapper<Retention>()
+                        .eq(Retention::getIsdeleted,Constants.ZERO)
+                        .isNull(Retention::getCategoryId)
+                        .eq(Retention::getCarType,Constants.SIX)
+                    )
+        );
+        mapList.add(map);
+        return mapList;
+
+    }
+
+
 
     private String getVideoUrl() {
         return  systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe";
@@ -1792,8 +2206,12 @@
                     .in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() })
 //                    .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
                     .orderByDesc(PlatformJob::getStatus )
-                    .orderByAsc(PlatformJob::getId )
+                    .orderByAsc(PlatformJob::getSortnum )
             );
+            List<PlatformDevice> platformDevices = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda().eq(PlatformDevice::getType,Constants.ONE)
+                    .eq(PlatformDevice::getIsdeleted,Constants.ZERO).isNotNull(PlatformDevice::getDeviceId));
+
+            String videoUrl = getVideoUrl();
             //鏈堝彴鐘舵�侊細0=浣滀笟涓紱1=绌洪棽涓紱2=浣滀笟瓒呮椂;3=鍙彿
             for(Platform model : platformList){
                 PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO();
@@ -1801,6 +2219,13 @@
                 platformDurationVO.setPlatformId(model.getId());
                 platformDurationVO.setPlatformCode(model.getCode());
                 platformDurationVO.setPlatformSort(model.getSortnum());
+                if(CollectionUtils.isNotEmpty(platformDevices)){
+                    List<PlatformDevice> deviceList = platformDevices.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),model.getId())).collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(deviceList)) {
+                        platformDurationVO.setDeviceId(deviceList.get(Constants.ZERO).getDeviceId());
+                        platformDurationVO.setVideoPluginUrl(videoUrl);
+                    }
+                }
                 PlatformJob job = getJobFromListById(model.getId(),jobList);
                 if(job != null){
                     if(Constants.equalsInteger(job.getType(),Constants.ONE) || Constants.equalsInteger(job.getType(),Constants.THREE)){
@@ -1808,9 +2233,13 @@
                     }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"));
+                    Integer workMinute = 0;
+                    Date overDate =null;
+                    if(model.getWorkRate()!=null && model.getWorkRate().compareTo(new BigDecimal(0)) !=0){
+                        workMinute   = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+                        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());//杞︾墝鍙�
@@ -1819,7 +2248,7 @@
                     }else{
                         platformDurationVO.setStatus(Constants.ZERO); //浣滀笟涓�
                         platformDurationVO.setWorkTime(PlatformJobServiceImpl.getWorkTime(job,platformLogMapper));//宸插伐浣滄椂闂�
-                        if(overDate.getTime() < System.currentTimeMillis() ){
+                        if(overDate!=null && overDate.getTime() < System.currentTimeMillis() ){
                             model.setStatus(Constants.TWO); //浣滀笟宸茶秴鏃�
                         }
                     }
@@ -1857,7 +2286,7 @@
         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 )", create_date)
-                .apply("to_days(t.create_date) = to_days(now())")
+                .apply("to_days(t.done_date) = to_days(now())")
                 .eq(Platform::getIsdeleted, Constants.ZERO)
                 .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
                         , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
@@ -1871,7 +2300,7 @@
         }
         int curtotalNum = 0;
         Date today =  Utils.Date.getStart(new Date());
-        long curTime=0, lastTime=0;
+        long curTime=0, lastTime=0 ;
         for (int i = 0; i < 8; i++) {
             lastTime = curTime;//涓婃鐨勬椂闂�
             int curHour = 8+(i*2);
@@ -1894,7 +2323,7 @@
                 curtotalNum += Constants.formatIntegerNum(workEfficiencyVO.getWorkNum()) ;
             }
             workEfficiencyVO.setTotalWorkNum(curtotalNum);//绱鍊�
-            if(System.currentTimeMillis() < curTime){
+            if((System.currentTimeMillis() + 2*60*60*1000) < curTime ){
                 workEfficiencyVO.setTotalWorkNum(0);
             }
             workEfficiencyVOList.add(workEfficiencyVO);
@@ -1956,16 +2385,16 @@
         data.setFreePlatform(
                 list.stream().filter(i->Constants.formatIntegerNum(i.getWorkStatus())<=Constants.ZERO).collect(Collectors.toList()).size()
         );
-        //鏌ヨ浠婃棩鏈堝彴涓姸鎬佷綔涓氭暟閲�
+      /*  //鏌ヨ浠婃棩鏈堝彴涓姸鎬佷綔涓氭暟閲�
         List<PlatformJob> jobList =  platformJobMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
                 .selectAll(PlatformJob.class)
                 .select("count(id)" ,PlatformJob::getCountum)
                 .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                 .apply("to_days(create_date) = to_days(now())" )
-                .groupBy(PlatformJob::getStatus )
+                .groupBy(PlatformJob::getStatus)
         );
-        if(jobList!=null){
 
+        if(jobList!=null){
             //-------------TODO----------銆愮湅鏉裤�戠埍纭闇�姹�--------------
             //     * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12宸插彇娑�
             for(PlatformJob model : jobList){
@@ -2042,14 +2471,64 @@
                 }
 
             }
+      }*/
+        //棰勭害鏁�
+        data.setReservationCar(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                .apply("to_days(create_date) = to_days(now())" )).intValue());
+        //浣滀笟涓�
+        data.setWorkingCar(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+        ).intValue());
+        //鎺掗槦杞�
+        data.setLineUpCar(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey(),
+                        Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+                        Constants.PlatformJobStatus.IN_WAIT.getKey())).intValue());
+        //宸插彨鍙�
+        data.setCalledNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                .apply("to_days(call_date) = to_days(now())" )).intValue());
+        //绛惧埌鏁�
+        data.setSignedNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                .apply("to_days(sign_date) = to_days(now())" )).intValue());
+        //浠婃棩瀹屾垚鏁�
+        data.setDoneNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                .in(PlatformJob::getStatus,Constants.PlatformJobStatus.LEAVED.getKey(),
+                        Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
+                        Constants.PlatformJobStatus.DONE.getKey())
+                .apply("to_days(done_date) = to_days(now())" )).intValue());
 
-            data.setVideoPluginUrl(getVideoUrl());
-            String indexCodes = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_CHANGNEI_SCREEN_INDEXCODES).getCode();
-            if(StringUtils.isNotBlank(indexCodes)){
-                data.setVideoIndexCodes(indexCodes.split(","));
-            }
+        //宸蹭綔涓氭暟
+        data.setWorkedNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                .and(w-> w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+                        .or().in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
+                                ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+                                ,Constants.PlatformJobStatus.LEAVED.getKey()).apply("to_days(done_date) = to_days(now())")
+                        .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey()).apply("to_days(done_date) = to_days(now())")
+                        .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey()).apply("to_days(trans_platform_date) = to_days(now())")
+                )
+//                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());})
+//                .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
+//                                ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+//                                ,Constants.PlatformJobStatus.LEAVED.getKey())
+//                        .apply("to_days(done_date) = to_days(now())");})
+//                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
+//                        .apply("to_days(error_date) = to_days(now())");})
+//                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey())
+//                        .apply("to_days(trans_platform_date) = to_days(now())");})
+        ).intValue());
+
+        data.setVideoPluginUrl(getVideoUrl());
+        String indexCodes = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_CHANGNEI_SCREEN_INDEXCODES).getCode();
+        if(StringUtils.isNotBlank(indexCodes)){
+            data.setVideoIndexCodes(indexCodes.split(","));
         }
-
         return  data;
     }
 
@@ -2124,6 +2603,11 @@
                     if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
                         t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
                     }
+                    if(Constants.UNIT_TYPE == 1) {
+                        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                        t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                        t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                    }
                 }
                 result.getDetailList().add(t);
                 result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
@@ -2141,10 +2625,43 @@
      */
     @Override
     public  WholeProvinceBoardVO centerProvinceData(String  factoryCode){
+        WholeProvinceBoardVO data = initWholeProvinceBoardVOData(factoryCode);
+      /* Date date = new Date();
+        TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
+        param.setDateEnd(DateUtil.getShortTime(date));
+        param.setDateStart(DateUtil.getShortTime(date));
+        if(StringUtils.isNotBlank(code)){
+            param.setFacrotyCodeList(new ArrayList<>());
+            param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
+        }
+        List<TmsOutQtyAndVehicleQtyResponse> listSame=  tmsService.getOutQtyAndVehicleQty(param);
+        if(listSame!=null ){
+            for(TmsOutQtyAndVehicleQtyResponse model : listSame){
+                data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getTotalOutQty())));//浠婃棩鍑哄簱閲�
+                data.setCrrentOutCarNum(data.getCrrentOutCarNum()+(Constants.formatIntegerNum(model.getVehicleQty())));//浠婃棩鍑哄簱杞︽
+            }
+        }*/
+        initOutboundCapability(data,factoryCode);
+        return  data;
+
+    }
+    @Override
+    public  WholeProvinceBoardVO centerProvinceDataNew(String  factoryCode){
+        WholeProvinceBoardVO data = initWholeProvinceBoardVOData(factoryCode);
+
+        initOutboundCapabilityNew(data,factoryCode);
+        return  data;
+
+    }
+
+    private WholeProvinceBoardVO initWholeProvinceBoardVOData(String factoryCode) {
         WholeProvinceBoardVO data = new WholeProvinceBoardVO();
         data.setMaxAbility(new BigDecimal(0));
         data.setHoursAbility(new BigDecimal(0));
         data.setCurrentPlanNum(new BigDecimal(0));
+        data.setCurrentOrderNum(new BigDecimal(0));
+        data.setNoNeedTransportOrderNum(new BigDecimal(0));
+        data.setNeedTransportOrderNum(new BigDecimal(0));
         data.setCurrentOrderNum(new BigDecimal(0));
         data.setCrrentRestNum(new BigDecimal(0));
         data.setCrrentOutNum(new BigDecimal(0));
@@ -2166,24 +2683,42 @@
                 }
             }
         }
-      /*  Date date = new Date();
-        TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
-        param.setDateEnd(DateUtil.getShortTime(date));
-        param.setDateStart(DateUtil.getShortTime(date));
+        return  data;
+    }
+
+    private void initOutboundCapabilityNew(WholeProvinceBoardVO data, String code) {
+        TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
         if(StringUtils.isNotBlank(code)){
             param.setFacrotyCodeList(new ArrayList<>());
-            param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
+            param.getFacrotyCodeList().add(code);
         }
-        List<TmsOutQtyAndVehicleQtyResponse> listSame=  tmsService.getOutQtyAndVehicleQty(param);
-        if(listSame!=null ){
-            for(TmsOutQtyAndVehicleQtyResponse model : listSame){
-                data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getTotalOutQty())));//浠婃棩鍑哄簱閲�
-                data.setCrrentOutCarNum(data.getCrrentOutCarNum()+(Constants.formatIntegerNum(model.getVehicleQty())));//浠婃棩鍑哄簱杞︽
-            }
-        }*/
-        initOutboundCapability(data,factoryCode);
-        return  data;
+        TmsGetOutCapabilityResponse result=  tmsService.getOutCapacity(param);
+        if(result !=null){
+            data.setCrrentOutNum(Constants.formatBigdecimal(result.getCurrentOutNum())  );//浠婃棩鍑哄簱閲�
+            data.setNeedTransportOrderNum(Constants.formatBigdecimal(result.getCurrentTransportNum()));//褰撳墠浠诲姟閲�-宸查厤杞芥湭鍑哄簱
+            data.setNoNeedTransportOrderNum(Constants.formatBigdecimal(result.getCurrentNotTransportNum())  );//褰撳墠浠诲姟閲�-鏃犻渶璋冨害
+            data.setCrrentRestNum(Constants.formatBigdecimal(result.getCurrentTransportNum()));//鍓╀綑浠诲姟閲�-宸查厤杞芥湭鍑哄簱
+            data.setCurrentOrderNum(Constants.formatBigdecimal(result.getCurrentOrderNum())  );//褰撳墠璁㈠崟閲�
+            data.setCurrentPlanCarNum(Constants.formatBigdecimal(result.getCurrentTransportVehicleNum()).intValue() );//褰撳墠浠诲姟杞︽
+            data.setCrrentRestCarNum(Constants.formatBigdecimal(result.getCurrentTransportVehicleNum()).intValue() );//鍓╀綑浠诲姟杞︽閲�
+            data.setCrrentOutCarNum(Constants.formatBigdecimal(result.getCurrentOutVehicleNum()).intValue());//浠婃棩鍑哄簱杞︽
 
+            //褰撳墠浠诲姟閲忓拰鍓╀綑浠诲姟閲忥紝涓猴紙鏃犻渶閰嶈浇+闇�瑕侀厤杞界殑浠诲姟閲忎箣鍜岋級
+            data.setCurrentPlanNum(data.getNeedTransportOrderNum().add(data.getNoNeedTransportOrderNum()));//褰撳墠浠诲姟閲�
+            data.setCrrentRestNum(data.getCurrentPlanNum());//褰撳墠浠诲姟閲�
+
+        }
+        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+        if(Constants.UNIT_TYPE == 1) {
+            data.setMaxAbility(Constants.formatBigdecimal(data.getMaxAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setHoursAbility(Constants.formatBigdecimal(data.getHoursAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCrrentRestNum(Constants.formatBigdecimal(data.getCrrentRestNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentPlanNum(Constants.formatBigdecimal(data.getCurrentPlanNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCrrentOutNum(Constants.formatBigdecimal(data.getCrrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentOrderNum(Constants.formatBigdecimal(data.getCurrentOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setNoNeedTransportOrderNum(Constants.formatBigdecimal(data.getNoNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setNeedTransportOrderNum(Constants.formatBigdecimal(data.getNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+        }
     }
     private void initOutboundCapability(WholeProvinceBoardVO data, String code) {
         TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
@@ -2193,78 +2728,91 @@
         }
         TmsOutboundCapabilityResponse result=  tmsService.getOutboundCapability(param);
         if(result !=null){
+            String todayDate = DateUtil.getShortTime(new Date());
             List<String> planCodes = new ArrayList<>();
             List<String> todayCodes = new ArrayList<>();
-            String todayDate = DateUtil.getShortTime(new Date());
             if(result.getCurrentDayOrderList()!=null && result.getCurrentDayOrderList().size()>0){
                 for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayOrderList()){
-                    data.setCurrentOrderNum(data.getCurrentOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
-                    /**
-                     * DISPATCH_TYPE in(1,2) 涓� TRANSPORT_CODE涓嶄负绌猴紝sum(NC_TOTALITY)  +      DISPATCH_TYPE not in(1,2) sum(NC_TOTALITY)
-                     * 	浠婃棩鍑哄簱涓嬭揪鐨勮鍒掍换鍔℃�婚噺
-                     */
-                    if(StringUtils.isNotBlank(model.getTransportCode())
-                            && (StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
-                        data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
-                    }
-                    if(!(StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
-                        data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁″垝閲�
-                    }
-
-                    /**
-                     * 浠婃棩涓嬭揪鍑哄簱鐨勮鍒掍换鍔″搴旂殑杩愯緭杞︽鏁�
-                     * TRANSPORT_CODE涓嶄负绌篶ount(transport_code )
-                     */
-                    if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
-                        planCodes.add(model.getTransportCode());
-                    }
-                    /**
-                     * 浠婃棩涓嬭揪鍑哄簱鐨勮鍒掍换鍔″搴旂殑杩愯緭杞︽鏁�
-                     * TRANSPORT_CODE涓嶄负绌篶ount(transport_code )
-                     */
-                    if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
-                        planCodes.add(model.getTransportCode());
-                    }
-                    /**
-                     *  out_date涓哄綋鏃�,sum(NC_TOTALITY) 浠婃棩瀹屾垚鐨勫嚭搴撲綔涓氫换鍔℃�婚噺
-                     * TRANSPORT_CODE涓嶄负绌� 涓攐ut_date涓哄綋鏃� count(transport_code)  	浠婃棩瀹屾垚鐨勫嚭搴撲綔涓氫换鍔＄殑杩愯緭杞︽鏁�
-                     */
-                    if(StringUtils.isNotBlank(model.getOutDate()) && model.getOutDate().length()> 10){
-                        String tDate = model.getOutDate().substring(0,10);
-                        if(tDate.equals(todayDate)){
-                            //濡傛灉鏄綋鏃�
-                            data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
-                        }
-                        if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),todayCodes)){
-                            todayCodes.add(model.getTransportCode());
-                        }
-                    }
+                    dealOutOrderBiz(data,model,planCodes,todayCodes,todayDate);
                 }
             }
             if(result.getCurrentDayAgoOrderList()!=null && result.getCurrentDayAgoOrderList().size()>0){
                 for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayAgoOrderList()){
-                    /**
-                     * out_date涓虹┖锛宻um(NC_TOTALITY)	鏄ㄥぉ鏈畬鎴愬嚭搴撹鍒掍换鍔�
-                     * out_date涓虹┖ 涓擳RANSPORT_CODE涓嶄负绌� * count(transport_code )	鏄ㄥぉ鏈畬鎴愬嚭搴撹鍒掍换鍔¤溅娆�
-                     */
-                    if(StringUtils.isBlank(model.getOutDate())){
-                        data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁″垝閲�
-                        if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
-                            planCodes.add(model.getTransportCode());
-                        }
-                    }
+                    dealOutOrderBiz(data,model,planCodes,todayCodes,todayDate);
                 }
             }
-            data.setCurrentPlanCarNum(planCodes.size());//浠婃棩璁″垝杞︽
+            data.setCurrentPlanCarNum(planCodes.size());//浠婃棩浠诲姟杞︽
             data.setCrrentOutCarNum(todayCodes.size());//浠婃棩鍑哄簱杞︽
         }
-        data.setCrrentRestNum(data.getCurrentPlanNum().subtract(data.getCrrentOutNum()));
-        data.setCrrentRestCarNum(data.getCurrentPlanCarNum() -data.getCrrentOutCarNum());
+//        data.setCrrentRestNum(data.getCurrentPlanNum().subtract(data.getCrrentOutNum()));
+//        data.setCrrentRestCarNum(data.getCurrentPlanCarNum() -data.getCrrentOutCarNum());
+        data.setCrrentRestNum(data.getCurrentPlanNum());
+        data.setCrrentRestCarNum(data.getCurrentPlanCarNum());
         if(data.getCrrentRestNum().compareTo(new BigDecimal(0)) <=0){
             data.setCrrentRestNum(new BigDecimal(0));
         }
         if(data.getCrrentRestCarNum()<=0){
             data.setCrrentRestCarNum(0);
+        }
+        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+        if(Constants.UNIT_TYPE == 1) {
+            data.setMaxAbility(Constants.formatBigdecimal(data.getMaxAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setHoursAbility(Constants.formatBigdecimal(data.getHoursAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCrrentRestNum(Constants.formatBigdecimal(data.getCrrentRestNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentPlanNum(Constants.formatBigdecimal(data.getCurrentPlanNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCrrentOutNum(Constants.formatBigdecimal(data.getCrrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentOrderNum(Constants.formatBigdecimal(data.getCurrentOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setNoNeedTransportOrderNum(Constants.formatBigdecimal(data.getNoNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setNeedTransportOrderNum(Constants.formatBigdecimal(data.getNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+        }
+    }
+
+    /**
+     * 1銆佸綋鍓嶈鍗曢噷锛氭埅姝㈢洰鍓嶆湭閰嶈浇璁㈠崟閲忥紱
+     * 2銆佸綋鍓嶄换鍔￠噺锛氭埅姝㈢洰鍓嶅凡閰嶈浇鏈嚭搴撹鍗曢噺+鏃犻渶閰嶈浇鐨勬湭鍑哄簱浠诲姟閲忥紱
+     * 3銆佸綋鍓嶄换鍔￠噺鍜屽墿浣欎换鍔￠噺缁熻閫昏緫涓�鑷达紱
+     * @param data
+     * @param model
+     */
+    private void dealOutOrderBiz(WholeProvinceBoardVO data, TmsOutboundCapabilityInfoResponse model,List<String> planCodes,List<String> todayCodes,  String todayDate ) {
+
+        /**
+         * 褰撳墠璁㈠崟閲忥細鎴嚦鐩墠鏈厤杞界殑鏁版嵁
+         */
+        if(StringUtils.isBlank(model.getTransportCode())
+                &&( StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
+            data.setCurrentOrderNum(data.getCurrentOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//褰撳墠璁㈠崟閲�
+        }
+        /**
+         * 褰撳墠浠诲姟閲�(鍜屽墿浣欎换鍔￠噷锛夛細鎴嚦鐩墠宸查厤杞芥湭鍑哄簱鐨勮鍗�
+         */
+        if(StringUtils.isNotBlank(model.getTransportCode()) && StringUtils.isBlank(model.getOutDate())){
+            data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//褰撳墠浠诲姟閲忥紙绱锛�
+            data.setNeedTransportOrderNum(data.getNeedTransportOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//鍚屽煄鍓╀綑浠诲姟閲忥紙绱锛�
+            if(notInList(model.getTransportCode(),planCodes)){
+                planCodes.add(model.getTransportCode());
+            }
+        }
+        /**
+         *   鍚屽煄鍗曞瓙锛堟棤闇�閰嶈浇浣嗘槸鏈畬鎴愶級
+         */
+        if(StringUtils.isBlank(model.getOutDate())
+                && !StringUtils.equals("1",model.getDispatchType()) && !StringUtils.equals("2",model.getDispatchType())){
+            data.setNoNeedTransportOrderNum(data.getNoNeedTransportOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//鍚屽煄鍓╀綑浠诲姟閲忥紙绱锛�
+            data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//褰撳墠浠诲姟閲忥紙绱锛�
+        }
+        /**
+         * 浠婃棩鍑哄簱閲忥紝鍑哄簱鏃堕棿涓轰粖澶╃殑
+         */
+        if(StringUtils.isNotBlank(model.getOutDate()) && model.getOutDate().length()> 10){
+            String tDate = model.getOutDate().substring(0,10);
+            if(tDate.equals(todayDate)){
+                //濡傛灉鏄綋鏃�
+                data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩鍑哄簱閲�
+                if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),todayCodes)){
+                    todayCodes.add(model.getTransportCode());
+                }
+            }
         }
     }
 
@@ -2286,7 +2834,10 @@
         TotalOutQtyNumVO  data = new TotalOutQtyNumVO();
         data.setCurrentInNum(new BigDecimal(0));
         data.setLastInNum(new BigDecimal(0));
+        data.setCurrentProvinceNum(new BigDecimal(0));
+        data.setCurrentOtherNum(new BigDecimal(0));
         data.setSameInNum(new BigDecimal(0));
+
         //---------鐪佸----------------
         data.setCurrentOutNum(new BigDecimal(0));
         data.setLastOutNum(new BigDecimal(0));
@@ -2326,6 +2877,8 @@
             List<TmsOutQtyAndVehicleQtyResponse> listSame=  tmsService.getOutQtyAndVehicleQty(param);//鍘诲勾鍚屾湡
             if(listSame!=null ){
                 for(TmsOutQtyAndVehicleQtyResponse model : listSame){
+                    model.setOutSideProvinceOutQty(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty())));//鐪佸绱
+                    model.setInSideProvinceOutQty(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴绱
                     data.setSameOutNum(data.getSameOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                     data.setSameInNum(data.getSameInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
                 }
@@ -2336,9 +2889,15 @@
         List<TmsOutQtyAndVehicleQtyResponse> listCur =  tmsService.getOutQtyAndVehicleQty(param);//鏈懆鏈�
         if(listCur!=null ){
             for(TmsOutQtyAndVehicleQtyResponse model : listCur){
+                model.setOutSideProvinceOutQty(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty())));//鐪佸绱
+                model.setInSideProvinceOutQty(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴绱
                 data.setCurrentOutNum(data.getCurrentOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                 data.setCurrentInNum(data.getCurrentInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
                 data.setTotalCarNum(data.getTotalCarNum()+Constants.formatIntegerNum(model.getVehicleQty()));//绱杞︽
+                data.setCurrentProvinceNum(data.getCurrentProvinceNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty()))
+                        .add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴鐪佸閿�鍞噺
+                data.setCurrentOtherNum(data.getCurrentOtherNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()))
+                        .add(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty())));//鐪佸唴鐪佸鍏朵粬鍑哄簱閲�
             }
         }
         param.setDateEnd(DateUtil.getShortTime(lastEnd));
@@ -2346,6 +2905,8 @@
         List<TmsOutQtyAndVehicleQtyResponse> listLast =  tmsService.getOutQtyAndVehicleQty(param);//涓婂懆鏈�
         if(listCur!=null ){
             for(TmsOutQtyAndVehicleQtyResponse model : listLast){
+                model.setOutSideProvinceOutQty(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty())));//鐪佸绱
+                model.setInSideProvinceOutQty(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴绱
                 data.setLastOutNum(data.getLastOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                 data.setLastInNum(data.getLastInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
             }
@@ -2353,6 +2914,18 @@
         if(type == 2){//鏈勾鐨�
             data.setSameOutNum(data.getLastOutNum());
             data.setSameInNum(data.getLastInNum());
+        }
+
+        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+        if(Constants.UNIT_TYPE == 1) {
+            data.setCurrentInNum(Constants.formatBigdecimal(data.getCurrentInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentOutNum(Constants.formatBigdecimal(data.getCurrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentOtherNum(Constants.formatBigdecimal(data.getCurrentOtherNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentProvinceNum(Constants.formatBigdecimal(data.getCurrentProvinceNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setLastInNum(Constants.formatBigdecimal(data.getLastInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setLastOutNum(Constants.formatBigdecimal(data.getLastOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setSameInNum(Constants.formatBigdecimal(data.getSameInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setSameOutNum(Constants.formatBigdecimal(data.getSameOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
         }
         return data;
     }
@@ -2371,14 +2944,21 @@
         List<TmsDistributionOfDeliveryLocResponse> response  = tmsService.getDistributionOfDeliveryLocations(param);//鏌ヨ鍑哄簱閲�
         if(response!=null &&response.size()>0){
             for(TmsDistributionOfDeliveryLocResponse model : response){
-                WholeProvinceMapVO tt = getFromProvinceResultList(model ,result);
-                if(tt == null){
-                    tt =new WholeProvinceMapVO();
-                    tt.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
-                    tt.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
-                    tt.setProvinceCode(model.getToProvinceCode());
-                    tt.setProvinceName(model.getToProvinceName());
-                    result.add(tt);
+                WholeProvinceMapVO t = getFromProvinceResultList(model ,result);
+                if(t == null){
+                    t =new WholeProvinceMapVO();
+                    t.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
+                    t.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
+                    t.setProvinceCode(model.getToProvinceCode());
+                    t.setProvinceName(model.getToProvinceName());
+                    result.add(t);
+                }
+            }
+            if(Constants.UNIT_TYPE == 1) {
+             for(WholeProvinceMapVO t : result){
+                    //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                    t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                    t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
                 }
             }
         }
@@ -2424,7 +3004,7 @@
         return infoList;
     }
     /**
-     * 杩戜竷鏃ュ埌璐ф儏鍐�
+     * 杩戜竷鏃ュ埌璐ф儏鍐�-鏀规垚杩�15鏃�
      * @return
      */
     @Override
@@ -2436,17 +3016,17 @@
             param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
         }
         Date date = new Date();
-        Date startDate = DateUtil.addDaysToDate(date,-7);
+        Date startDate = DateUtil.addDaysToDate(date,-15);
         //鐪嬫澘澶у睆杩�7鏃ュ埌璐ф儏鍐垫棩鏈� 0琛ㄧず褰撳ぉ褰撳墠鎺�7澶╋紝-1琛ㄧず鏈湀鍒�1鍙�-7鍙�
         String flag = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.SCREEN_SEVENT_ARRIVAL_STARTDATE).getCode();
         if(StringUtils.equals(flag,"-1")){
             startDate =DateUtil.getBeginDayOfMonth(0);
-            date = DateUtil.addDaysToDate(startDate,7);
+            date = DateUtil.addDaysToDate(startDate,15);
         }
         param.setNcCreateDateFrom(DateUtil.getShortTime(startDate));
         param.setNcCreateDateThrough(DateUtil.getShortTime(date));
         List<TmsSevenArrivalStatusAndDetailsResponse> infoList =   tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲�
-        for (int i = 0; i < 7; i++) {
+        for (int i = 0; i < 15; i++) {
             LastSevenDaysOrderVo model = new LastSevenDaysOrderVo();
             Date td = DateUtil.addDaysToDate(date,-i);
             model.setDateStr(DateUtil.getShortTime(td));
@@ -2487,6 +3067,7 @@
         WholeProvinceZXTVO result = new WholeProvinceZXTVO();
         result.setCurrentNum(new BigDecimal(0));
         result.setTotalNum(new BigDecimal(0));
+        result.setZtNum(new BigDecimal(0));
         result.setUseRate(new BigDecimal(0));
         result.setDetailList(new ArrayList<>());
         List<TmsFactoryParam> paramList =factoryList();
@@ -2496,41 +3077,52 @@
                 WholeProvinceZxtDetailVO t = new WholeProvinceZxtDetailVO();
                 t.setFactoryName(p.getName());
                 t.setCurrentNum(new BigDecimal(0));
+                t.setZaituNum(new BigDecimal(0));
                 t.setTotalNum(Constants.formatBigdecimal(p.getNum1()));//鎬诲簱瀛橀噺
                 getFromReportVehicleQtyList(p.getCode(),t,response);//澶勭悊鎻愭姤杩愬姏鍜屾�昏繍鍔涙暟鎹�
                 t.setUseRate(new BigDecimal(0));
-                if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
-                    t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
+                if((t.getTotalNum().subtract(t.getZaituNum())).compareTo(new BigDecimal(0)) !=0){
+                    t.setUseRate(t.getCurrentNum().divide(t.getTotalNum().subtract(t.getZaituNum()),4,BigDecimal.ROUND_HALF_UP));
                 }
+                /*if(Constants.UNIT_TYPE == 1) {
+                    //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                    t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                    t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                }*/
                 result.getDetailList().add(t);
                 result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
                 result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));
+                result.setZtNum(result.getZtNum().add(t.getZaituNum()));
             }
         }
-        if(result.getTotalNum().compareTo(new BigDecimal(0)) !=0){
-            result.setUseRate(result.getCurrentNum().divide(result.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
+        if((result.getTotalNum().subtract(result.getZtNum())).compareTo(new BigDecimal(0)) !=0){
+            result.setUseRate(result.getCurrentNum().divide(result.getTotalNum().subtract(result.getZtNum()),4,BigDecimal.ROUND_HALF_UP));
         }
         return result;
     }
     private void getFromReportVehicleQtyList(String code,WholeProvinceZxtDetailVO t, List<TmsTotalAndReportVehicleQtyResponse> responses) {
         BigDecimal current = new BigDecimal(0);
         BigDecimal total= new BigDecimal(0);
+        BigDecimal ztTotal= new BigDecimal(0);
         if(responses!=null && responses.size()>0){
             for(TmsTotalAndReportVehicleQtyResponse model: responses){
                 if(StringUtils.equals(model.getFactoryCode(),code)){
+                    ztTotal = ztTotal.add(Constants.formatBigdecimal(model.getInTransitQty()));
                     total = total.add(Constants.formatBigdecimal(model.getTotalQty()));
                     current = current.add(Constants.formatBigdecimal(model.getReportQty()));
                 }
             }
         }
         t.setCurrentNum(current);
+        t.setZaituNum(ztTotal);
         t.setTotalNum(total);
     }
     private BigDecimal getCurrentOutQryByList(List<TmsOutQtyAndVehicleQtyResponse> response) {
         BigDecimal r = new BigDecimal(0);
         if(response!=null && response.size()>0){
             for(TmsOutQtyAndVehicleQtyResponse model: response){
-                    r = r.add(Constants.formatBigdecimal(model.getTotalOutQty()));
+//                model.setTotalOutQty(Constants.formatBigdecimal(model.getTotalOutT03Qty()).add(Constants.formatBigdecimal(model.getTotalOutT01Qty())));
+                r = r.add(Constants.formatBigdecimal(model.getTotalOutQty()));
             }
         }
         return r ;
@@ -2560,6 +3152,11 @@
                 if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
                     t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
                 }
+                if(Constants.UNIT_TYPE == 1){
+                    //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                    t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
+                    t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
+                }
                 result.getDetailList().add(t);
                 result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
                 result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));
@@ -2581,7 +3178,6 @@
             }
         }
         return r ;
-
     }
 
 

--
Gitblit v1.9.3