From d70d789667434c1ba80b281f398137d66d68aa6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 23 十二月 2024 17:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 13 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 5 -
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java | 1
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 159 -------------------------------
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 83 +++++++++++-----
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 7
13 files changed, 84 insertions(+), 200 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index ee12e34..283990d 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -563,8 +563,21 @@
SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
+
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
+ Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
result.getRecords().stream().forEach(s -> {
+ if(Constants.equalsInteger(s.getStatus(),Constants.ZERO)&&Constants.equalsInteger(s.getMeetingStatus(),Constants.ONE)){
+ //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
+ if(
+ DateUtil.afterMinutesDate(s.getStartTime(),-minute).getTime()<=System.currentTimeMillis()
+ ){
+ s.setMeetingStatus(4);
+ }
+ }
+
+
if(s.getMeetingStatus().equals(Constants.ZERO)){
if(s.getMeetingStatus()==Constants.ONE){
//寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index c71f2ca..0bc7693 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -178,7 +178,7 @@
queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType());
// queryWrapper.eq(Objects.nonNull(noticesDTO.getMemberId()),Notices::getUserId,noticesDTO.getMemberId());
queryWrapper.like(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle());
- queryWrapper.orderByDesc(Notices::getCreateDate);
+ queryWrapper.orderByDesc(Notices::getId);
PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper));
if(noticesDTO.getQueryType().equals(Constants.ZERO)){
for (Notices notices:pageData.getRecords()) {
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 0b358d4..30f6359 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -66,6 +66,9 @@
<if test="dto.status != null ">
AND usr.`status` = #{dto.status}
</if>
+ <if test="dto.memberType != null ">
+ AND usr.`type` = #{dto.memberType}
+ </if>
<if test="dto.workStatus != null ">
AND m.WORK_STATUS = #{dto.workStatus}
</if>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 5698d26..49f08c6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -110,7 +110,7 @@
,Constants.PlatformJobStatus.WORKING.getKey()
,Constants.PlatformJobStatus.TRANSFERING.getKey()
,Constants.PlatformJobStatus.EXCEPTION.getKey()
- ,Constants.PlatformJobStatus.DONE.getKey()
+// ,Constants.PlatformJobStatus.DONE.getKey()
)
.orderByDesc(PlatformJob::getSignNum)
.last(" limit 20 ")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
index 802483c..e307abf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
@@ -97,6 +97,7 @@
WholeProvinceZXTVO list = boardService.inventoryUseRate();
return ApiResponse.success(list);
}
+
@LoginNoRequired
@ApiOperation("杩愬姏璧勬簮鍒╃敤鐜�")
@GetMapping("/tranportAbilityUseRate")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
index e82d39a..9db2a06 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
@@ -106,7 +106,7 @@
public ApiResponse<PageData<PlatformBooks>> findPage (@RequestBody PageWrap<PlatformBooks> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo loginUserInfo = this.getLoginUser(token);
pageWrap.getModel().setQueryDate(DateUtil.getBeforDay(new Date(),30));
- pageWrap.getModel().setDriverPhone(loginUserInfo.getMobile());
+ pageWrap.getModel().setDriverId(loginUserInfo.getMemberId());
return ApiResponse.success(platformBooksService.findPage(pageWrap));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index d045111..80aae19 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -8,6 +8,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Http;
import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
import com.doumee.dao.business.WxNoticeConfigMapper;
import com.doumee.dao.business.model.*;
@@ -353,6 +354,7 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}", jumpUrl);
if(StringUtils.isBlank(response)){
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
}else{
@@ -376,8 +378,8 @@
* @param openIds
* @param sendType 0=鐢宠浜猴紱1=瀹℃壒浜�
*/
- public void sendPlatformBookTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, PlatformBooks platformBooks, String objCode,String token,
- List<String> openIds,Integer sendType){
+ public void sendPlatformBookTemplateNotice(SystemDictDataBiz systemDictDataBiz, WxNoticeConfigMapper wxNoticeConfigMapper, PlatformBooks platformBooks, String objCode, String token,
+ List<String> openIds, Integer sendType){
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.platformBook)
@@ -394,7 +396,6 @@
}
String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
wxUrlParams,platformBooks.getId().toString());
-
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
Map<String, Object> paramMap = new HashMap<String, Object>();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
index b22fbb0..19e7ef1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
@@ -44,6 +44,7 @@
@ApiModelProperty(value = "鍦ㄥ洯璁垮鏁伴噺")
private int visitTotal;
+
@ApiModelProperty(value = "褰撳墠鍦ㄥ洯杞﹁締鎬绘暟")
private int inParkCarTotal;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
index e9eb5d6..d70727c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
@@ -246,9 +246,4 @@
PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser);
- void wholeProvinceCenterData(WholeProvinceBoardVO data);
-
- void centerDataForInOut(WholeProvinceBoardVO data);
-
- void centerDataOutInRata(WholeProvinceBoardVO data);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index cbdaa5b..7794166 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -1842,7 +1842,7 @@
if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
//鍙戦�佸井淇″叕浼楀彿閫氱煡
wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
- wxNoticeConfigMapper,platformBooks,
+ wxNoticeConfigMapper, platformBooks,
Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.platformBookContent.platformBookAuditSuccess: WxPlatConstants.platformBookContent.platformBookAuditFail,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(driver.getOpenid().split(",")),0);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index 9c6977e..42e1c16 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -302,12 +302,13 @@
.eq(SystemUser::getDeleted, Constants.ZERO)
.eq(SystemUser::getType, Constants.ZERO)
.eq(SystemUser::getMobile,platformBooks.getDriverPhone())
+ .isNotNull(SystemUser::getOpenid)
.last(" limit 1 "));
if(Objects.nonNull(driver)&&StringUtils.isNotBlank(driver.getOpenid())){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
- wxNoticeConfigMapper,platformBooks,
+ wxNoticeConfigMapper, platformBooks,
WxPlatConstants.platformBookContent.platformBookUpload,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(driver.getOpenid().split(",")),0);
@@ -416,7 +417,6 @@
public void revoke(RevokeDTO revokeDTO, LoginUserInfo loginUserInfo){
if(Objects.isNull(revokeDTO)
|| Objects.isNull(revokeDTO.getId())
- || StringUtils.isBlank(revokeDTO.getInfo())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index c13f906..01c5d7b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -2203,164 +2203,5 @@
}
- /**
- * 绱鍑哄簱閲忕粺璁� - 澶у睆
- * @param data
- */
- @Override
- public void wholeProvinceCenterData(WholeProvinceBoardVO data){
-// //绱鏈勾搴﹀嚭搴撻噺
-// List<PlatformJob> platformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
-// .lambda()
-// .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE
-// ,Constants.PlatformJobStatus.AUTHED_LEAVE
-// ,Constants.PlatformJobStatus.LEAVED)
-// .isNotNull(PlatformJob::getDoneDate)
-// .in(PlatformJob::getType,Constants.platformJobType.wxczh,Constants.platformJobType.zyczh)
-// .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy"))
-// );
-// data.setYearOutTotal(platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
-// data.setYearOutTimes(platformJobList.size());
-//
-//
-// List<PlatformJob> platformJobsMonthList = platformJobList.stream().filter(i->DateUtil.getFomartDate(i.getDoneDate(),"yyyy-MM").equals(DateUtil.getFomartDate(new Date(),"yyyy-MM"))).collect(Collectors.toList());
-// data.setMonthOutTotal(platformJobsMonthList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
-// data.setMonthOutTimes(platformJobsMonthList.size());
-// String beforYear = DateUtil.getBeforYear(new Date(),1);
-//
-// //绱鏈勾搴﹀嚭搴撻噺
-// List<PlatformJob> beforYearPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
-// .lambda()
-// .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE
-// ,Constants.PlatformJobStatus.AUTHED_LEAVE
-// ,Constants.PlatformJobStatus.LEAVED)
-// .isNotNull(PlatformJob::getDoneDate)
-// .in(PlatformJob::getType,Constants.platformJobType.wxczh,Constants.platformJobType.zyczh)
-// .like( PlatformJob::getDoneDate, beforYear.substring(0,4))
-// );
-//
-// List<PlatformJob> beforPlatformJobsMonthList = platformJobList.stream().filter(i->DateUtil.getFomartDate(i.getDoneDate(),"yyyy-MM").equals(beforYear.substring(0,7))).collect(Collectors.toList());
-// //鍚屾瘮鏁版嵁
-// data.setYearOutTotalOnYear(beforYearPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
-// data.setMonthOutTotalOnYear(beforPlatformJobsMonthList.stream().filter(i->Objects.nonNull(i.getTotalNum())).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
-//
-
- }
-
- @Override
- public void centerDataForInOut(WholeProvinceBoardVO data){
-// //浠婃棩瀹屾垚鐨勫嚭鍏ュ簱鎵�鏈夋暟鎹�
-// List<PlatformJob> platformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
-// .lambda()
-// .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE
-// ,Constants.PlatformJobStatus.AUTHED_LEAVE
-// ,Constants.PlatformJobStatus.LEAVED)
-// .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd"))
-// );
-// //浠婃棩涔嬪墠 鎵�鏈夋湭瀹屾垚鐨勫嚭鍏ュ簱鏁版嵁 - WMS鎺ㄩ��
-// List<PlatformJob> wmsPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
-// .lambda()
-// .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE
-// ,Constants.PlatformJobStatus.AUTHED_LEAVE
-// ,Constants.PlatformJobStatus.LEAVED
-// ,Constants.PlatformJobStatus.CANCEL)
-// .eq(PlatformJob::getOrigin ,Constants.ONE)
-// .le(PlatformJob::getCreateDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") +" 23:59:59")
-// );
-// //浠婃棩涔嬪墠 鎵�鏈夋湭瀹屾垚鐨勫嚭鍏ュ簱鏁版嵁 - 棰勭害鏁版嵁
-// List<PlatformJob> bookPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
-// .lambda()
-// .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE
-// ,Constants.PlatformJobStatus.AUTHED_LEAVE
-// ,Constants.PlatformJobStatus.LEAVED
-// ,Constants.PlatformJobStatus.CANCEL)
-// .eq(PlatformJob::getOrigin ,Constants.ONE)
-// .le(PlatformJob::getArriveDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") +" 23:59:59")
-// );
-//
-// BigDecimal finishOutTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// BigDecimal unFinishWmsOutTotal = wmsPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// BigDecimal unFinishBookOutTotal = bookPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-//
-// BigDecimal finishInTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// BigDecimal unFinishWmsInTotal = wmsPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// BigDecimal unFinishBookInTotal = bookPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-//
-// data.setOutTotal(finishOutTotal);
-// data.setOutPlanTotal(finishOutTotal.add(unFinishWmsOutTotal).add(unFinishBookOutTotal));
-//
-// data.setInTotal(finishInTotal);
-// data.setInPlanTotal(finishInTotal.add(unFinishWmsInTotal).add(unFinishBookInTotal));
-
- }
-
-
-
-
- @Override
- public void centerDataOutInRata(WholeProvinceBoardVO data){
-// //绱鏈湀搴︽墍鏈夋搷浣滈噺
-// List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
-// .selectAll(PlatformJob.class)
-// .select(" ( select ifnull(sum(p.param3),0) from platform_log p where p.obj_id = platform_job.id ) ",PlatformJob::getWorkTime)
-// .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE
-// ,Constants.PlatformJobStatus.AUTHED_LEAVE
-// ,Constants.PlatformJobStatus.LEAVED)
-// .isNotNull(PlatformJob::getDoneDate)
-// .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy-MM"))
-// );
-//
-// //鑾峰彇鏈湀鎵�鏈夊嚭搴撻噺
-// BigDecimal monthOutTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// Long monthOutWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum);
-// BigDecimal monthInTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// Long monthInWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum);
-//
-// data.setMonthOutRata(BigDecimal.ZERO);
-// //鏈堝害鍑哄簱鏁堢巼
-// if(Objects.nonNull(monthOutTotal) && Objects.nonNull(monthOutWorkTotal) && monthOutWorkTotal>0L && monthOutTotal.compareTo(BigDecimal.ZERO) > 0){
-// BigDecimal workTotal = new BigDecimal(monthOutWorkTotal);
-// data.setMonthOutRata(monthOutTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP));
-// }
-//
-// //鏈堝害鍏ュ簱鏁堢巼
-//
-// data.setMonthInRata(BigDecimal.ZERO);
-// if(Objects.nonNull(monthInTotal) && Objects.nonNull(monthInWorkTotal) && monthInWorkTotal>0L && monthInTotal.compareTo(BigDecimal.ZERO) > 0){
-// BigDecimal workTotal = new BigDecimal(monthInWorkTotal);
-// data.setMonthInRata(monthInTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP));
-// }
-//
-//
-//
-// List<PlatformJob> dayPlatformJobList = platformJobJoinMapper.selectList(new QueryWrapper<PlatformJob>()
-// .lambda()
-// .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE
-// ,Constants.PlatformJobStatus.AUTHED_LEAVE
-// ,Constants.PlatformJobStatus.LEAVED)
-// .isNotNull(PlatformJob::getDoneDate)
-// .like( PlatformJob::getDoneDate, DateUtil.getFomartDate(new Date(),"yyyy-MM-dd"))
-// );
-//
-// BigDecimal dayOutTotal = dayPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// Long dayOutWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.wxczh)||i.getType().equals(Constants.platformJobType.zyczh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum);
-// BigDecimal dayInTotal = dayPlatformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getTotalNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// Long dayInWorkTotal = platformJobList.stream().filter(i->Objects.nonNull(i.getTotalNum())&&(i.getType().equals(Constants.platformJobType.zycxh)||i.getType().equals(Constants.platformJobType.wxcxh)||i.getType().equals(Constants.platformJobType.sgscxh))).map(i->i.getWorkTime()).reduce(Long.valueOf(Constants.ZERO),Long::sum);
-//
-// data.setDayOutRata(BigDecimal.ZERO);
-// //鏃ュ嚭搴撴晥鐜�
-// if(Objects.nonNull(dayOutTotal) && Objects.nonNull(dayOutWorkTotal) && dayOutWorkTotal>0L && dayOutTotal.compareTo(BigDecimal.ZERO) > 0){
-// BigDecimal workTotal = new BigDecimal(dayOutWorkTotal);
-// data.setDayOutRata(dayOutTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP));
-// }
-// //鏃ュ叆搴撴晥鐜�
-// data.setDayInRata(BigDecimal.ZERO);
-// if(Objects.nonNull(dayInTotal) && Objects.nonNull(dayInWorkTotal) && dayInWorkTotal>0L && dayInTotal.compareTo(BigDecimal.ZERO) > 0){
-// BigDecimal workTotal = new BigDecimal(dayInWorkTotal);
-// data.setMonthInRata(dayInTotal.multiply(new BigDecimal(3600)).divide(workTotal,2,BigDecimal.ROUND_UP));
-// }
-
-
- }
}
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 396aa3e..52993fb 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
@@ -138,7 +138,10 @@
.apply("to_days(done_date) = to_days(now())") );
if(jobs!=null){
for(PlatformJob j :jobs){
- num =num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ if(Objects.nonNull(j)&&Objects.nonNull(j.getTotalNum())){
+ num =num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ }
+
}
}
}else{
@@ -152,7 +155,9 @@
, Constants.PlatformJobStatus.LEAVED.getKey()) );
if(jobs!=null){
for(PlatformJob j :jobs){
- num = num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ if(Objects.nonNull(j)&&Objects.nonNull(j.getTotalNum())){
+ num = num.add(Constants.formatBigdecimal(j.getTotalNum()));
+ }
}
}
}
@@ -535,7 +540,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;
}
@@ -710,6 +714,7 @@
.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")
@@ -1286,8 +1291,8 @@
*/
@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()
@@ -1370,8 +1375,14 @@
}
if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
//璁＄畻鐢ㄦ皵鍚屾瘮鐜瘮
- data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
- data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
+ data.getGasQuantity().setSameRate(
+ (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum()).doubleValue()*100 +""
+ /*Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum()
+ .divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""*/);
+ data.getGasQuantity().setRingRate(
+ (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getRingNum())).divide(data.getGasQuantity().getRingNum()).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){
// //璁＄畻鐢ㄦ按鍚屾瘮鐜瘮
@@ -1408,7 +1419,7 @@
* @param data
*/
private void getLastMonthElectricityData(EnergyModelDataVO data) {
- BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
+// 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"));
@@ -1471,23 +1482,31 @@
* @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");
+// 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");
- 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")));
- }
-
+ 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()));
}
- data.setTotal(Constants.formatBigdecimal2Float(total).toString());
}
private EnergyModelDataVO getDefaultData() {
@@ -1556,7 +1575,7 @@
.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));
@@ -1691,7 +1710,7 @@
(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()
);
//鍦ㄥ洯鐩稿叧鏂硅溅杈�
@@ -1976,6 +1995,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())){
@@ -2001,7 +2021,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())){
@@ -2046,7 +2066,16 @@
}
BaseResponse<List<RegionDataRankingDataResponse>> response = HKService.regionDataRanking(request);
if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
- return response.getData();
+ 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;
}
--
Gitblit v1.9.3