From 3d6cc6bf2bdad1714c98c820dc1805b89d594141 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 12 十月 2024 16:27:02 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/GetTodoListResponse.java | 38 ++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 16 ++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/GetTodoListRequest.java | 18 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 24 +++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 25 +++++---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 7 ++
8 files changed, 115 insertions(+), 17 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index d76042c..bc502df 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -100,6 +100,12 @@
public ApiResponse<BaseResponse> testBroadcast(@RequestBody CustomBroadcastRequest request, HttpServletResponse response) {
return ApiResponse.success( HKService.customBroadcast(request));
}
+ @ApiOperation("銆愭捣搴枫�戣幏鍙栦唬鍔�")
+ @PostMapping("/testBroadcast")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testBroadcast(@RequestBody GetTodoListRequest request, HttpServletResponse response) {
+ return ApiResponse.success( HKService.getTodoListPage(request));
+ }
@ApiOperation("銆愭捣搴枫�戞祴璇曚汉鑴稿浘鐗囦笅杞�")
@PostMapping("/testDonwLoadMemberImg")
@LoginNoRequired
@@ -126,7 +132,6 @@
public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.nhEventPageList(param));
}
-
@ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵��")
@PostMapping("/sensorStatusSearch")
@LoginNoRequired
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index c93a503..ad7e78d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -136,6 +136,7 @@
String[] sensorStatusSearch= new String[]{"/api/fpnms/v2/sensor/status/search","鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�"};//鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
String[] fireDeviceStatusSearch= new String[]{"/api/fpnms/v2/device/status/search","鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��"};//鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
String[] findDeviceAlarmPage= new String[]{"/api/v1/alarm/findDeviceAlarmPage","鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�"};//鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�
+ String[] getTodoListPage= new String[]{"/api/v3/todo/getTodoListPage","鍒嗛〉鑾峰彇寰呭姙鍒楄〃"};//1.10.1鍒嗛〉鑾峰彇寰呭姙鍒楄〃
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 0e94f0b..6a26848 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -299,6 +299,14 @@
}
}
/**
+ * 鍒嗛〉鑾峰彇寰呭姙鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String getTodoListPage(Map<String, String> body) throws Exception{
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getTodoListPage,body);
+ }
+ /**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
* @param body
* @return
@@ -364,15 +372,7 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
}
- public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
- Map<String, String> path = getPath(pathStr[0]);
- Map<String, String> header = new HashMap<>();
- header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
- String result = ArtemisHttpUtil.doGetArtemis(path, body, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
- return result;
- }
public static String startDoPostStringArtemis(String[] pathStr,String body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
@@ -380,7 +380,14 @@
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
+ }
+ public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ String result = ArtemisHttpUtil.doGetArtemis(path, body, null, null, header);
+ saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
+ return result;
}
public static String startDoPostStringArtemis(String[] pathStr,String param,String body ){
Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/GetTodoListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/GetTodoListRequest.java
new file mode 100644
index 0000000..5c94e1a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/GetTodoListRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class GetTodoListRequest {
+
+ private String comId;// Query String false 缁勪欢id
+ private int pageSize ;// Query Number false 鍒嗛〉澶у皬锛�1~999锛�
+ private int cascade ;// Query Number false 绾ц仈鏁版嵁鏉ユ簮0:涓嬬骇骞冲彴鏉ユ簮锛�1:闈炰笅绾у钩鍙版潵婧愶紝涓虹┖榛樿鏌ヨ鎵�鏈夋暟鎹潵婧�
+ private String messageId;// Query String false messageId
+ private int pageNo;// Query Number false 褰撳墠椤电爜(1~100000)
+ private String localeType;// Query String false 璇█绫诲瀷zh_CN:涓枃en_US:鑻辨枃
+ private int status;// Query Number false 涓氬姟鐘舵�佺被鍨�,1-寰呭鐞嗭紝2-瀹℃壒涓紝3-宸插畬鎴愶紝4-鎶勯�佹垜锛�5-鎴戝鎵�,榛樿寰呭鐞�
+ private String userId;// Query String false 鐢ㄦ埛id
+ private String clientType;// Query String false 璋冪敤鏂圭被鍨�0:鍏朵粬锛�1锛欰PP锛屼负绌烘椂榛樿涓�1锛�2锛氶棬鎴�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/GetTodoListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/GetTodoListResponse.java
new file mode 100644
index 0000000..bf7f72f
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/GetTodoListResponse.java
@@ -0,0 +1,38 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class GetTodoListResponse {
+ private String tid;// String false 涓婚敭id
+ private String msgId ;//String false 寰呭姙id
+ private String userId ;//String false 鐢ㄦ埛id
+ private String comId;// String false 缁勪欢鏍囪瘑
+ private String moduleId;// String false 妯″潡鏍囪瘑
+ private String msgTitle;// String false 淇℃伅鏍囬
+ private String msgStatus ;//String false 淇℃伅鐘舵��
+ private String msgStatusStr;// String false 淇℃伅鐘舵�佸悕绉�
+ private String msgCreateTime;// String false 娑堟伅鍒涘缓鏃堕棿,浼樺厛浣跨敤msgCreateTimeIso
+ private String msgCreateTimeIso;// String false 娑堟伅鍒涘缓鏃堕棿,ISO鏃堕棿
+ private String serverTime;// Number false 鎺ュ彛璋冪敤鏃舵湇鍔℃椂闂存埑锛屾绉�
+ private String menuCode;// String false 鑿滃崟code
+ private String picUrl ;//String false 鍥剧墖url锛屼笉涓虹┖鍒欏睍绀�
+ private String extendJson ;//String false 鎵╁睍瀛楁Json锛屼笉涓虹┖鍒欏睍绀�
+ private String extendNoShow;// String false 涓嶄綔灞曠ず鐨勬墿灞曞瓧娈礘son
+ private String extendParam;// String false 鎵╁睍鏍峰紡瀛楁
+ private String extendCascade;// String false 璺宠浆淇℃伅瀛楁
+ private String moduleName;// String false 妯″潡鍚嶇О锛屽嵆娑堟伅绫诲瀷
+ private String targetComId ;//String false 璺宠浆鐩爣缁勪欢ID
+ private String createUser;// String false 杩欐潯寰呭姙鐨勭敵璇蜂汉
+ private String webCascadeUrl;// String false 杩欐潯寰呭姙鐨勭敵璇蜂汉
+ private String h5CascadeUrl;// String false h5绔烦杞湴鍧�锛堢骇鑱斿钩鍙颁娇鐢級
+ private String cascadeTodoOpenType ;//String false 绾ц仈寰呭姙鐨勬墦寮�鏂瑰紡 1锛氭祻瑙堝櫒鏂版墦寮�绐楀彛锛�2锛歩am鎵撳紑iportal鐨勪吉鑿滃崟锛�3锛歩am鎵撳紑寰呭姙鐨勭┖鑿滃崟
+ private String cascadeSourceConfigId ;//String false 绾ц仈閰嶇疆id
+ private String h5Url;// String false 妯″潡閰嶇疆鐨凥5璺宠浆URL
+ private String segmentId ;//String false 娈垫爣璇嗭紝鐢ㄤ簬缁勪欢瀵诲潃鐢�
+ private String lastUsers ;//String false 涓婁竴澶勭悊浜�
+ private String currentUsers ;//String false 褰撳墠澶勭悊浜�
+ private String todoTypeCode;// String false 寰呭姙鍒嗙被缂栫爜
+ private String currentUserIds ;//String false 褰撳墠澶勭悊浜虹殑id
+ private String lastUserIds ;//String false 涓婁竴澶勭悊浜虹殑id
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 470fd3e..388c717 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -902,13 +902,13 @@
*鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
* @return
*/
- public static BaseResponse<BaseListPageResponse<WxConfigInfoResponse>> getWxConfig(WxConfigInfoRequest param){
+ public static BaseResponse< WxConfigInfoResponse> getWxConfig(WxConfigInfoRequest param){
log.info("銆愭捣搴锋牴鎹厤缃井淇″叕浼楀彿缂栧彿鏌ヨ寰俊鍏紬鍙蜂俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.getWxConfig(toMap(param));
TypeReference typeReference =
- new TypeReference<BaseResponse<BaseListPageResponse<WxConfigInfoResponse>>>(){};
- BaseResponse<BaseListPageResponse<WxConfigInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ new TypeReference<BaseResponse<WxConfigInfoResponse>>(){};
+ BaseResponse<WxConfigInfoResponse> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅");
return result;
}catch (Exception e){
@@ -916,6 +916,24 @@
}
return null;
}
+ /**
+ *鍒嗛〉鑾峰彇寰呭姙鍒楄〃
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<GetTodoListResponse>> getTodoListPage(GetTodoListRequest param){
+ log.info("銆愭捣搴峰垎椤佃幏鍙栧緟鍔炲垪琛ㄣ��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.getTodoListPage(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<GetTodoListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<GetTodoListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鑾峰彇寰呭姙鍒楄〃");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤佃幏鍙栧緟鍔炲垪琛ㄣ��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
/**
*鍒嗛〉鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 70323e1..dfdaa12 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -83,7 +83,6 @@
@ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
@ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
- @TableField(exist = false)
private String deviceName;
@ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
@@ -96,6 +95,8 @@
@ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
private Integer memberId;
+ @ApiModelProperty(value = "璁垮1闂ㄧ浜嬩欢2杞﹁締浜嬩欢")
+ private String accessType;
@ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
private String eventCode;
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 0047699..0e353d4 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
@@ -394,8 +394,6 @@
queryWrapper.last("limit 1");
Visits visits = visitsMapper.selectJoinOne(Visits.class,queryWrapper);
if(visits !=null){
- //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
- delRetentionLis.add(visits.getMemberId());
if(dataSyncConfig.getOrgUserDataOrigin() == DataSyncConfig.origin.hk){
//濡傛灉鏄紛鍒╁ぇ灞忛」鐩紝涓嶅仛澶勭悊
return;
@@ -404,7 +402,7 @@
updateVistis.setId(visits.getId());
if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_IN.getKey()) {
//濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
- retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
+// retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
//鏉ヨ鏃堕棿
updateVistis.setStatus(Constants.VisitStatus.signin);
updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
@@ -422,7 +420,19 @@
updateVistis.setOutType(Constants.ZERO);
updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
}else{
+ //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
+ delRetentionLis.add(visits.getMemberId());
//濡傛灉鏄瀹㈤�氳
+ if(request.getData()!=null&&request.getData().getParamValues()!=null &&
+ StringUtils.equals(request.getData().getParamValues().getInOrOut(),"1")){
+ //濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+ Retention r = getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType());
+ r.setCarNo(request.getData().getParamValues().getPlateNos());
+ r.setAccessType(request.getData().getParamValues().getAccessType());
+ r.setDeviceName(request.getData().getParamValues().getSrcName());
+ r.setDeviceIndex(request.getData().getParamValues().getSrcIndex());
+ retentionList.add(r);
+ }
}
updateVistis.setEditDate(new Date());
//鏇存柊璁垮鏉ヨ鎴栬�呯绂绘椂闂翠俊鎭�
--
Gitblit v1.9.3