From 36e1ec74d47e84cd1b31d7d4bc2319fd14ab1ea8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 18 十二月 2024 09:25:55 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 148 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 104 insertions(+), 44 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 88f2582..0a4d61f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -14,13 +14,14 @@
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.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.WmsInventoryDataResponse;
+import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsInventoryJsonResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
@@ -39,7 +40,9 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -153,7 +156,7 @@
* @return
*/
@Override
- public BoardStockListVO stockList( ){
+ public BoardStockListVO stockList(){
BoardStockListVO data = new BoardStockListVO();
double toatalNum = 1d;
BigDecimal num = new BigDecimal(0);
@@ -161,17 +164,16 @@
try {
toatalNum =Double.parseDouble(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_TOTAL_STOCK_NUM).getCode()) ;
}catch (Exception e){
-
}
- WmsBaseResponse<WmsInventoryDataResponse> response = wmsService.getInventoryList();
- if(response!=null && response.getData()!=null && response.getData().size()>=0){
+ WmsBaseResponse<WmsBaseDataResponse> response = wmsService.getInventoryList();
+ if(response!=null && response.getData()!=null && response.getData().size()>0){
List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();
if(t!=null &&t.size()>0){
for(WmsInventoryJsonResponse j :t){
num = num.add (Constants.formatBigdecimal( j.getQty()));
GeneralVO d = new GeneralVO();
d.setNum(Constants.formatBigdecimal(j.getQty()));
- d.setName(j.getItem_name());
+ d.setName(j.getItemName());
list.add(d);
}
}
@@ -182,7 +184,7 @@
toatalNum =1;
}
data.setTotalNum(new BigDecimal(toatalNum));
- data.setUseRate(data.getTotalNum().divide(data.getNum(),2,BigDecimal.ROUND_UP));
+ data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_HALF_UP));
return data;
}
@@ -670,6 +672,7 @@
List<PlatformJob> dataList = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate)
.selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -680,7 +683,7 @@
TransportMeasureVO data = new TransportMeasureVO();
data.setPlanDate(date);
data.setPlanTimes(0);
- data.setPlanTaskNum(new BigDecimal(random.nextInt(0)));
+ data.setPlanTaskNum(new BigDecimal( 0));
data.setFinishTaskNum(new BigDecimal(0));
for(PlatformJob job :dataList){
if(queryType == 2){
@@ -729,7 +732,11 @@
.selectAll(PlatformJob.class)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getCarCodeFront,param.getCarCode())
- .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())
+ .in(PlatformJob::getStatus,
+ Constants.PlatformJobStatus.DONE.getKey(),
+ Constants.PlatformJobStatus.LEAVED.getKey(),
+ Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey())
.last("limit 1"));
if(job!=null){
List<PlatformLog> logList = platformLogMapper.selectJoinList(PlatformLog.class,
@@ -769,7 +776,7 @@
.orderByDesc(PlatformLog::getCreateDate));
if(detailList!=null){
for(PlatformWmsDetail d : detailList){
- if(!isNotExistIocode(d.getIocode(),data.getContractList())){
+ if(isExistIocode(d.getIocode(),data.getContractList())){
continue;
}
tt = new CarsContractVO();
@@ -804,7 +811,7 @@
return list;
}
- private boolean isNotExistIocode(String iocode, List<CarsContractVO> detailList) {
+ private boolean isExistIocode(String iocode, List<CarsContractVO> detailList) {
if(detailList!=null){
for(CarsContractVO d :detailList){
if(StringUtils.equals(d.getIoCode(),iocode)){
@@ -847,44 +854,50 @@
Date lastYear = DateUtil.addYearToDate(year,-1);//鍘诲勾
List<PlatformJob> monthNum = platformJobMapper.selectJoinList(PlatformJob.class,
- new MPJLambdaWrapper<PlatformJob>()
- .selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
-// .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(month)+") and month(create_date) = month("+DateUtil.getPlusTime2(month)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(month)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(month)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(month)+"') "));
List<PlatformJob> monthLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastMonth)+") and month(create_date) = month("+DateUtil.getPlusTime2(lastMonth)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastMonth)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastMonth)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(lastMonth)+"') and done_date<= '"
+ +DateUtil.getPlusTime2(lastMonth)+"'"));
List<PlatformJob> yearNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
- .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getType,PlatformJob::getType)
+// .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(year)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(year)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(year)+"') and done_date<= '"+DateUtil.getPlusTime2(year)+"'"));
List<PlatformJob> yearLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getId)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastYear)+"') and done_date<= '"+DateUtil.getPlusTime2(lastYear)+"'"));
data.setMonthOutTotal(getSumTotalByList(monthNum,0,null));//鏈湀鍑哄簱閲�
- data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//涓婃湁鍑哄簱閲�
+ data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//涓婃湀鍑哄簱閲�
data.setYearOutTotal(getSumTotalByList(yearNum,null,null) );//鏈勾鍑哄簱閲�
data.setYearLastOutTotal(getSumTotalByList(yearLastNum,null,null) );//鍘诲勾鍑哄簱閲�
data.setMonthOutTimes(monthNum!=null?monthNum.size():0);
@@ -900,19 +913,30 @@
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())
- .apply(" and to_days(create_date) <to_days(now())"));
+ .apply(" to_days(create_date) <to_days(now())"));
- //==========浠婂ぉ鍑哄叆搴撲换鍔�
- List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
+ //==========浠婂ぉ鍑哄叆搴撳畬鎴愰噺
+ List<PlatformJob> currentDoneNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
- .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
.selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));
+ .apply(" to_days(done_date) = to_days(now())"));
+ //==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔�----
+ List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .apply(" to_days(create_date) = to_days(now())"));
BigDecimal beforeOutNum = (getSumTotalByList(beforeJobNum,0,null));//浠婂ぉ涔嬪墠鏈畬鎴愬嚭搴撲换鍔�
BigDecimal currentOutNum = (getSumTotalByList(currentNum,0,null));//浠婂ぉ涓嬪彂鍑哄簱浠诲姟
@@ -920,12 +944,12 @@
BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
data.setCurrentInNum(beforeInNum.add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
- data.setCurrentInDoneNum(getSumTotalByList(currentNum,0,1));//浠婃棩瀹屾垚閲�
- data.setCurrentOutDoneNum(getSumTotalByList(currentNum,1,1));//浠婃棩瀹屾垚閲�
+ data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,1,1));//浠婃棩瀹屾垚閲�
+ data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,0,1));//浠婃棩瀹屾垚閲�
//------------浠婃棩鍑哄叆搴撴晥鐜�----------------
- BigDecimal outHours = getTotalDoneTimes(currentNum,0);//
- BigDecimal inHours = getTotalDoneTimes(currentNum,1);//
+ BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);//
+ BigDecimal inHours = getTotalDoneTimes(currentDoneNum,1);//
if(outHours.compareTo(new BigDecimal(0))>0){
data.setTodayOutRate(data.getCurrentOutDoneNum().divide(outHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
}
@@ -933,15 +957,15 @@
data.setTodayInRate(data.getCurrentInDoneNum().divide(inHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
}
//------------鏈湀鍑哄叆搴撴晥鐜�----------------
- BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());
+// BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());
BigDecimal inMonthNum = getSumTotalByList(monthNum,1,null).add(data.getCurrentInDoneNum());
- BigDecimal outYearHours = getTotalDoneTimes(yearNum,0).add(outHours);//
- BigDecimal inYearHours = getTotalDoneTimes(yearNum,1).add(inHours);//
- if(outYearHours.compareTo(new BigDecimal(0))>0){
- data.setMonthOutRate(outMonthNum.divide(outYearHours,2));//鏈湀鍏ュ簱鏁堢巼
+ BigDecimal outMonthHours = getTotalDoneTimes(monthNum,0).add(outHours);//
+ BigDecimal inMonthHours = getTotalDoneTimes(monthNum,1).add(inHours);//
+ if(outMonthHours.compareTo(new BigDecimal(0))>0){
+ data.setMonthOutRate(data.getMonthOutTotal().divide(outMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
}
- if(inYearHours.compareTo(new BigDecimal(0))>0){
- data.setMonthInRate(inMonthNum.divide(inYearHours,2));//鏈湀鍏ュ簱鏁堢巼
+ if(inMonthHours.compareTo(new BigDecimal(0))>0){
+ data.setMonthInRate(inMonthNum.divide(inMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
}
return data;
}
@@ -1015,12 +1039,20 @@
// if(Constants.formatBigdecimal(job.getIoQty()).compareTo(new BigDecimal(0)) >0){
// r.add( job.getIoQty());
// }else{
- r.add(Constants.formatBigdecimal(job.getTotalNum()));
+ r = r.add(Constants.formatBigdecimal(job.getTotalNum()));
// }
}
return Constants.formatBigdecimal0Float(r);
}
+ @Override
+ public List<CarsAlarmResultListResponse> carsEventList(){
+
+ if(HKCarOpenService.HK_CARS_LIST == null){
+ HKCarOpenService.HK_CARS_LIST = HKCarOpenService.getAllCarsDetais();
+ }
+ return HKCarOpenService.getAlarmEvemtList( HKCarOpenService.HK_CARS_LIST,new Date());
+ }
@Override
public BoardCarsListVO platformJobCarsList(){
BoardCarsListVO data = new BoardCarsListVO();
@@ -1057,7 +1089,8 @@
.groupBy(PlatformJob::getCarCodeFront));
data.setBusyNum( busyNum!=null ?busyNum.size():0);//鍦ㄩ�旀湁浠诲姟鏁伴噺
data.setIdleNum(codes.size() -data.getBusyNum());//鏃犱换鍔＄┖闂叉暟閲�
- data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));
+ HKCarOpenService.HK_CARS_LIST = detaisResponses;
+// data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));
if(busyNum != null){
FLAG: for(CarsDeviceDetaisResponse model:detaisResponses){
for(PlatformJob job : busyNum){
@@ -1390,7 +1423,6 @@
}
if(data == null){
data = new RegionEnergyListResponse();
- data.setSecondRegionDataList(new ArrayList<>());
data.setRootValue("0");
data.setSamePercent("0");
data.setRingPercent("0");
@@ -1896,4 +1928,32 @@
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 ){
+ return response.getData();
+ }else{
+ return null;
+ }
+ }
+
+
+
}
--
Gitblit v1.9.3