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; 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访客ç¾ç¦» } /** 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 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 èµæºç±»å/èµæºæéç ]æ¤å¤çèµæºç±»åæè®¾å¤èµæºï¼å¦é¨ç¦æ§å¶å¨ãé¨ç¦ç¹ï¼æ³¨ï¼èµæºiasDevice\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 éåºååº,éåºï¼desc ååºï¼asc private JSONArray expressions ;//Array false æ¥è¯¢è¡¨è¾¾å¼ } 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 äºçº§æ§å¶å¨id 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". } 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 */ 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; 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()); 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; } /** * ãæ¶é²ç®¡æ§ãçæ¿-åè¦å¤çåæéå