From 699043a90869a77ccb9d48db96feb6edc1f61af3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 12 十二月 2024 19:49:11 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) 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 af2e92e..d71fde8 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 @@ -400,12 +400,13 @@ request.setSorts(new ArrayList<>()); RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest(); file.setFieldName("event_type"); - file.setFieldValue("131588");//瀹夐槻鍛婅 + file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀� file.setType("in"); if(type == 1){ + file.setFieldValue("131588");//瀹夐槻鍛婅 + }else if(type == 2){ - }else if(type == 1){ - + file.setFieldValue("131593");//浜哄憳鍛婅 } request.getFiledOptions().add(file); SortRequest sort = new SortRequest(); @@ -1444,7 +1445,12 @@ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE) &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count() ); + data.setVideoPluginUrl(getVideoUrl()); return data; + } + + private String getVideoUrl() { + return systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe"; } private void getParkingCarsNum(SecurityBoardVO data) { @@ -1717,6 +1723,12 @@ } } + + data.setVideoPluginUrl(getVideoUrl()); + String indexCodes = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_CHANGNEI_SCREEN_INDEXCODES).getCode(); + if(StringUtils.isNotBlank(indexCodes)){ + data.setVideoIndexCodes(indexCodes.split(",")); + } } return data; -- Gitblit v1.9.3