From 4b8fda000f9f600ba5187e738278b340b55ebd7c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 18 十二月 2024 18:41:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 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 3789e72..19ca4b2 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,9 +164,8 @@
try {
toatalNum =Double.parseDouble(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_TOTAL_STOCK_NUM).getCode()) ;
}catch (Exception e){
-
}
- WmsBaseResponse<WmsInventoryDataResponse> response = wmsService.getInventoryList();
+ 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){
@@ -171,7 +173,7 @@
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(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_UP));
+ data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_HALF_UP));
return data;
}
@@ -730,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,
@@ -770,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();
@@ -805,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)){
@@ -938,12 +944,12 @@
BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
data.setCurrentInNum(beforeInNum.add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
- data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,0,1));//浠婃棩瀹屾垚閲�
- data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,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));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
}
@@ -1270,6 +1276,7 @@
data.setYesterdayElectricity(getDefaultData());//鏄ㄦ棩鐢ㄧ數
getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堢敤鐢甸噺鏁版嵁
carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
+
getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堢敤鐢甸噺鏁版嵁
getCurrentDateElectircityData(data.getTodayElectricity(),0);//閫氳繃瀹夐槻骞宠幏鍙栦粖鏃ョ敤鐢甸噺鏁版嵁
getCurrentDateElectircityData(data.getYesterdayElectricity(),-1);//閫氳繃瀹夐槻骞宠幏鍙栨槰鏃ョ敤鐢甸噺鏁版嵁
@@ -1417,7 +1424,6 @@
}
if(data == null){
data = new RegionEnergyListResponse();
- data.setSecondRegionDataList(new ArrayList<>());
data.setRootValue("0");
data.setSamePercent("0");
data.setRingPercent("0");
@@ -1923,4 +1929,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