From b1ba48885c599674b7ed19242a1fc266abac7f9d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 16:12:02 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java | 33 +++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java | 30 ++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 12 +++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java | 4 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 46 ++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 18 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 8 ++
9 files changed, 150 insertions(+), 4 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 dd51620..73aecd0 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
@@ -151,6 +151,8 @@
public static final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE";
public static final String EARLY_START_WX_NOTICE = "EARLY_START_WX_NOTICE";
public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX";
+ public static final String PRESSURE_LEVEL_UNIT = "PRESSURE_LEVEL_UNIT";
+ public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
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 6d540f1..bbbfaf8 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
@@ -628,6 +628,7 @@
String[] regionDataRanking= new String[]{"/api/ecm/v1/energy/regionDataRanking","娑堥槻鐪嬫澘-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉�"};//娑堥槻鐪嬫澘-鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕 - 鑳借�楃湅鏉�
String[] energyTotal= new String[]{"/api/ecm/v1/energy/energyTotal","娑堥槻鐪嬫澘-4鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹�"};//娑堥槻鐪嬫澘-鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹�
String[] findDeviceStatistics= new String[]{"/api/v1/device/findDeviceStatistics","鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�"};// 鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�
+ String[] resourcesByParams= new String[]{"/api/irds/v2/resource/resourcesByParams","銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃"};// 銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃
String[] iccmSignoff= new String[]{"/api/iccm/v1/signoff","iccm璁垮绛剧"};// iccm璁垮绛剧
}
/**
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 8f3c266..d305617 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
@@ -908,6 +908,14 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.findDeviceStatistics,body);
}
/**
+ * 銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String resourcesByParams(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.resourcesByParams,body);
+ }
+ /**
*娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
* @param body
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java
new file mode 100644
index 0000000..e3276aa
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java
@@ -0,0 +1,33 @@
+package com.doumee.core.haikang.model.param.request;
+
+import com.alibaba.fastjson.JSONArray;
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
+import lombok.Data;
+
+/**
+ * {
+ * "name":"娑�",
+ * "regionIndexCodes": [
+ * "root000000"
+ * ],
+ * "isSubRegion": true,
+ * "resourceType": "fireSensor",
+ * "pageNo": 1,
+ * "pageSize": 20,
+ * "orderBy": "name",
+ * "orderType": "desc"
+ * }
+ */
+
+@Data
+public class ResourcesByParamsRequest extends BaseListPageRequest {
+private String name ;//String false 鍚嶇О锛屾ā绯婃悳绱紝鏈�澶ч暱搴�32锛岃嫢鍖呭惈涓枃锛屾渶澶ч暱搴︽寚涓嶈秴杩囨寜鐓ф寚瀹氱紪鐮佺殑瀛楄妭闀垮害锛屽嵆getBytes("utf-8").length
+private String[] regionIndexCodes;// Array false 鍖哄煙缂栧彿,鍙互涓虹┖;String[]锛屾敮鎸佹牴鎹尯鍩熸壒閲忔煡璇紱鍖哄煙缂栧彿涓暟<=1000涓紱鍗曚釜闀垮害<=64Byte锛涳紝鍙粠[鏌ヨ鍖哄煙鍒楄〃v2]@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-API鍒楄〃-璧勬簮鐩綍-鍖哄煙淇℃伅鎺ュ彛#鏌ヨ鍖哄煙鍒楄〃v2]鎺ュ彛鑾峰彇杩斿洖鍙傛暟indexCode
+private Boolean isSubRegion;// Boolean false true鏃讹紝鎼滅储regionIndexCodes鍙婂叾瀛愬瓩鍖哄煙鐨勮祫婧愶紱false鏃讹紝鍙悳绱� regionIndexCodes鐨勮祫婧�
+private String resourceType ;//String true 璧勬簮绫诲瀷锛岃瑙乕闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚姝ゅ鐨勮祫婧愮被鍨嬫寚璁惧璧勬簮锛屽闂ㄧ鎺у埗鍣ㄣ�侀棬绂佺偣锛涙敞锛氳祫婧恑asDevice\reader\floor鏃犻渶杩涜鏉冮檺鏍￠獙
+private String[] authCodes;// Array false 鏉冮檺鐮侀泦鍚堬紝璇﹁[闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚
+private String[] capabilitySet;// Array false 璁惧鑳藉姏闆�(鍚澶囦笂鐨勬櫤鑳借兘鍔�)锛岃瑙乕闄勫綍A.44 璁惧鑳藉姏闆哴@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.44 璁惧鑳藉姏闆哴
+ private String orderBy;// String false 鎺掑簭瀛楁,娉ㄦ剰锛氭帓搴忓瓧娈靛繀椤绘槸鏌ヨ鏉′欢锛屽惁鍒欒繑鍥炲弬鏁伴敊璇�
+private String orderType ;//String false 闄嶅簭鍗囧簭,闄嶅簭锛歞esc 鍗囧簭锛歛sc
+private JSONArray expressions ;//Array false 鏌ヨ琛ㄨ揪寮�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java
new file mode 100644
index 0000000..0f5cec0
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java
@@ -0,0 +1,30 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ResourcesByParamsResponse {
+ private String indexCode ;//String false 闂ㄧ鐐瑰敮涓�鏍囪瘑
+ private String name;//String false 闂ㄧ鐐瑰悕绉�
+ private String resourceType;// String false 璧勬簮绫诲瀷锛岃瑙乕闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚
+ private String doorNo ;//Number false 闂ㄧ鐐圭紪鍙�
+ private String description;// String false 鎻忚堪
+ private String parentIndexCodes;// String false 鐖剁骇璧勬簮缂栧彿
+ private String regionIndexCode;// String false 鎵�灞炲尯鍩熷敮涓�鏍囪瘑
+ private String regionPath;// String false 鎵�灞炲尯鍩熻矾寰勶紝鐢卞敮涓�鏍囩ず缁勬垚锛屾渶澶�10绾э紝鏍煎紡锛� @鏍硅妭鐐笯瀛愬尯鍩�1@瀛愬尯鍩�2@
+ private String channelType ;//String false 閫氶亾绫诲瀷
+ private String channelNo;// String false 閫氶亾鍙�
+ private String installLocation;// String false 瀹夎浣嶇疆
+ private String capabilitySet;// String false 璁惧鑳藉姏闆嗭紝璇﹁[闄勫綍A.44 璁惧鑳藉姏闆哴@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.44 璁惧鑳藉姏闆哴
+ private String controlOneId;// String false 涓�绾ф帶鍒跺櫒id
+ private String controlTwoId;// String false 浜岀骇鎺у埗鍣╥d
+ private String readerInId;// String false 璇诲崱鍣�1
+ private String readerOutId;// String false 璇诲崱鍣�2
+ private String comId;// String false 缁勪欢鏍囧織
+ private String createTime ;//String false 鍒涘缓鏃堕棿
+ private String updateTime;// String false 鏇存柊鏃堕棿
+ private String fireproChannelMaxvalue;//":"3.5鈥�
+ private String fireproChannelMinValue;//": 鈥�0.50".
+}
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 4a93cf7..820d0bd 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
@@ -1989,6 +1989,24 @@
return null;
}
/**
+ *鏍规嵁鏉′欢鏌ヨ鐩綍涓嬫湁鏉冮檺鐨勮祫婧愬垪琛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<ResourcesByParamsResponse>> resourcesByParams(ResourcesByParamsRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.resourcesByParams(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<ResourcesByParamsResponse> >>(){};
+ BaseResponse<BaseListPageResponse<ResourcesByParamsResponse> > result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
* @return
*/
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
index ea6fc86..b94b800 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
@@ -25,6 +25,10 @@
@ApiModelProperty(value = "灏忕被缂栧彿")
private String cateCode;
+// @ApiModelProperty(value = "闃堝��")
+// private String level;
+
+
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 83d0616..3a0dbe1 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
@@ -1034,7 +1034,7 @@
carrecord.setInOrOut(Constants.ZERO);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){
+ if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
//濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
@@ -1089,7 +1089,7 @@
}
}
}
- if(carrecord.getInOrOut()!=null && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
+ if(isCarInOrOutEvent(request) && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
dealNotFkCarMemberBiz(event,request,carrecord,retentionList,inoutDayCount,inoutRecordList);
}
@@ -1097,6 +1097,14 @@
return event;
}
+ private boolean isCarInOrOutEvent(EventParkInfoRequest request) {
+ if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey() ||
+ Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
+ return true;
+ }
+ return false;
+ }
+
private void dealNotFkCarMemberBiz( CarEvent event ,EventParkInfoRequest request, InoutRecord carrecord,List<Retention> retentionList,InoutDayCount inoutDayCount,List<InoutRecord> inoutRecordList) {
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
carrecord.setCarBizType(event.getCarType()==null?Constants.RetentionCarType.other:event.getCarType());
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 af13ac2..4ed6fa7 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
@@ -647,6 +647,8 @@
}
/**
* 銆愭秷闃茬鎺с�戠湅鏉�-瀹炴椂鐩戞祴鏁版嵁
+ * 娑插帇鍥哄畾鍊硷細254001
+ * 姘村帇鍥哄畾鍊硷細253958
* @return
*
*/
@@ -664,6 +666,8 @@
BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> response = HKService.minitorDataSearch(param);
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();
if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
&& response.getData()!=null ) {
List<MonitorDataSearchResponse> r = response.getData().getList();
@@ -671,7 +675,8 @@
for(MonitorDataSearchResponse model : r){
MonitorDataVO m = new MonitorDataVO();
m.setName(model.getName());
- m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
+// m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
+ m.setLevel(getLevelDataByDeviceName(model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
m.setDataList(new ArrayList<>());
if(model.getValues()!=null){
List<MonitorDataInfoVO> dataList = new ArrayList<>();
@@ -683,7 +688,6 @@
vm.setCateName(v.getMonitorSpecificName());
vm.setCateCode(v.getMonitorTypeKey());
vm.setTypeCode(v.getMonitorTypeCode());
- vm.setTypeName(v.getMonitorTypeName());
dataList.add(vm);
}
}else{
@@ -708,6 +712,44 @@
return list;
}
+ private String getLevelDataByDeviceName(String name,String unit) {
+
+ /**
+ * {
+ * "name":"娑�",
+ * "regionIndexCodes": [
+ * "root000000"
+ * ],
+ * "isSubRegion": true,
+ * "resourceType": "fireSensor",
+ * "pageNo": 1,
+ * "pageSize": 20,
+ * "orderBy": "name",
+ * "orderType": "desc"
+ * }
+ */
+ String r = "";
+
+ ResourcesByParamsRequest param = new ResourcesByParamsRequest();
+ param.setName(name);
+ param.setIsSubRegion(Boolean.TRUE);
+ param.setRegionIndexCodes(new String[]{"root000000"});
+ param.setResourceType("fireSensor");
+ param.setOrderType("desc");
+ param.setOrderBy("name");
+ param.setPageNo(1);
+ param.setPageSize(20);
+ BaseResponse<BaseListPageResponse<ResourcesByParamsResponse>> response = HKService.resourcesByParams(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && 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;
+ }
+ return r;
+
+ }
+
/**
* 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅澶勭悊鍒嗘瀽闆嗗悎
--
Gitblit v1.9.3