代码初始化

k94314517

2025-03-26 92aac24e1045295cd555d6a00985f9dedaf1bcea

代码初始化

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

@@ -75,7 +75,7 @@
        visitsService.updateById(visits);
        return ApiResponse.success(null);
    }
    @ApiOperation("取消预约")
    @ApiOperation("手动签离")
    @GetMapping("/visitCancel")
    @CloudRequiredPermission("business:visits:cancel")
    public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
@@ -83,6 +83,21 @@
        return ApiResponse.success(null);
    }


    /**
     * 2025-3-25 14:14:34  加入取消预约 待审批、审批中、已审批
     * @param visitId
     * @param token
     * @return
     */
    @ApiOperation("取消预约")
    @GetMapping("/visitsCancel")
    @CloudRequiredPermission("business:visits:cancel")
    public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        visitsService.visitsCancel(visitId);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据日期(starttime)同步访客数据")
    @PostMapping("/syncByDate")
    @CloudRequiredPermission("business:visits:sync")

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java

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

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.service.business.third.model.ApiResponse;
@@ -90,4 +91,18 @@
        return ApiResponse.success("操作成功");
    }

    /**
     * 2025-3-25 14:14:34  加入取消预约 待审批、审批中、已审批
     * @param visitId
     * @param token
     * @return
     */
    @ApiOperation("取消预约")
    @GetMapping("/visitsCancel")
    @CloudRequiredPermission("business:visits:cancel")
    public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        visitsService.visitsCancel(visitId);
        return ApiResponse.success(null);
    }

}

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

@@ -62,4 +62,7 @@
    @ExcelColumn(name="类型")
    private Integer type;

    @ApiModelProperty(value = "类型 0非施工人员访客申请 1施工人员访客申请 ", example = "1")
    @ExcelColumn(name="类型 0非施工人员访客申请 1施工人员访客申请 ")
    private Integer constructionType;
}

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

@@ -141,7 +141,11 @@

    void  visitLevel(Integer visitId);
    void  visitCancel(Integer visitId);

    /**
     * 处理待审核、审核中、已审核的数据取消业务
     * 2025年3月25日14:10:10
      */
    void  visitsCancel(Integer visitId);
    void resetPassword(ResetPasswordDTO resetPasswordDTO);

    void visitResend(Integer visitId);

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

@@ -1580,7 +1580,9 @@

        //广播 led通知
        platformJob.setPlatformName(platform.getName());
        this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.DONE.getInfo(),
        this.broadcastAndLEed(platformJob,
                //Constants.PlatformLedContent.DONE.getInfo(),
                Constants.PlatformLedContent.IDEL_CONTNET.getInfo(),
                Constants.PlatformBroadcastContent.DONE.getInfo());
        return platformJob;
    }

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

@@ -1568,6 +1568,28 @@
                .eq(Retention::getType,Constants.memberType.visitor)
                .eq(Retention::getMemberId,visits.getMemberId()));
    }

    /**
     * 处理待审核、审核中、已审核的数据取消业务
     * 2025年3月25日14:10:10
     */
    @Override
    public void  visitsCancel(Integer visitId){
        Visits visits = visitsMapper.selectById(visitId);
        if(Objects.isNull(visits)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"访客记录状态错误，请刷新重试");
        }
        visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.invalid)
                .eq(Visits::getId,visitId));
    }




    @Override
    public  void visitResend(Integer visitId) {
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();

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

@@ -2002,7 +2002,7 @@
        }
        int curtotalNum = 0;
        Date today =  Utils.Date.getStart(new Date());
        long curTime=0, lastTime=0;
        long curTime=0, lastTime=0 ;
        for (int i = 0; i < 8; i++) {
            lastTime = curTime;//上次的时间
            int curHour = 8+(i*2);
@@ -2025,7 +2025,7 @@
                curtotalNum += Constants.formatIntegerNum(workEfficiencyVO.getWorkNum()) ;
            }
            workEfficiencyVO.setTotalWorkNum(curtotalNum);//累计值
            if(System.currentTimeMillis() < curTime){
            if((System.currentTimeMillis() + 2*60*60*1000) < curTime ){
                workEfficiencyVO.setTotalWorkNum(0);
            }
            workEfficiencyVOList.add(workEfficiencyVO);