Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-03-20 5e611231af1fad7993447234fc43a150b918f1e9

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 admin/src/components/business/OperaHiddenDangerWindow.vue

@@ -10,7 +10,7 @@
        <div class="header">
          <div class="left">
            <div class="h1">隐患提报</div>
            <div class="time">提报时间：{{model.createDate}}</div>
            <div class="time">提报时间：{{model.submitTime}}</div>
          </div>
          <div class="right" v-if="model.status==0">待处理</div>
          <div class="right"  style="background:#53b76f " v-if="model.status==1">已处理</div>
@@ -127,7 +127,7 @@
                </div>
                <div class="line">
                  <div class="company">
                    {{ item.createUserName }} 
                    {{ item.createUserName }}
                    <div style="display: inline" v-if="index == logList.length-1">
                      ï¼ˆ<span class="status-green" v-if="model.status==1">已处理</span>
                      <span class="status-blue" v-if="model.status==0">待处理</span>

 admin/src/components/common/Pagination.vue

@@ -40,15 +40,15 @@
</script>
<style lang="scss" scoped>
.table-pagination {
  margin-left: -18px;
  padding: 16px 0px 16px 25px;
  margin-left: 0px;
  padding: 16px 0px;
  text-align: left;
  display: block;
  z-index: 100;
  width: -webkit-fill-available;
  /* width: 80%; */
  position: fixed;
  bottom: 25px;
  bottom: 0px;
  background-color: white;
  margin-right: 50px;
}

 admin/src/layouts/AppLayout.vue

@@ -56,15 +56,15 @@
  background: #F7F8F9;
  height: 100%;
  display: flex;
  // overflow: hidden;
  overflow: scroll;
   overflow: hidden;
  //overflow: scroll;
  // å·¦è¾¹èœå•
  .el-aside {
    width: $menu-width !important;
    flex-shrink: 0;
    // height: 100%;
    // height: 900px;
    height: calc(100vh - 80px);
    height: calc(100vh - 60px);
    overflow-y: scroll;
    overflow-x: hidden;
    background: #fff;
@@ -84,7 +84,7 @@
    width: 100%;
     //height: 100%;
    overflow: hidden;
    height: calc(100vh - 94px);
    height: calc(100vh - 60px);
    padding: 0;
    position: relative;
    display: flex;

 admin/src/layouts/TableLayout.vue

@@ -175,15 +175,15 @@
    }
    // åˆ†é¡µ
    .table-pagination {
      margin-left: -18px;
      padding: 16px 0px 16px 25px;
      margin-left: 0px;
      padding: 16px 0px;
      text-align: left;
      display: block;
      z-index: 100;
      width: -webkit-fill-available;
      /* width: 80%; */
      position: fixed;
      bottom: 25px;
      bottom: 0px;
      background-color: white;
      margin-right: 50px;
    }

 admin/src/layouts/TableLayout1.vue

@@ -158,15 +158,15 @@
            }
            // åˆ†é¡µ
            .table-pagination {
              margin-left: -18px;
              padding: 16px 0px 16px 25px;
              margin-left: 0px;
              padding: 16px 0px ;
              text-align: left;
              display: block;
              z-index: 100;
              width: -webkit-fill-available;
              /* width: 80%; */
               position: fixed;
              bottom: 25px;
              bottom: 0px;
              background-color: white;
              margin-right: 50px;
            }

 admin/src/router/index.js

@@ -106,12 +106,12 @@
  const height = window.innerHeight
  console.log('beforeEach========================：' + height)
  const height13 = getEleHeghtByClassName('common-header', 0)
  const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
  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========================')
    // alert(height)
    const height3 = getEleHeghtByClassName('main-header', 0)
    const height4 = getEleHeghtByClassName('table-pagination', 0)
    const height2 = getEleHeghtByClassName('toolbar', 0)
    const height6 = getEleHeghtByClassName('doumee-filter', 0, 16)
    const height7 = getEleHeghtByClassName('pt16', 0, 0)
@@ -125,7 +125,7 @@
    console.log('tableLayout========================')
    const height1 = getEleHeghtByClassName('table-search-form', 40, 16)
    const height3 = getEleHeghtByClassName('main-header', 0)
    const height4 = getEleHeghtByClassName('table-pagination', 0)
    // const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
    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)

 admin/src/views/business/deviceEvent.vue

@@ -67,7 +67,7 @@
</el-table-column> -->
        <el-table-column prop="personName" label="姓名" min-width="80px"></el-table-column>
        <el-table-column prop="personPhone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="personIdcardDecode" label="证件号" min-width="140px"></el-table-column>
        <el-table-column prop="personIdcardDecode" label="身份证号" min-width="140px"></el-table-column>
        <el-table-column prop="personCompanyName" label="组织" min-width="100px"></el-table-column>
        <el-table-column label="人员类型" min-width="100px">
          <template slot-scope="{ row }">

 admin/src/views/business/reportRecord.vue

@@ -240,15 +240,16 @@

<style lang="scss" scoped>
.table-pagination {
  margin-left: -18px;
  padding: 16px 0px 16px 25px;

  margin-left: 0px;
  padding: 16px 0px ;
  text-align: left;
  display: block;
  z-index: 100;
  width: -webkit-fill-available;
  /* width: 80%; */
  position: fixed;
  bottom: 25px;
  bottom: 0px;
  background-color: white;
  margin-right: 50px;
}

 admin/src/views/platform/components/PlatformQueuing.vue

@@ -184,7 +184,9 @@

<style lang="scss" scoped>
@import "@/assets/style/variables.scss";

