最新版本541200007

jiangping

2024-11-29 a2e8793e2c53c7e80b67c1fe407b78fde59b2296

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java

@@ -18,6 +18,7 @@
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;
@@ -693,7 +694,7 @@
            }
        }
        platformJob.dealTime();
        this.getWorkTime(platformJob);
        this.getWorkTime(platformJob,platformLogMapper);
        this.getWmsJobData(platformJob);
        return platformJob;
    }
@@ -775,7 +776,7 @@
     * 获取已作业时间
     * @param platformJob
     */
    public Long getWorkTime(PlatformJob platformJob){
    public static Long getWorkTime(PlatformJob platformJob,PlatformLogMapper platformLogMapper){
        List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>()
                .lambda().eq(PlatformLog::getIsdeleted,Constants.ZERO)
                .eq(PlatformLog::getJobId,platformJob.getId())
@@ -798,7 +799,7 @@
                    .last(" limit 1 ")
            );
            if(Objects.nonNull(lastBeginPlatform)){
                String v = Long.toString(System.currentTimeMillis() - lastBeginPlatform.getCreateDate().getTime() / 1000) ;
                String v = Long.toString((System.currentTimeMillis() - lastBeginPlatform.getCreateDate().getTime() )/ 1000) ;
                optTime = optTime + Long.valueOf(v);
            }
        }
@@ -964,6 +965,7 @@
    public void cancelInPark(PlatformJob platformJob){
        if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)
                || Constants.equalsInteger(platformJob.getType(),Constants.THREE)
                || StringUtils.isBlank(platformJob.getCarCodeFront())
                || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){

            List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()