From 55075b2bbf2b6c41ec6ce831fb2b08666dbf4bf5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 18:52:26 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1
admin/src/views/business/inoutRecord.vue | 213 ++++++++++++++++++++++++++
admin/src/api/business/inoutRecord.js | 40 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 24 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 11
admin/src/components/business/OperaInoutRecordWindow.vue | 146 ++++++++++++++++++
admin/src/views/business/deviceEvent.vue | 3
8 files changed, 429 insertions(+), 17 deletions(-)
diff --git a/admin/src/api/business/inoutRecord.js b/admin/src/api/business/inoutRecord.js
new file mode 100644
index 0000000..54ffebd
--- /dev/null
+++ b/admin/src/api/business/inoutRecord.js
@@ -0,0 +1,40 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/inoutRecord/page', data, {
+ trim: true
+ })
+}
+
+// 瀵煎嚭Excel
+export function exportExcel (data) {
+ return request.post('/visitsAdmin/cloudService/business/inoutRecord/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/inoutRecord/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/inoutRecord/updateById', data)
+}
+
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/business/inoutRecord/delete/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/visitsAdmin/cloudService/business/inoutRecord/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/components/business/OperaInoutRecordWindow.vue b/admin/src/components/business/OperaInoutRecordWindow.vue
new file mode 100644
index 0000000..70543c8
--- /dev/null
+++ b/admin/src/components/business/OperaInoutRecordWindow.vue
@@ -0,0 +1,146 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
+ <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
+ <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
+ <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
+ </el-form-item>
+ <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
+ <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
+ <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳" prop="type">
+ <el-input v-model="form.type" placeholder="璇疯緭鍏ュ璞＄被鍨� 0杞﹁締 1浜哄憳" v-trim/>
+ </el-form-item>
+ <el-form-item label="娴峰悍浜嬩欢缂栫爜" prop="hkEventId">
+ <el-input v-model="form.hkEventId" placeholder="璇疯緭鍏ユ捣搴蜂簨浠剁紪鐮�" v-trim/>
+ </el-form-item>
+ <el-form-item label="娴峰悍浜嬩欢瀵硅薄缂栫爜" prop="hkId">
+ <el-input v-model="form.hkId" placeholder="璇疯緭鍏ユ捣搴蜂簨浠跺璞＄紪鐮�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈浜哄憳缂栫爜锛堝叧鑱攎ember)" prop="memberId">
+ <el-input v-model="form.memberId" placeholder="璇疯緭鍏ュ叧鑱斾汉鍛樼紪鐮侊紙鍏宠仈member)" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈浜哄憳缂栫爜锛堝叧鑱攃ars)" prop="carId">
+ <el-input v-model="form.carId" placeholder="璇疯緭鍏ュ叧鑱斾汉鍛樼紪鐮侊紙鍏宠仈cars)" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈鍒嗙被缂栫爜锛堝叧鑱攃ategory)" prop="categoryId">
+ <el-input v-model="form.categoryId" placeholder="璇疯緭鍏ュ叧鑱斿垎绫荤紪鐮侊紙鍏宠仈category)" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈鍒嗙被鍚嶇О" prop="categoryName">
+ <el-input v-model="form.categoryName" placeholder="璇疯緭鍏ュ叧鑱斿垎绫诲悕绉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="" prop="carBizType">
+ <el-input v-model="form.carBizType" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鐢ㄦ埛绫诲瀷 0璁垮 1鍐呴儴浜哄憳 2鐩稿叧鏂逛汉鍛� 3璐ц繍鍙告満" prop="memberType">
+ <el-input v-model="form.memberType" placeholder="璇疯緭鍏ョ敤鎴风被鍨� 0璁垮 1鍐呴儴浜哄憳 2鐩稿叧鏂逛汉鍛� 3璐ц繍鍙告満" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜哄憳鍚嶇О" prop="memberName">
+ <el-input v-model="form.memberName" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="杞︾墝鍙�" prop="carCode">
+ <el-input v-model="form.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳 2璁垮鐢宠璁板綍 3璁垮鎶ュ鐢宠璁板綍 4鏈堝彴浣滀笟璁板綍" prop="objType">
+ <el-input v-model="form.objType" placeholder="璇疯緭鍏ュ叧鑱斿璞＄被鍨� 0杞﹁締 1浜哄憳 2璁垮鐢宠璁板綍 3璁垮鎶ュ鐢宠璁板綍 4鏈堝彴浣滀笟璁板綍" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈瀵硅薄缂栫爜" prop="objId">
+ <el-input v-model="form.objId" placeholder="璇疯緭鍏ュ叧鑱斿璞＄紪鐮�" v-trim/>
+ </el-form-item>
+ <el-form-item label="杩涘嚭绫诲瀷 0杩� 1鍑�" prop="inOrOut">
+ <el-input v-model="form.inOrOut" placeholder="璇疯緭鍏ヨ繘鍑虹被鍨� 0杩� 1鍑�" v-trim/>
+ </el-form-item>
+ <el-form-item label="杩涘嚭璁惧鍚嶇О" prop="deviceName">
+ <el-input v-model="form.deviceName" placeholder="璇疯緭鍏ヨ繘鍑鸿澶囧悕绉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="companyName">
+ <el-input v-model="form.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈缁勭粐缂栫爜" prop="companyId">
+ <el-input v-model="form.companyId" placeholder="璇疯緭鍏ュ叧鑱旂粍缁囩紪鐮�" v-trim/>
+ </el-form-item>
+ <el-form-item label="缁熻鏃ユ湡锛�2024-10-12锛�" prop="timeInfo">
+ <el-date-picker v-model="form.timeInfo" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粺璁℃棩鏈燂紙2024-10-12锛�"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)" prop="categoryParentId">
+ <el-input v-model="form.categoryParentId" placeholder="璇疯緭鍏ュ叧鑱旂埗绾у垎绫荤紪鐮侊紙鍏宠仈category)" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍏宠仈鐖剁骇鍒嗙被鍚嶇О" prop="categoryParentName">
+ <el-input v-model="form.categoryParentName" placeholder="璇疯緭鍏ュ叧鑱旂埗绾у垎绫诲悕绉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜哄憳鎵嬫満鍙�" prop="memberPhone">
+ <el-input v-model="form.memberPhone" placeholder="璇疯緭鍏ヤ汉鍛樻墜鏈哄彿" v-trim/>
+ </el-form-item>
+ </el-form>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+export default {
+ name: 'OperaInoutRecordWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ creator: '',
+ createDate: '',
+ editor: '',
+ editDate: '',
+ isdeleted: '',
+ remark: '',
+ type: '',
+ hkEventId: '',
+ hkId: '',
+ memberId: '',
+ carId: '',
+ categoryId: '',
+ categoryName: '',
+ carBizType: '',
+ memberType: '',
+ memberName: '',
+ carCode: '',
+ objType: '',
+ objId: '',
+ inOrOut: '',
+ deviceName: '',
+ companyName: '',
+ companyId: '',
+ timeInfo: '',
+ categoryParentId: '',
+ categoryParentName: '',
+ memberPhone: ''
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/inoutRecord',
+ 'field.id': 'id'
+ })
+ }
+}
+</script>
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 530112d..4e743b0 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -80,8 +80,7 @@
<el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="110px"></el-table-column>
<el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column label="鍑哄叆绫诲瀷" min-width="100px">WMS浣滀笟宸插畬鎴�
-
+ <el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.extEventInOut === 1">杩�</span>
<span v-if="row.extEventInOut != 1">鍑�</span>
diff --git a/admin/src/views/business/inoutRecord.vue b/admin/src/views/business/inoutRecord.vue
new file mode 100644
index 0000000..63c90c2
--- /dev/null
+++ b/admin/src/views/business/inoutRecord.vue
@@ -0,0 +1,213 @@
+<template>
+ <TableLayout :permissions="['business:inoutrecord:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <div slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="inOrOut">
+ <el-select v-model="searchForm.inOrOut" style="width: 130px" clearable @change="search" placeholder="杩涘嚭绫诲瀷">
+ <el-option label="杩�" value="0"></el-option>
+ <el-option label="鍑�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="memberType">
+ <el-select v-model="searchForm.memberType" style="width: 130px" clearable @change="search" placeholder="浜哄憳绫诲瀷">
+ <el-option label="璁垮" value="1"></el-option>
+ <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
+ <el-option label="鐩稿叧鏂逛汉鍛�" value="4"></el-option>
+ <el-option label="璐ц繍鍙告満" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="浜哄憳鍚嶇О/鎵嬫満鍙�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="缁勭粐鍚嶇О" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="carCode">
+ <el-input v-model="searchForm.carCode" placeholder="杞︾墝鍙�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="categoryName">
+ <el-input v-model="searchForm.categoryName" placeholder="杞﹁締鍒嗙被鍚嶇О" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+<!-- <el-form-item label="" prop="carBizType">
+ <el-select v-model="searchForm.carBizType" clearable style="width: 180px" placeholder="杞﹁締涓氬姟绫诲瀷">
+ <el-option v-for="op in bizTypeList" :key="op.key" :label="op.name" :value="op.key" ></el-option>
+ </el-select>
+ </el-form-item>-->
+ <el-form-item label="" prop="deviceName">
+ <el-input v-model="searchForm.deviceName" placeholder="鍑哄叆鍙ｅ悕绉�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
+ <el-date-picker type="datetime" v-model="searchForm.startDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <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 @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:inoutrecord:exportExcel' ]">
+ <li>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:inoutrecord:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
+ </li>
+ </ul>
+ <el-table
+ :height="tableHeightNew"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="memberName" label="浜哄憳鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="memberPhone" label="浜哄憳鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="缁勭粐鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="memberType" label="鐢ㄦ埛绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.memberType ==1">璁垮</span>
+ <span v-else-if="row.memberType ==2">鍐呴儴浜哄憳</span>
+ <span v-else-if="row.memberType ==4">鐩稿叧鏂逛汉鍛�</span>
+ <span v-else-if="row.memberType ==5">璐ц繍鍙告満</span>
+ <span v-else ></span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+<!-- <el-table-column prop="carBizType" label="杞﹁締涓氬姟绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <template v-if="row.carCode">
+ <span v-if="row.carBizType ==0">璁垮杞﹁締</span>
+ <span v-else-if="row.carBizType ==1">澶栧崗杩愯緭杞﹁締</span>
+ <span v-else-if="row.carBizType ==2">甯傚叕鍙稿嵏璐ц溅杈�</span>
+ <span v-else-if="row.carBizType ==3">鍔犲伐鐑熷嵏璐ц溅杈�</span>
+ <span v-else-if="row.carBizType ==4">瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅</span>
+ <span v-else-if="row.carBizType ==5">瀹夋嘲鐗╂祦璐ц繍杞﹁締</span>
+ <span v-else >鏈煡杞﹁締</span>
+ </template>
+ </template>
+ </el-table-column>-->
+ <el-table-column prop="categoryName" label="杞﹁締鍒嗙被" min-width="100px">
+ <template slot-scope="{row}">
+<!--
+ <span v-if="row.categoryParentName!= row.categoryName"> {{(row.categoryParentName || '') +row.categoryName}}</span>
+-->
+ <span v-if="row.carCode" >{{ row.categoryName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="inOrOut" label="杩涘嚭绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.inOrOut ==1">鍑�</span>
+ <span v-else >杩�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceName" label="杩涘嚭鍙ｅ悕绉�" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInoutRecordWindow ref="operaInoutRecordWindow" @success="handlePageChange"/>
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import SearchFormCollapse from '@/components/common/SearchFormCollapse'
+import Pagination from '@/components/common/Pagination'
+import OperaInoutRecordWindow from '@/components/business/OperaInoutRecordWindow'
+import { timeForMat } from '@/utils/util'
+export default {
+ name: 'InoutRecord',
+ extends: BaseTable,
+ components: { SearchFormCollapse, TableLayout, Pagination, OperaInoutRecordWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ categoryName: '',
+ carBizType: '',
+ memberType: '',
+ memberName: '',
+ carCode: '',
+ inOrOut: '',
+ companyName: '',
+ startDate: null,
+ endDate: null,
+ radio: '0'
+ },
+ time: [],
+ bizTypeList: [{ key: 0, name: '璁垮杞﹁締' },
+ { key: 1, name: '澶栧崗杩愯緭杞﹁締' },
+ { key: 2, name: '甯傚叕鍙稿嵏璐ц溅杈�' },
+ { key: 3, name: '鍔犲伐鐑熷嵏璐ц溅杈�' },
+ { key: 4, name: '瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅' },
+ { key: 5, name: '瀹夋嘲鐗╂祦璐ц繍杞﹁締' },
+ { key: 6, name: '鏈煡杞﹁締' }
+ ]
+ }
+ },
+ created () {
+ this.config({
+ module: '鍑哄叆鍦轰汉娆¤溅娆℃瘡鏃ョ粺璁¤〃',
+ api: '/business/inoutRecord',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ this.changeRadio('0')
+ },
+ methods: {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startDate = timeForMat(0)[0]
+ this.searchForm.endDate = timeForMat(0)[1]
+ } else if (e === '1') {
+ this.searchForm.startDate = timeForMat(6)[0]
+ this.searchForm.endDate = timeForMat(6)[1]
+ } else if (e === '2') {
+ this.searchForm.startDate = timeForMat(29)[0]
+ this.searchForm.endDate = timeForMat(29)[1]
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startDate && this.searchForm.endDate && new Date(this.searchForm.startDate).getTime() > new Date(this.searchForm.endDate).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startDate = ''
+ return
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startDate = e[0]
+ this.searchForm.endDate = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ this.searchForm.radio = ''
+ this.time = []
+ this.search()
+ }
+ }
+}
+</script>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 73aecd0..b538ada 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -438,6 +438,7 @@
int atwlgwCar = 4;//瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅
int atwlzyCar = 5;//瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締
int other = 6;//鏈煡杞﹁締
+ int self = 7;//鑷湁杞�
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java
index 35e005d..26b30a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java
@@ -17,10 +17,18 @@
@ApiModelProperty(value = "璁惧鎴栬�呬紶鎰熷櫒鍚嶇О")
private String name;
+ @ApiModelProperty(value = "璁惧绫诲瀷 60娑蹭綅 61姘村帇")
+ private Integer type;
@ApiModelProperty(value = "闃堝��")
private String level;
+ @ApiModelProperty(value = "闃堝�兼渶灏忓��")
+ private String min;
+
+ @ApiModelProperty(value = "闃堝�兼渶澶у��")
+ private String max;
+
@ApiModelProperty(value = "鐩戞祴鏁版嵁闆嗗悎")
private List<MonitorDataInfoVO> dataList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 3a0dbe1..18f39cc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -239,12 +239,13 @@
record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
record.setType(Constants.ONE);//浜哄憳
+ record.setDeviceName(request.getSrcName());
record.setMemberType(Constants.RetentionMemberType.fk);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
record.setIsdeleted(Constants.ZERO);
record.setHkEventId(request.getEventId());
record.setHkId(userNo);
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
- if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
+ if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
record.setInOrOut(Constants.ZERO);
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
@@ -567,6 +568,8 @@
//濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
InoutRecord record = new InoutRecord();
+ record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+ request.getData().getParamValues().getSrcName():request.getSrcName());
record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
record.setType(Constants.ONE);//浜哄憳
@@ -899,6 +902,7 @@
carrecord.setType(Constants.ZERO);//杞﹁締
carrecord.setIsdeleted(Constants.ZERO);
carrecord.setObjType(Constants.ZERO);
+ carrecord.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());//鍋滆溅鍦哄拰鍑哄叆鍙�
carrecord.setHkEventId(request.getEventId());
carrecord.setCarCode(event.getPlateNos());
Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
@@ -928,7 +932,7 @@
event.setMemberId(carModel.getMemberId());
event.setCompanyId(carModel.getGroupId());
//-----------------20250429鏀归��----start---------------
- event.setCarType(carModel.getBizType());//杞﹁締涓氬姟绫诲瀷
+ event.setCarType(carModel.getBizType()==null?Constants.RetentionCarType.self : carModel.getBizType());//杞﹁締涓氬姟绫诲瀷
carrecord.setObjType(Constants.FOUR);
carrecord.setMemberName(carModel.getMemberName());//鍙告満
carrecord.setMemberPhone(carModel.getMemberPhone());//鍙告満
@@ -1031,7 +1035,7 @@
delRetentionList.add(event.getPlateNos());
delMemberRetentionList.add(event.getMemberId());
inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
- carrecord.setInOrOut(Constants.ZERO);
+ carrecord.setInOrOut(Constants.ONE);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
@@ -1124,7 +1128,7 @@
}
//缁熻浠婃棩鍏ュ洯鎬讳汉娆�
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);
- }else if(carrecord.getMemberId()!=null && Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
+ }else if( Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
//濡傛灉鏄嚭鍥尯
if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
//濡傛灉鏄浉鍏虫柟锛岀粺璁′粖鏃ョ疮璁℃暟
@@ -1137,13 +1141,11 @@
inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);
}
}
- if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
- if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
- carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
- carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
- }
- inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
+ if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
+ carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
}
+ inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
}
private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) {
@@ -1232,7 +1234,6 @@
event.setSrcName(request.getSrcName());
event.setSrcIndex(request.getSrcIndex());
event.setRoadwayType(request.getData().getRoadwayType());
- event.setRoadwayName(request.getData().getRoadwayName());
event.setRoadwayIndex(request.getData().getRoadwayIndex());
event.setPlateType(request.getData().getPlateType());
event.setTimeout(request.getTimeout());
@@ -1245,6 +1246,7 @@
event.setInoutType(request.getData().getInoutType());
event.setHappenTime(request.getHappenTime());
event.setGateName(request.getData().getGateName());
+ event.setRoadwayName(request.getData().getRoadwayName());
event.setGateIndex(request.getData().getGateIndex());
event.setEventType(request.getEventType());
event.setEventIndex(request.getData().getEventIndex());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index a87f967..17a669b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -668,7 +668,7 @@
String pressure = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_PRESSURE_LEVEL).getCode();
String liquid = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_LIQUID_LEVEL).getCode();
String pressureUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.PRESSURE_LEVEL_UNIT).getCode();
- String liquidUnit = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.LIQUID_LEVEL_UNIT).getCode();
+ String liquidUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LIQUID_LEVEL_UNIT).getCode();
if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
&& response.getData()!=null ) {
List<MonitorDataSearchResponse> r = response.getData().getList();
@@ -676,8 +676,9 @@
for(MonitorDataSearchResponse model : r){
MonitorDataVO m = new MonitorDataVO();
m.setName(model.getName());
+ m.setType(model.getType());
// m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
- m.setLevel(getLevelDataByDeviceName(model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
+ m.setLevel(getLevelDataByDeviceName(m,model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
m.setDataList(new ArrayList<>());
if(model.getValues()!=null){
List<MonitorDataInfoVO> dataList = new ArrayList<>();
@@ -715,7 +716,7 @@
return list;
}
- private String getLevelDataByDeviceName(String name,String unit) {
+ private String getLevelDataByDeviceName(MonitorDataVO m,String name,String unit) {
/**
* {
@@ -747,7 +748,9 @@
&& response.getData()!=null ) {
String min = response.getData().getList().get(0).getFireproChannelMinValue();
String max = response.getData().getList().get(0).getFireproChannelMaxvalue();
- r =StringUtils.defaultString(min,"-")+"~"+StringUtils.defaultString(max,"-") +unit;
+ m.setMax(max);
+ m.setMin(min);
+ r =StringUtils.defaultString(min,"-")+"锝�"+StringUtils.defaultString(max,"-") +unit;
}
return r;
--
Gitblit v1.9.3