From 218e84d2264e413f31a2f3957f05bb7b8ad42d5d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 10:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 2340 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 2,243 insertions(+), 97 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 05fef7f..552d487 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
@@ -1,37 +1,50 @@
package com.doumee.service.business.impl.thrid;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
+import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.request.*;
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.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+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;
+import com.doumee.core.wms.model.response.WmsBaseResponse;
+import com.doumee.core.wms.model.response.WmsBaseDataResponse;
+import com.doumee.core.wms.model.response.WmsInventoryJsonResponse;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.dao.system.model.SystemDictData;
-import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.impl.PlatformJobServiceImpl;
-import com.doumee.service.business.impl.VisitsServiceImpl;
import com.doumee.service.business.third.BoardService;
+import com.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.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -49,15 +62,25 @@
@Autowired
private PlatformLogMapper platformLogMapper;
@Autowired
+ private WmsService wmsService;
+ @Autowired
+ private HiddenDangerMapper hiddenDangerMapper;
+ @Autowired
private PlatformWaterGasMapper platformWaterGasMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
- private PlatformWarnEventMapper platformWarnEventMapper;
+ private TmsFactoryParamMapper tmsFactoryParamMapper;
+ @Autowired
+ private PlatformWarnEventJoinMapper platformWarnEventJoinMapper;
@Autowired
private PlatformJobMapper platformJobMapper;
@Autowired
+ private PlatformBooksMapper platformBooksMapper;
+ @Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
+ @Autowired
+ private PlatformWmsJobMapper platformWmsJobMapper;
@Autowired
private PlatformMapper platformMapper;
@Autowired
@@ -66,6 +89,127 @@
private RetentionMapper retentionMapper;
@Autowired
private PlatformGroupMapper platformGroupMapper;
+ @Autowired
+ private TmsService tmsService;
+ @Autowired
+ private PlatformDeviceMapper platformDeviceMapper;
+ @Autowired
+ private CategoryMapper categoryMapper;
+ @Value("${debug_model}")
+ private Boolean isDebug;
+ /**
+ * 鑾峰彇鍖哄煙鏍戝舰缁撴瀯鏁版嵁
+ * @return
+ */
+ @Override
+ public List<GeneralVO> todayTotalInList(){
+ /**
+ * 1甯傚叕鍙革細鏍规嵁棰勭害鐨勫叆鍥師鍥犱负甯傚叕鍙稿嵏璐х殑浠诲姟涓哄競鍏徃鍏ュ簱鐨勭粺璁★紱
+ * 2闆嗘暎涓績锛歐MS鎺ㄩ�佺殑鍏ュ簱鍗曟嵁锛�
+ * 3鍔犲伐鍏ュ簱锛氶绾﹀叆鍥负閲嶅簡鍔犲伐鍏ュ簱鐨勶紙浣滀笟鏈堝彴涓哄畨娉扮墿娴佸嵏璐ф湀鍙帮級锛�
+ */
+ String[] names = new String[]{"甯傚叕鍙�","闆嗘暎涓績","鍔犲伐鍏ュ簱"};
+ String reason =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CITY_XH_REASON_ID).getCode();
+ String platformGroupId =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ATWL_XH_PLATFORM_ID).getCode();;
+ List<GeneralVO> list = new ArrayList<>();
+ for (int i = 0; i < 3; i++) {
+ Random random = new Random();
+ GeneralVO data = new GeneralVO();
+ data.setName(names[i]);
+ BigDecimal num =new BigDecimal(0);
+ if(i == 0){
+ List<PlatformBooks> jobs = platformBooksMapper.selectJoinList(PlatformBooks.class, new MPJLambdaWrapper<PlatformBooks>()
+ .select(PlatformJob::getTotalNum)
+ .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformBooks::getJobId)
+ .eq(PlatformBooks::getIsdeleted,Constants.ZERO)
+ .eq(PlatformBooks::getReasonId,reason)
+ .apply("to_days(t1.done_date) = to_days(now())")
+ .eq(PlatformBooks::getStatus,Constants.TWO));
+ if(jobs!=null){
+ for(PlatformBooks j :jobs){
+ num =num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ }
+ }
+ }else if(i ==1){
+ List<PlatformJob> jobs = platformJobMapper.selectList (new MPJLambdaWrapper<PlatformJob>()
+ .select(PlatformJob::getTotalNum)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getOrigin,Constants.ONE)
+ .in(PlatformJob::getType,new Integer[]{0,2,4})
+ .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
+ , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ , Constants.PlatformJobStatus.LEAVED.getKey())
+ .apply("to_days(done_date) = to_days(now())") );
+ if(jobs!=null){
+ for(PlatformJob j :jobs){
+ if(Objects.nonNull(j)&&Objects.nonNull(j.getTotalNum())){
+ num =num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ }
+
+ }
+ }
+ }else{
+ 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()
+ , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ , Constants.PlatformJobStatus.LEAVED.getKey()) );
+ if(jobs!=null){
+ for(PlatformJob j :jobs){
+ if(Objects.nonNull(j)&&Objects.nonNull(j.getTotalNum())){
+ num = num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ }
+ }
+ }
+ }
+ data.setNum(num);
+ list.add(data);
+ }
+ return list;
+
+ }
+ /**
+ * 鑾峰彇鍖哄煙鏍戝舰缁撴瀯鏁版嵁
+ * @return
+ */
+ @Override
+ public BoardStockListVO stockList(){
+ BoardStockListVO data = new BoardStockListVO();
+ double toatalNum = 1d;
+ BigDecimal num = new BigDecimal(0);
+ List<GeneralVO> list = new ArrayList<>();
+ try {
+ toatalNum =Double.parseDouble(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_TOTAL_STOCK_NUM).getCode()) ;
+ }catch (Exception e){
+ }
+ WmsBaseResponse<WmsBaseDataResponse> response = wmsService.getInventoryList();
+ if(response!=null && response.getData()!=null && response.getData().size()>0){
+ List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();
+ if(t!=null &&t.size()>0){
+ for(WmsInventoryJsonResponse j :t){
+ //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());
+ list.add(d);
+ }
+ }
+ }
+ data.setStockList(list);
+ data.setNum(num);
+ if(toatalNum<=0){
+ toatalNum =1;
+ }
+ data.setTotalNum(new BigDecimal(toatalNum));
+ data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_HALF_UP));
+ return data;
+
+ }
/**
* 鑾峰彇鍖哄煙鏍戝舰缁撴瀯鏁版嵁
* @return
@@ -267,7 +411,10 @@
public List<PlatformGroupFinishVO> platformGroupFinish(){
List<PlatformGroupFinishVO> data = new ArrayList<>();
List<PlatformGroup> groups = platformGroupMapper.selectJoinList(PlatformGroup.class, new MPJLambdaWrapper<PlatformGroup>()
- .select("(select sum(a.TOTAL_NUM) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0 and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)
+ .select("(select sum(case when a.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = a.id ) else a.total_num end) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0 and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)
+ //.select("(select sum(a.TOTAL_NUM) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0 and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)
+
+ //.select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end ioQty ")
.selectAll(PlatformGroup.class)
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
);
@@ -306,6 +453,7 @@
public CarWorkSituationVO carWorkSituation(int limit){
CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+ .like(PlatformLog::getCreateDate,DateUtil.getCurrDate())
.orderByDesc(PlatformLog::getCreateDate)
.last(" limit "+limit)
);
@@ -342,46 +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");//瀹夐槻鍛婅
+ //瀹夐槻浜嬩欢鍒掑垎鏂瑰紡锛�
+ //閲嶇偣鍖哄煙锛氶噸鐐逛汉鍛�-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,1644175361,1644175361,1644171265,1644171265");//瀹夐槻鍛婅 鍖哄煙鍏ヤ镜
+ }else if(type == 2){
+ 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;
}
@@ -392,7 +580,6 @@
BaseResponse<CamerasPreviewURLsResponse> result = HKService.cameraPreviewURLs(request);
if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
return result.getData().getUrl();
-
}
return null;
}
@@ -401,11 +588,11 @@
List<EnergyDataVO> loadCurveList = new ArrayList<>();
try {
BaseResponse<List<EnergyTodayLoadDataResponse>> response = HKService.energyTodayLoadData();
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
for (EnergyTodayLoadDataResponse model :response.getData()) {
EnergyDataVO data = new EnergyDataVO();
data.setTimeData(model.getName());
- data.setEnergy(new BigDecimal(model.getName()));
+ data.setEnergy(new BigDecimal(StringUtils.defaultString(model.getValue(),"0")));
loadCurveList.add(data);
}
}
@@ -435,13 +622,1033 @@
}
/**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌
+ * @return
+ *
+ */
+ @Override
+ public List<AlarmEventDataVO> fightingAdminAlertList(){
+ List<AlarmEventDataVO> data = new ArrayList<>();
+
+ List<FindHomeAlarmInfoPageResponse> allList = new ArrayList<>();
+ boolean hasNext = true;
+ int curTotal = 0;
+ int curPage = 1;
+ FindHomeAlarmInfoPageRequest param = new FindHomeAlarmInfoPageRequest();
+ param.setHour(24);
+ 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(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);
+ 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
+ *
+ */
+ @Override
+ public List<MonitorDataVO> monitorDataList(){
+ List<MonitorDataVO> list = new ArrayList<>();
+ MinitorDataSearchRequest param = new MinitorDataSearchRequest();
+ param.setResourceTypeCodes(new String[]{});
+ param.setRegionIndexCode("root000000");
+ //60-娑蹭綅 61-姘村帇
+ param.setResourceTypeCodes("60,61".split(","));
+ param.setIncludeDown("1");
+ param.setUserId("admin");
+ param.setPageNo(1);
+ param.setPageSize(100);
+ 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();
+ if(r!= null){
+ for(MonitorDataSearchResponse model : r){
+ MonitorDataVO m = new MonitorDataVO();
+ m.setName(model.getName());
+ 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();
+ vm.setValue(v.getMonitorValue());
+ vm.setCateName(v.getMonitorSpecificName());
+ vm.setCateCode(v.getMonitorTypeKey());
+ vm.setTypeCode(v.getMonitorTypeCode());
+ dataList.add(vm);
+ }
+ }else{
+ if(v.getMonitorTypeCode().equals("253958")){
+ MonitorDataInfoVO vm = new MonitorDataInfoVO();
+ vm.setValue(v.getMonitorValue());
+ vm.setCateName(v.getMonitorSpecificName());
+ vm.setCateCode(v.getMonitorTypeKey());
+ vm.setTypeCode(v.getMonitorTypeCode());
+ vm.setTypeName(v.getMonitorTypeName());
+ dataList.add(vm);
+ }
+ }
+
+ }
+ m.setDataList(dataList);
+ }
+ list.add(m);
+ }
+ }
+ }
+ 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;
+
+ }
+
+
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅澶勭悊鍒嗘瀽闆嗗悎
+ * @return
+ *
+ */
+ @Override
+ public List<AlarmDataVO> fightingAlarmHandleData(){
+ List<AlarmDataVO> alarmHandleDataVOList = new ArrayList<>();
+ Date now =DateUtil.StringToDate(DateUtil.getFirstDayCurrentMonth(),"yyyy-MM") ;
+ for (int i = 1; i <= 12; i++) {
+ Date start = DateUtil.addMonthToDate(now,-12+i);
+ Date end = DateUtil.addMonthToDate(now,-11+i);
+ AlarmDataVO t = getAlertDataByStartEndTime(DateUtil.getPlusTime2(start),DateUtil.getPlusTime2(end));
+ alarmHandleDataVOList.add(t);
+ }
+ return alarmHandleDataVOList;
+ }
+ /**
+ * 銆愬洯鍖虹墿鏂欎腑蹇冭皟搴︺�戠湅鏉�-杩愯緭浠诲姟鍒嗘瀽
+ *
+ * @return
+ *
+ */
+ @Override
+ public List<TransportMeasureVO> transportMeasure(Integer queryType){
+ List<TransportMeasureVO> list = new ArrayList<>();
+ Random random = new Random();
+ List<Date> dayList = DateUtil.getDateListBeforDays(new Date(),7);//杩�7澶�
+ if(Constants.equalsInteger(queryType,Constants.ONE)){
+ dayList = DateUtil.getThisMonthDateList();//鏈湀澶╂暟
+ }else if(Constants.equalsInteger(queryType,Constants.TWO)){
+ dayList = DateUtil.getThisYearMonthList();//鏈勾鏈堜唤
+ }
+ List<PlatformJob> dataList = platformJobMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply(queryType==0,"to_days(create_date) >= to_days(now()) -7")
+ .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);
+ data.setPlanTimes(0);
+ data.setPlanTaskNum(new BigDecimal( 0));
+ data.setFinishTaskNum(new BigDecimal(0));
+ for(PlatformJob job :dataList){
+ if(queryType == 2){
+ 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())));
+// }
+ }
+ }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())){
+// //瀹屾垚鏁�
+// 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())));
+ }
+ }
+ }
+
+ list.add(data);
+ }
+ return list;
+ }
+ /**
+ * 銆愬洯鍖虹墿鏂欎腑蹇冭皟搴︺�戠湅鏉�-鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎
+ *
+ * @return
+ *
+ */
+ @Override
+ public CarsJobAndContractVO getCarsJobDetails(CarsJobAndContractDTO param){
+ CarsJobAndContractVO data = new CarsJobAndContractVO();
+ if(StringUtils.isBlank(param.getCarCode())){
+ return data;
+ }
+ PlatformJob job = platformJobMapper.selectJoinOne(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getCarCodeFront,param.getCarCode())
+ .notIn(PlatformJob::getStatus,
+ Constants.PlatformJobStatus.DONE.getKey(),
+ Constants.PlatformJobStatus.LEAVED.getKey(),
+ Constants.PlatformJobStatus.AUTHED_LEAVE.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>()
+ .selectAll(PlatformLog.class)
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getJobId,job.getId())
+ .orderByDesc(PlatformLog::getCreateDate));
+ data.setLogList(logList);
+ data.setName(job.getDriverName());
+ data.setPhone(job.getDrivierPhone());
+ data.setBillCode(job.getBillCode());
+ data.setTotalNum(Constants.formatBigdecimal(job.getTotalNum()));
+ data.setContractList(new ArrayList<>());
+ CarsContractVO tt = new CarsContractVO();
+ tt.setIoCode(job.getContractNum());
+ tt.setDetailList(new ArrayList<>());
+ data.getContractList().add(tt);
+
+ PlatformWmsJob wmsJob = platformWmsJobMapper.selectJoinOne(PlatformWmsJob.class,
+ new MPJLambdaWrapper<PlatformWmsJob>()
+ .selectAll(PlatformWmsJob.class)
+ .eq(PlatformWmsJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsJob::getJobId,job.getId())
+ .last("limit 1"));
+ if(wmsJob!=null){
+ data.setName(wmsJob.getDriverName());
+ data.setPhone(wmsJob.getDriverPhone());
+ data.setBillCode(wmsJob.getCarryBillCode());
+ data.setContractList(new ArrayList<>());
+
+ List<PlatformWmsDetail> detailList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class,
+ new MPJLambdaWrapper<PlatformWmsDetail>()
+ .selectAll(PlatformWmsDetail.class)
+ .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsDetail::getWmsJobId,wmsJob.getId())
+ .orderByDesc(PlatformLog::getCreateDate));
+ if(detailList!=null){
+ for(PlatformWmsDetail d : detailList){
+ if(isExistIocode(d.getIocode(),data.getContractList())){
+ continue;
+ }
+ tt = new CarsContractVO();
+ tt.setIoCode(d.getIocode());
+ tt.setAddress(d.getRepertotyAddress());
+ tt.setDetailList(getDetailListByCode(d.getIocode(),detailList,tt));
+ data.getContractList().add(tt);
+ data.getTotalNum().add(Constants.formatBigdecimal(tt.getTotalNum()));//鎬昏繍杈撻噺
+ }
+ }
+ }
+
+ }
+ }
+
+ private List<PlatformWmsDetail> getDetailListByCode(String iocode, List<PlatformWmsDetail> detailList,CarsContractVO tt) {
+ List<PlatformWmsDetail> list = new ArrayList<>();
+ BigDecimal total = new BigDecimal(0);
+ if(detailList!=null){
+ for(PlatformWmsDetail d :detailList){
+ if(StringUtils.equals(d.getIocode(),iocode)){
+ list.add(d);
+ total.add(Constants.formatBigdecimal(d.getIoQty()));
+ }
+ }
+ }
+ tt.setTotalNum(total);
+ return list;
+ }
+
+ private boolean isExistIocode(String iocode, List<CarsContractVO> detailList) {
+ if(detailList!=null){
+ for(CarsContractVO d :detailList){
+ if(StringUtils.equals(d.getIoCode(),iocode)){
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅淇℃伅闆嗗悎
+ * @param type 0/null = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾
+ * @return
+ *
+ */
+ @Override
+ 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;
+ }
+
+ /**
+ * 鏌ヨ鏈湀 鏈勾鐨勭疮璁″嚭搴撻噺缁熻鏁版嵁,鍑哄簱浠诲姟銆佸叆搴撲换鍔￠噺
+ * @return
+ */
+ @Override
+ public PlatformJobRunBoardNewVO platformJobCenterData(){
+ PlatformJobRunBoardNewVO data = new PlatformJobRunBoardNewVO();
+ 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::getTotalNum,PlatformJob::getTotalNum)
+ .selectAs(PlatformJob::getDoneDate,PlatformJob::getDoneDate)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .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(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)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
+// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastMonth)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(lastMonth)+"') and done_date<= '"
+ +DateUtil.getPlusTime2(lastMonth)+"'"));
+
+ log.error("4銆�=====================>"+DateUtil.getCurrDateTime());
+ List<PlatformJob> yearLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getId)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .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<= 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.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>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .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)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .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>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.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)
+ .selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.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));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
+ 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)+"') ")
+ );
+
+
+ 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));//鏈湀鍏ュ簱鏁堢巼
+// }
+ return data;
+ }
+
+ private BigDecimal getDoneHoursByData(String start ,String end) {
+ List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+ .apply("create_date >= '"+start+"' and create_date <= '"+end+"'")
+ .isNotNull(PlatformLog::getParam3)
+ .ne(PlatformLog::getParam3,Constants.ZERO+""));
+ 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){
+ return r;
+ }
+ List<Integer> jobIds= 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))){
+ //鍑哄簱
+ jobIds.add(job.getId());
+ }
+ if(type !=null &&type ==1 && (Constants.equalsInteger(job.getType(),Constants.ZERO) ||Constants.equalsInteger(job.getType(),Constants.TWO)||Constants.equalsInteger(job.getType(),Constants.FOUR))){
+ //鍏ュ簱
+ jobIds.add(job.getId());
+ }
+ }
+ if(jobIds.size()>0){
+ //澶勭悊浣滀笟鏃堕暱
+ List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+ .in(PlatformLog::getJobId,jobIds)
+ .isNotNull(PlatformLog::getParam3)
+ .ne(PlatformLog::getParam3,Constants.ZERO+""));
+ 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)3600);
+ }
+ }
+ return r;
+ }
+
+
+ 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 = null ;
+ if(CollectionUtils.isNotEmpty(startTimeList)){
+ 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 = null ;
+ if(CollectionUtils.isNotEmpty(endTimeList)){
+ 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;
+ }
+ for(PlatformJob job : list){
+
+ if(type !=null &&type ==0 && !(Constants.equalsInteger(job.getType(),Constants.ONE) ||Constants.equalsInteger(job.getType(),Constants.THREE))){
+ continue;
+ }
+ if(type !=null &&type ==1 && !(Constants.equalsInteger(job.getType(),Constants.ZERO) ||Constants.equalsInteger(job.getType(),Constants.TWO)||Constants.equalsInteger(job.getType(),Constants.FOUR))){
+ continue;
+ }
+ if(status !=null &&status ==1 && !(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(Constants.formatBigdecimal(job.getIoQty()).compareTo(new BigDecimal(0)) >0){
+// r.add( job.getIoQty());
+// }else{
+ r = r.add(Constants.formatBigdecimal(job.getTotalNum()));
+// }
+ }
+ return Constants.formatBigdecimal0Float(r);
+ }
+
+ @Override
+ public List<CarsAlarmResultListResponse> carsEventList(){
+
+ if(HKCarOpenService.HK_CARS_LIST == null){
+ HKCarOpenService.HK_CARS_LIST = HKCarOpenService.getAllCarsDetais();
+ }
+ return HKCarOpenService.getAlarmEvemtList( HKCarOpenService.HK_CARS_LIST,new Date());
+ }
+ @Override
+ public BoardCarsListVO platformJobCarsList(){
+ BoardCarsListVO data = new BoardCarsListVO();
+ List<CarsDeviceDetaisResponse> detaisResponses = HKCarOpenService.getAllCarsDetais();
+ data.setCarsList(detaisResponses);
+ if(data.getCarsList()!=null && data.getCarsList().size()>0){
+ List<String> codes = new ArrayList<>();
+ //璁惧鐘舵�� 0锛氱绾匡紱1锛氬湪绾匡紱2锛氫紤鐪�
+ int online = 0;
+ for(CarsDeviceDetaisResponse model:detaisResponses){
+ if(Constants.equalsInteger(model.getStatus(),Constants.ONE)
+ ||Constants.equalsInteger(model.getStatus(),Constants.TWO)){
+ //濡傛灉鏄湪绾挎垨鑰呬紤鐪狅紝鏌ヨ鍦ㄩ�旇繕鏄┖闂瞭y
+ codes.add(model.getPlateNum());
+ model.setJobStatus(Constants.ZERO);
+ }else{
+ model.setJobStatus(Constants.TWO);
+ data.setOfflineNum(data.getOfflineNum()+1);
+ }
+ }
+ if(codes.size()>0){
+ //鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�
+ List<PlatformJob> busyNum = platformJobMapper.selectList(new QueryWrapper<PlatformJob>() .lambda()
+ .select(PlatformJob::getCarCodeFront)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .in(PlatformJob::getCarCodeFront,codes)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()
+ ,Constants.PlatformJobStatus.WAIT_CALL.getKey()
+ ,Constants.PlatformJobStatus.CALLED.getKey()
+ ,Constants.PlatformJobStatus.IN_WAIT.getKey()
+ ,Constants.PlatformJobStatus.TRANSFERING.getKey()
+ ,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
+ ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
+ ,Constants.PlatformJobStatus.EXCEPTION.getKey())
+ .groupBy(PlatformJob::getCarCodeFront));
+ data.setBusyNum( busyNum!=null ?busyNum.size():0);//鍦ㄩ�旀湁浠诲姟鏁伴噺
+ data.setIdleNum(codes.size() -data.getBusyNum());//鏃犱换鍔＄┖闂叉暟閲�
+ HKCarOpenService.HK_CARS_LIST = detaisResponses;
+// data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));
+ if(busyNum != null){
+ FLAG: for(CarsDeviceDetaisResponse model:detaisResponses){
+ for(PlatformJob job : busyNum){
+ if(StringUtils.equals(job.getCarCodeFront(),model.getPlateNum())){
+ model.setJobStatus(Constants.ONE);
+ continue FLAG;
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ return data;
+ }
+
+ public static AlarmDataVO getAlertDataByStartEndTime(String start,String end){
+ AlarmDataVO alarmDataVO = new AlarmDataVO();
+ FindAlarmBaseDataStatisticRequest param = new FindAlarmBaseDataStatisticRequest();
+ param.setAlarmStartTime(start);
+ param.setAlarmEndTime(end);
+ param.setUserId("admin");
+ BaseResponse<FindAlarmBaseDataStatisticResponse> response = HKService.findAlarmBaseDataStatistic(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null ) {
+ alarmDataVO.setTotalNum(Constants.formatIntegerNum(response.getData().getTotalAlarmNum()));
+ alarmDataVO.setRealNum(Constants.formatIntegerNum(response.getData().getTotalAlarmNum()));
+ alarmDataVO.setErrNum(Constants.formatIntegerNum(response.getData().getMisReportAlarmNum()));
+ alarmDataVO.setLiftNum(Constants.formatIntegerNum(response.getData().getHandledAlarmNum()));
+ alarmDataVO.setProcessingNum(Constants.formatIntegerNum(response.getData().getUnHandedAlarmNum()));
+ alarmDataVO.setStartDate(start);
+ alarmDataVO.setEndDate(end);
+ }else{
+ alarmDataVO.setTotalNum(Constants.ZERO);
+ alarmDataVO.setRealNum(Constants.ZERO);
+ alarmDataVO.setErrNum(Constants.ZERO);
+ alarmDataVO.setLiftNum(Constants.ZERO);
+ alarmDataVO.setProcessingNum(Constants.ZERO);
+ alarmDataVO.setStartDate(start);
+ alarmDataVO.setEndDate(end);
+ }
+ return alarmDataVO;
+ }
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌
+ * @return
+ */
+ @Override
+ public YearDeviceDataVO yearFightingAdminDeviceData(){
+ YearDeviceDataVO data = new YearDeviceDataVO();
+ FireStatisticRequest param = new FireStatisticRequest();
+ param.setIndexCode("api_fire_statistic");
+ BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ) {
+ 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);
+ if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response1.getData()!=null ) {
+ data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
+ data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
+ }
+ return data;
+ }
+
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍒嗙被鍜屾眹鎬荤殑鍚勭姸鎬佽澶囨暟閲�
+ * @return
+ */
+ @Override
+ public FightingAdminCenterDataVO centerFightingAdminData(){
+ FightingAdminCenterDataVO data = new FightingAdminCenterDataVO();
+ List<DeviceNumByTypeVO> list = new ArrayList<>();
+ 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);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ for(FireDevStatusListResponse r :response.getData()){
+ DeviceNumByTypeVO t = new DeviceNumByTypeVO();
+ t.setTypeName(r.getDevTypeName());
+ t.setOfflineDeviceNum(Constants.formatIntegerNum(r.getOfflineFireDevCount()));
+ t.setAlarmDeviceNum(Constants.formatIntegerNum(r.getAlarmFireDevCount()));
+ t.setOnlineDeviceNum(Constants.formatIntegerNum(r.getOnlineFireDevCount()));
+ t.setErrDeviceNum(Constants.formatIntegerNum(r.getFaultFireDevCount()));
+ t.setTotalDeviceNum(Constants.formatIntegerNum(r.getTotalFireDevCount()));
+ list.add(t);
+ data.setOfflineDeviceNum(Constants.formatIntegerNum( data.getOfflineDeviceNum())+Constants.formatIntegerNum(r.getOfflineFireDevCount()));
+ data.setAlarmDeviceNum(Constants.formatIntegerNum( data.getAlarmDeviceNum())+Constants.formatIntegerNum(r.getAlarmFireDevCount()));
+ data.setOnlineDeviceNum(Constants.formatIntegerNum( data.getOnlineDeviceNum())+Constants.formatIntegerNum(r.getOnlineFireDevCount()));
+ 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(" 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 )
+ .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;
+ }
+
+
+ /**
+ * 娑堥槻 娓╂箍搴︽暟鎹�
+ */
+ @Override
+ public List<TemperatureHumidityDataVO> getTemperatureHumidityData(){
+ TemperatureHumidityDataRequest request = new TemperatureHumidityDataRequest();
+ List<TemperatureHumidityDataVO> temperatureHumidityDataVOList = new ArrayList<>();
+ request.setPageNo(1);
+ request.setPageSize(100);
+ request.setParentIndexCode(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.TEMPERATURE_HUMIDITY).getCode());
+ BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse>> response = HKService.temperatureHumidityDataStatistic(request);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ List<TemperatureHumidityDataResponse> temperatureHumidityDataResponseList = response.getData().getList();
+
+ if(CollectionUtils.isNotEmpty(temperatureHumidityDataResponseList)){
+ Set<String> parentIndexCode = new HashSet<String>(temperatureHumidityDataResponseList.stream().map(
+ i->i.getIndexCode().replace("@0","").replace("@1","")
+ ).collect(Collectors.toList()));
+ for (String code:parentIndexCode) {
+ List<TemperatureHumidityDataResponse> dateList =
+ temperatureHumidityDataResponseList.stream().filter(i->i.getIndexCode().indexOf(code)>=Constants.ZERO).collect(Collectors.toList());
+ TemperatureHumidityDataVO temperatureHumidityDataVO = new TemperatureHumidityDataVO();
+ for (TemperatureHumidityDataResponse data:dateList) {
+ if(StringUtils.isNotBlank(data.getName())){
+ Integer index = data.getName().indexOf("-");
+ if(index>=0){
+ data.setName(data.getName().substring(0,index));
+ }
+ }
+ if(data.getSensorType().equals("currTemperature")){
+ temperatureHumidityDataVO.setTemperatureData(data);
+ }else{
+ temperatureHumidityDataVO.setHumidityData(data);
+ }
+ }
+ temperatureHumidityDataVOList.add(temperatureHumidityDataVO);
+ }
+ }
+ }
+ return temperatureHumidityDataVOList;
+ }
+
+
+
+ /**
* 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
* @return
*/
@Override
public EnergyBoardVO centerEnergyData(){
- EnergyBoardVO data = new EnergyBoardVO();
- Random random = new Random();
+ EnergyBoardVO data = new EnergyBoardVO();
+ Random random = new Random();
PlatformWaterGas smoke= platformWaterGasMapper.selectOne(new QueryWrapper<PlatformWaterGas>()
.select("sum(num) as num")
.lambda()
@@ -458,20 +1665,27 @@
BigDecimal carbonWater = new BigDecimal(0);//鏈湀鐢ㄦ按
BigDecimal carbonElec = new BigDecimal(0);//鐢ㄧ數
+ data.setYesterdayElectricity(getDefaultData());//鏄ㄦ棩鐢ㄧ數
data.setTodayElectricity(getDefaultData());//浠婃棩鐢ㄧ數
data.setElectricityQuantity(getDefaultData());//涓婃湀鐢ㄧ數
+ data.setMonthElectricity(getDefaultData());//鏈湀鐢ㄧ數
+
+
+ getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堢敤鐢甸噺鏁版嵁
+ carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
+
+ getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堢敤鐢甸噺鏁版嵁
+ getCurrentDateElectircityData(data.getYesterdayElectricity(),-1);//閫氳繃瀹夐槻骞宠幏鍙栨槰鏃ョ敤鐢甸噺鏁版嵁
+ getCurrentDateElectircityData(data.getTodayElectricity(),0);//閫氳繃瀹夐槻骞宠幏鍙栦粖鏃ョ敤鐢甸噺鏁版嵁
+
data.setWaterQuantity(getDefaultData());//涓婃湀鐢ㄦ按
data.setGasQuantity(getDefaultData());//涓婃湀鐢ㄦ皵
- data.setMonthElectricity(getDefaultData());//鏈湀鐢ㄧ數
- data.setYesterdayElectricity(getDefaultData());//鏄ㄦ棩鐢ㄧ數
- getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堟暟鎹�
carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
- getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堟暟鎹�
- String firstDate = DateUtil.getFirstDayOfThisMonth() +" 00:00:00";
+ String firstDate = DateUtil.getFirstDayCurrentMonth() +" 00:00:00";
Date month0 = DateUtil.getDateFromString(firstDate);
Date month1 = DateUtil.increaseMonth(month0,-1);//涓婃湀
Date month2 = DateUtil.increaseMonth(month0,-2);//涓婁笂鏈�
- Date month3 = DateUtil.increaseMonth(month0,-12);//鍘诲勾鍚屾湀
+ Date month3 = DateUtil.increaseMonth(month0,-13);//鍘诲勾鍚屾湀
List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
.lambda()
@@ -492,10 +1706,10 @@
data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
@@ -507,23 +1721,34 @@
data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}
}
}
if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
//璁＄畻鐢ㄦ皵鍚屾瘮鐜瘮
- data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
- data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
+ if(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 +""*/);
+ }
+ 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){
// //璁＄畻鐢ㄦ按鍚屾瘮鐜瘮
- data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
- data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
+ data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
+ data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
}
/*璁＄畻纰虫帓閲忥紝浠ヤ笅涓変釜鍥犵礌涔嬪拰
@@ -532,7 +1757,7 @@
3) 鑷潵姘翠簩姘у寲纰虫帓鏀鹃噺(kg)=鑷潵姘翠娇鐢ㄩ噺(m3)脳0.91锛�*/
data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
.add(carbonGas.multiply(new BigDecimal(0.19)))
- .add(carbonWater.multiply(new BigDecimal(0.91)))));
+ .add(carbonWater.multiply(new BigDecimal(0.91)))).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP));
return data;
}
@@ -543,7 +1768,7 @@
*/
private void getMonthElectricityData(EnergyModelDataVO data) {
BaseResponse<MonthDataByMeterTypeResponse> response = HKService.getCurrentMonthDataByMeterType("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
@@ -555,11 +1780,93 @@
* @param data
*/
private void getLastMonthElectricityData(EnergyModelDataVO data) {
- BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
- data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
- data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
- data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
+// BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
+// if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+// data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
+// data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
+// data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
+// }
+// String nowMonth = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd");
+// //涓婃湀鏃ユ湡
+// DateUtil.getBeforMonthStr(new Date(),1);
+// //涓婁笂鏈堟棩鏈�
+// DateUtil.getBeforMonthStr(new Date(),2);
+// //涓婂勾鏃ユ湡
+// DateUtil.getBeforMonthStr(new Date(),13);
+
+ EnergyTotalDataRequest param = new EnergyTotalDataRequest();
+ param.setPeriodType("month");
+ param.setDate(DateUtil.getBeforMonthStr(new Date(),1).substring(0,7));
+ BaseResponse<EnergyTotalDataResponse> beforMonthResponse = HKService.energyTotal(param);
+ if(beforMonthResponse != null && StringUtils.equals(beforMonthResponse.getCode(), HKConstants.RESPONSE_SUCCEE) && beforMonthResponse.getData()!=null ){
+ data.setTotal(beforMonthResponse.getData().getElectricity());
+ data.setTotalNum(new BigDecimal(beforMonthResponse.getData().getElectricity()));
+ }
+ param.setDate(DateUtil.getBeforMonthStr(new Date(),2).substring(0,7));
+ BaseResponse<EnergyTotalDataResponse> beforBeforMonthResponse = HKService.energyTotal(param);
+ if(beforBeforMonthResponse != null && StringUtils.equals(beforBeforMonthResponse.getCode(), HKConstants.RESPONSE_SUCCEE) && beforBeforMonthResponse.getData()!=null ){
+ if(Objects.nonNull(beforBeforMonthResponse.getData()) && StringUtils.isNotBlank(beforBeforMonthResponse.getData().getElectricity())){
+ data.setRingNum(new BigDecimal(beforBeforMonthResponse.getData().getElectricity()));
+ }else{
+ data.setRingNum(BigDecimal.ZERO);
+ }
+ if(Objects.isNull(data.getTotal()) || Objects.isNull(data.getRingNum())
+ || data.getTotalNum().compareTo(BigDecimal.ZERO) ==0 || data.getRingNum().compareTo(BigDecimal.ZERO) ==0 ){
+ data.setRingRate("0");
+ }else{
+ data.setRingRate(new BigDecimal(data.getTotal()).divide(data.getRingNum(),2,BigDecimal.ROUND_HALF_UP).toString());
+ }
+ }
+ param.setDate(DateUtil.getBeforMonthStr(new Date(),13).substring(0,7));
+ BaseResponse<EnergyTotalDataResponse> beforYearMonthResponse = HKService.energyTotal(param);
+ if(beforYearMonthResponse != null && StringUtils.equals(beforYearMonthResponse.getCode(), HKConstants.RESPONSE_SUCCEE) && beforBeforMonthResponse.getData()!=null ){
+ if(Objects.nonNull(beforYearMonthResponse.getData()) && StringUtils.isNotBlank(beforYearMonthResponse.getData().getElectricity())){
+ data.setSameNum(new BigDecimal(beforYearMonthResponse.getData().getElectricity()));
+ }else{
+ data.setSameNum(BigDecimal.ZERO);
+ }
+ if(Objects.isNull(data.getTotal()) || Objects.isNull(data.getSameNum())
+ || data.getTotalNum().compareTo(BigDecimal.ZERO) ==0 || data.getSameNum().compareTo(BigDecimal.ZERO) ==0 ){
+ data.setSameRate("0");
+ }else{
+ data.setSameRate(new BigDecimal(data.getTotal()).divide(data.getSameNum(),2,BigDecimal.ROUND_HALF_UP).toString());
+ }
+ }
+ }
+
+
+
+
+
+ /**
+ * 閫氳繃瀹夐槻骞宠幏鍙栦粖鏃ョ敤鐢甸噺
+ * @param data
+ */
+ private void getCurrentDateElectircityData(EnergyModelDataVO data,int days) {
+// EnergyTrendRequest param = new EnergyTrendRequest();
+// param.setDate(DateUtil.getFomartDate(DateUtil.addDaysToDate(new Date(),days),"yyyy-MM-dd"));//鏃ユ湡
+// param.setMeterType(1);
+// param.setShowType("4");
+// param.setNodeType(2);
+// param.setNodeId("root000000");
+// param.setPeriodType("day");
+// BigDecimal total = new BigDecimal(0);
+// BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
+// if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+// && response.getData()!=null&& response.getData().getYvalues()!=null ){
+// for (int i = 0; i < response.getData().getYvalues().get(0).getValue().length; i++) {
+// total = total.add(new BigDecimal(StringUtils.defaultString( response.getData().getYvalues().get(0).getValue()[i],"0")));
+// }
+//
+// }
+// data.setTotal(Constants.formatBigdecimal2Float(total).toString());
+ EnergyTotalDataRequest param = new EnergyTotalDataRequest();
+ param.setPeriodType("day");
+ param.setDate(DateUtil.getFomartDate(DateUtil.addDaysToDate(new Date(),days),"yyyy-MM-dd"));
+ BaseResponse<EnergyTotalDataResponse> beforMonthResponse = HKService.energyTotal(param);
+ if(beforMonthResponse != null && StringUtils.equals(beforMonthResponse.getCode(), HKConstants.RESPONSE_SUCCEE) && beforMonthResponse.getData()!=null ){
+ data.setTotal(beforMonthResponse.getData().getElectricity());
+ data.setTotalNum(new BigDecimal(beforMonthResponse.getData().getElectricity()));
}
}
@@ -582,19 +1889,31 @@
public RegionEnergyListResponse energyRegionData(){
RegionEnergyListResponse data = null;
BaseResponse<RegionEnergyListResponse> response = HKService.regionEnergyList("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data = response.getData();
}
if(data == null){
data = new RegionEnergyListResponse();
- data.setSecondRegionDataList(new ArrayList<>());
data.setRootValue("0");
data.setSamePercent("0");
data.setRingPercent("0");
data.setSecondRegionDataList(new ArrayList<>());
}
- return data;
+ if(data.getSecondRegionDataList()!=null && data.getSecondRegionDataList().size()>1){
+ int index =-1;
+ for (int i = 0; i <data.getSecondRegionDataList().size() ; i++) {
+ RegionTopPowerResponse t=data.getSecondRegionDataList().get(i);
+ if(Constants.formatBigdecimal(t.getPercent()).compareTo(new BigDecimal(1)) == 0){
+ index =i;
+ break;
+ }
+ }
+ if(index>-1){
+ data.getSecondRegionDataList().remove(index);//鍒犻櫎鏍硅妭鐐规暟鎹�
+ }
+ }
+ return data;
}
/**
* 杩�12涓按鐢垫皵娌硅�楁暟鎹粺璁�
@@ -609,15 +1928,15 @@
if(type >=0 && type <=2){
//鐢ㄦ按鐢ㄧ數鐢ㄦ皵
List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
- .select("DATE_FORMAT(TIME_INFO,'yyyy-MM') as time_info_str,sum(num) as num")
+ .select("DATE_FORMAT(TIME_INFO,'%Y-%m') as time_info_str,sum(num) as num")
.lambda()
.eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
.eq(PlatformWaterGas::getType,type)
.apply("time_info BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND CURDATE()")//杩�12涓湀
- .last(" groupby DATE_FORMAT(TIME_INFO,'yyyy-MM')")
+ .last(" group by DATE_FORMAT(TIME_INFO,'%Y-%m')")
);
for (int i = 0; i < 12; i++) {
- Date tempDate = DateUtil.increaseMonth(lastMonth,i);
+ Date tempDate = DateUtil.increaseMonth(lastMonth,i);
EnergyDataVO data = new EnergyDataVO();
data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
data.setEnergy(new BigDecimal(0));
@@ -631,26 +1950,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,(i+1)+"鏈�"));
+ 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){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+ 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(0).setEnergy(new BigDecimal(response.getData().getYvalues().get(0).getValue()[i]));
+ energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i-lastMonths],"0")));
}
}
@@ -661,18 +2004,20 @@
@Override
public VisitDataVO visitSecurityData(){
//寰呰闂�佸凡鐧昏銆佸凡绂诲紑
-
VisitDataVO result = new VisitDataVO();
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
+ .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 )));//宸茬绂�
- PageWrap<Visits> pageWrap = new PageWrap<>();
+ /*PageWrap<Visits> pageWrap = new PageWrap<>();
pageWrap.setCapacity(10);
pageWrap.setPage(1);
pageWrap.setModel(new Visits());
@@ -689,14 +2034,39 @@
list.add(data);
}
result.setRetentionNum(visitsPageData.getTotal());
+ }*/
+
+ String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
+ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
+ queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
+ queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
+ queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID");
+ queryWrapper.eq(Visits::getStatus,Constants.VisitStatus.signin);
+ queryWrapper.apply(" TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+" ");
+ queryWrapper.ne("m.type ",Constants.TWO);
+ queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
+ queryWrapper.orderByDesc(Visits::getEditDate);
+ List<Visits> vr = visitsJoinMapper.selectList(queryWrapper);
+ result.setVisitRetentionDataList(new ArrayList<>());//璁垮婊炵暀鏁版嵁闆嗗悎
+ if(vr!=null&&vr!=null){
+ vr.stream().forEach(s ->{
+ VisitRetentionDataVO t = new VisitRetentionDataVO();
+ t.setName(s.getName());
+ t.setCompanyName(s.getCompanyName());
+ t.setTimeOutMinute(s.getTimeOut());
+ result.getVisitRetentionDataList().add(t);
+ });
}
- result.setVisitRetentionDataList(list);//璁垮婊炵暀鏁版嵁闆嗗悎
+ result.setRetentionNum(result.getVisitRetentionDataList().size());
return result;
}
@Override
public SecurityBoardVO centerSecurityData(){
-
SecurityBoardVO data = new SecurityBoardVO();
getParkingCarsNum(data);//鑾峰彇杞︿綅鏁版嵁
@@ -705,6 +2075,7 @@
.selectAll(Retention.class)
.selectAs(Company::getType,Retention::getCompanyType)
.leftJoin(Company.class,Company::getId,Retention::getCompanyId)
+ .eq(Retention::getIsdeleted,Constants.ZERO)
);
//浠婃棩鍦ㄥ洯浜烘暟
@@ -712,18 +2083,28 @@
(int) retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
);
//鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
+ data.setRelatedTotal(
+ (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.ZERO)).count()
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) ).count()
);
//鍦ㄥ洯璁垮鏁伴噺
data.setVisitTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
);
//鍦ㄥ洯杞﹁締
- data.setInternalCarTotal(
+ data.setInParkCarTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
);
- //鍦ㄥ洯鐩稿叧鏂硅溅杈�
+ //2025骞�8鏈�4鏃�09:24:23 鏇存崲鏁版嵁婧� 涓嶄粠娴峰悍鍙�
+ data.setFreeParkingLot(data.getParkingLotTotal()<data.getInParkCarTotal()?Constants.ZERO:data.getParkingLotTotal() - data.getInParkCarTotal());
+ //褰撳墠鍦ㄥ洯璐ц溅鍙告満鎬绘暟
+ 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()
@@ -732,28 +2113,69 @@
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";
}
private void getParkingCarsNum(SecurityBoardVO data) {
@@ -783,18 +2205,35 @@
if(platformList!=null && platformList.size()>0){
List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
.selectAll( PlatformJob.class)
+// .selectAs(Platform::getCode,PlatformJob::getPlatformCode)
.select("( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+" order by pl.CREATE_DATE desc limit 1 ) as newStartDate")
- .select(" (select sum(ifnull(pl.IO_QTY , 0 )) from platform_wms_detail pl where pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
- .apply("to_days(t.create_date) = to_days(now())")
+ //.select(" ( select sum(ifnull(pl.IO_QTY , 0 )) from platform_wms_detail pl where pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
+ .select(" ( case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end )",PlatformJob::getWorkNum)
+// .apply("to_days(t.create_date) = to_days(now())")
.eq(Platform::getIsdeleted, Constants.ZERO)
.in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() })
- .orderByDesc(PlatformJob::getStatus ));
+// .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .orderByDesc(PlatformJob::getStatus )
+ .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();
platformDurationVO.setPlatformName(model.getName());
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)){
@@ -802,9 +2241,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());//杞︾墝鍙�
@@ -813,7 +2256,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); //浣滀笟宸茶秴鏃�
}
}
@@ -850,8 +2293,8 @@
List<WorkEfficiencyVO> workEfficiencyVOList = new ArrayList<>();
List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
.selectAll( PlatformJob.class)
- .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", PlatformJob::getIoQty)
- .apply("to_days(t.create_date) = to_days(now())")
+// .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.done_date) = to_days(now())")
.eq(Platform::getIsdeleted, Constants.ZERO)
.in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
, Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
@@ -863,22 +2306,9 @@
if(jobList==null || jobList.size()==0){
return workEfficiencyVOList;
}
- /* List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
- .selectAll( PlatformWmsDetail.class)
- .selectAs( PlatformJob::getDoneDate,PlatformWmsDetail::getDoneDate)
- .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
- .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
- .eq(PlatformJob::getIsdeleted, Constants.ZERO)
- .in(Constants.equalsInteger(type,Constants.ZERO),PlatformJob::getType,new Integer[]{0,2,4})
- .in(Constants.equalsInteger(type,Constants.ONE),PlatformJob::getType,new Integer[]{1,3})
- .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
- , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
- , Constants.PlatformJobStatus.LEAVED.getKey())
- .apply("to_days(t1.create_date) = to_days(now())")
- );*/
int curtotalNum = 0;
Date today = Utils.Date.getStart(new Date());
- long curTime=0, lastTime=0;
+ long curTime=0, lastTime=0 ;
for (int i = 0; i < 8; i++) {
lastTime = curTime;//涓婃鐨勬椂闂�
int curHour = 8+(i*2);
@@ -901,6 +2331,9 @@
curtotalNum += Constants.formatIntegerNum(workEfficiencyVO.getWorkNum()) ;
}
workEfficiencyVO.setTotalWorkNum(curtotalNum);//绱鍊�
+ if((System.currentTimeMillis() + 2*60*60*1000) < curTime ){
+ workEfficiencyVO.setTotalWorkNum(0);
+ }
workEfficiencyVOList.add(workEfficiencyVO);
}
return workEfficiencyVOList;
@@ -934,8 +2367,13 @@
}
@Override
public List<PlatformWarnEvent> warningList(int limit){
- List<PlatformWarnEvent> platformLogList = platformWarnEventMapper.selectList(new QueryWrapper<PlatformWarnEvent>().lambda()
+ List<PlatformWarnEvent> platformLogList = platformWarnEventJoinMapper
+ .selectJoinList(PlatformWarnEvent.class,new MPJLambdaWrapper<PlatformWarnEvent>()
+ .selectAll(PlatformWarnEvent.class)
+ .selectAs(Platform::getName,PlatformWarnEvent::getPlatformName)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO)
+ .apply("to_days(t.create_date) = to_days(now())")
.orderByDesc(PlatformWarnEvent::getCreateDate)
.last(" limit "+limit)
);
@@ -955,16 +2393,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){
@@ -986,12 +2424,14 @@
if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
}
//宸插彨鍙凤紙棰勭害杞︺�佺鍒版暟銆佸凡鍙彿锛�
if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CALLED.getKey()) ){
data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
}
// 浣滀笟杞﹁締锛堥绾﹁溅銆佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅锛�
if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
@@ -999,6 +2439,7 @@
data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum()));
}
// 浣滀笟瀹屾垚锛堥绾﹁溅銆佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅銆佸凡瀹屾垚锛�
if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
@@ -1024,7 +2465,7 @@
}
// 宸茬鍥�
if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())){
- data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum()));
+ // data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum()));
}
// 宸茶繃鍙凤紙棰勭害杞︺�佺鍒版暟銆佹帓闃熻溅锛�
if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.OVER_NUMBER.getKey())){
@@ -1038,9 +2479,714 @@
}
}
- }
+ }*/
+ //棰勭害鏁�
+ 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.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;
}
+ /**
+ * 鏌ヨ鑳借�楃敤鐢典俊鎭� 1=浠婃棩锛�2=鏈湀锛�3=鏄ㄦ棩
+ * @return
+ */
+ @Override
+ public List<RegionDataRankingDataResponse> getRegionDataRanking(Integer type){
+ RegionDataRankingDataRequest request = new RegionDataRankingDataRequest();
+ request.setMeterType(1);
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ request.setDate(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd"));
+ request.setPeriodType("day");
+ }else if(Constants.equalsInteger(type,Constants.TWO)){
+ request.setDate(DateUtil.getFomartDate(new Date(),"yyyy-MM"));
+ request.setPeriodType("month");
+ }else{
+ request.setDate(DateUtil.getBeforDay(new Date(),1));
+ request.setPeriodType("day");
+ }
+ BaseResponse<List<RegionDataRankingDataResponse>> response = HKService.regionDataRanking(request);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ List<RegionDataRankingDataResponse> regionDataRankingDataResponseList = new ArrayList<>();
+ for (RegionDataRankingDataResponse regionDataRankingDataResponse:response.getData()) {
+ if(StringUtils.isNotBlank(regionDataRankingDataResponse.getPercent())){
+ if(Constants.equalsInteger(Integer.valueOf(new BigDecimal(regionDataRankingDataResponse.getPercent()).intValue()),Constants.ONE)){
+ continue;
+ }
+ regionDataRankingDataResponseList.add(regionDataRankingDataResponse);
+ }
+ }
+ return regionDataRankingDataResponseList;
+ }else{
+ return null;
+ }
+ }
+ /**
+ * 鍑哄簱鑳藉姏
+ * @return
+ */
+ @Override
+ public WholeProvinceZXTVO outAbilityUseRate(){
+ WholeProvinceZXTVO result = new WholeProvinceZXTVO();
+ result.setCurrentNum(new BigDecimal(0));
+ result.setTotalNum(new BigDecimal(0));
+ result.setUseRate(new BigDecimal(0));
+ result.setDetailList(new ArrayList<>());
+ List<TmsFactoryParam> paramList = factoryList();
+ List<WholeProvinceZxtDetailVO> list = new ArrayList<>();
+ TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
+ if(paramList!=null){
+ String startDate = DateUtil.formatDate(new Date(),"yyyy-MM-dd");
+ String endDate = DateUtil.formatDate(new Date(),"yyyy-MM-dd");
+ if(isDebug){
+ startDate = "2024-12-01";
+ endDate = "2024-12-05";
+ }
+ for(TmsFactoryParam p : paramList){
+ WholeProvinceZxtDetailVO t = new WholeProvinceZxtDetailVO();
+ t.setFactoryName(p.getName());
+ t.setCurrentNum(new BigDecimal(0));
+ t.setUseRate(new BigDecimal(0));
+ t.setTotalNum(Constants.formatBigdecimal(p.getParam3()));//8灏忔椂鍑哄簱鑳藉姏
+ if(StringUtils.isNotBlank(p.getCode())){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.setDateStart(startDate);
+ param.setDateEnd(endDate);
+ param.getFacrotyCodeList().add(p.getCode());
+ List<TmsOutQtyAndVehicleQtyResponse> response = tmsService.getOutQtyAndVehicleQty(param);//鏌ヨ鍑哄簱閲�
+ t.setCurrentNum(getCurrentOutQryByList(response));
+ 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()));
+ }
+ }
+ if(result.getTotalNum().compareTo(new BigDecimal(0)) !=0){
+ result.setUseRate(result.getCurrentNum().divide(result.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
+ }
+ return result;
+ }
+ /**
+ * 鍏ㄨ韩鍑哄簱鑳藉姏
+ * @return
+ */
+ @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));
+ List<TmsFactoryParam> paramList = factoryList();
+ String code = null;
+ if(paramList!=null){
+ //澶勭悊鏈�澶у嚭搴撹兘鍔涘拰8灏忔椂鍑哄簱鑳藉姏
+ for(TmsFactoryParam param : paramList){
+ if(StringUtils.isNotBlank(factoryCode)){
+ if(StringUtils.equals(param.getCode(),factoryCode)){
+ data.setHoursAbility(Constants.formatBigdecimal(param.getParam3()));
+ data.setMaxAbility(Constants.formatBigdecimal(param.getNum2()));
+ code = param.getCode();
+ break;
+ }
+ }else{
+ data.setHoursAbility(data.getHoursAbility().add(Constants.formatBigdecimal(param.getParam3())));
+ data.setMaxAbility(data.getMaxAbility().add(Constants.formatBigdecimal(param.getNum2())));
+ }
+ }
+ }
+ 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);
+ }
+ 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();
+ if(StringUtils.isNotBlank(code)){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add(code);
+ }
+ TmsOutboundCapabilityResponse result= tmsService.getOutboundCapability(param);
+ if(result !=null){
+ String todayDate = DateUtil.getShortTime(new Date());
+ List<String> planCodes = new ArrayList<>();
+ List<String> todayCodes = new ArrayList<>();
+ if(result.getCurrentDayOrderList()!=null && result.getCurrentDayOrderList().size()>0){
+ for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayOrderList()){
+ dealOutOrderBiz(data,model,planCodes,todayCodes,todayDate);
+ }
+ }
+ if(result.getCurrentDayAgoOrderList()!=null && result.getCurrentDayAgoOrderList().size()>0){
+ for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayAgoOrderList()){
+ dealOutOrderBiz(data,model,planCodes,todayCodes,todayDate);
+ }
+ }
+ 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());
+ 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());
+ }
+ }
+ }
+ }
+
+ private boolean notInList(String transportCode, List<String> planCodes) {
+ for(String s :planCodes){
+ if(StringUtils.equals(transportCode,s)){
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * 鍑哄簱鑳藉姏鏉庢案鍒�
+ * @return
+ */
+ @Override
+ public TotalOutQtyNumVO totalOutQtyNum(int type,String code){
+ 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));
+ data.setSameOutNum(new BigDecimal(0));
+
+ Date sameStart = DateUtil.getBeginDayOfMonth(-1);
+ Date sameEnd = DateUtil.getEndDayOfMonth(-1);
+ Date curStart = DateUtil.getBeginDayOfMonth(0);
+ Date curEnd = DateUtil.getEndDayOfMonth(0);
+ Date lastStart = DateUtil.getBeginDayOfLastMonth();
+ Date lastEnd = DateUtil.getEndDayOfLastMonth();
+ if(type ==1){
+ //鏈懆
+ sameStart= DateUtil.getBeginDayOfWeek(-1);
+ sameEnd= DateUtil.getEndDayOfWeek(-1);
+ curStart= DateUtil.getBeginDayOfWeek(0);
+ curEnd= DateUtil.getEndDayOfWeek(0);
+ lastStart = DateUtil.getBeginDayOfLastWeek();
+ lastEnd= DateUtil.getEndDayOfLastWeek();
+ }else if(type == 2){
+ curStart= DateUtil.getBeginDayOfYear(0);
+ curEnd= DateUtil.getEndDayOfYear(0);
+ lastStart= DateUtil.getBeginDayOfYear(-1);
+ lastEnd= DateUtil.getEndDayOfYear(-1);
+ sameStart = null;
+ sameEnd =null;
+ }
+ TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
+ if(StringUtils.isNotBlank(code)){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add(code);
+ }
+ if(type !=2){
+ //鏈勾鐨勪笉闇�瑕佹煡鍘诲勾鍚屽懆鏈�
+ param.setDateEnd(DateUtil.getShortTime(sameEnd));
+ param.setDateStart(DateUtil.getShortTime(sameStart));
+ 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())));
+ }
+ }
+ }
+ param.setDateEnd(DateUtil.getShortTime(curEnd));
+ param.setDateStart(DateUtil.getShortTime(curStart));
+ 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));
+ param.setDateStart(DateUtil.getShortTime(lastStart));
+ 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())));
+ }
+ }
+ 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;
+ }
+ /**
+ * 鍑哄簱鑳藉姏鏉庢案鍒�
+ * @return
+ */
+ @Override
+ public List<WholeProvinceMapVO> mapYearAndMonthOutList(String code){
+ List<WholeProvinceMapVO> result = new ArrayList<>();
+ TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
+ if(StringUtils.isNotBlank(code)){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add(code);
+ }
+ List<TmsDistributionOfDeliveryLocResponse> response = tmsService.getDistributionOfDeliveryLocations(param);//鏌ヨ鍑哄簱閲�
+ if(response!=null &&response.size()>0){
+ for(TmsDistributionOfDeliveryLocResponse model : response){
+ 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));
+ }
+ }
+ }
+ return result;
+ }
+
+ private WholeProvinceMapVO getFromProvinceResultList(TmsDistributionOfDeliveryLocResponse model, List<WholeProvinceMapVO> result) {
+ for(WholeProvinceMapVO t : result){
+ if(StringUtils.equals(t.getProvinceCode(), model.getToProvinceCode())){
+ t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).add(Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity())));
+ t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).add(Constants.formatBigdecimal0Float(model.getYearOutboundQuantity())));
+ return t;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * 鍑哄簱鑳藉姏鏉庢案鍒�
+ * @return
+ */
+ @Override
+ public List<TmsFactoryParam> factoryList(){
+ List<TmsFactoryParam> paramList = tmsFactoryParamMapper.selectList(new QueryWrapper<TmsFactoryParam>().lambda()
+ .eq(TmsFactoryParam::getIsdeleted,Constants.ZERO)
+ .orderByAsc(TmsFactoryParam::getSortnum));
+ return paramList;
+ }
+ /**
+ * 鑾峰彇鏈畬鎴愯鍗曢泦鍚�
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsBasePageResponse<TmsOrderNoFinishListResponse> orderNoFinishList(TmsOrderNoFinishListRequest param){
+ TmsBasePageResponse<TmsOrderNoFinishListResponse> infoList = tmsService.getNotFinishOrderList(param);//鏌ヨ鍑哄簱閲�
+ /* if(infoList!=null && infoList.getRows()!=null){
+ for(TmsOrderNoFinishListResponse model :infoList.getRows()){
+ model.setStatusDesc(TMSContants.TopStatusLevel.getNameByKey(TMSContants.ChildStatusLevel.getParentIndexByStatus(model.getStatus())));
+
+ }
+ }*/
+ return infoList;
+ }
+ /**
+ * 杩戜竷鏃ュ埌璐ф儏鍐�-鏀规垚杩�15鏃�
+ * @return
+ */
+ @Override
+ public List<LastSevenDaysOrderVo> arriveGoodsList(String code){
+ List<LastSevenDaysOrderVo> list = new ArrayList<>();
+ TmsSevenArrivalDetailsRequest param = new TmsSevenArrivalDetailsRequest();
+ if(StringUtils.isNotBlank(code)){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
+ }
+ Date date = new Date();
+ 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,15);
+ }
+ param.setNcCreateDateFrom(DateUtil.getShortTime(startDate));
+ param.setNcCreateDateThrough(DateUtil.getShortTime(date));
+ List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲�
+ for (int i = 0; i < 15; i++) {
+ LastSevenDaysOrderVo model = new LastSevenDaysOrderVo();
+ Date td = DateUtil.addDaysToDate(date,-i);
+ model.setDateStr(DateUtil.getShortTime(td));
+ dealGoodsListFromResponse(model,infoList);
+ list.add(model);
+ }
+ return list;
+ }
+ private void dealGoodsListFromResponse( LastSevenDaysOrderVo model, List<TmsSevenArrivalStatusAndDetailsResponse> list) {
+ model.setIngList(new ArrayList<>());
+ model.setWaitList(new ArrayList<>());
+ model.setDoneList(new ArrayList<>());
+ if(list ==null || list.size()==0){
+ return;
+ }
+ for(TmsSevenArrivalStatusAndDetailsResponse temp : list){
+ if(StringUtils.equals(temp.getNcCreateDate(),model.getDateStr())){
+ if(Constants.equalsInteger(temp.getStatus(),Constants.ZERO)){
+ model.getWaitList().add(temp);
+ }else if(Constants.equalsInteger(temp.getStatus(),Constants.ONE)){
+ model.getIngList().add(temp);
+ }else if(Constants.equalsInteger(temp.getStatus(),Constants.TWO)){
+ model.getDoneList().add(temp);
+ }
+ }
+ }
+ model.setDoneNum(model.getDoneList().size());
+ model.setIngNum(model.getIngList().size());
+ model.setWaitNum(model.getWaitList().size());
+ }
+
+ /**
+ * 鍑哄簱鑳藉姏鏉庢案鍒�
+ * @return
+ */
+ @Override
+ public WholeProvinceZXTVO tranportAbilityUseRate(){
+ 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();
+ if(paramList!=null){
+ List<TmsTotalAndReportVehicleQtyResponse> response = tmsService.getTotalAndReportVehicleQty();//鏌ヨ鍑哄簱閲�
+ for(TmsFactoryParam p : paramList){
+ 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().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().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){
+// model.setTotalOutQty(Constants.formatBigdecimal(model.getTotalOutT03Qty()).add(Constants.formatBigdecimal(model.getTotalOutT01Qty())));
+ r = r.add(Constants.formatBigdecimal(model.getTotalOutQty()));
+ }
+ }
+ return r ;
+ }
+
+ /**
+ * 浠撳簱璧勬簮鍒╃敤鐜�
+ * @return
+ */
+ @Override
+ public WholeProvinceZXTVO inventoryUseRate(){
+ WholeProvinceZXTVO result = new WholeProvinceZXTVO();
+ result.setCurrentNum(new BigDecimal(0));
+ result.setTotalNum(new BigDecimal(0));
+ result.setUseRate(new BigDecimal(0));
+ result.setDetailList(new ArrayList<>());
+ List<TmsFactoryParam> paramList = factoryList();
+ List<TmsInventoryListResponse> responses = tmsService.getRealTimeInventory();
+ if(paramList!=null){
+ for(TmsFactoryParam p : paramList){
+ WholeProvinceZxtDetailVO t = new WholeProvinceZxtDetailVO();
+ t.setFactoryName(p.getName());
+ t.setCurrentNum(new BigDecimal(0));
+ t.setTotalNum(Constants.formatBigdecimal(p.getNum1()));//鎬诲簱瀛橀噺
+ t.setCurrentNum(getFromInventoryList(p.getCode(),responses));
+ 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(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()));
+ }
+ }
+ if(result.getTotalNum().compareTo(new BigDecimal(0)) !=0){
+ result.setUseRate(result.getCurrentNum().divide(result.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
+ }
+ return result;
+ }
+
+ private BigDecimal getFromInventoryList(String code, List<TmsInventoryListResponse> responses) {
+ BigDecimal r = new BigDecimal(0);
+ if(responses!=null && responses.size()>0){
+ for(TmsInventoryListResponse model: responses){
+ if(StringUtils.equals(model.getFactoryCode(),code)){
+ r = r.add(Constants.formatBigdecimal(model.getStockQty()));
+ }
+ }
+ }
+ return r ;
+ }
+
+
}
--
Gitblit v1.9.3