最新版本541200007

doum

昨天 98f2e843d13efe8e48a1bc210d82f3f85528f561

最新版本541200007

 server/startsh/admin_start.sh

@@ -13,3 +13,9 @@
nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
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/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/startsh/service_start.sh

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
#!/bin/bash

killall java
redis-server &
/usr/local/nginx/sbin/nginx
/usr/local/nacos/nacos/bin/startup.sh -m standalone

nohup java -jar /usr/local/jars/system_gateway.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/admin_timer.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &

 server/startsh/Æô¶¯½Å±¾ºÍÈÕÖ¾´¦Àí½Å±¾ËµÃ÷.txt

@@ -11,3 +11,11 @@
#按Esc键后再输入:wq！,回车保存
#查看是否创建成功
crontab -l




vim /etc/systemd/system/zhyqVisits.service

sudo systemctl start zhyqVisits.service
sudo systemctl enable zhyqVisits.service

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

@@ -21,6 +21,7 @@
    public static final String HEADER_USER_TOKEN = "dm_user_token";
    public static final String REDIS_TOKEN_KEY = "token_";
    public static final String REDIS_HK_TOKEN_KEY = "hk_token_";
    public static   boolean IS_AUTOCALL_WORKING = false;
    public static final String HK_TOKEN_VALIDITY = "HK_TOKEN_VALIDITY";
    public static final String[]  ALL_SPELL_LIST_FIRST = new String[]{"A", "B", "C", "D", "E", "F", "G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
    public static final int ZERO = 0 ;

 server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java

@@ -1,6 +1,7 @@
package com.doumee.api;

import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.third.WmsService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.PlatformJobService;
@@ -75,9 +76,24 @@
    @ApiOperation("月台自动叫号")
    @PostMapping("/autoPlatformCallCar")
    public ApiResponse autoPlatformCallCar() {
        platformJobService.autoPlatformCallCar(wmsService);
        platformJobService.autoCallInParkCar(wmsService);
        log.error("========月台自动叫号============开始"+System.currentTimeMillis()+"");
        if(Constants.IS_AUTOCALL_WORKING){
            log.error("========月台自动叫号============结束，上一轮作业未结束"+System.currentTimeMillis());
            return ApiResponse.success("月台自动叫号,上一轮作业未结束");
        }
        try {
            Constants.IS_AUTOCALL_WORKING =true;
            platformJobService.autoPlatformCallCar(wmsService);
            platformJobService.autoCallInParkCar(wmsService);
            log.error("========月台自动叫号============完成"+System.currentTimeMillis()+"");
        }catch (Exception e){
            log.error("========月台自动叫号============异常"+System.currentTimeMillis()+e.getMessage());
        }finally {
            Constants.IS_AUTOCALL_WORKING =false;
            log.error("========月台自动叫号============结束"+System.currentTimeMillis());
        }
        return ApiResponse.success("月台自动叫号");

    }



 server/visits/dmvisit_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: visitsAdmin
    # å®‰å…¨é…ç½®

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

@@ -696,10 +696,10 @@
        savePlatformLog(Constants.PlatformJobLogType.SIGN.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.SIGN.getInfo());
        //签到微信通知 2025å¹´3月26日14:25:00
        logger.info("签到微信通知=========================>开始====签到类型=>"+signInDTO.getSignType()+"===>人员主键=>"+platformGroup.getSignInNoticeUsers());
        log.info("签到微信通知=========================>开始====签到类型=>"+signInDTO.getSignType()+"===>人员主键=>"+platformGroup.getSignInNoticeUsers());
        if(!Constants.equalsInteger(signInDTO.getSignType(),Constants.TWO)&&
                StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers())){
            logger.info("签到微信通知=========================>进入");
            log.info("签到微信通知=========================>进入");
            List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
                    .eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO).isNotNull(SystemUser::getOpenid)
                    .in(SystemUser::getMemberId,Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")))
@@ -712,7 +712,7 @@
                );
            }
        }
        logger.info("签到微信通知=========================>结束");
        log.info("签到微信通知=========================>结束");
    }


@@ -1036,7 +1036,6 @@



    private Logger logger = LoggerFactory.getLogger(PlatformJobServiceImpl.class);

    @Override
    public void sendInPark(PlatformJob platformJob){
@@ -1710,7 +1709,7 @@
                               jobIds.add(job.getJobId());
                           }
                       }catch (Exception e){
                           logger.error("=============更新电子锁状态信息异常："+e.getMessage());
                           log.error("=============更新电子锁状态信息异常："+e.getMessage());
                       }
                   }
               }
