最新版本541200007

jiangping

2025-05-29 15950f3c8123c40c28050c0bd7d5d774cad4728a

最新版本541200007

 admin/src/components/common/Menu.vue

@@ -106,11 +106,11 @@
    computeTableHeight () {
      this.$nextTick(() => {
        const height = window.innerHeight
        console.log('main_app========================：'+height)
        // console.log('main_app========================：'+height)
        const height13 = this.getEleHeghtByClassName('common-header',0)
        const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0] ? document.getElementsByTagName('thead')[0].clientHeight : 0
        if (document.getElementsByClassName('main_app') && document.getElementsByClassName('main_app')[0]) {
          console.log('main_app========================')
          // console.log('main_app========================')
          // alert(height)
          const height3 = this.getEleHeghtByClassName('main-header',0)
          const height4 = this.getEleHeghtByClassName('table-pagination',0)
@@ -122,16 +122,16 @@
          const height11 = this.getEleHeghtByClassName('el-tabs-ele',0)
          const height12 = this.getEleHeghtByClassName('platgroup_tabs',0)
          this.$router.app.$store.commit('setTableHeightNew', height - height13- height3 - height5 - height6 - height2 - height7 - height4 - height9 - height10 - height11 - height12)
          console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
          // console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
        } else {
          console.log('tableLayout========================')
          // console.log('tableLayout========================')
          const height1 = this.getEleHeghtByClassName('table-search-form', 40,16)
          const height3 = this.getEleHeghtByClassName('main-header', 0)
          const height4 = this.getEleHeghtByClassName('table-pagination', 0)
          const height2 = this.getEleHeghtByClassName('toolbar', 0)
          console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
          // console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
          this.$router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
          console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
          // console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
        }
      })
    },
@@ -139,7 +139,7 @@
      if ((document.getElementsByClassName(name) && document.getElementsByClassName(name)[0])) {
        let t = 0
        document.getElementsByClassName(name).forEach(e => {
          console.log(name+'========================' + t + ':' + e.clientHeight)
          // console.log(name+'========================' + t + ':' + e.clientHeight)
          t++
        })
        return document.getElementsByClassName(name)[document.getElementsByClassName(name).length - 1].clientHeight+(margin||0)

 admin/src/router/index.js

@@ -125,7 +125,7 @@
    const height11 = getEleHeghtByClassName('el-tabs-ele', 0)
    const height12 = getEleHeghtByClassName('platgroup_tabs', 0,20)
    router.app.$store.commit('setTableHeightNew', height -10 - height2 - height3 - height4 - height5 - height6 - height7 - height9 - height10 - height11 - height12 - height13)
    console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
    // console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
  } else {
    // console.log('tableLayout========================')
    const height1 = getEleHeghtByClassName('table-search-form', 40, 16)
@@ -134,7 +134,7 @@
    const height2 = getEleHeghtByClassName('toolbar', 0)
    console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
    router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
    console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
    // console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
  }
}


 server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java

 server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java

@@ -4,7 +4,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PostMapping;

