From cf2758071b5f344ec5b65dcdbc51f4ed9bda1407 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 二月 2024 18:35:25 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 2
server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 3
admin/src/views/business/visits.vue | 20 ++-
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 70 ++++++++------
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 69 ++++++++++++-
admin/src/views/business/visitEvent.vue | 13 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 52 +++-------
12 files changed, 149 insertions(+), 96 deletions(-)
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index 5cf8c69..f3b0c33 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -50,22 +50,23 @@
stripe
>
<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="phone" 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="visitorWorkUint" label="鍏徃" min-width="100px"></el-table-column>
<el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
<el-table-column prop="beVisitedPersonName" label="琚浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="beVisitedPersonOrg" 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
+ <el-image v-if="row.captureUrlFull!=null"
style="width: 80px; height: 80px"
- :src="row.captureUrl"
- :preview-src-list="[row.captureUrl]">
+ :src="row.captureUrlFull"
+ :preview-src-list="[row.captureUrlFull]">
</el-image>
</template>
</el-table-column>
- <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 7041eee..ee9f101 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -13,13 +13,15 @@
</el-form-item>
<el-form-item label="瀹℃壒鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
- <el-option label="寰呭鏍�" value="0"></el-option>
- <el-option label="宸叉彁浜RP瀹℃壒" value="1"></el-option>
+ <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="5"></el-option>
- <el-option label="涓嬪彂澶辫触" value="6"></el-option>
+ <el-option label="棰勭害鎴愬姛" value="5"></el-option>
+ <el-option label="棰勭害澶辫触" value="6"></el-option>
+ <el-option label="鎷滆涓�" value="7"></el-option>
+ <el-option label="宸茬绂�" value="8"></el-option>
</el-select>
</el-form-item>
<section>
@@ -65,13 +67,15 @@
</el-table-column>
<el-table-column prop="status" fixed="right" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span style="color: rgba(245, 154, 35, 0.996);" v-if="row.status === 0">寰呭鏍�</span>
- <span v-if="row.status === 1">宸叉彁浜RP瀹℃壒</span>
+ <span style="color: rgba(245, 154, 35, 0.996);" v-if="row.status === 0">寰呮彁浜ゅ鎵�</span>
+ <span v-if="row.status === 1">瀹℃壒涓�</span>
<span v-if="row.status === 2">瀹℃牳閫氳繃</span>
<span style="color: red;" v-if="row.status === 3">瀹℃牳涓嶉�氳繃</span>
<span v-if="row.status === 4">鍙栨秷</span>
- <span v-if="row.status === 5">涓嬪彂鎴愬姛</span>
- <span v-if="row.status === 6">涓嬪彂澶辫触</span>
+ <span v-if="row.status === 5">棰勭害鎴愬姛</span>
+ <span v-if="row.status === 6">棰勭害澶辫触</span>
+ <span v-if="row.status === 7">鎷滆涓�</span>
+ <span v-if="row.status === 8">宸茬绂�</span>
</template>
</el-table-column>
<el-table-column
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 e65e0b2..6a629fa 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
@@ -72,7 +72,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
//@RequiresPermissions("business:visitevent:query")
- public ApiResponse<PageData<VisitEventDTO>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
+ public ApiResponse<PageData<VisitEvent>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
return ApiResponse.success(visitEventService.findVisitPage(pageWrap));
}
@@ -80,7 +80,7 @@
@PostMapping("/exportExcel")
//@RequiresPermissions("business:visitevent:exportExcel")
public void exportExcel (@RequestBody PageWrap<VisitEvent> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(VisitEventVo.class).export(visitEventService.findPageExcel(pageWrap), "璁垮浜嬩欢鎺ㄩ�佽褰曡〃", response);
+ ExcelExporter.build(VisitEvent.class).export(visitEventService.findPageExcel(pageWrap), "璁垮浜嬩欢鎺ㄩ�佽褰曡〃", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
index d31fad0..3c8935d 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
@@ -86,7 +86,7 @@
HKService.eventSub(param);//鍋滆溅鍦轰簨浠�
param.setEventDest(path+"/visit");
- param.setEventTypes(new Integer[]{HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()
+ param.setEventTypes(new Integer[]{HKConstants.EventTypes.VISIT_SIGN_IN.getKey()
,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()});
HKService.cancelEventSub(param);//鍏堝彇娑�
HKService.eventSub(param);//璁垮浜嬩欢
@@ -107,6 +107,7 @@
,HKConstants.EventTypes.PARK_LINE_OUT.getKey()
,HKConstants.EventTypes.PARK_PASS_IN.getKey()
,HKConstants.EventTypes.PARK_PASS_OUT.getKey()
+ ,HKConstants.EventTypes.VISIT_SIGN_IN.getKey()
,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey(),
HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()});
String path =systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_URL).getCode();
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index ea2897d..101e31a 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -25,7 +25,7 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-//@Component
+@Component
@EnableScheduling
public class ScheduleTool {
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 d6f9cb7..09f4d91 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
@@ -68,7 +68,7 @@
@ApiModelProperty(value = "鎵嬫満鍙�")
- private String personPhone;
+ private String phone;
@ApiModelProperty(value = "浜哄憳绫诲瀷")
private String personType;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index 5a55fa1..c45977c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -23,73 +23,73 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+// @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+// @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍒涘缓鏃堕棿" )
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+// @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @ExcelColumn(name="鏇存柊鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+// @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+// @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
- @ExcelColumn(name="浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+// @ExcelColumn(name="浜嬩欢鍞竴鏍囪瘑")
private String eventId;
@ApiModelProperty(value = "浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
- @ExcelColumn(name="浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
+// @ExcelColumn(name="浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
private String srcIndex;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
- @ExcelColumn(name="浜嬩欢婧愮被鍨�")
+// @ExcelColumn(name="浜嬩欢婧愮被鍨�")
private String srcType;
@ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
- @ExcelColumn(name="浜嬩欢婧愬悕绉�")
+// @ExcelColumn(name="浜嬩欢婧愬悕绉�")
private String srcName;
@ApiModelProperty(value = "浜嬩欢绫诲瀷锛堢櫥璁� 绛剧锛�")
- @ExcelColumn(name="浜嬩欢绫诲瀷")
+// @ExcelColumn(name="浜嬩欢绫诲瀷")
private Integer eventType;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
- @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
+// @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
- @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
+// @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
private Integer timeout;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
- @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+// @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿")
private String happenTime;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
- @ExcelColumn(name="浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
+// @ExcelColumn(name="浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
private String srcParentIndex;
@ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
- @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
+// @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
private String visitorId;
@ApiModelProperty(value = "濮撳悕")
@@ -97,15 +97,15 @@
private String personName;
@ApiModelProperty(value = "鎬у埆 1-鐢�2-濂�", example = "1")
- @ExcelColumn(name="鎬у埆 1-鐢�2-濂�")
+// @ExcelColumn(name="鎬у埆 1-鐢�2-濂�")
private Integer sex;
@ApiModelProperty(value = "璇佷欢绫诲瀷 111韬唤璇�")
- @ExcelColumn(name="璇佷欢绫诲瀷 111韬唤璇�")
+// @ExcelColumn(name="璇佷欢绫诲瀷 111韬唤璇�")
private Integer idType;
@ApiModelProperty(value = "璇佷欢鍙� ")
- @ExcelColumn(name="璇佷欢鍙� ")
+ @ExcelColumn(name="璇佷欢鍙�")
private String idNo;
@ApiModelProperty(value = "琚闂汉濮撳悕")
@@ -121,7 +121,7 @@
private String visitorWorkUint;
@ApiModelProperty(value = "璁垮楠岃瘉鐮�")
- @ExcelColumn(name="璁垮楠岃瘉鐮�")
+// @ExcelColumn(name="璁垮楠岃瘉鐮�")
private String visitorCode;
@ApiModelProperty(value = "鏉ヨ浜嬬敱")
@@ -129,7 +129,7 @@
private String purpose;
@ApiModelProperty(value = "璇佷欢绛惧彂鏈哄叧")
- @ExcelColumn(name="璇佷欢绛惧彂鏈哄叧")
+// @ExcelColumn(name="璇佷欢绛惧彂鏈哄叧")
private String signOrg;
@ApiModelProperty(value = "鏉ヨ鏃堕棿")
@@ -148,27 +148,27 @@
private String carNo;
@ApiModelProperty(value = "鐓х墖uri")
- @ExcelColumn(name="鐓х墖uri")
+// @ExcelColumn(name="鐓х墖uri")
private String photoUrl;
@ApiModelProperty(value = "鎶撴媿鍥緐ri")
- @ExcelColumn(name="鎶撴媿鍥緐ri")
+// @ExcelColumn(name="鎶撴媿鍥緐ri")
private String captureUrl;
@ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
- @ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
+// @ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
private String svrIndexCode;
@ApiModelProperty(value = "琚闂汉id")
- @ExcelColumn(name="琚闂汉id")
+// @ExcelColumn(name="琚闂汉id")
private String beVisitedPersonId;
@ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
- @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
+// @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
private String beVisitedPersonOrgId;
@ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
- @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
+// @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
private String idcardDecode;
// 鏉′欢鏌ヨ鍙傛暟
@@ -183,4 +183,14 @@
@ApiModelProperty(value = "缁熻鏁伴噺 ")
@TableField(exist = false)
private int num ;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ @TableField(exist = false)
+ @ExcelColumn(name="浜嬩欢绫诲瀷")
+ private String eventTypeName;
+
+ @ApiModelProperty(value = "鎶撴媿鍥緐ri瀹屾暣")
+ @TableField(exist = false)
+// @ExcelColumn(name="鎶撴媿鍥緐ri")
+ private String captureUrlFull;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
index 6d07749..6b496dd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
@@ -106,7 +106,7 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<VisitEvent>
*/
- PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap);
+ PageData<VisitEvent> findVisitPage(PageWrap<VisitEvent> pageWrap);
/**
@@ -114,5 +114,5 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<VisitEventVo>
*/
- List<VisitEventVo> findPageExcel(PageWrap<VisitEvent> pageWrap);
+ List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap);
}
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 11ae971..5bbd244 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
@@ -235,9 +235,9 @@
}
@Override
- public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap) {
+ public PageData<VisitEvent> findVisitPage(PageWrap<VisitEvent> pageWrap) {
- IPage<VisitEventDTO> visitEventDTOIPage = getDataInfo(pageWrap);
+ IPage<VisitEvent> visitEventDTOIPage = getDataInfo(pageWrap);
if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
}
@@ -245,27 +245,12 @@
}
@Override
- public List<VisitEventVo> findPageExcel(PageWrap<VisitEvent> pageWrap) {
- IPage<VisitEventDTO> visitEventExcel = getDataInfo(pageWrap);
- List<VisitEventVo> voList = new ArrayList<>();
- if(null != visitEventExcel && visitEventExcel.getRecords().size() > 0) {
- visitEventExcel.getRecords().stream().forEach(obj->{
- VisitEventVo eventVo = new VisitEventVo();
- eventVo.setPersonName(obj.getPersonName());
- eventVo.setPersonPhone(obj.getPersonPhone());
- eventVo.setIdNo(obj.getIdNo());
- eventVo.setPersonCompanyName(obj.getPersonCompanyName());
- eventVo.setCarNo(obj.getCarNo());
- eventVo.setBeVisitedPersonName(obj.getBeVisitedPersonName()+"-"+obj.getBeVisitedPersonOrg());
- eventVo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()));
- eventVo.setHappenTime(obj.getHappenTime());
- voList.add(eventVo);
- });
- }
- return voList;
+ public List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEvent> visitEventExcel = getDataInfo(pageWrap);
+ return newVisitEvent(visitEventExcel.getRecords());
}
- private IPage<VisitEventDTO> getDataInfo(PageWrap<VisitEvent> pageWrap) {
+ private IPage<VisitEvent> getDataInfo(PageWrap<VisitEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -275,9 +260,7 @@
IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper .leftJoin(Visits.class,Visits::getHkId,VisitEvent::getVisitorId);
- queryWrapper.selectAll(VisitEvent.class)
- .selectAs(Visits::getCompanyName,VisitEventDTO::getPersonCompanyName);
+ queryWrapper.selectAll(VisitEvent.class);
queryWrapper.like(number,
VisitEvent::getPhone,
pageWrap.getModel().getKeyWords())
@@ -293,37 +276,36 @@
.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
VisitEvent::getEventType,
pageWrap.getModel().getEventType())
- .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ .ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
VisitEvent::getHappenTime,
pageWrap.getModel().getStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ .le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()),
VisitEvent::getHappenTime,
- pageWrap.getModel().getEndTime());
+ pageWrap.getModel().getEndTime())
+ .eq(VisitEvent::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
- IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
+ IPage<VisitEvent> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEvent.class, queryWrapper);
return visitEventDTOIPage;
}
- private List<VisitEventDTO> newVisitEvent(List<VisitEventDTO> VisitEventDTOList) {
+ private List<VisitEvent> newVisitEvent(List<VisitEvent> 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->{
if(StringUtils.isNotBlank( obj.getCaptureUrl())
&& !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX)
&& !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX_ERROR)) {
if(null != list && list.size() > 0) {
- obj.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
- +dataMap.get(Constants.MEMBER_IMG).getCode()
+ obj.setCaptureUrlFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.VISIT_EVENT_IMG).getCode()
+obj.getCaptureUrl());
}
}
- obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
- newDataList.add(obj);
+ obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())); ;
});
- return newDataList;
+ return VisitEventDTOList;
}
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
index df5556f..60d05d1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
@@ -141,9 +141,9 @@
model.setHkId(device.getPrivilegeGroupId());
model.setName(device.getPrivilegeGroupName());
model.setHkStatus(Constants.ONE);
- model.setIsdeleted(Constants.ZERO);
+ model.setStatus(Constants.ONE);
model.setIsDefault(device.getIsDefault());
- model.setType(String.valueOf(Constants.ZERO));
+ model.setType(String.valueOf(Constants.ONE));
return model;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 3ec0b8d..d872e52 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -50,6 +50,8 @@
@Autowired
private CarsMapper carsMapper;
@Autowired
+ private ParkBookMapper parkBookMapper;
+ @Autowired
private DeviceEventMapper deviceEventMapper;
@Autowired
private MemberMapper memberMapper;
@@ -307,7 +309,9 @@
EventVisitDataRequest model = request.getData();
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getType,Visits::getMemberType);
queryWrapper.eq(Visits::getHkId,model.getVisitorId() );
+ queryWrapper.leftJoin(Member.class,Member::getId,Visits::getMemberId );
queryWrapper.last("limit 1");
Visits visits = visitsMapper.selectJoinOne(Visits.class,queryWrapper);
if(visits !=null){
@@ -321,9 +325,11 @@
//鏉ヨ鏃堕棿
updateVistis.setStatus(Constants.VisitStatus.signin);
updateVistis.setInDate(DateUtil.getISO8601DateByStr(model.getStartTime()));
+ updateVistis.setOutDate(DateUtil.getISO8601DateByStr(model.getEndTime()));
}else {
//濡傛灉鏄瀹㈢绂讳簨浠�
updateVistis.setStatus(Constants.VisitStatus.signout);
+ updateVistis.setInDate(DateUtil.getISO8601DateByStr(model.getStartTime()));
updateVistis.setOutDate(DateUtil.getISO8601DateByStr(model.getEndTime()));
updateVistis.setOutType(Constants.ZERO);
updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
@@ -343,7 +349,9 @@
event.setVisitorCode(request.getData().getVisitorCode());
event.setTimeout(request.getTimeout());
event.setSvrIndexCode(request.getData().getSvrIndexCode());
+ event.setHappenTime(request.getHappenTime());
event.setStatus(request.getStatus());
+ event.setEndTime(request.getData().getEndTime());
event.setStartTime(request.getData().getStartTime());
event.setSrcType(request.getSrcType());
event.setSrcParentIndex(request.getSrcParentIndex());
@@ -352,8 +360,23 @@
event.setSignOrg(request.getData().getSignOrg());
event.setSex(request.getData().getSex());
event.setPurpose(request.getData().getPurpose());
+ event.setPhone(request.getData().getPhone());
+ event.setBeVisitedPersonId(request.getData().getBeVisitedPersonId());
+ event.setBeVisitedPersonName(request.getData().getBeVisitedPersonName());
+ event.setBeVisitedPersonOrg(request.getData().getBeVisitedPersonOrg());
+ event.setBeVisitedPersonOrgId(request.getData().getBeVisitedPersonOrgId());
+ event.setVisitorWorkUint(request.getData().getVisitorWorkUint());
event.setPhotoUrl(getHkImgUrl(request.getData().getPhotoUrl()));
event.setPersonName(request.getData().getPersonName());
+ event.setCarNo(request.getData().getCarNo());
+ event.setCaptureUrl(request.getData().getCaptureUrl());
+ if(StringUtils.isNotBlank(request.getData().getCaptureUrl())){
+ event.setCaptureUrl(HKConstants.IMG_INDEX+request.getData().getCaptureUrl());
+ }
+ if(StringUtils.isNotBlank(request.getData().getPhotoUrl())){
+
+ event.setPhotoUrl(HKConstants.IMG_INDEX+request.getData().getPhotoUrl());
+ }
event.setIdType(request.getData().getIdType());
String idnum =request.getData().getIdNo();
if(StringUtils.isNotBlank(idnum)){
@@ -364,8 +387,6 @@
}
event.setEventType(request.getEventType());
event.setEventId(request.getEventId());
- event.setHappenTime(event.getHappenTime());
-
return event;
}
@@ -411,16 +432,28 @@
//闂ㄧ浜嬩欢闆嗗悎
List<EventParkInfoRequest> events = param.getParams().getEvents();
List<CarEvent> list = new ArrayList<>();
+ List<Retention> retentionList = new ArrayList<>();
+ List<String> delRetentionList = new ArrayList<>();
for(EventParkInfoRequest request : events){
if(request.getData() ==null ||StringUtils.isBlank(request.getData().getPlateNo())){
continue;
}
//灏佽浜嬩欢淇℃伅琛ㄥ璞�
- list.add(getParkEventModelByRequest(request));
+ list.add(getParkEventModelByRequest(request,delRetentionList,retentionList));
}
if(list.size()>0){
//鎻掑叆闂ㄧ璁板綍
carEventMapper.insertBatchSomeColumn(list);
+ }
+ if(delRetentionList.size()>0){
+ //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
+ retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+ .eq(Retention::getType,Constants.THREE)
+ .in(Retention::getCarNo,delRetentionList));
+ }
+ if(retentionList.size()>0){
+ //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
+ retentionMapper.insertBatchSomeColumn(retentionList);
}
log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========鎴愬姛=======");
}catch (Exception e){
@@ -436,7 +469,7 @@
* @param request
* @return
*/
- private CarEvent getParkEventModelByRequest(EventParkInfoRequest request) {
+ private CarEvent getParkEventModelByRequest(EventParkInfoRequest request, List<String> delRetentionList , List<Retention> retentionList ) {
CarEvent event = new CarEvent();
event.setIsdeleted(Constants.ZERO);
event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
@@ -490,18 +523,40 @@
event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
}
if(StringUtils.isNotBlank(event.getPlateNos())){
- Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
- .eq(Cars::getCode,event.getPlateNos())
- .eq(Cars::getIsdeleted,Constants.ONE )
+ ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
+ .eq(ParkBook::getCarCode,event.getPlateNos())
+ .eq(ParkBook::getIsdeleted,Constants.ONE )
.last("limit 1" ));
if(cars!=null){
event.setMemberId(cars.getMemberId());
}
+
+ if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
+ //濡傛灉鏄叆鍘傛斁琛�
+ delRetentionList.add(event.getPlateNos());
+ retentionList.add(getRetentionModelByParkRequest(request));
+ }else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
+ //濡傛灉鏄嚭鍦烘斁琛�
+ delRetentionList.add(event.getPlateNos());
+ }
}
+
return event;
}
+ private Retention getRetentionModelByParkRequest(EventParkInfoRequest request) {
+ Retention retention = new Retention();
+ retention.setIsdeleted(Constants.ZERO);
+ retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
+ retention.setCarNo(request.getData().getPlateNo());
+ retention.setType(Constants.THREE);
+// retention.setDeviceName(request.getSrcName());
+// retention.setDeviceIndex(request.getSrcIndex());
+
+ return retention;
+ }
+
private void saveInterfaceLog(Object param, String path,String result) {
InterfaceLog hkMonitoryLogDO=new InterfaceLog();
hkMonitoryLogDO.setType(1);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index 22f9196..4a44285 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -284,7 +284,7 @@
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Visits.class);
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName)
- .select("t1.hk_id as receptMemberHkId")
+ .selectAs(Member::getHkId,Visits::getReceptMemberHkId)
.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.eq(Visits::getStatus,Constants.VisitStatus.pass)//瀹℃壒閫氳繃
.eq(Visits::getHkStatus,Constants.ZERO)//鏈悓姝ュ埌娴峰悍
--
Gitblit v1.9.3