@@ -2576,9 +2575,6 @@
        return platformJob;
    }




    @Override
    public void autoPlatformCallCar(WmsService wmsService){
        //查询当前开启的月台数据
@@ -2586,6 +2582,7 @@
                .eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allPlatformGroup)){
            log.error("========月台自动叫号============结束：无自动叫号月台组");
            return;
        }
        //过滤当前时间段不在时间内的月台组  AUTO_CALL_END_TIME AUTO_CALL_START_TIME
@@ -2596,6 +2593,7 @@
                && Integer.valueOf(i.getAutoCallEndTime().replaceAll(":","")) > nowHm
        ).collect(Collectors.toList());
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(autoCallGroup)){
            log.error("========月台自动叫号============结束：无工作时间内 è‡ªåŠ¨å«å·æœˆå°ç»„");
            return;
        }
        //查询所有月台
@@ -2607,12 +2605,14 @@
                .in(Platform::getGroupId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
            log.error("========月台自动叫号============结束：无自动叫号月台");
            return;
        }
        //循环所有自动叫号月台
        for (PlatformGroup platformGroup:autoCallGroup) {
            List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(platforms)){
                log.error("========月台自动叫号============结束：无自动叫号月台-"+platformGroup.getName());
                continue;
            }
            Boolean isDefaul = false;
@@ -2630,7 +2630,6 @@
                }
            }
            for (Platform platform:platforms) {

                //月台 å«å·å…¥å›­æ•°é‡
                Integer workingNum = platform.getWorkingNum();
                //查询当前月台是否存在月台叫号数据 å¦‚果大于等于可叫号数量 åˆ™è·³è¿‡
@@ -2639,6 +2638,7 @@
                        .eq(PlatformJob::getPlatformId,platform.getId())
                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())).intValue();
                if(workNum>=workingNum){
                    log.error("========月台自动叫号============结束：超过自动叫号作业限制-"+platform.getName());
                    continue;
                };

@@ -2659,11 +2659,13 @@
                        .orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
                        .orderByAsc(PlatformJob::getSignDate));
                if(CollectionUtils.isEmpty(platformJobList)){
                    log.error("========月台自动叫号============结束：无满足条件的作业1-"+platform.getName());
                    continue;
                }
                for (int i = 0; i < workingNum - workNum ; i++) {
                    PlatformJob platformJob  = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
                    if(Objects.isNull(platformJob)){
                        log.error("========月台自动叫号============结束：无满足条件的作业2-"+platform.getName());
                        continue;
                    }
                    JobOperateDTO jobOperateDTO = new JobOperateDTO();
@@ -2681,7 +2683,7 @@
                            wmsService.orderPlatformBind(callPlatformJob);
                        }
                    }catch (Exception e){
                        logger.error("月台自动叫号权限下发失败：{}"+JSONObject.toJSONString(platform));
                        log.error("月台自动叫号权限下发失败：{}"+JSONObject.toJSONString(platform));
                    }
                }
            }
@@ -2779,7 +2781,7 @@
                            wmsService.orderPlatformBind(callPlatformJob);
                        }
                    }catch (Exception e){
                        logger.error("自动叫号入园权限下发失败：{}"+JSONObject.toJSONString(platform));
                        log.error("自动叫号入园权限下发失败：{}"+JSONObject.toJSONString(platform));
                    }
                }
            }

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

@@ -144,14 +144,15 @@
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，月台组信息不正确！");
            }
            //如果月台分组发生变化
            Long count =  platformJobJoinMapper.selectCount(  new QueryWrapper<PlatformJob>().lambda()
            Long count =  platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda()
                    .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                    .eq(PlatformJob::getPlatformId,model.getId())
                    .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
                            ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
                            ,Constants.PlatformJobStatus.DONE.getKey()
                            ,Constants.PlatformJobStatus.LEAVED.getKey()
                            ,Constants.PlatformJobStatus.CANCEL.getKey()
                    .in(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()
                            ,Constants.PlatformJobStatus.CALLED.getKey()
                            ,Constants.PlatformJobStatus.WORKING.getKey()
                            ,Constants.PlatformJobStatus.TRANSFERING.getKey()
                            ,Constants.PlatformJobStatus.EXCEPTION.getKey()
                            ,Constants.PlatformJobStatus.OVER_NUMBER.getKey()
                    ));
            if(count!=null && count>0){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，当前月台有正在作业的任务，不能进行月台组切换操作！");