From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 3
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java | 5
admin/src/views/business/retention.vue | 61 +++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 38 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 13
server/openapi/src/main/java/com/doumee/api/BizResourceController.java | 35 ++
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java | 6
server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java | 6
server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 2
admin/src/views/business/visitEvent.vue | 117 +++++---
admin/src/views/business/carEvent.vue | 123 ++++++--
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 4
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java | 14
admin/src/utils/util.js | 23 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java | 4
admin/src/views/business/device.vue | 46 ++-
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 4
admin/src/api/business/visitEvent.js | 8
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 41 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 22 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java | 2
admin/src/api/business/device.js | 5
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 39 ++
admin/src/views/business/deviceEvent.vue | 115 ++++++--
25 files changed, 559 insertions(+), 179 deletions(-)
diff --git a/admin/src/api/business/device.js b/admin/src/api/business/device.js
index 4f85769..221ac0f 100644
--- a/admin/src/api/business/device.js
+++ b/admin/src/api/business/device.js
@@ -7,6 +7,11 @@
})
}
+// 鍚屾
+export function syncDevices (data) {
+ return request.post('/business/erpsync/syncDevices', data)
+}
+
// 淇敼
export function updateById (data) {
return request.post('/business/device/updateById', data)
diff --git a/admin/src/api/business/visitEvent.js b/admin/src/api/business/visitEvent.js
index 2d5ab68..05d7a8c 100644
--- a/admin/src/api/business/visitEvent.js
+++ b/admin/src/api/business/visitEvent.js
@@ -6,3 +6,11 @@
trim: true
})
}
+
+// 瀵煎嚭Excel
+export function exportExcel (data) {
+ return request.post('/business/visitEvent/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
diff --git a/admin/src/utils/util.js b/admin/src/utils/util.js
index bc975bc..48cf55e 100644
--- a/admin/src/utils/util.js
+++ b/admin/src/utils/util.js
@@ -18,3 +18,26 @@
}
return data
}
+
+export function timeForMat (count) {
+ // 鎷兼帴鏃堕棿
+ const time1 = new Date()
+ const time2 = new Date()
+ if (count === 1) {
+ time1.setTime(time1.getTime() - (24 * 60 * 60 * 1000))
+ } else {
+ time1.setTime(time1.getTime())
+ }
+
+ const Y1 = time1.getFullYear()
+ const M1 = ((time1.getMonth() + 1) > 9 ? (time1.getMonth() + 1) : '0' + (time1.getMonth() + 1))
+ const D1 = (time1.getDate() > 9 ? time1.getDate() : '0' + time1.getDate())
+ const timer1 = Y1 + '-' + M1 + '-' + D1 + ' ' + '23:59:59' // 褰撳墠鏃堕棿
+
+ time2.setTime(time2.getTime() - (24 * 60 * 60 * 1000 * count))
+ const Y2 = time2.getFullYear()
+ const M2 = ((time2.getMonth() + 1) > 9 ? (time2.getMonth() + 1) : '0' + (time2.getMonth() + 1))
+ const D2 = (time2.getDate() > 9 ? time2.getDate() : '0' + time2.getDate())
+ const timer2 = Y2 + '-' + M2 + '-' + D2 + ' ' + '00:00:00' // 涔嬪墠鐨�7澶╂垨鑰�30澶�
+ return [timer2, timer1]
+}
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index 5644f65..aba7510 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -1,49 +1,47 @@
<template>
- <TableLayout :permissions="['business:category:query']">
+ <TableLayout :permissions="['business:carevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="杞︾墝鍙�" prop="plateNos">
<el-input v-model="searchForm.plateNos" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="plateNos">
- <el-input v-model="searchForm.plateNos" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃/閮ㄩ棬鍚嶇О" prop="plateNos">
- <el-input v-model="searchForm.plateNos" placeholder="璇疯緭鍏ュ叕鍙�/閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
+ <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="plateNos">
- <el-select v-model="searchForm.plateNos" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-form-item label="浜哄憳绫诲瀷" prop="memberType">
+ <el-select v-model="searchForm.memberType" placeholder="璇烽�夋嫨">
+ <el-option label="鍔冲姟璁垮" value="0"></el-option>
+ <el-option label="鏅�氳瀹�" value="1"></el-option>
+ <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
<el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-option label="鍏ュ満鍘嬬嚎浜嬩欢" value="771760130"></el-option>
+ <el-option label="鍏ュ満鏀捐浜嬩欢" value="771760131"></el-option>
+ <el-option label="鍑哄満鍘嬬嚎浜嬩欢" value="771760133"></el-option>
+ <el-option label="鍑哄満鏀捐浜嬩欢" value="771760134"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="eventType">
<el-date-picker
- v-model="searchForm.eventType"
- type="daterange"
+ @change="seleTime"
+ v-model="time"
+ type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-radio-group v-model="searchForm.eventType" size="small">
- <el-radio-button label="褰撳ぉ"></el-radio-button>
- <el-radio-button label="杩�7澶�"></el-radio-button>
- <el-radio-button label="杩�30澶�"></el-radio-button>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
</el-radio-group>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -52,8 +50,8 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']">瀵煎嚭</el-button></li>
+ <ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
+ <li><el-button type="primary" v-permissions="['business:carevent:exportExcel']">瀵煎嚭</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -61,20 +59,34 @@
stripe
>
<el-table-column prop="plateNos" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="plateNos" label="褰掑睘鐢ㄦ埛绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="plateNos" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="plateNos" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="plateNos" label="鍏徃/閮ㄩ棬" min-width="100px"></el-table-column>
+ <el-table-column label="褰掑睘鐢ㄦ埛绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.personType === '0'">鍔冲姟璁垮</span>
+ <span v-if="row.personType === '1'">鏅�氳瀹�</span>
+ <span v-if="row.personType === '2'">鍐呴儴浜哄憳</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="personCompanyName" label="鍏徃/閮ㄩ棬" min-width="100px"></el-table-column>
<el-table-column prop="parkName" label="鍋滆溅搴撳悕绉�" min-width="100px"></el-table-column>
<el-table-column prop="gateName" label="鍑哄叆鍙ｅ悕绉�" min-width="100px"></el-table-column>
- <el-table-column prop="eventType" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="inoutType" label="鍑哄叆绫诲瀷" min-width="100px">
+ <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.inoutType === 0">杩涘満</span>
<span v-if="row.inoutType === 1">鍑哄満</span>
</template>
</el-table-column>
- <el-table-column prop="vehiclePicUrl" label="鎶撴媿鍥剧墖" min-width="100px"></el-table-column>
+ <el-table-column label="鎶撴媿鍥剧墖" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image
+ style="width: 80px; height: 80px"
+ :src="row.vehiclePicUrl"
+ :preview-src-list="[row.vehiclePicUrl]">
+ </el-image>
+ </template>
+ </el-table-column>
<el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@@ -91,6 +103,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { timeForMat } from '@/utils/util'
export default {
name: 'CarEvent',
extends: BaseTable,
@@ -100,9 +113,15 @@
// 鎼滅储
searchForm: {
eventType: '',
- plateNos: ''
+ keyWords: '',
+ plateNos: '',
+ memberType: '',
+ companyName: '',
+ startTime: '',
+ endTime: '',
+ radio: null
},
- options: []
+ time: []
}
},
created () {
@@ -113,6 +132,38 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.time = []
+ this.searchForm.radio = null
+ this.search()
+ },
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(1)[0]
+ this.searchForm.endTime = timeForMat(1)[1]
+ this.time = timeForMat(1)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(7)[0]
+ this.searchForm.endTime = timeForMat(7)[1]
+ this.time = timeForMat(7)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(30)[0]
+ this.searchForm.endTime = timeForMat(30)[1]
+ this.time = timeForMat(30)
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ this.searchForm.radio = null
+ this.search()
+ }
}
}
</script>
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index d93229a..dc6a3de 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -1,18 +1,15 @@
<template>
- <TableLayout :permissions="['business:company:query']">
+ <TableLayout :permissions="['business:device:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="闂ㄧ鍚嶇О" prop="title">
- <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ラ棬绂佸悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="闂ㄧ鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ラ棬绂佸悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="闂ㄧ绛夌骇" prop="level">
<el-select v-model="searchForm.level" placeholder="璇烽�夋嫨闂ㄧ绛夌骇" @keypress.enter.native="search">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-option label="涓�绾ч棬绂�" value="1"></el-option>
+ <el-option label="浜岀骇闂ㄧ" value="2"></el-option>
+ <el-option label="涓夌骇闂ㄧ" value="3"></el-option>
</el-select>
</el-form-item>
<section>
@@ -23,7 +20,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <li><el-button type="primary">鍚屾</el-button></li>
+ <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -32,16 +29,16 @@
>
<el-table-column prop="manufature" label="鍘傚晢" min-width="100px"></el-table-column>
<el-table-column prop="no" label="璁惧缂栧彿" min-width="100px"></el-table-column>
- <el-table-column prop="title" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="level" label="闂ㄧ绛夌骇" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="璁惧鐘舵�� 0绂佺敤 1鍚敤" min-width="100px">
+ <el-table-column prop="status" label="璁惧鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status === 0">绂佺敤</span>
<span v-if="row.status === 1">鍚敤</span>
</template>
</el-table-column>
<el-table-column
- v-if="containPermissions(['business:company:update'])"
+ v-if="containPermissions(['business:device:update'])"
label="鎿嶄綔"
min-width="120"
fixed="right"
@@ -68,6 +65,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
+import { syncDevices } from '@/api/business/device'
export default {
name: 'Device',
extends: BaseTable,
@@ -76,7 +74,7 @@
return {
// 鎼滅储
searchForm: {
- title: '',
+ name: '',
level: ''
},
options: []
@@ -90,6 +88,26 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ synchronousData () {
+ this.$confirm('纭鍚屾鍚�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ syncDevices({})
+ .then(res => {
+ this.$message({
+ type: 'success',
+ message: '鍚屾鎴愬姛'
+ })
+ this.search()
+ })
+ }).catch(() => {
+
+ })
+ }
}
}
</script>
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index c5be976..f055fb4 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -1,53 +1,53 @@
<template>
- <TableLayout :permissions="['business:member:query']">
+ <TableLayout :permissions="['business:deviceevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="eventType">
- <el-input v-model="searchForm.eventType" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃/缁勭粐鍚嶇О" prop="eventType">
- <el-input v-model="searchForm.eventType" placeholder="璇疯緭鍏ュ叕鍙�/缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鍏徃/缁勭粐鍚嶇О" prop="personCompanyName">
+ <el-input v-model="searchForm.personCompanyName" placeholder="璇疯緭鍏ュ叕鍙�/缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="浜哄憳绫诲瀷" prop="userType">
- <el-select v-model="searchForm.userType" placeholder="璇烽�夋嫨">
- <el-option label="鏈煡" value="0"></el-option>
- <el-option label="鏅��" value="1"></el-option>
- <el-option label="鏉ュ" value="2"></el-option>
- <el-option label="榛戝悕鍗�" value="3"></el-option>
- <el-option label="绠＄悊鍛�" value="4"></el-option>
+ <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="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
<el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option label="鏈煡" value="0"></el-option>
- <el-option label="鏅��" value="1"></el-option>
- <el-option label="鏉ュ" value="2"></el-option>
- <el-option label="榛戝悕鍗�" value="3"></el-option>
- <el-option label="绠＄悊鍛�" value="4"></el-option>
+ <el-option label="浜鸿劯璁よ瘉澶辫触" value="197163"></el-option>
+ <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="eventType">
<el-date-picker
- v-model="searchForm.eventType"
- type="daterange"
+ @change="seleTime"
+ v-model="time"
+ type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-radio-group v-model="searchForm.eventType" size="small">
- <el-radio-button label="褰撳ぉ"></el-radio-button>
- <el-radio-button label="杩�7澶�"></el-radio-button>
- <el-radio-button label="杩�30澶�"></el-radio-button>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
</el-radio-group>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -63,12 +63,26 @@
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="idcard" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="company" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
- <el-table-column prop="srcName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="personCompanyName" 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="eventType" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="eventType" label="鍑哄叆绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="extEventPictureURL" 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>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶撴媿鐓х墖" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image
+ style="width: 80px; height: 80px"
+ :src="row.extEventPictureURL"
+ :preview-src-list="[row.extEventPictureURL]">
+ </el-image>
+ </template>
+ </el-table-column>
<el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@@ -85,6 +99,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { timeForMat } from '@/utils/util'
export default {
name: 'DeviceEvent',
extends: BaseTable,
@@ -93,9 +108,15 @@
return {
// 鎼滅储
searchForm: {
+ keyWords: '',
+ personCompanyName: '',
+ personType: '',
eventType: '',
- userType: ''
- }
+ startTime: '',
+ endTime: '',
+ radio: null
+ },
+ time: []
}
},
created () {
@@ -106,6 +127,38 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(1)[0]
+ this.searchForm.endTime = timeForMat(1)[1]
+ this.time = timeForMat(1)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(7)[0]
+ this.searchForm.endTime = timeForMat(7)[1]
+ this.time = timeForMat(7)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(30)[0]
+ this.searchForm.endTime = timeForMat(30)[1]
+ this.time = timeForMat(30)
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.time = []
+ this.searchForm.radio = null
+ this.search()
+ }
}
}
</script>
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 3609c9b..297ea95 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -1,15 +1,12 @@
<template>
- <TableLayout :permissions="['business:member:query']">
+ <TableLayout :permissions="['business:retention:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎵嬫満鍙�" prop="phone">
- <el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍏徃/閮ㄩ棬鍚嶇О" prop="companyId">
- <el-input v-model="searchForm.companyId" placeholder="璇疯緭鍏ュ叕鍙�/閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
+ <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="type">
<el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
@@ -18,10 +15,13 @@
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="companyId">
+ <el-form-item label="璧峰鏃堕棿" prop="startTime">
<el-date-picker
- v-model="searchForm.companyId"
- type="daterange"
+ @change="seleTime"
+ v-model="time"
+ type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -34,8 +34,8 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ <ul class="toolbar" v-permissions="['business:retention:exportExcel']">
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:retention:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -44,7 +44,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="companyId" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
<el-table-column prop="type" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍔冲姟璁垮</span>
@@ -54,10 +54,14 @@
</el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="idcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column>
- <el-table-column prop="eventDate" label="杩涘満闂ㄧ" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardNo" label="韬唤璇佸彿" min-width="130px"></el-table-column>
+ <el-table-column prop="deviceName" label="杩涘満闂ㄧ" min-width="100px"></el-table-column>
<el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="faceImg" label="杩涘満鎶撴媿鐓х墖" min-width="100px"></el-table-column>
+ <el-table-column label="杩涘満鎶撴媿鐓х墖" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image style="width: 80px; height: 80px;" :src="row.faceImg"></el-image>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -81,11 +85,13 @@
return {
// 鎼滅储
searchForm: {
- companyId: '',
+ companyName: '',
type: '',
- name: '',
- phone: ''
- }
+ keyWords: '',
+ startTime: '',
+ endTime: ''
+ },
+ time: []
}
},
created () {
@@ -96,6 +102,19 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.time = []
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ }
}
}
</script>
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index b26d310..5cf8c69 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -1,52 +1,38 @@
<template>
- <TableLayout :permissions="['business:member:query']">
+ <TableLayout :permissions="['business:visitevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕" prop="personName">
- <el-input v-model="searchForm.personName" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="endTime">
- <el-input v-model="searchForm.endTime" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="杞︾墝鍙�" prop="carNo">
<el-input v-model="searchForm.carNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃鍚嶇О" prop="endTime">
- <el-input v-model="searchForm.endTime" placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" @keypress.enter.native="search"></el-input>
+ <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="carNo">
- <el-select v-model="searchForm.carNo" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍑哄叆绫诲瀷" prop="carNo">
- <el-select v-model="searchForm.carNo" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+ <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮鐧昏" value="1392513025"></el-option>
+ <el-option label="璁垮绛剧" value="1392513026"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="carNo">
<el-date-picker
- v-model="searchForm.carNo"
- type="daterange"
+ @change="seleTime"
+ v-model="time"
+ type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-radio-group v-model="searchForm.eventType" size="small">
- <el-radio-button label="褰撳ぉ"></el-radio-button>
- <el-radio-button label="杩�7澶�"></el-radio-button>
- <el-radio-button label="杩�30澶�"></el-radio-button>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
</el-radio-group>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -55,22 +41,31 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
>
<el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="endTime" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
+ <el-table-column prop="personPhone" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
<el-table-column prop="idNo" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="idNo" label="鍏徃" min-width="100px"></el-table-column>
+ <el-table-column prop="personCompanyName" label="鍏徃" min-width="100px"></el-table-column>
<el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="carNo" label="璁惧绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="carNo" label="璁惧鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="carNo" label="鍑哄叆绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="captureUrl" label="鎶撴媿鍥緐ri" min-width="100px"></el-table-column>
- <el-table-column prop="happenTime" label="鎶撴媿鐓х墖" min-width="100px"></el-table-column>
- <el-table-column prop="captureUrl" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="beVisitedPersonName" label="琚浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column label="鎶撴媿鍥緐ri" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image
+ style="width: 80px; height: 80px"
+ :src="row.captureUrl"
+ :preview-src-list="[row.captureUrl]">
+ </el-image>
+ </template>
+ </el-table-column>
+ <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -86,6 +81,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { timeForMat } from '@/utils/util'
export default {
name: 'VisitEvent',
extends: BaseTable,
@@ -95,10 +91,15 @@
// 鎼滅储
searchForm: {
personName: '',
+ carNo: '',
+ keyWords: '',
+ startTime: '',
endTime: '',
- carNo: ''
+ eventType: '',
+ companyName: '',
+ radio: null
},
- options: []
+ time: []
}
},
created () {
@@ -109,6 +110,38 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(1)[0]
+ this.searchForm.endTime = timeForMat(1)[1]
+ this.time = timeForMat(1)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(7)[0]
+ this.searchForm.endTime = timeForMat(7)[1]
+ this.time = timeForMat(7)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(30)[0]
+ this.searchForm.endTime = timeForMat(30)[1]
+ this.time = timeForMat(30)
+ }
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.time = []
+ this.searchForm.radio = null
+ this.search()
+ }
}
}
</script>
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
index f48a563..120f8b2 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
@@ -77,7 +77,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:carevent:exportExcel")
+ //@RequiresPermissions("business:carevent:exportExcel")
public void exportExcel (@RequestBody PageWrap<CarEvent> pageWrap, HttpServletResponse response) {
ExcelExporter.build(CarEvent.class).exportWithFirstAndEnd (carEventService.findPage(pageWrap).getRecords(),"鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", null, "鍋滆溅鍦轰簨浠舵帹閫佽褰曞鍑烘姤琛�",null , response);
// ExcelExporter.build(CarEvent.class).export(carEventService.findPage(pageWrap).getRecords(), "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", response);
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
index a3000e6..e4f472b 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
@@ -77,7 +77,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:deviceevent:exportExcel")
+ //@RequiresPermissions("business:deviceevent:exportExcel")
public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) {
ExcelExporter.build(DeviceEvent.class).export(deviceEventService.findPage(pageWrap).getRecords(), "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃", response);
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
index 75aa63a..efcf4fc 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
@@ -34,9 +34,9 @@
private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
@PreventRepeat
- @ApiOperation("銆怑RP銆戝叏閲忓悓姝ョ粍缁囦俊鎭帴鍙�")
- @PostMapping("/syncCompanies")
- @RequiresPermissions("business:erpsync:company")
+ @ApiOperation("銆怑RP銆戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
+ @PostMapping("/syncDevices")
+ //@RequiresPermissions("business:erpsync:device")
public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
String result = hkSyncDeviceService.syncHkDevices(param);
return ApiResponse.success(result);
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
index 4d409a8..9f2cd2f 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
@@ -77,7 +77,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:visitevent:exportExcel")
+ //@RequiresPermissions("business:visitevent:exportExcel")
public void exportExcel (@RequestBody PageWrap<VisitEvent> pageWrap, HttpServletResponse response) {
ExcelExporter.build(VisitEvent.class).export(visitEventService.findPage(pageWrap).getRecords(), "璁垮浜嬩欢鎺ㄩ�佽褰曡〃", response);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
index 059b2c3..65345d2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* 鍒嗙被淇℃伅琛�
* @author 姹熻箘韫�
@@ -21,7 +23,7 @@
@ApiModelProperty(value = "韬唤璇佸彿" )
private String idNo;
@ApiModelProperty(value = "鏃堕棿鑼冨洿-寮�濮嬶紝鏍煎紡yyyy-MM-dd HH:mm:ss锛屽2023-11-24 09:17:11" )
- private String startTime ;
+ private Date startTime ;
@ApiModelProperty(value = "鏃堕棿鑼冨洿-鎴锛屾牸寮弝yyy-MM-dd HH:mm:ss锛屽2023-11-24 09:17:11" )
- private String endTime ;
+ private Date endTime ;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
index 6300986..a797d66 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
@@ -49,7 +49,9 @@
private String srcName;
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
- private String eventType;
+ private Integer eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ private String eventTypeName;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
index 262cccf..9714634 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
@@ -36,8 +36,10 @@
@ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
private String eventId;
- @ApiModelProperty(value = "浜嬩欢绫诲瀷")
- private String eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷 -- 197163,浜鸿劯璁よ瘉澶辫触 ; 196893,浜鸿劯璁よ瘉閫氳繃")
+ private Integer eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ private String eventTypeName;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
private String srcType;
@@ -48,9 +50,11 @@
@ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
- @ApiModelProperty(value = "闂ㄧ鍚嶇О")
- @ExcelColumn(name="闂ㄧ鍚嶇О")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰悕绉�")
private String srcName;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ private String devName;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@@ -191,4 +195,6 @@
@ApiModelProperty(value = "閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
index 0f7183f..687b20e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
@@ -46,7 +46,10 @@
private String srcName;
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
- private String eventType;
+ private Integer eventType;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ private String eventTypeName;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 7bfc9df..319179b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -261,6 +261,10 @@
@ExcelColumn(name="閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
+
// 鏉′欢鏌ヨ鍙傛暟
@ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 310ffed..7b67428 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -211,6 +211,10 @@
@TableField(exist = false)
private String roleIdParam;
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true )
+ @TableField(exist = false)
+ private Integer[] roleIds;
+
//鏆傛棤浣跨敤
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@TableField(exist = false)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 984e2f4..61c681a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -123,12 +123,15 @@
// 鏉′欢鏌ヨ鍙傛暟
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ @TableField(exist = false)
private String keyWords;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
private Date endTime;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 460c1d2..9e12712 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -3,14 +3,20 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.VisitEventQuery;
import com.doumee.dao.admin.response.CarEventDTO;
+import com.doumee.dao.admin.response.DeviceEventDTO;
+import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.CarEventMapper;
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.CarEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -22,8 +28,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹炵幇
@@ -38,6 +45,9 @@
@Autowired
private CarEventJoinMapper carEventJoinMapper;
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public Integer create(CarEvent carEvent) {
@@ -308,7 +318,32 @@
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
-
+ if(null != carEventDTOIPage && carEventDTOIPage.getRecords().size() > 0) {
+ carEventDTOIPage.setRecords(newCarEventDTO(carEventDTOIPage.getRecords()));
+ }
return PageData.from(carEventDTOIPage);
}
+
+ private List<CarEventDTO> newCarEventDTO(List<CarEventDTO> newCarEventDTOList) {
+ List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.CAR_EVENT_IMG);
+ List<SystemDictData> list = systemDictDataMapper.list(codes);
+ Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
+ List<CarEventDTO> newDataList = new ArrayList<>();
+ newCarEventDTOList.stream().forEach(obj->{
+ obj.setVehiclePicUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.CAR_EVENT_IMG).getCode()
+ +obj.getVehiclePicUrl());
+ if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_IN.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_OUT.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_OUT.getName());
+ }else{
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_OUT.getName());
+ }
+ newDataList.add(obj);
+ });
+ return newDataList;
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index da81379..aa7858e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.PhoneUtil;
import cn.hutool.core.util.ReUtil;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -13,6 +14,7 @@
import com.doumee.dao.business.DeviceEventMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemDictDataMapper;
@@ -309,18 +311,20 @@
boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(Device.class,Device::getHkId,DeviceEvent::getSrcParentIndex)
.selectAll(DeviceEvent.class)
.selectAs(Member::getName,DeviceEventDTO::getPersonName)
.selectAs(Member::getType,DeviceEventDTO::getPersonType)
.selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
.selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
+ .selectAs(Device::getName,DeviceEventDTO::getDevName)
.selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords())
.like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords())
.eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
Member::getType,
pageWrap.getModel().getPersonType())
- .eq( pageWrap.getModel().getEventType()!=null,
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
DeviceEvent::getEventType,
pageWrap.getModel().getEventType())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
@@ -360,7 +364,12 @@
dto.setExtEventPictureURL(null);
}
}
- newDeviceEventDTOS.add(dto);
+ if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()){
+ dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getName());
+ }else if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()){
+ dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName());
+ }
+ newDeviceEventDTOS.add(dto);
}
return newDeviceEventDTOS;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 8468395..7b3865d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -5,11 +5,14 @@
import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.RetentionMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.RetentionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -21,9 +24,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹炵幇
@@ -38,6 +41,9 @@
@Autowired
private RetentionJoinMapper retentionJoinMapper;
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
@@ -215,6 +221,16 @@
Retention::getEventDate,pageWrap.getModel().getStartTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
+ if(null != retentionIPage && retentionIPage.getRecords().size() > 0) {
+ List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
+ List<SystemDictData> list = systemDictDataMapper.list(codes);
+ Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
+ retentionIPage.getRecords().stream().forEach(obj->{
+ obj.setFaceImg(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getFaceImg());
+ });
+ }
return PageData.from(retentionIPage);
}
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index 4ff7a2a..16a128b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -3,14 +3,19 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.VisitEventQuery;
+import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.VisitEventMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -22,8 +27,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 璁垮浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
@@ -38,6 +44,9 @@
@Autowired
private VisitEventJoinMapper visitEventJoinMapper;
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public Integer create(VisitEvent visitEvent) {
@@ -236,9 +245,9 @@
IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper .leftJoin(Visits.class,Visits::getHkId,VisitEvent::getVisitorId);
queryWrapper.selectAll(VisitEvent.class)
- .selectAs(Company::getName,VisitEventDTO::getPersonCompanyName);
+ .selectAs(Visits::getCompanyName,VisitEventDTO::getPersonCompanyName);
queryWrapper.like(number,
VisitEvent::getPhone,
pageWrap.getModel().getKeyWords())
@@ -262,8 +271,28 @@
pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
+ if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
+ visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
+ }
return PageData.from(visitEventDTOIPage);
}
-
+ private List<VisitEventDTO> newVisitEvent(List<VisitEventDTO> VisitEventDTOList) {
+ List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
+ List<SystemDictData> list = systemDictDataMapper.list(codes);
+ Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
+ List<VisitEventDTO> newDataList = new ArrayList<>();
+ VisitEventDTOList.stream().forEach(obj->{
+ obj.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getCaptureUrl());
+ if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());
+ }
+ newDataList.add(obj);
+ });
+ return newDataList;
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 436a7bc..9e8b703 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -270,32 +270,47 @@
if(list !=null && list.size()>0) {
List<Member> addList = new ArrayList<>();
List<Member> updateList = new ArrayList<>();
- List<Integer> delIds = new ArrayList<>();
+ List<Integer> delIds = new ArrayList<>();
+ List<Member> delList = new ArrayList<>();
List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType, Constants.memberType.internal));
- dealUserChangeList(list,addList,updateList,delIds,allList);
+ dealUserChangeList(list,addList,updateList,delList,allList);
if(addList.size()>0){
+ for (Member member:addList) {
+ dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
+ }
memberMapper.insertBatchSomeColumn(addList);
}
if(updateList.size()>0){
for(Member c : updateList){
+ dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
memberMapper.updateById(c);
}
}
- if(delIds.size()>0){
- //鍒犻櫎鎵�鏈夐渶瑕佸垹闄ょ殑缁勭粐淇℃伅(閫昏緫鍒犻櫎锛�
+ if(delList.size()>0){
+ for (Member member:delList) {
+ dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
+ }
+ delIds = delList.stream().map(m->m.getId()).collect(Collectors.toList());
memberMapper.update(null,new UpdateWrapper<Member>().lambda().set(Member::getHkStatus,Constants.ZERO)
.set(Member::getIsdeleted, Constants.ONE).in(Member::getId,delIds));
}
-
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�");
}
return null;
}
- private void dealUserChangeList(List<UserListRespone> list, List<Member> addList, List<Member> updateList, List<Integer> delIds, List<Member> allList) {
+ public void dealRoleEmpower(Member member,Date startTime , Date endTime){
+ List<Integer> doorIds = null;
+ doorIds = getRoleIdByParam(member.getRoleIds(),member);
+ //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
+ dealMemberRoleEmpower(member,doorIds,startTime,endTime);
+ }
+
+
+ private void dealUserChangeList(List<UserListRespone> list, List<Member> addList, List<Member> updateList,List<Member> delList, List<Member> allList) {
Date date = new Date();
for(UserListRespone response : list){
//鏍规嵁 erpId 鏌ヨ鐢ㄦ埛淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
@@ -311,7 +326,10 @@
//濡傛灉鏄洿鏂�
if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
//濡傛灉宸插垹闄わ紝鍔犲叆鍒犻櫎闆嗗悎涓�
- delIds.add(member.getId());
+ member.setRoleIds(response.getRoleIds());
+ delList.add(member);
+// delIds.add(member.getId());
+
continue;
}
updateList.add(addUpdateMemberModel(response,member,date));
@@ -320,7 +338,8 @@
if(allList!=null && allList.size()>0){
for(Member c : allList){
if(isUserDeleted(c,list)){
- delIds.add(c.getId());
+ delList.add(c);
+// delIds.add(c.getId());
}
}
}
@@ -341,6 +360,7 @@
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
member.setCompanyId(param.getOrgId());
member.setHkStatus(Constants.ZERO);
+ member.setRoleIds(param.getRoleIds());
return member;
}
@@ -353,12 +373,14 @@
member.setEditDate(new Date());
member.setErpDate(new Date());
member.setHkStatus(Constants.ZERO);
+ member.setRoleIds(param.getRoleIds());
return member;
}
private boolean isUserDeleted(Member c, List<UserListRespone> list) {
for(UserListRespone m : list){
if(StringUtils.equals(c.getErpId(),m.getId().toString())){
+ c.setRoleIds(m.getRoleIds());
return true;
}
}
diff --git a/server/openapi/src/main/java/com/doumee/api/BizResourceController.java b/server/openapi/src/main/java/com/doumee/api/BizResourceController.java
index a5c3166..08f57e8 100644
--- a/server/openapi/src/main/java/com/doumee/api/BizResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/BizResourceController.java
@@ -1,11 +1,13 @@
package com.doumee.api;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.ErpLoginRequired;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
+import com.doumee.core.utils.Constants;
import com.doumee.service.business.ERPSyncService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -15,7 +17,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Created by IntelliJ IDEA.
@@ -32,6 +36,9 @@
@Autowired
private ERPSyncService erpSyncService;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@ApiOperation(value = "璋冪敤鍑嵁鑾峰彇鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝鍚慐RP鎻愪緵缁熸帴鍙ｈ皟鐢ㄥ嚟璇�")
@@ -147,6 +154,34 @@
erpSyncService.approveApply(param);
return ApiResponse.success(null);
}
+
+
+
+ @ApiOperation(value = "FTP璐︽埛淇℃伅", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝FTP璐︽埛淇℃伅")
+ @GetMapping("/resource/ftpAccount")
+ public ApiResponse<Map<String,Object>> ftpAccount() {
+ Map<String,Object> map = new HashMap<>();
+ map.put("FTP涓绘満鍦板潃IP",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode());
+ map.put("FTP璁块棶绔彛",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode());
+ map.put("FTP璁块棶鐧诲綍鍚�",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode());
+ map.put("FTP璁块棶鐧婚檰瀵嗙爜",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
+ map.put("FTP璁垮浜嬩欢鍥剧墖瀛樺偍鐩綍",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.VISIT_EVENT_IMG).getCode());
+ map.put("FTP杞﹁締浜嬩欢鍥剧墖瀛樺偍鐩綍",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.CAR_EVENT_IMG).getCode());
+ map.put("FTP闂ㄧ浜嬩欢鍥剧墖瀛樺偍鐩綍",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.DEVICE_EVENT_IMG).getCode());
+ map.put("FTP鐢ㄦ埛鍥剧墖瀛樺偍鐩綍",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode());
+ return ApiResponse.success(map);
+ }
+
+
+
}
--
Gitblit v1.9.3