| admin/src/views/business/deviceEvent.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/parkBook.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/dmvisit_service/src/main/resources/application-devYL.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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" 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: '' } } 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()); server/dmvisit_service/src/main/resources/application-devYL.yml
@@ -58,7 +58,6 @@ appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ des_pwd: 123456SDFKDJF ## MQTT##