/**
 * @author jiangping
@@ -14,89 +15,89 @@
public interface VisitServiceFegin {

    @ApiOperation("【访客系统】定时查询人员设备授权结果")
    @GetMapping("/timer/empower/syncEmpowerDetailData")
    @PostMapping("/timer/empower/syncEmpowerDetailData")
    ApiResponse syncEmpowerDetailData();
    @ApiOperation("【访客系统】定时查询人员设备授权下载进度")
    @GetMapping("/timer/empower/syncEmpowerResultData")
    @PostMapping("/timer/empower/syncEmpowerResultData")
    ApiResponse syncEmpowerResultData();
    @ApiOperation("【访客系统】定时重新下发失败的授权数据")
    @GetMapping("/timeempowerr/syncEmpowerFailData")
    @PostMapping("/timeempowerr/syncEmpowerFailData")
     ApiResponse syncEmpowerFailData();
    @ApiOperation("【访客系统】定时刷新人员设备授权")
    @GetMapping("/timer/empower/syncEmpowerData")
    @PostMapping("/timer/empower/syncEmpowerData")
     ApiResponse syncEmpowerData();
    @ApiOperation("【访客系统】定时查询设备状态")
    @GetMapping("/timer/device/getAscDeviceStatus")
    @PostMapping("/timer/device/getAscDeviceStatus")
    ApiResponse getAscDeviceStatus() ;
    @ApiOperation("【访客系统】设置全部LED屏显内容为默认内容")
    @GetMapping("/timer/device/allLedDefualtContent")
    @PostMapping("/timer/device/allLedDefualtContent")
    ApiResponse allLedDefualtContent();
    @ApiOperation("【访客系统】定时备份数据库")
    @GetMapping("/timer/db/backupDatabase")
    @PostMapping("/timer/db/backupDatabase")
     ApiResponse backupDatabase() ;
    @ApiOperation("【访客系统】定时查询月台状态")
    @GetMapping("/timer/platform/getPlatformStatus")
    @PostMapping("/timer/platform/getPlatformStatus")
     ApiResponse getPlatformStatus() ;
    @ApiOperation("【访客系统】定时下载海康系统图片数据")
    @GetMapping("/timer/image/downHKImgs")
    @PostMapping("/timer/image/downHKImgs")
     ApiResponse downHKImgs();
    @ApiOperation("【访客系统】定时接口日志清理")
    @GetMapping("/timer/log/clearThreeMonthLog")
    @PostMapping("/timer/log/clearThreeMonthLog")
     ApiResponse clearThreeMonthLog();
    @ApiOperation("【访客系统】定时车辆包期授权")
    @GetMapping("/timer/park/syncParkBookData")
    @PostMapping("/timer/park/syncParkBookData")
     ApiResponse syncParkBookData();
    @ApiOperation("【访客系统】定时查询车辆查询")
    @GetMapping("/timer/park/syncVehicleUpdateData")
    @PostMapping("/timer/park/syncVehicleUpdateData")
     ApiResponse syncVehicleUpdateData() ;
    @ApiOperation("【访客系统】定时同步海康组织数据")
    @GetMapping("/timer/orguser/syncOrgData")
    @PostMapping("/timer/orguser/syncOrgData")
     ApiResponse syncOrgData() ;
    @ApiOperation("【访客系统】定时重新下发删除人员数据")
    @GetMapping("/timer/orguser/syncMemberDelData")
    @PostMapping("/timer/orguser/syncMemberDelData")
     ApiResponse syncMemberDelData() ;
    @ApiOperation("【访客系统】定时同步海康人员数据")
    @GetMapping("/timer/orguser/syncUserData")
    @PostMapping("/timer/orguser/syncUserData")
     ApiResponse syncUserData();
    @ApiOperation("【访客系统】定时冻结人员")
    @GetMapping("/timer/orguser/memberFreeze")
    @PostMapping("/timer/orguser/memberFreeze")
     ApiResponse memberFreeze();
    @ApiOperation("【访客系统】定时下发访客预约申请")
    @GetMapping("/timer/visit/syncVisitData")
    @PostMapping("/timer/visit/syncVisitData")
     ApiResponse syncVisitData() ;
    @ApiOperation("【访客系统】定时查询访客预约状态")
    @GetMapping("/timer/visit/getOutTimeVisitRecord")
    @PostMapping("/timer/visit/getOutTimeVisitRecord")
     ApiResponse getOutTimeVisitRecord();
    @ApiOperation("【访客系统】定时今日的访客预约数据")
    @GetMapping("/timer/visit/syncVistAppointData")
    @PostMapping("/timer/visit/syncVistAppointData")
    ApiResponse syncVistAppointData() ;
//    @ApiOperation("【访客系统】定时更新微信公众号accesstoken")
//    @GetMapping("/timer/wxtoken/updateWxAccessToken")
//    @PostMapping("/timer/wxtoken/updateWxAccessToken")
//    ApiResponse updateWxAccessToken();
    @ApiOperation("【访客系统】访客数据即将超时预警")
    @GetMapping("/timer/visit/visitTimeOut")
    @PostMapping("/timer/visit/visitTimeOut")
    ApiResponse visitTimeOut() ;
    @ApiOperation("【访客系统】访客申请待审批记录截止时间已过自动取消预约")
    @GetMapping("/timer/visit/visitNoCheckCancel")
    @PostMapping("/timer/visit/visitNoCheckCancel")
    ApiResponse visitNoCheckCancel() ;
    @ApiOperation("【数字化月台】月台停靠超时报警业务")
    @GetMapping("/timer/platformJob/platformJobTimer")
    @PostMapping("/timer/platformJob/platformJobTimer")
    ApiResponse platformJobTimer();
    @ApiOperation("【数字化月台】月台检查电子锁上锁状态")
    @GetMapping("/timer/platformJob/platformCheckWmsLockStatus")
    @PostMapping("/timer/platformJob/platformCheckWmsLockStatus")
    ApiResponse platformCheckWmsLockStatusTimer();
    @ApiOperation("【数字化月台】月台作业超时报警业务")
    @GetMapping("/timer/platformJob/platformJobWorkTimeOut")
    @PostMapping("/timer/platformJob/platformJobWorkTimeOut")
    ApiResponse platformJobWorkTimeOut();
    @ApiOperation("【数字化月台】月台等待作业超时业务")
    @GetMapping("/timer/platformJob/platformJobWaitTimeOut")
    @PostMapping("/timer/platformJob/platformJobWaitTimeOut")
    ApiResponse platformJobWaitTimeOut();
    @ApiOperation("【短信通知】定时发送等待短信任务")
    @GetMapping("/timer/sms/sendWaitingSmsNotice")
    @PostMapping("/timer/sms/sendWaitingSmsNotice")
    ApiResponse sendWaitingSmsNotice();

    @ApiOperation("【数字化月台】月台今日作业未完成通知定时")
    @GetMapping("/timer/platformJob/sendUnFinishNotice")
    @PostMapping("/timer/platformJob/sendUnFinishNotice")
    ApiResponse sendUnFinishNotice();



 server/system_timer/src/main/java/com/doumee/jobs/service/TimerBizSevice.java

@@ -5,6 +5,7 @@
import com.doumee.dao.timer.entity.QuartzJob;
import com.doumee.dao.timer.mapper.QuartzJobMapper;
import com.doumee.dao.timer.scheduler.QuartzManage;
import lombok.extern.slf4j.Slf4j;
import org.quartz.CronTrigger;
import org.springframework.stereotype.Service;

@@ -13,6 +14,7 @@
import java.util.List;
import java.util.Objects;
@Service
@Slf4j
public class TimerBizSevice {
    @Resource
    private QuartzJobMapper quartzJobMapper ;
@@ -23,11 +25,13 @@
     */
    @PostConstruct
    public void init () {
            log.error("================执行"+System.currentTimeMillis());
            LambdaQueryWrapper<QuartzJob> queryWrapper = new LambdaQueryWrapper<>() ;
            queryWrapper.in(QuartzJob::getState, JobState.JOB_RUN.getStatus(),JobState.JOB_STOP.getStatus());
            List<QuartzJob> jobList = quartzJobMapper.selectList(queryWrapper);
            jobList.forEach(quartzJob -> {
                try {
                    log.error("================执行"+quartzJob.getId());
                    CronTrigger cronTrigger = quartzManage.getCronTrigger(quartzJob.getId()) ;
                    if (Objects.isNull(cronTrigger)){
                        quartzManage.createJob(quartzJob);
@@ -35,6 +39,7 @@
                        quartzManage.updateJob(quartzJob);
                    }
                }catch (Exception e){
//                    log.error("================执行"+quartzJob.getId());
                    e.printStackTrace();
                }
            });

 server/system_timer/src/main/resources/application-dev.yml

@@ -1,9 +1,9 @@
spring:
  # 数据源配置
  datasource:
    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: doumee
    password: rtjgfEr@&0c0m
    url: jdbc:mysql://112.26.66.25:3306/antaiwuliu?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
    username: root
    password: Doumee@168&QWERT
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:

 server/system_timer/src/main/resources/bootstrap-dev.yml

@@ -2,6 +2,8 @@
  cloud:
    loadbalancer:
      enabled: true
      retry:
        enabled: false
      nacos:
        # 使用Nacos负载策略，开发环境可以利用就近访问机制定向访问，启动参数如下：
        # -Dspring.cloud.nacos.discovery.cluster-name=自定义

 server/system_timer/src/main/resources/bootstrap-pro.yml

@@ -2,6 +2,8 @@
  cloud:
    loadbalancer:
      enabled: true
      retry:
        enabled: false
      nacos:
        # 使用Nacos负载策略，开发环境可以利用就近访问机制定向访问，启动参数如下：
        # -Dspring.cloud.nacos.discovery.cluster-name=自定义

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

@@ -10,7 +10,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -41,7 +41,7 @@


    @ApiOperation("数据库备份，保留最近7个备份sql")
    @GetMapping("/backupDatabase")
    @PostMapping("/backupDatabase")
    public ApiResponse backupDatabase() {
        try {
            String timestamp = DateUtil.getNowLongTime();

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

@@ -1,12 +1,13 @@
package com.doumee.api;

import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -23,13 +24,13 @@
    @Autowired
    private DeviceService deviceService;
    @ApiOperation("开启定时查询设备状态")
    @GetMapping("/getAscDeviceStatus")
    @PostMapping("/getAscDeviceStatus")
    public ApiResponse getAscDeviceStatus() {
        hkSyncDeviceService.getAscDeviceStatus();
        return ApiResponse.success("开启定时查询设备状态成功");
    }
    @ApiOperation("更新全部LED屏显内容为默认内容")
    @GetMapping("/allLedDefualtContent")
    @PostMapping("/allLedDefualtContent")
    public ApiResponse allLedDefualtContent() {
        deviceService.allLedDefualtContent();
        return ApiResponse.success("更新全部LED屏显内容为默认内容");

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

@@ -22,7 +22,7 @@

    public static Integer endId2 = 0;
    @ApiOperation("开启定时查询人员设备授权结果")
    @GetMapping("/syncEmpowerDetailData")
    @PostMapping("/syncEmpowerDetailData")
    public ApiResponse syncEmpowerDetailData() {
        if(endId2 ==null){
            endId2 =0;
@@ -36,14 +36,14 @@
        return ApiResponse.success("开启定时查询人员设备授权结果成功");
    }
    @ApiOperation("开启定时查询人员设备授权下载进度")
    @GetMapping("/syncEmpowerResultData")
    @PostMapping("/syncEmpowerResultData")
    public ApiResponse syncEmpowerResultData() {
        hkSyncEmpowerService.syncEmpowerResultData(0);
        return ApiResponse.success("开启定时查询人员设备授权下载进度成功");
    }

    @ApiOperation("开启定时重新下发失败的授权数据")
    @GetMapping("/syncEmpowerFailData")
    @PostMapping("/syncEmpowerFailData")
    public ApiResponse syncEmpowerFailData() {
        hkSyncEmpowerService.syncEmpowerFailData(0);
        return ApiResponse.success("开启定时重新下发失败的授权数据成功");
@@ -53,7 +53,7 @@
    @Autowired
    private HkSyncVehicleFromHKServiceImpl hkSyncVehicleFromHKService;
    @ApiOperation("开启定时刷新人员设备授权")
    @GetMapping("/syncEmpowerData")
    @PostMapping("/syncEmpowerData")
    public ApiResponse syncEmpowerData() {
        if(endId ==null){
            endId =0;

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

@@ -6,7 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -27,7 +27,7 @@
    @Autowired
    private HkSyncImgServiceImpl hkSyncImgService;
    @ApiOperation("开启定时下载海康系统图片数据")
    @GetMapping("/downHKImgs")
    @PostMapping("/downHKImgs")
    public ApiResponse downHKImgs() {
        if(dataSyncConfig.getNeedDealImg()!=null && dataSyncConfig.getNeedDealImg()){
            hkSyncImgService.downHKImgs(0);

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

@@ -7,7 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -27,7 +27,7 @@
    private VisitsService visitsService;

    @ApiOperation("开启定时查询最新人员代办数据状态")
    @GetMapping("/getNoticeList")
    @PostMapping("/getNoticeList")
    public ApiResponse getNoticeList() {
        hkSyncVisitService.syncVisitData();
        return ApiResponse.success("开启定时下发访客预约申请成功");

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

@@ -6,7 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -27,13 +27,13 @@
    private HkSyncParkServiceImpl hkSyncParkService;

    @ApiOperation("开启定时车辆包期授权")
    @GetMapping("/syncParkBookData")
    @PostMapping("/syncParkBookData")
    public ApiResponse syncParkBookData() {
        hkSyncParkService.syncParkBookData();
        return ApiResponse.success("开启定时车辆包期授权成功");
    }
    @ApiOperation("开启定时查询车辆查询")
    @GetMapping("/syncVehicleUpdateData")
    @PostMapping("/syncVehicleUpdateData")
    public ApiResponse syncVehicleUpdateData() {
        hkSyncVehicleFromHKService.syncVehicleUpdateData(new Date(System.currentTimeMillis()-24*60*60*1000));
        return ApiResponse.success("开启定时查询车辆查询成功");

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

@@ -6,7 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -21,7 +21,7 @@
    @Autowired
    private HkSyncPlatformsServiceImpl hkSyncPlatformsService;
    @ApiOperation("开启定时查询月台状态")
    @GetMapping("/getPlatformStatus")
    @PostMapping("/getPlatformStatus")
    public ApiResponse getPlatformStatus() {
        hkSyncPlatformsService.getPlatformStatus(new PlatformStatusRequest());
        return ApiResponse.success("开启定时查询月台状态成功");

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

@@ -5,7 +5,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -20,7 +20,7 @@
    @Autowired
    private SmsEmailService smsEmailService;
    @ApiOperation("开启定时短信发送定时任务")
    @GetMapping("/sendWaitingSmsNotice")
    @PostMapping("/sendWaitingSmsNotice")
    public ApiResponse sendWaitingSmsNotice() {
        smsEmailService.sendWaitingSmsNotice();
        return ApiResponse.success("开启定时短信发送定时任务成功");

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

@@ -9,7 +9,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -34,7 +34,7 @@
    private DataSyncConfig dataSyncConfig;

    @ApiOperation("开启定时同步海康组织数据")
    @GetMapping("/syncOrgData")
    @PostMapping("/syncOrgData")
    public ApiResponse syncOrgData() {
        log.info("=========================开启定时同步海康组织数据===========start===========");
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
@@ -46,7 +46,7 @@
        return ApiResponse.success("开启定时同步海康组织数据成功");
    }
    @ApiOperation("开启定时重新下发删除人员数据")
    @GetMapping("/syncMemberDelData")
    @PostMapping("/syncMemberDelData")
    public ApiResponse syncMemberDelData() {
        log.info("=========================开启定时重新下发删除人员数据===========start===========");
        hkSyncOrgUserService.syncMemberDelData();
@@ -55,7 +55,7 @@
        return ApiResponse.success("开启定时重新下发删除人员数据成功");
    }
    @ApiOperation("开启定时同步海康人员数据")
    @GetMapping("/syncUserData")
    @PostMapping("/syncUserData")
    public ApiResponse syncUserData() {
        log.info("=========================开启定时同步海康人员数据===========start===========");
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
@@ -67,7 +67,7 @@
        return ApiResponse.success("开启定时同步海康人员数据成功");
    }
    @ApiOperation("开启定时冻结人员")
    @GetMapping("/memberFreeze")
    @PostMapping("/memberFreeze")
    public ApiResponse memberFreeze() {
        memberService.memberFreeze();
        return ApiResponse.success("开启定时冻结人员成功");

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

@@ -8,7 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -31,19 +31,19 @@
    private VisitsService visitsService;

    @ApiOperation("开启定时下发访客预约申请")
    @GetMapping("/syncVisitData")
    @PostMapping("/syncVisitData")
    public ApiResponse syncVisitData() {
        hkSyncVisitService.syncVisitData();
        return ApiResponse.success("开启定时下发访客预约申请成功");
    }
    @ApiOperation("开启定时查询访客预约状态")
    @GetMapping("/getOutTimeVisitRecord")
    @PostMapping("/getOutTimeVisitRecord")
    public ApiResponse getOutTimeVisitRecord() {
        hkSyncVisitService.getOutTimeVisitRecordIccm();
        return ApiResponse.success("开启定时查询访客预约状态成功");
    }
    @ApiOperation("开启定时今日的访客预约数据")
    @GetMapping("/syncVistAppointData")
    @PostMapping("/syncVistAppointData")
    public ApiResponse syncVistAppointData() {
        if(!Constants.DEALING_FROM_HK_VISIT){
            try {
@@ -60,13 +60,13 @@
    }

    @ApiOperation("访客即将超时预警")
    @GetMapping("/visitTimeOut")
    @PostMapping("/visitTimeOut")
    public ApiResponse visitTimeOut() {
        visitsService.syncTimeOutData();
        return ApiResponse.success("访客即将超时预警");
    }
    @ApiOperation("待审批记录超时自动取消预约")
    @GetMapping("/visitNoCheckCancel")
    @PostMapping("/visitNoCheckCancel")
    public ApiResponse visitNoCheckCancel() {
        visitsService.visitNoCheckCancel();
        return ApiResponse.success("待审批记录超时自动取消预约");

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

@@ -8,7 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -28,7 +28,7 @@
    @Autowired
    private PlatformInterfaceLogService platformInterfaceLogService;
    @ApiOperation("开启定时接口日志清理")
    @GetMapping("/clearThreeMonthLog")
    @PostMapping("/clearThreeMonthLog")
    public ApiResponse clearThreeMonthLog() {
        interfaceLogService.clearThreeMonthLog();
        wmsInterfaceLogService.clearThreeMonthLog();

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

@@ -7,7 +7,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -26,13 +26,13 @@


    @ApiOperation("月台停靠超时报警业务")
    @GetMapping("/platformJobTimer")
    @PostMapping("/platformJobTimer")
    public ApiResponse platformJobTimer() {
        platformJobService.timeOutReport();
        return ApiResponse.success("月台停靠超时报警业务");
    }
    @ApiOperation("月台作业检查电子锁上锁状态")
    @GetMapping("/platformCheckWmsLockStatus")
    @PostMapping("/platformCheckWmsLockStatus")
    public ApiResponse checkWmsLockStatus() {
        platformJobService.checkWmsLockStatus();
        return ApiResponse.success("月台停靠超时报警业务");
@@ -40,7 +40,7 @@


    @ApiOperation("月台作业超时报警业务")
    @GetMapping("/platformJobWorkTimeOut")
    @PostMapping("/platformJobWorkTimeOut")
    public ApiResponse platformJobWorkTimeOut() {
        platformJobService.timeOutWork();
        return ApiResponse.success("月台作业超时报警业务");
@@ -48,7 +48,7 @@


    @ApiOperation("月台等待作业超时业务")
    @GetMapping("/platformJobWaitTimeOut")
    @PostMapping("/platformJobWaitTimeOut")
    public ApiResponse platformJobWaitTimeOut() {
        platformJobService.timeOutCallIn();
        return ApiResponse.success("月台等待作业超时业务");
@@ -58,7 +58,7 @@

    @PreventRepeat(interval = 2000)
    @ApiOperation("月台今日作业未完成通知定时")
    @GetMapping("/sendUnFinishNotice")
    @PostMapping("/sendUnFinishNotice")
    public synchronized ApiResponse sendUnFinishNotice() {
        log.error("========月台今日作业未完成通知定时============开始"+System.currentTimeMillis()+"");
        platformJobService.sendUnFinishNotice();

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

@@ -18,7 +18,7 @@
import org.apache.shiro.mgt.DefaultSecurityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -44,7 +44,7 @@
    @Value("${debug_model}")
    private Boolean timing;
//    @ApiOperation("开启定时更新微信公众号accesstoken")
//    @GetMapping("/updateWxAccessToken")
//    @PostMapping("/updateWxAccessToken")
//    public ApiResponse updateWxAccessToken() {
//       DefaultSecurityManager securityManager = new DefaultSecurityManager();
//        SecurityUtils.setSecurityManager(securityManager);
@@ -64,7 +64,7 @@
//        return ApiResponse.success("开启定时更新微信公众号accesstoken成功");
//    }
    @ApiOperation("开启定时更新微信公众号accesstoken")
    @GetMapping("/updateWxAccessTokenOrigin")
    @PostMapping("/updateWxAccessTokenOrigin")
    public ApiResponse updateWxAccessTokenOrigin() {
       DefaultSecurityManager securityManager = new DefaultSecurityManager();
        SecurityUtils.setSecurityManager(securityManager);

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

@@ -74,7 +74,7 @@
    public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
    }
    @ApiOperation("分页查询")
    @ApiOperation("分页查询在场车辆")
    @PostMapping("/pageCars")
    @CloudRequiredPermission("business:retention:query")
    public ApiResponse<PageData<RetentionCarsVO>> findPageForCars (@RequestBody PageWrap<RetentionCarsVO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){

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

@@ -235,8 +235,10 @@
                .leftJoin(Member.class,Member::getId,Retention::getMemberId)
                .leftJoin(Member.class,Member::getId,Retention::getMemberId)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
                .selectAs(Company::getCompanyNamePath,Retention::getCompanyName)
                .selectAs(Member::getName,Retention::getName)
                .selectAs(Category::getName,Retention::getCategoryName)
                .selectAs(Member::getPhone,Retention::getPhone)
                .selectAs(Member::getVisitCompanyName,Retention::getVisitCompanyName)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{