From 299e120bbaef0899c1a49834e3148c3a399138eb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 10:09:30 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 4 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseInfoRequest.java | 19 +++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseRequest.java | 14 +++++++
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 ++++
5 files changed, 62 insertions(+), 2 deletions(-)
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 392fe0a..8093d93 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 浜嬩欢鍙傛暟淇℃伅 鏄� 涓嶉檺 鍏蜂綋鍙傛暟淇℃伅
+
+}
--
Gitblit v1.9.3