From 8c4dfb07d551ceb372887ff8f22bd1f574d0347b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 31 十月 2025 11:26:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/jkCustomer.vue | 5 +
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 4
admin/src/components/business/OperaJkCabinetWindow.vue | 6 +-
admin/src/components/business/OperaJkLineImportWindow.vue | 7 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseRequest.java | 14 ++++
admin/src/components/business/OperaJkKeysWindow.vue | 8 +-
admin/src/components/business/OperaInternalCompanyWindow.vue | 3
admin/.env.production | 4
admin/src/views/business/jkKeys.vue | 6 +
admin/src/components/business/OperaJkSketchImportWindow.vue | 5 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseInfoRequest.java | 19 ++++++
admin/src/views/business/jkCabinet.vue | 10 +-
admin/src/views/business/internalCompany.vue | 3
admin/src/components/business/cabinetDetails.vue | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java | 18 ++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 9 +++
admin/src/views/business/jkLine.vue | 5 -
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.java | 2
admin/.env.development | 4
20 files changed, 106 insertions(+), 32 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 3747781..05e081e 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,9 +3,9 @@
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-VUE_APP_API_URL = 'http://192.168.1.45:10010'
+# VUE_APP_API_URL = 'http://192.168.1.45:10010'
-# VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
# VUE_APP_API_URL = 'http://localhost:10010'
diff --git a/admin/.env.production b/admin/.env.production
index ebe0cf3..e85e66f 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,7 +1,7 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-# VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
-VUE_APP_API_URL = 'http://10.49.39.23/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
+# VUE_APP_API_URL = 'http://10.49.39.23/system_gateway'
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index a6f2673..6ff4b28 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -19,7 +19,8 @@
<el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
</el-form-item>
<el-form-item label="缁勭粐绫诲瀷" prop="type" v-if="(editType === 'edit' && parentId) || (editType === 'add')" >
- <el-radio-group v-model="form.type" :disabled="(editType === 'edit') || (!!(editType === 'add' && parentId))">
+<!-- :disabled="(editType === 'edit') || (!!(editType === 'add' && parentId))"-->
+ <el-radio-group v-model="form.type">
<el-radio :label="0">鐩稿叧鏂圭粍缁�</el-radio>
<el-radio :label="1">鍐呴儴缁勭粐</el-radio>
</el-radio-group>
diff --git a/admin/src/components/business/OperaJkCabinetWindow.vue b/admin/src/components/business/OperaJkCabinetWindow.vue
index 4d2e072..19370db 100644
--- a/admin/src/components/business/OperaJkCabinetWindow.vue
+++ b/admin/src/components/business/OperaJkCabinetWindow.vue
@@ -102,11 +102,11 @@
</el-form-item>
<el-form-item label="鍓嶇紑" prop="noPrefix" v-if="form.noType === 1">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input style="flex: 1;" v-model="form.noPrefix" placeholder="璇疯緭鍏ユ暟瀛楁垨瀛楁瘝" v-trim/>
+ <el-input style="flex: 1;" v-model="form.noPrefix" :disabled="form.id ? true : false" placeholder="璇疯緭鍏ユ暟瀛楁垨瀛楁瘝" v-trim/>
<span style="margin: 0 20px;">浣嶆暟</span>
- <el-input style="flex: 1;" v-model="form.noLength" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
+ <el-input style="flex: 1;" v-model="form.noLength" :disabled="form.id ? true : false" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
<span style="margin: 0 20px;">璧峰缂栧彿</span>
- <el-input style="flex: 1;" v-model="form.noIndex" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
+ <el-input style="flex: 1;" v-model="form.noIndex" :disabled="form.id ? true : false" placeholder="璇疯緭鍏ユ暟瀛�" v-trim/>
</div>
</el-form-item>
<el-form-item label="鎺掑垪椤哄簭" prop="sortType" v-if="form.noType === 1">
diff --git a/admin/src/components/business/OperaJkKeysWindow.vue b/admin/src/components/business/OperaJkKeysWindow.vue
index dd81ab1..d6c444c 100644
--- a/admin/src/components/business/OperaJkKeysWindow.vue
+++ b/admin/src/components/business/OperaJkKeysWindow.vue
@@ -20,8 +20,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="RFID鏍囩" prop="rfidLable">
- <el-input v-model="form.rfidLable" placeholder="璇疯緭鍏FID鏍囩" v-trim/>
+ <el-form-item label="RFID鏍囩" prop="rfidCode">
+ <el-input v-model="form.rfidCode" placeholder="璇疯緭鍏FID鏍囩" v-trim/>
</el-form-item>
<el-form-item label="棰嗗彇瑙勫垯" prop="roleType">
<el-radio-group v-model="form.roleType">
@@ -48,7 +48,7 @@
id: null,
code: '',
carId: '',
- rfidLable: '',
+ rfidCode: '',
roleType: 0
},
// 楠岃瘉瑙勫垯
@@ -59,7 +59,7 @@
carId: [
{ required: true, message: '璇烽�夋嫨鎵�灞炶溅杈�', trigger: 'blur' }
],
- rfidLable: [
+ rfidCode: [
{ required: true, message: '璇疯緭鍏FID鏍囩', trigger: 'blur' }
],
roleType: [
diff --git a/admin/src/components/business/OperaJkLineImportWindow.vue b/admin/src/components/business/OperaJkLineImportWindow.vue
index c8f72f8..d9efbc3 100644
--- a/admin/src/components/business/OperaJkLineImportWindow.vue
+++ b/admin/src/components/business/OperaJkLineImportWindow.vue
@@ -11,7 +11,7 @@
<p class="tip-warn"><i class="el-icon-warning"></i>瀵煎叆璇存槑锛�<br>
1.璇峰厛涓嬭浇鏂囦欢妯℃澘锛屽苟鎸夌収妯℃澘瑕佸幓濉啓琛ㄦ牸鍐呭;<br>
</p>
- <el-form class="demo-form-inline" >
+ <el-form class="demo-form-inline" v-loading="loading">
<el-form-item label="绾胯矾淇℃伅" required>
<div style="width: 100%;display: flex;align-items: center;">
<el-button type="primary" @click="clickRef">鐐瑰嚮涓婁紶</el-button>
@@ -38,7 +38,8 @@
data () {
return {
importing:false,
- fileName: ''
+ fileName: '',
+ loading: false,
}
},
methods: {
@@ -56,6 +57,7 @@
this.$refs.fileExcel.click()
},
result (e) {
+ this.loading = true
const data = new FormData()
data.append('file', e.target.files[0])
importExcel(data)
@@ -69,6 +71,7 @@
this.fileName = ''
})
.finally(() => {
+ this.loading = false
this.$refs.fileExcel.value = null
})
}
diff --git a/admin/src/components/business/OperaJkSketchImportWindow.vue b/admin/src/components/business/OperaJkSketchImportWindow.vue
index 1c307d5..8faec5a 100644
--- a/admin/src/components/business/OperaJkSketchImportWindow.vue
+++ b/admin/src/components/business/OperaJkSketchImportWindow.vue
@@ -13,7 +13,7 @@
2.姣忔瀵煎叆閿�鍞鍗曡〃绀哄嵆鍒犻櫎涔嬪墠瀵煎叆姝ゆ鐩稿簲鏃ユ湡鐨勮鍗曡褰曪紝浠ユ娆″鍏ョ殑鏁版嵁涓轰富;<br>
</p>
<el-form class="demo-form-inline" :model="form" ref="form" :rules="rules">
- <el-form-item label="閫佽揣鏃ユ湡" prop="dateInfo" >
+ <el-form-item label="閫佽揣鏃ユ湡" prop="dateInfo" v-loading="loading">
<el-date-picker v-model="form.dateInfo" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ棩鏈�" />
</el-form-item>
<el-form-item label="璁㈠崟淇℃伅" required>
@@ -42,6 +42,7 @@
data () {
return {
importing: false,
+ loading: false,
fileName: '',
form: {
dateInfo: null
@@ -71,6 +72,7 @@
})
},
result (e) {
+ this.loading = true
const data = new FormData()
data.append('dateInfo', this.form.dateInfo)
data.append('file', e.target.files[0])
@@ -85,6 +87,7 @@
this.fileName = ''
})
.finally(() => {
+ this.loading = false
this.$refs.fileExcel.value = null
})
}
diff --git a/admin/src/components/business/cabinetDetails.vue b/admin/src/components/business/cabinetDetails.vue
index f1bb5d4..e55f3af 100644
--- a/admin/src/components/business/cabinetDetails.vue
+++ b/admin/src/components/business/cabinetDetails.vue
@@ -179,6 +179,7 @@
unBindKeys(this.ids)
.then(res => {
this.getList()
+ this.getKeysAll()
})
}).catch(() => {
@@ -207,7 +208,7 @@
page: 1,
model: {
cabinetId: this.id,
- keyId: this.searchForm.keyId,
+ keyCode: this.searchForm.keyCode,
status: this.searchForm.status,
bindStatus: this.searchForm.bindStatus,
workingStatus: this.searchForm.workingStatus
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 4e8edc9..6bfea48 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -45,9 +45,10 @@
<el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
<el-table-column label="鎿嶄綔" width="230" fixed="right">
<template slot-scope="{row}">
+<!-- v-if="row.type ==0"-->
<el-button type="text"
@click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', { id: row.parentId, name: row.parentName, type: row.parentType, companyPath: row.parentCompanyPath }, row, 'edit')"
- icon="el-icon-edit" v-permissions="['business:company:update']" v-if="row.type ==0">缂栬緫</el-button>
+ icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
<el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', row, null, 'add')"
icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
<el-button type="text" @click="deleteById(row)" style="color: red" icon="el-icon-delete"
diff --git a/admin/src/views/business/jkCabinet.vue b/admin/src/views/business/jkCabinet.vue
index e2182e2..8383506 100644
--- a/admin/src/views/business/jkCabinet.vue
+++ b/admin/src/views/business/jkCabinet.vue
@@ -8,8 +8,8 @@
<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="rumStatus">
- <el-select v-model="searchForm.rumStatus" placeholder="璇烽�夋嫨" @change="search">
+ <el-form-item label="杩愯鐘舵��" prop="runStatus">
+ <el-select v-model="searchForm.runStatus" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
<el-option label="鍦ㄧ嚎" :value="0"></el-option>
<el-option label="绂荤嚎" :value="1"></el-option>
@@ -18,8 +18,8 @@
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="鍚敤" :value="1"></el-option>
- <el-option label="绂佺敤" :value="0"></el-option>
+ <el-option label="鍚敤" :value="0"></el-option>
+ <el-option label="绂佺敤" :value="1"></el-option>
</el-select>
</el-form-item>
<section>
@@ -116,7 +116,7 @@
code: '',
name: '',
status: '',
- rumStatus: ''
+ runStatus: ''
},
form: null
}
diff --git a/admin/src/views/business/jkCustomer.vue b/admin/src/views/business/jkCustomer.vue
index 3e63429..eb890d6 100644
--- a/admin/src/views/business/jkCustomer.vue
+++ b/admin/src/views/business/jkCustomer.vue
@@ -144,6 +144,11 @@
this.loadLines()
},
methods: {
+ reset() {
+ this.lineList = []
+ this.$refs.searchForm.resetFields()
+ this.search()
+ },
loadCategory () {
fetchCateList({
type: 4
diff --git a/admin/src/views/business/jkKeys.vue b/admin/src/views/business/jkKeys.vue
index 6e83a1f..3478e40 100644
--- a/admin/src/views/business/jkKeys.vue
+++ b/admin/src/views/business/jkKeys.vue
@@ -45,7 +45,11 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="code" label="閽ュ寵缂栧彿" min-width="100px"></el-table-column>
<el-table-column prop="carCode" label="鎵�灞炶溅杈�" min-width="100px"></el-table-column>
- <el-table-column prop="rfidLable" label="RFID鏍囩" min-width="100px"></el-table-column>
+ <el-table-column prop="rfidLable" label="RFID鏍囩" min-width="150px">
+ <template slot-scope="{row}">
+ <span v-if="row.rfidCode">{{row.rfidCode}} ({{row.rfidLable}})</span>
+ </template>
+ </el-table-column>
<el-table-column prop="cabinetName" label="缁戝畾閽ュ寵鏌�" min-width="100px"></el-table-column>
<el-table-column prop="gridCode" label="瀛樻斁浣嶇疆" min-width="100px"></el-table-column>
<el-table-column label="缁戝畾鐘舵��" min-width="100px">
diff --git a/admin/src/views/business/jkLine.vue b/admin/src/views/business/jkLine.vue
index 256926e..1bbc62b 100644
--- a/admin/src/views/business/jkLine.vue
+++ b/admin/src/views/business/jkLine.vue
@@ -11,7 +11,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="杩愰�佽溅杈�" prop="carId">
+ <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="code">
@@ -31,8 +31,7 @@
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
-
- :height="tableHeightNew"
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
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 0c40d2f..e3459ae 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
@@ -1130,7 +1130,7 @@
WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"),
IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
- WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
+ WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ),
TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ),
EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
@@ -1194,7 +1194,7 @@
IN_CITY_CAR_USE(3, "鍏溅甯傚唴鐢ㄨ溅 ", "鍏溅甯傚唴鐢ㄨ溅 "),
OUT_CITY_CAR_USE(4, "鍏溅瀹ゅ鐢ㄨ溅 ", "鍏溅瀹ゅ鐢ㄨ溅 "),
CITY_WLC_BOOK(5, "甯傚叕鍙哥墿娴佽溅棰勭害 ", "5甯傚叕鍙哥墿娴佽溅棰勭害 "),
- PLATFROM_REASON(6, "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 ", "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 "),
+ PLATFROM_REASON(6, "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 ", "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 ")
;
// 鎴愬憳鍙橀噺
private String name;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 65d569e..5d1cdd4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -7,6 +7,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.config.jwt.JwtProperties;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
@@ -171,6 +172,14 @@
String result = hkSyncPushService.dealVisitEvent(param,response);
return ApiResponse.success(result);
}
+ @ApiOperation("銆愭捣搴枫�戝叾浠栬闃呬簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
+ @PostMapping("/push/notice")
+ @LoginNoRequired
+ public ApiResponse pushNotice(@RequestBody EventVisitRequest param, HttpServletResponse response){
+ String result = hkSyncPushService.dealVisitEvent(param,response);
+
+ return ApiResponse.success(result);
+ }
@ApiOperation("銆愭捣搴枫�戣瀹CCM浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/visitIccm")
@LoginNoRequired
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseInfoRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseInfoRequest.java
new file mode 100644
index 0000000..53821ce
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseInfoRequest.java
@@ -0,0 +1,19 @@
+package com.doumee.core.haikang.model.param.request.event.base;
+
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.core.haikang.model.param.request.event.visit.EventVisitDataRequest;
+import lombok.Data;
+
+@Data
+public class EventBaseInfoRequest {
+ private String eventId;// String 浜嬩欢鍞竴鏍囪瘑 鏄� 64
+ private String srcIndex;// String 浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙� 鏄� 64
+ private String srcType;// String 浜嬩欢婧愮被鍨� 鏄� 16
+ private Integer eventType ;//Number 浜嬩欢绫诲瀷 鏄�
+ private String srcName;// String 浜嬩欢婧愬悕绉� 鍚� 64
+ private Integer status ;//Number 浜嬩欢鐘舵�� 鏄� 0-鐬椂1-寮�濮�2-鍋滄3-浜嬩欢鑴夊啿4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-寮傛鍥剧墖涓婁紶
+ private Integer timeout ;//Number 鑴夊啿瓒呮椂鏃堕棿 鏄� 鍗曚綅锛氱
+ private String happenTime ;//String 浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂达級 鏄� 64
+ private String srcParentIndex ;//String 浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶囩紪鍙� 鍚� 64
+ private JSONObject data;
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java
new file mode 100644
index 0000000..f743d60
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.param.request.event.base;
+
+import com.doumee.core.haikang.model.param.request.event.visit.EventVisitInfoRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EventBaseParamRequest {
+
+
+ private String sendTime;// P String 浜嬩欢浠庢帴鏀惰�咃紙绋嬪簭澶勭悊鍚庯級鍙戝嚭鐨勬椂闂� 鏄� 32 浜嬩欢鍙戦�佹椂闂�
+ private String ability;// P String 浜嬩欢绫诲埆 鏄� 64 鏍囪瘑鍋滆溅鍦轰簨浠�
+ private String[] uids;// String[] 鐢ㄦ埛id 鍚� 涓嶉檺
+ private String[] clients ;//String[] 缁勪欢鏍囪瘑 鍚� 涓嶉檺
+ private List<EventBaseInfoRequest> events;// P Events[] 浜嬩欢淇℃伅 鏄� 涓嶉檺
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseRequest.java
new file mode 100644
index 0000000..014e535
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseRequest.java
@@ -0,0 +1,14 @@
+package com.doumee.core.haikang.model.param.request.event.base;
+
+import com.doumee.core.haikang.model.param.request.event.visit.EventVisitParamRequest;
+import lombok.Data;
+
+@Data
+public class EventBaseRequest {
+
+// private String parkIndexCodes ;// string False 鍋滆溅搴撳敮涓�鏍囪瘑闆嗗悎 澶氫釜鍊间娇鐢ㄨ嫳鏂囬�楀彿鍒嗛殧锛屼笉瓒呰繃1000涓�
+
+ private String method ;// String 鏂规硶鍚嶏紝鐢ㄤ簬鏍囪瘑鎶ユ枃鐢ㄩ�� 鏄� 16 浜嬩欢鍥哄畾OnEventNotify
+ private EventBaseParamRequest params ;// Params 浜嬩欢鍙傛暟淇℃伅 鏄� 涓嶉檺 鍏蜂綋鍙傛暟淇℃伅
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.java
index 8db98a6..cf5e81f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.java
@@ -6,7 +6,6 @@
@Data
public class EventVisitDataRequest {
-
private String visitorId ;//String 璁垮id 鏄� 64 瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁
private String personName;// String 濮撳悕 鏄� 32
private Integer sex;// Number 鎬у埆 鏄� 1-鐢�2-濂�
@@ -27,5 +26,4 @@
private String svrIndexCode;// String 鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑 鍚�
private String beVisitedPersonId;// String 琚闂汉Id 鏄�
private String beVisitedPersonOrgId;// String 琚闂汉鎵�灞炵粍缁嘔d 鏄�
-
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.java
index 4093801..67b7e46 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.java
@@ -5,8 +5,7 @@
@Data
public class EventVisitRequest {
-// private String parkIndexCodes ;// string False 鍋滆溅搴撳敮涓�鏍囪瘑闆嗗悎 澶氫釜鍊间娇鐢ㄨ嫳鏂囬�楀彿鍒嗛殧锛屼笉瓒呰繃1000涓�
-
+// private String parkIndexCodes;// string False 鍋滆溅搴撳敮涓�鏍囪瘑闆嗗悎 澶氫釜鍊间娇鐢ㄨ嫳鏂囬�楀彿鍒嗛殧锛屼笉瓒呰繃1000涓�
private String method ;// String 鏂规硶鍚嶏紝鐢ㄤ簬鏍囪瘑鎶ユ枃鐢ㄩ�� 鏄� 16 浜嬩欢鍥哄畾OnEventNotify
private EventVisitParamRequest params ;// Params 浜嬩欢鍙傛暟淇℃伅 鏄� 涓嶉檺 鍏蜂綋鍙傛暟淇℃伅
--
Gitblit v1.9.3