From 9dad3435777fc8781d3c42a6cc18849e8fbb54b9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 19:51:43 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 6 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 e261bbd..afbc248 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
@@ -67,6 +67,8 @@
@Autowired
private PlatformJobMapper platformJobMapper;
@Autowired
+ private PlatformBooksMapper platformBooksMapper;
+ @Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
@@ -83,6 +85,74 @@
* @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::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){
+ num =num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ }
+ }
+ }else{
+ List<PlatformJob> jobs = platformJobMapper.selectList (new MPJLambdaWrapper<PlatformJob>()
+ .select(PlatformJob::getTotalNum)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .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){
+ 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;
@@ -94,7 +164,7 @@
}
WmsBaseResponse<WmsInventoryDataResponse> response = wmsService.getInventoryList();
- if(response!=null && response.getData()!=null && response.getData().size()>=0){
+ 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){
@@ -955,22 +1025,25 @@
public BoardCarsListVO platformJobCarsList(){
BoardCarsListVO data = new BoardCarsListVO();
List<CarsDeviceDetaisResponse> detaisResponses = HKCarOpenService.getAllCarsDetais();
- List<CarsAlarmResultListResponse> eventList = HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date());
- data.setCarsList(detaisResponses);
+ 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)){
+ 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锛�
- long busyNum = platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ 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()
@@ -982,8 +1055,20 @@
,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
,Constants.PlatformJobStatus.EXCEPTION.getKey())
.groupBy(PlatformJob::getCarCodeFront));
- data.setBusyNum((int)busyNum);//鍦ㄩ�旀湁浠诲姟鏁伴噺
+ data.setBusyNum( busyNum!=null ?busyNum.size():0);//鍦ㄩ�旀湁浠诲姟鏁伴噺
data.setIdleNum(codes.size() -data.getBusyNum());//鏃犱换鍔＄┖闂叉暟閲�
+ 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;
+ }
+ }
+ }
+
+ }
}
}
--
Gitblit v1.9.3