From 6ef74724e5da3271b77c8953df3c556439eed13d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 14:15:37 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 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 af2e92e..9750228 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
@@ -22,6 +22,7 @@
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
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.web.reqeust.CarsJobAndContractDTO;
@@ -60,7 +61,7 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
- private PlatformWarnEventMapper platformWarnEventMapper;
+ private PlatformWarnEventJoinMapper platformWarnEventJoinMapper;
@Autowired
private PlatformJobMapper platformJobMapper;
@Autowired
@@ -314,7 +315,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)
);
@@ -400,12 +404,13 @@
request.setSorts(new ArrayList<>());
RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
file.setFieldName("event_type");
- file.setFieldValue("131588");//瀹夐槻鍛婅
+ file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
file.setType("in");
if(type == 1){
+ file.setFieldValue("131588");//瀹夐槻鍛婅
+ }else if(type == 2){
- }else if(type == 1){
-
+ file.setFieldValue("131593");//浜哄憳鍛婅
}
request.getFiledOptions().add(file);
SortRequest sort = new SortRequest();
@@ -1169,7 +1174,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;
}
@@ -1253,8 +1258,21 @@
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涓按鐢垫皵娌硅�楁暟鎹粺璁�
@@ -1444,7 +1462,12 @@
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
&&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
);
+ data.setVideoPluginUrl(getVideoUrl());
return data;
+ }
+
+ private String getVideoUrl() {
+ return systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe";
}
private void getParkingCarsNum(SecurityBoardVO data) {
@@ -1475,7 +1498,8 @@
List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
.selectAll( PlatformJob.class)
.select("( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+" order by pl.CREATE_DATE desc limit 1 ) as newStartDate")
- .select(" (select sum(ifnull(pl.IO_QTY , 0 )) from platform_wms_detail pl where pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
+ //.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 a.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() })
@@ -1612,9 +1636,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(create_date) = to_days(now())")
+ .apply("to_days(t.create_date) = to_days(now())")
.orderByDesc(PlatformWarnEvent::getCreateDate)
.last(" limit "+limit)
);
@@ -1665,12 +1693,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())){
@@ -1717,6 +1747,12 @@
}
}
+
+ 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;
--
Gitblit v1.9.3