From 5e611231af1fad7993447234fc43a150b918f1e9 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 20 三月 2025 17:50:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/layouts/AppLayout.vue | 8 +-
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 28 +++++++++
admin/src/layouts/TableLayout.vue | 6 +-
admin/src/views/business/reportRecord.vue | 7 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 9 +-
admin/src/layouts/TableLayout1.vue | 6 +-
admin/src/views/platform/components/PlatformQueuing.vue | 4 +
admin/src/views/platform/components/PlatformSign.vue | 8 +-
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 3 +
admin/src/components/business/OperaHiddenDangerWindow.vue | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 22 ++++---
admin/src/components/common/Pagination.vue | 6 +-
admin/src/router/index.js | 4
server/meeting/meeting_admin/src/main/java/com/doumee/api/timer/TaskController.java | 39 +++++++++++++
admin/src/views/business/deviceEvent.vue | 2
15 files changed, 115 insertions(+), 41 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index 8595d0c..0f8ca3e 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/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>
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 91af47d..d4a6f28 100644
--- a/admin/src/components/common/Pagination.vue
+++ b/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;
}
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index face93a..cf6447e 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/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;
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index 3386129..0ba9fbd 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/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;
}
diff --git a/admin/src/layouts/TableLayout1.vue b/admin/src/layouts/TableLayout1.vue
index 453b42b..aaee5ed 100644
--- a/admin/src/layouts/TableLayout1.vue
+++ b/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;
}
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index 224a5f2..3f3c68d 100644
--- a/admin/src/router/index.js
+++ b/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)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 59aea23..530112d 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/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 }">
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index d6f2406..53cc989 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/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;
}
diff --git a/admin/src/views/platform/components/PlatformQueuing.vue b/admin/src/views/platform/components/PlatformQueuing.vue
index 336c393..103b8af 100644
--- a/admin/src/views/platform/components/PlatformQueuing.vue
+++ b/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;
diff --git a/admin/src/views/platform/components/PlatformSign.vue b/admin/src/views/platform/components/PlatformSign.vue
index ca3075d..a50ca78 100644
--- a/admin/src/views/platform/components/PlatformSign.vue
+++ b/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;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/timer/TaskController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/timer/TaskController.java
new file mode 100644
index 0000000..253f5ba
--- /dev/null
+++ b/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();
+ }
+
+
+
+}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
index fdab03e..af18b8f 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
+++ b/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();
+
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index e784118..734a7aa 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/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
*/
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 921d94a..7e673c7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/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);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index b98167b..a9e55a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/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(),"鏈煡璇㈠埌鍔冲姟浜哄憳鍏徃");
--
Gitblit v1.9.3