.table-pagination {
  bottom: 0px !important;
}
.queuing_modal {
  padding: 10px 30px;


 admin/src/views/platform/components/PlatformSign.vue

@@ -96,11 +96,9 @@
    handleCall(item) {
      // const activePlatform = this.activePlat
      platformJobSign({ jobId: item.id, signType: '2' }).then(res => {
        if (res.code == 200) {
          Message.success('签到成功')
          this.$message.success('签到成功')
          this.$emit('success')
          this.getList()
        }
      })
    },
    getList(page) {
@@ -169,7 +167,9 @@

<style lang="scss" scoped>
@import "@/assets/style/variables.scss";

.table-pagination {
  bottom: 0px !important;
}
.queuing_modal {
  padding: 10px 30px;


 server/meeting/meeting_admin/src/main/java/com/doumee/api/timer/TaskController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.doumee.api.timer;

import com.doumee.core.utils.DateUtil;
import com.doumee.service.business.BookingsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.Date;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/3/20 9:58
 */
@Component
@EnableScheduling
@Slf4j
public class TaskController {


    @Autowired
    private BookingsService bookingsService;


    /**
     * å®šæ—¶è‡ªåŠ¨å¼€å§‹ä¼šè®®
     */
    @Scheduled(cron = "1 * * * * ?")
    public void autoStart() {
        bookingsService.autoStart();
    }



}

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java

@@ -213,4 +213,7 @@
    void startEarly(BusinessOverDTO businessOverDTO);

    RoomDetailResponse getRoomDetail(Integer roomId);

    void autoStart();

}

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -1304,6 +1304,34 @@
    }

    /**
     * è‡ªåŠ¨å¼€å§‹ä¼šè®®
     */
    @Override
    public void autoStart(){
        List<Rooms> roomList = roomsMapper.selectList(new QueryWrapper<Rooms>().lambda().eq(Rooms::getIsdeleted,Constants.ZERO).eq(Rooms::getStatus,Constants.ZERO));
        for (Rooms rooms:roomList) {
            //查询当前会议室是否存在进行中的会议
            if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda().eq(Bookings::getIsdeleted,Constants.ZERO)
                    .eq(Bookings::getStatus,Constants.ZERO).isNotNull(Bookings::getStartTimeReal)
            )<=Constants.ZERO){
                //根据会议室获取可以开启的会议记录（第一条记录）
                Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
                        .eq(Bookings::getIsdeleted,Constants.ZERO)
                        .eq(Bookings::getStatus,Constants.ZERO)
                        .eq(Bookings::getRoomId,rooms.getId())
                        .apply(" now() > START_TIME and now < END_TIME ")
                        .isNull(Bookings::getStartTimeReal)
                        .orderByAsc(Bookings::getStartTime)
                        .last(" limit 1 ")
                );
                bookings.setStartTimeReal(new Date());
                bookings.setEditDate(new Date());
                bookingsMapper.updateById(bookings);
            }
        }
    }

    /**
     * æå‰å¼€å§‹
     * @param businessOverDTO
     */

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

@@ -609,18 +609,17 @@
                .eq(Cars::getIsdeleted,Constants.ZERO)
                .eq(Cars::getAuthStatus,Constants.ONE)//已授权包期的车辆
        );
        if ((carsMapper!=null && carsList.size()>0)){
        if (carsList!=null && carsList.size()>0){
            for(Cars car :carsList){
               if(Constants.equalsInteger(car.getAuthStatus(),Constants.ZERO)){
                   Cars model = new Cars();
               if(Constants.equalsInteger(car.getAuthStatus(),Constants.ONE)){
                   carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                           .eq(Cars::getId,car.getId())
                           .set(Cars::getStartTime,null)
                           .set(Cars::getEndTime,null)
                           .set(Cars::getAuthTimeType,null)
                           .set(Cars::getAuthStatus,Constants.ZERO)
                           .set(Cars::getEditDate,model.getEditDate())
                           .set(Cars::getEdirot,model.getEdirot())
                           .set(Cars::getEditDate,member.getEditDate())
                           .set(Cars::getEdirot,member.getEditor())
                   );
                   //删除已授权下发的包期授权
                   CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);

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

@@ -182,21 +182,23 @@
        problemLog.setStatus(Constants.ZERO);
        problemLog.setOpenid(finishAnswerDTO.getOpenId());
        problemLog.setScore(finishAnswerDTO.getScore());
        if(finishAnswerDTO.getUseType().equals(Constants.ZERO)&&StringUtils.isNotBlank(finishAnswerDTO.getUserId())){
        if( StringUtils.isNotBlank(finishAnswerDTO.getUserId())){
            Member member = memberMapper.selectById(finishAnswerDTO.getUserId());
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到访客人员");
            if(member!=null){
/*             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到访客人员");
                if(!member.getStatus().equals(Constants.ZERO)){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号已经" + (member.getStatus().equals(Constants.ONE)?"禁用":"拉黑/删除") );
                }*/
                problemLog.setName(member.getName());
                problemLog.setPhone(member.getPhone());
                problemLog.setCompanyId(member.getCompanyId());
                problemLog.setCompanyName(member.getVisitCompanyName());
            }
            /*if(!member.getType().equals(Constants.memberType.driver)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非访客人员类型，答题失败");
            }*/
            if(!member.getStatus().equals(Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号已经" + (member.getStatus().equals(Constants.ONE)?"禁用":"拉黑/删除") );
            }
            problemLog.setName(member.getName());
            problemLog.setPhone(member.getPhone());
            problemLog.setCompanyId(member.getCompanyId());
            problemLog.setCompanyName(member.getVisitCompanyName());


           /* Company company = companyMapper.selectById(member.getCompanyId());
            if(Objects.isNull(company)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到劳务人员公司");