最新版本541200007

doum

8 小时以前 4e1d90d7cfaef3c7a2893e6fcb946ce7dabe938e

最新版本541200007

 server/startsh/admin_start.sh

@@ -15,7 +15,7 @@
nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &

#tail -f /usr/local/jars/logs/visitsTimer/info.2025-10-20.1.log
#tail -f /usr/local/jars/logs/visitsAdmin/info.2025-10-20.1.log
#tail -f /usr/local/jars/logs/visitsAdmin/info.2025-10-24.1.log
#tail -f /usr/local/jars/logs/system_gateway/info.2025-10-20.1.log
#tail -f /usr/local/jars/logs/systemTimer/info.2025-10-20.1.log
#tail -f /usr/local/jars/logs/meetingAdmin/info.2025-10-20.1.log

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -929,6 +929,7 @@
        LEAVED(10, "已离园 ","车辆从{data}离场 " ),
        OVER_NUMBER(11, "已过号","超时未到指定月台自动过号" ),
        CHANGE_GROUP(12, "更换月台组","从【{data}】更换到【{data1}】" ),
        BACK_TO_WAIT_SIGNIN(13, "重新签到","重新签到" ),
        ;

        // 成员变量

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java

@@ -6,6 +6,7 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.dao.business.vo.PlatformJobExportVo;
import com.doumee.dao.web.reqeust.JobOperateDTO;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -20,6 +21,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -197,4 +199,13 @@
        platformJobService.jobUrge(platformJob.getId(),getLoginUser(token));
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("移除车辆排队队列（回到待签到）")
    @PostMapping("/backToWatiSign")
    @CloudRequiredPermission("business:platformjob:update")
    public ApiResponse backToWatiSign (@RequestBody PlatformJob platformJob,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        platformJobService.backToWatiSign(platformJob.getId(),getLoginUser(token));
        return ApiResponse.success("操作成功");
    }

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java

@@ -26,7 +26,7 @@

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;
    private Integer   id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    private Integer creator;

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

@@ -274,4 +274,5 @@
    void autoCallInParkCar(WmsService wmsService);

    void jobUrge(Integer jobId,LoginUserInfo loginUserInfo);
    void backToWatiSign(Integer jobId,LoginUserInfo loginUserInfo);
}

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

@@ -1812,6 +1812,7 @@
                //生成任务记录
                PlatformJob platformJob = platformBooks.toPlatformJob();
                platformJob.setId(null);
                platformJob.setOrigin(Constants.ZERO);
                platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
                if(Constants.equalsInteger(platformGroup.getType(),Constants.ZERO)){
                    platformJob.setType(Constants.platformJobType.wxcxh);

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

@@ -2638,8 +2638,10 @@
    @Transactional
    public void autoPlatformCallCar(WmsService wmsService){
        //查询当前开启的月台数据
        List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
                .eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
        List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda()
                .eq(PlatformGroup::getStatus,Constants.ZERO)
                .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
                .eq(PlatformGroup::getAutoCall,Constants.ONE)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allPlatformGroup)){
            log.error("========月台自动叫号============结束：无自动叫号月台组");
@@ -2672,6 +2674,7 @@
        List<PlatformJob> noticeList = new ArrayList<>();
        //循环所有自动叫号月台
        for (PlatformGroup platformGroup:autoCallGroup) {
            log.error("========月台组自动叫号============ --"+platformGroup.getName());
            List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(platforms)){
                log.error("========月台自动叫号============结束：无自动叫号月台-"+platformGroup.getName());
@@ -2705,7 +2708,8 @@
                Integer workNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getPlatformId,platform.getId())
                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())).intValue();
                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey(),Constants.PlatformJobStatus.WORKING.getKey())
                ) .intValue();
                if(workNum>=workingNum){
                    log.error("========月台自动叫号============结束：超过自动叫号作业限制-"+platform.getName());
                    continue;
@@ -2834,8 +2838,7 @@
                if((((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
                                +
                                ((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
                )==Constants.ONE
                ){
                )==Constants.ONE ){
                    isDefaul = true;
                }
            }
@@ -2994,6 +2997,9 @@
                            typeParam = 1;//
                        }
                    }
                }else{
                    //预约车全部散件
                    typeParam = 1;
                }
            }

@@ -3030,6 +3036,36 @@
                .eq(PlatformJob::getId,platformJob.getId())
        );
    }
    @Override
    public void backToWatiSign(Integer jobId,LoginUserInfo loginUserInfo){
        if(Objects.isNull(jobId)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        PlatformJob platformJob = platformJobMapper.selectById(jobId);
        if(Objects.isNull(platformJob)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，状态已流转");
        }

        PlatformJob oldPlatformJob = new PlatformJob();
        BeanUtils.copyProperties(platformJob,oldPlatformJob);

        platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
        platformJob.setEditDate(new Date());
        platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
                .eq(PlatformJob::getId,platformJob.getId())
                .set(PlatformJob::getEditor,loginUserInfo.getId())
                .set(PlatformJob::getSignDate,null)
                .set(PlatformJob::getSingType,null)
                .set(PlatformJob::getSignDistance,null)
                .set(PlatformJob::getStatus,platformJob.getStatus())
                .set(PlatformJob::getEditDate,platformJob.getEditDate()));
        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.BACK_TO_WAIT_SIGNIN.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.BACK_TO_WAIT_SIGNIN.getInfo());
    }