From b82a5aa7d6167748cce7e94f53b6a3b1fbc201b3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 九月 2024 17:13:52 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 2 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 38 ++++++++++++++-----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 14 ++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 12 +++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 10 ++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 4 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java | 1
9 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
index 150a642..0baf391 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
@@ -230,7 +230,9 @@
@PostMapping("/powerLevel")
public ApiResponse powerLevel (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.powerLevel(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.powerLevel(jobOperateDTO);
+ //涓嬪彂绂诲洯鏉冮檺
+ platformJobService.sendInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 2574f93..05a3247 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -217,6 +217,8 @@
@TableField(exist = false)
private BigDecimal useRata;
+
+
@ApiModelProperty(value = "鏈堝彴浣滀笟鏁版嵁")
@TableField(exist = false)
private PlatformWorkVO platformWorkVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index 875c590..0871a62 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -35,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -144,8 +143,10 @@
@ApiModelProperty(value = "鍙彿鏃堕棿")
@ExcelColumn(name="鍙彿鏃堕棿")
-
private Date callDate;
+
+
+
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍙彿浜虹紪鐮�")
@@ -286,6 +287,13 @@
@ExcelColumn(name="纭浠诲姟鏃堕棿")
private Date confirmTaskDate;
+ @ApiModelProperty(value = "鏈�鏂板彨鍙锋椂闂�")
+ @TableField(exist = false)
+ private Date newCallDate;
+
+ @ApiModelProperty(value = "鏈�鏂板紑濮嬩綔涓氭椂闂�")
+ @TableField(exist = false)
+ private Date newStartDate;
@ApiModelProperty(value = "鍓嶆柟鎺掗槦鏁伴噺", example = "1")
@TableField(exist = false)
@@ -359,10 +367,12 @@
private Integer jobType;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂磋捣")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateStart;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateEnd;
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 0100842..0ea961a 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
@@ -197,7 +197,7 @@
* 鎵嬪姩鎺堟潈杞﹁締绂诲満
* @param jobOperateDTO
*/
- void powerLevel(JobOperateDTO jobOperateDTO);
+ PlatformJob powerLevel(JobOperateDTO jobOperateDTO);
/**
* 鑾峰彇鏈堝彴涓嬬殑浠诲姟淇℃伅
* @param groupId
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 3ead21d..9e6f5d5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -252,6 +252,8 @@
//鏌ヨ浠婂ぉ鎵�鏈夌殑浠诲姟鏁版嵁
List<PlatformJob> platformJobList = platformJobJoinMapper.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 = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -294,9 +296,8 @@
platformWorkVO.setCallNum(
platformJobs.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platform.getId()) && Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())).collect(Collectors.toList()).size()
);
-
- platformWorkVO.setWaitNum(
+ platformWorkVO.setWaitNum(
platformJobs.stream().filter(i->
Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())
|| Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
@@ -331,10 +332,9 @@
platformGroupWorkVO.setWaitNum(platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
.eq(PlatformJob::getPlatformGroupId,platformGroupId)
- .in(PlatformJob::getStatus,
- Constants.PlatformJobStatus.WAIT_CALL.getKey(),
- Constants.PlatformJobStatus.IN_WAIT.getKey(),
- Constants.PlatformJobStatus.CALLED.getKey()
+ .and( i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()
+ .apply(" ( status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and PLATFORM_GROUP_ID = "+platformGroupId+" ) ")
)
)
);
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 dfa3cea..cd03e09 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
@@ -175,7 +175,7 @@
.selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
.selectAs(PlatformWmsJob::getIoCreatedate,PlatformJob::getIoCreatedate)
- .selectAs(SystemUser::getUsername,PlatformJob::getOutUserName)
+ .selectAs(SystemUser::getRealname,PlatformJob::getOutUserName)
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
@@ -203,6 +203,7 @@
.eq(pageWrap.getModel().getSingType() != null, PlatformJob::getSingType, pageWrap.getModel().getSingType())
.eq(pageWrap.getModel().getSignDistance() != null, PlatformJob::getSignDistance, pageWrap.getModel().getSignDistance())
.eq(pageWrap.getModel().getPlatformNames() != null, PlatformJob::getPlatformNames, pageWrap.getModel().getPlatformNames())
+ .like(pageWrap.getModel().getPlatformName() != null, Platform::getName, pageWrap.getModel().getPlatformName())
.eq(pageWrap.getModel().getPlatforms() != null, PlatformJob::getPlatforms, pageWrap.getModel().getPlatforms())
.eq(pageWrap.getModel().getPlatformId() != null, PlatformJob::getPlatformId, pageWrap.getModel().getPlatformId())
.ge(pageWrap.getModel().getInwaitDate() != null, PlatformJob::getInwaitDate, Utils.Date.getStart(pageWrap.getModel().getInwaitDate()))
@@ -296,10 +297,6 @@
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
.eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())
.like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
-// .eq(Objects.nonNull(pageWrap.getModel().getCallType())
-// &&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.ONE),
-// PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()
-// )
.apply(Objects.nonNull(pageWrap.getModel().getCallType())
&&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.ONE),
@@ -325,7 +322,7 @@
&&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.THREE),
i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()
- .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey()).or()
+// .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey()).or()
.apply(" ( t.status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_GROUP_ID = "+pageWrap.getModel().getPlatformGroupId()+" ) ")
)
// .like(PlatformJob::getArriveDate,DateUtil.dateTypeToString(new Date(),"yyyy-MM-dd"))
@@ -550,6 +547,16 @@
}else{
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绛惧埌绫诲瀷閿欒");
}
+ //鏌ヨ鏈堝彴缁勬暟鎹�
+ PlatformGroup platformGroup = platformGroupMapper.selectById(platformJob.getPlatformGroupId());
+ if(Objects.isNull(platformGroup)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏈堝彴缁勪俊鎭�");
+ }
+ if(System.currentTimeMillis() > DateUtil.getDateByString(DateUtil.getCurrDate() + " " + platformGroup.getEndTime() + ":59" ).getTime()
+ || System.currentTimeMillis() < DateUtil.getDateByString(DateUtil.getCurrDate() + " " + platformGroup.getStartTime() + ":00" ).getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈湪宸ヤ綔鏃堕棿["+platformGroup.getStartTime() + "-" + platformGroup.getEndTime() +"]锛屾棤娉曡繘琛岀鍒�");
+ }
+
platformJob.setSignDate(new Date());
platformJob.setSingType(signInDTO.getSignType());
platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
@@ -617,13 +624,16 @@
){
//鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
this.queryWaitNum(platformJob);
+ Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
+ if(Objects.nonNull(platform)){
+ platformJob.setPlatformName(platform.getName());
+ }
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
//浣滀笟鏈堝彴淇℃伅
Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
if(Objects.nonNull(platform)){
platformJob.setPlatformName(platform.getName());
}
-
}
platformJob.dealTime();
this.getWorkTime(platformJob);
@@ -1116,7 +1126,8 @@
if(Objects.isNull(platformJob)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+ if(! (Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
+ ||Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey()) )){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
PlatformJob oldPlatformJob = new PlatformJob();
@@ -1146,7 +1157,7 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void powerLevel(JobOperateDTO jobOperateDTO){
+ public PlatformJob powerLevel(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
|| Objects.isNull(jobOperateDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -1164,11 +1175,16 @@
platformJob.setOutHkdate(new Date());
platformJob.setStatus(Constants.PlatformJobStatus.AUTHED_LEAVE.getKey());
platformJob.setEditDate(new Date());
+ platformJob.setRemark(jobOperateDTO.getRemark());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.AUTHED_LEAVE.getKey(),oldPlatformJob,platformJob ,
Constants.PlatformJobLogType.AUTHED_LEAVE.getInfo());
- //TODO 鎺堟潈杞﹁締绂诲満鏉冮檺
+ return platformJob;
+
+
+
+
}
@@ -1273,6 +1289,7 @@
platformLog.setParam2(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
String v = Long.toString((platformLog.getCreateDate().getTime() - DateUtil.StringToDate(lastBeginPlatform.getParam1(),"yyyy-MM-dd HH:mm:ss").getTime() )/ 1000) ;
platformLog.setParam3(v);
+ platformLog.setRemark(platformJobBefor.getPlatformId().toString());
}else{
platformLog.setParam3("0");
}
@@ -1300,6 +1317,7 @@
platformLog.setParam2(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
String v = Long.toString((platformJobAfter.getDoneDate().getTime() - DateUtil.StringToDate(lastBeginPlatform.getParam1(),"yyyy-MM-dd HH:mm:ss").getTime()) / 1000) ;
platformLog.setParam3(v);
+ platformLog.setRemark(platformJobBefor.getPlatformId().toString());
}
}else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.WORKING.getKey())){
platformLog.setParam1(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java
index 7500514..8cbe776 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java
@@ -107,6 +107,7 @@
public List<PlatformReason> findList(PlatformReason platformReason) {
QueryWrapper<PlatformReason> wrapper = new QueryWrapper<>(platformReason);
wrapper.eq("isdeleted",Constants.ZERO);
+ wrapper.orderByAsc("SORTNUM");
return platformReasonMapper.selectList(wrapper);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 6f2a9c0..37627fa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -316,6 +316,9 @@
.selectAs(PlatformGroup::getName,Platform::getGroupName)
.select(" (select ifnull(TIMESTAMPDIFF(HOUR, '2023-01-01 '||pg.start_time||':00', '2023-01-01 '||pg.end_time||':00' ),0) from platform_group pg " +
" where t.group_id = pg.id ) as openTime ")
+ .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0) / 3600 , 2 ) from platform_log pl where pl.OBJ_ID = t.id and pl.remark = t.id " +
+ " and pl.CREATE_DATE > '"+Utils.Date.getStart(platform.getQueryDateStart())+"' " +
+ "and pl.CREATE_DATE <= '"+Utils.Date.getEnd(platform.getQueryDateEnd())+"' ) as workCountTime ")
.leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId);
queryWrapper
.eq(platform.getGroupId() != null, Platform::getGroupId, platform.getGroupId())
@@ -328,8 +331,6 @@
List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
- .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0) / 3600 , 2 ) from platform_log pl where pl.OBJ_ID = t.id " +
- " ) as workTimes ")
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey(),
Constants.PlatformJobStatus.DONE.getKey(),
Constants.PlatformJobStatus.TRANSFERING.getKey(),
@@ -346,16 +347,13 @@
for (Platform bean:platformList) {
List<PlatformJob> beanJobList = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),bean.getId())).collect(Collectors.toList());
bean.setStopCount(beanJobList.size());
- bean.setWorkCountTime(
- beanJobList.stream().map(i->i.getWorkTimes()).reduce(BigDecimal.ZERO,BigDecimal::add)
- );
if(Objects.isNull(bean.getOpenTime())||bean.getOpenTime().compareTo(BigDecimal.ZERO)<=0){
bean.setUseRata(BigDecimal.ZERO);
continue;
}
BigDecimal sumTime = BigDecimal.valueOf(sumDays).multiply(bean.getOpenTime());
bean.setUseRata(
- bean.getWorkCountTime().divide(sumTime,BigDecimal.ROUND_HALF_DOWN,2)
+ bean.getWorkCountTime().multiply(new BigDecimal(100)).divide(sumTime,BigDecimal.ROUND_HALF_DOWN,2)
);
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index ba580d2..1b26bdc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1011,6 +1011,7 @@
.orderByDesc(PlatformLog::getCreateDate)
.last(" limit 1"));
String v = Long.toString(job.getDoneDate().getTime() - lastBeginPlatform.getCreateDate().getTime() / 1000) ;
+ lastBeginPlatform.setRemark(job.getPlatformId().toString());
lastBeginPlatform.setParam3(v);
lastBeginPlatform.setParam2(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
platformLogMapper.updateById(lastBeginPlatform);//鏇存柊涓婁竴娆′綔涓氱殑瀹屾垚鏃堕棿鍜屼綔涓氭椂闀�
--
Gitblit v1.9.3