From 78ce920fa8a3f06cf40ee936b7b33c457206ecb6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 10:51:57 +0800
Subject: [PATCH] 整理
---
admin/src/views/business/parkBook.vue | 10 +++++++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 5 ++---
server/dmvisit_service/src/main/resources/application-devYL.yml | 1 -
admin/src/views/business/deviceEvent.vue | 25 +++++++++++++------------
4 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 6230072..b21c70d 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -10,8 +10,7 @@
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="personType">
<el-select v-model="searchForm.personType" placeholder="璇烽�夋嫨">
- <el-option label="鍔冲姟璁垮" value="0"></el-option>
- <el-option label="鏅�氳瀹�" value="1"></el-option>
+ <el-option label="澶栨潵璁垮" value="1"></el-option>
<el-option label="鍐呴儴浜哄憳" value="2"></el-option>
</el-select>
</el-form-item>
@@ -55,23 +54,20 @@
>
<el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.userType === 0">鍔冲姟璁垮</span>
- <span v-if="row.userType === 1">鏅�氳瀹�</span>
- <span v-if="row.userType === 2">鍐呴儴浜哄憳</span>
+ <span v-if="row.personType === 0">鍔冲姟璁垮</span>
+ <span v-if="row.personType === 1">鏅�氳瀹�</span>
+ <span v-if="row.personType === 2">鍐呴儴浜哄憳</span>
+ <span v-if="row.personType == null">澶栨潵璁垮</span>
</template>
</el-table-column>
- <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="personCompanyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="100px"></el-table-column>
<el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
<el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.extEventInOut === 1">杩�</span>
- <span v-if="row.extEventInOut === 0">鍑�</span>
- <span v-if="row.extEventInOut === -1">鏈煡</span>
+ <span v-if="row.extEventInOut != 1">鍑�</span>
</template>
</el-table-column>
<el-table-column label="鎶撴媿鐓х墖" min-width="100px">
@@ -83,7 +79,12 @@
</el-image>
</template>
</el-table-column>
- <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
+
+ <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="personCompanyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
+
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/admin/src/views/business/parkBook.vue b/admin/src/views/business/parkBook.vue
index a3709ff..fe1acb8 100644
--- a/admin/src/views/business/parkBook.vue
+++ b/admin/src/views/business/parkBook.vue
@@ -2,14 +2,17 @@
<TableLayout :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
- <el-form-item label="杞︾墝鍙�" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+ <el-form-item label="杞︾墝鍙�" prop="carCode">
+ <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鍛樺伐濮撳悕/鎵嬫満鍙�" prop="memberName">
<el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ラ儴闂�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鍋滆溅搴撳悕绉�" prop="parksName">
+ <el-input v-model="searchForm.parksName" placeholder="璇疯緭鍏ュ仠杞﹀簱鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -109,8 +112,9 @@
return {
// 鎼滅储
searchForm: {
- code: '',
+ carCode: '',
memberName: '',
+ parksName: '',
companyName: ''
}
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index a616c57..7d09643 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -694,7 +694,7 @@
if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
//&&!IdcardUtil.isValidCard(cardno)
){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇併��"+cardno+"銆戝彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.memberType.visitor)
@@ -730,10 +730,9 @@
}else{
if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
//濡傛灉鐢ㄦ埛鐘舵�佸紓甯革紝鍒欐彁绀�
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇ヨ韩浠借瘉鍙疯绂佹璁块棶鐢宠锛屽鏈夌枒闂紝璇疯仈绯绘偍鐨勬嫓璁夸汉杩涜鏍稿疄");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿銆�"+cardno+"銆戣绂佹璁块棶鐢宠锛屽鏈夌枒闂紝璇疯仈绯绘偍鐨勬嫓璁夸汉杩涜鏍稿疄");
}
//鏍告煡棰勭害鐢ㄦ埛鏄惁瀛樺湪鏈绂荤殑棰勭害璁板綍
-
// isExsitNoOutVisisRecord(member);
member.setFaceImg(visits.getFaceImg());
diff --git a/server/dmvisit_service/src/main/resources/application-devYL.yml b/server/dmvisit_service/src/main/resources/application-devYL.yml
index 200579d..929847b 100644
--- a/server/dmvisit_service/src/main/resources/application-devYL.yml
+++ b/server/dmvisit_service/src/main/resources/application-devYL.yml
@@ -58,7 +58,6 @@
appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
-
des_pwd: 123456SDFKDJF
## MQTT##
--
Gitblit v1.9.3