From af2a56b525dd3b015b34446a2af3e3af3467cd75 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 十二月 2025 13:48:20 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 149 +++++++++----------------------------------------
1 files changed, 28 insertions(+), 121 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 0415313..8f017ef 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -271,135 +271,43 @@
}
@Override
public String setBroadcaseBobaoHttp(Device param){
- /* Device model = deviceMapper.selectById(param.getId());
+ Device model = deviceMapper.selectById(param.getId());
if(model ==null && Constants.equalsInteger(param.getType(),Constants.FOUR)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
String input = "";
- JSONObject objext = new JSONObject();
//閲嶆柊涓嬪彂璁″垝
JSONObject jsonObject = new JSONObject();
- //绗竴灞�
- JSONArray firstJsonArray = new JSONArray();
- JSONObject downJson = new JSONObject();
- downJson.put("terminalID",1);
- //涓嶅～榛樿瀵规墍鏈夐�氶亾涓嬪彂
- JSONArray audioJsonArray = new JSONArray();
- audioJsonArray.add(1);
- downJson.put("audioOutID",audioJsonArray);
- firstJsonArray.add(downJson);
- jsonObject.put("TerminalInfoList",firstJsonArray);
- //绗竴灞傛暟缁�
- JSONArray allJsonArray = new JSONArray();
- //鏁扮粍涓璞�
- for (WaterTimingBroadcastDO waterTimingBroadcastDO : searchList) {
- JSONObject downArrayData = new JSONObject();
- downArrayData.put("audioOutID",audioJsonArray);
- downArrayData.put("enabled",true);
- downArrayData.put("planSchemeID",waterTimingBroadcastDO.getName());
- JSONObject executeJson = new JSONObject();
- executeJson.put("startTime", getDateStringByZones(waterTimingBroadcastDO.getStartDate()));
- executeJson.put("stopTime",getDateStringByZones(waterTimingBroadcastDO.getEndDate()));
- if (Constant.ONE.equals(waterTimingBroadcastDO.getPeriodType())){
- //鏃ヨ鍒�
- JSONArray executeJsonArray = new JSONArray();
- JSONObject executeJsonDataItem = new JSONObject();
- executeJsonDataItem.put("beginTime",waterTimingBroadcastDO.getStartTime()+"+08:00");
- executeJsonDataItem.put("endTime",waterTimingBroadcastDO.getEndTime()+"+08:00");
- executeJsonDataItem.put("playMode","loop");
- executeJsonDataItem.put("playNowTime","");
- executeJsonDataItem.put("planSchemeExecID",0);
- JSONObject secondDownOperationJson = new JSONObject();
- if (Constant.ONE.equals(waterTimingBroadcastDO.getContentType())){
- //鏂囨湰
- secondDownOperationJson.put("audioSource","speechSynthesis");
- secondDownOperationJson.put("speechSynthesisContent",waterTimingBroadcastDO.getContent());
- }else if (Constant.TWO.equals(waterTimingBroadcastDO.getContentType())){
- //闊抽
- secondDownOperationJson.put("audioSource","customAudio");
- String json = waterTimingBroadcastDO.getJson();
- JSONObject jsonData = JSONObject.parseObject(json);
- List<Integer> hkAudioIds = new ArrayList<>();
- hkAudioIds.add(jsonData.getIntValue(waterDeviceDO.getIp()));
- secondDownOperationJson.put("customAudioID",hkAudioIds);
- }
- secondDownOperationJson.put("audioLevel",5);
- //璇█绫诲瀷
- secondDownOperationJson.put("TTSLanguageType","chinese");
- secondDownOperationJson.put("voiceType","female");
- secondDownOperationJson.put("audioVolume",100);
- executeJsonDataItem.put("Operation",secondDownOperationJson);
- executeJsonArray.add(executeJsonDataItem);
- executeJson.put("dailyScheduleList",executeJsonArray);
- }else {
- //鍛ㄨ鍒�
- JSONArray executeJsonArray = new JSONArray();
- List<String> executeTime = new ArrayList<>();
- if (Constant.ONE.equals(waterTimingBroadcastDO.getPeriodType())){
- //鏃ヨ鍒� 寰幆涓�娆�
- executeTime.add("1");
- }else if (Constant.TWO.equals(waterTimingBroadcastDO.getPeriodType())){
- //鍛ㄨ鍒掑涓�涓懆鍑�
- executeTime = Arrays.asList(waterTimingBroadcastDO.getExecuteTime().split(","));
- }
- for (String s : executeTime) {
- JSONObject executeJsonData = new JSONObject();
- if (Constant.TWO.equals(waterTimingBroadcastDO.getPeriodType())){
- //鍛ㄨ鍒掑涓�涓懆鍑�
- executeJsonData.put("dayOfWeek",Integer.parseInt(s));
- }
- JSONArray executeJsonDataArray = new JSONArray();
- JSONObject executeJsonDataItem = new JSONObject();
- executeJsonDataItem.put("beginTime",waterTimingBroadcastDO.getStartTime()+"+08:00");
- executeJsonDataItem.put("endTime",waterTimingBroadcastDO.getEndTime()+"+08:00");
- executeJsonDataItem.put("playMode","loop");
- executeJsonDataItem.put("playNowTime","");
- executeJsonDataItem.put("planSchemeExecID",0);
- JSONObject secondDownOperationJson = new JSONObject();
- if (Constant.ONE.equals(waterTimingBroadcastDO.getContentType())){
- //鏂囨湰
- secondDownOperationJson.put("audioSource","speechSynthesis");
- secondDownOperationJson.put("speechSynthesisContent",waterTimingBroadcastDO.getContent());
- }else if (Constant.TWO.equals(waterTimingBroadcastDO.getContentType())){
- //闊抽
- secondDownOperationJson.put("audioSource","customAudio");
- String json = waterTimingBroadcastDO.getJson();
- JSONObject jsonData = JSONObject.parseObject(json);
- List<Integer> hkAudioIds = new ArrayList<>();
- hkAudioIds.add(jsonData.getIntValue(waterDeviceDO.getIp()));
- secondDownOperationJson.put("customAudioID",hkAudioIds);
- }
- secondDownOperationJson.put("audioLevel",5);
- //璇█绫诲瀷
- secondDownOperationJson.put("TTSLanguageType","chinese");
- secondDownOperationJson.put("voiceType","female");
- secondDownOperationJson.put("audioVolume",10);
- executeJsonDataItem.put("Operation",secondDownOperationJson);
- executeJsonDataArray.add(executeJsonDataItem);
- executeJsonData.put("scheduleList",executeJsonDataArray);
- executeJsonArray.add(executeJsonData);
- }
- executeJson.put("weeklyScheduleList",executeJsonArray);
- }
+ /* {
+ "command": "start",
+ "TTSContent": "鍐�G70122,姣涢噸48.68鍚紝绉伴噸缁撴潫锛岃涓嬬",
+ "audioLevel": 6,
+ "audioOutID": [
+ 1
+ ],
+ "audioVolume": 100,
+ "voiceType": "female",
+ "TTSLanguageType": "chinese"
+ }*/
+ jsonObject.put("command","start");
+ jsonObject.put("TTSContent",param.getSendInfo());
+ jsonObject.put("audioLevel",6);
+ jsonObject.put("audioVolume",100);
+ jsonObject.put("TTSLanguageType","chinese");
+ jsonObject.put("voiceType","female");
+ jsonObject.put("pace",50);
+ JSONArray a = new JSONArray();
+ a.add(1);
+ jsonObject.put("audioOutID",a);
+ String params =jsonObject.toJSONString();
+ log.error("========娴峰悍骞挎挱鎾斁鍏ュ弬鍐呭 : " + params);
+ String result = HttpsUtil.doPutHk(model.getIp(),Integer.parseInt(StringUtils.defaultString(model.getPort(),"80")),model.getDoorId(), model.getDoorName()
+ ,"/ISAPI/AccessControl/EventCardLinkageCfg/TTSAudio?format=json",params);
- if (Constant.ONE.equals(waterTimingBroadcastDO.getPeriodType())){
- //鏃ヨ鍒�
- downArrayData.put("dailyScheduleInfo",executeJson);
- }else {
- //鍛ㄨ鍒�
- downArrayData.put("weklyScheduleInfo",executeJson);
- }
- allJsonArray.add(downArrayData);
- }
- jsonObject.put("broadcastPlanSchemeList",allJsonArray);
- log.info("娴峰悍鎾斁璁″垝涓嬪彂鍏ュ弬鍐呭 : " + jsonObject);
-
- String result = HttpsUtil.doPostHk(param.getIp(),Integer.parseInt(StringUtils.defaultString(param.getPort(),"80"))
- ,"/ISAPI/VideoIntercom/broadcast/AddPlanScheme?format=json",param.getDoorId(), param.getDoorName(),jsonObject.toJSONString());
- return result;*/
- return null;
+ log.error("========娴峰悍骞挎挱鎾斁杩斿洖鍐呭 : " + result);
+ return result;
}
@Override
public void setLedContent(TransparentChannelSingleRequest model) {
@@ -457,7 +365,6 @@
}catch (Exception e){
log.error( "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆寮傚父"+ device.getName());
}
-
}
log.error( "灞忓箷鍐呭璁剧疆=======================缁撴潫========" );
}
--
Gitblit v1.9.3