From af2a56b525dd3b015b34446a2af3e3af3467cd75 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 十二月 2025 13:48:20 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/deviceBroadcast.vue | 1
admin/src/views/business/deviceBroadcastChannel.vue | 75 +++++++++++++-
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 149 +++++------------------------
admin/.env.production | 1
server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java | 21 ++--
admin/src/components/operation/OperCarUseBookParamWindow.vue | 4
/dev/null | 0
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 14 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java | 4
13 files changed, 129 insertions(+), 150 deletions(-)
diff --git a/admin/.env.production b/admin/.env.production
index 6cd03e2..557f12f 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -8,3 +8,4 @@
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
+
diff --git a/admin/src/components/operation/OperCarUseBookParamWindow.vue b/admin/src/components/operation/OperCarUseBookParamWindow.vue
index 19c6d8b..01fcbf1 100644
--- a/admin/src/components/operation/OperCarUseBookParamWindow.vue
+++ b/admin/src/components/operation/OperCarUseBookParamWindow.vue
@@ -117,9 +117,7 @@
<div class="line">
<span>鐢ㄨ溅鏃舵</span>
<span>
- {{ item.startTime.slice(5, 16) }}鑷硔{
- item.endTime.slice(5, 16)
- }}</span>
+ {{ item.startTime.slice(5, 16) }}鑷硔{ item.endTime.slice(5, 16) }}</span>
</div>
<div class="line">
<span>鐩殑鍦�</span>
diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index baf4669..6722735 100644
--- a/admin/src/views/business/deviceBroadcast.vue
+++ b/admin/src/views/business/deviceBroadcast.vue
@@ -43,7 +43,6 @@
</el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�"></el-table-column>
<el-table-column
- v-if="containPermissions(['business:devicerole:update', 'business:devicerole:delete'])"
label="鎿嶄綔"
align="center"
min-width="120"
diff --git a/admin/src/views/business/deviceBroadcastChannel.vue b/admin/src/views/business/deviceBroadcastChannel.vue
index c10e474..63bc99c 100644
--- a/admin/src/views/business/deviceBroadcastChannel.vue
+++ b/admin/src/views/business/deviceBroadcastChannel.vue
@@ -28,6 +28,16 @@
<el-table-column prop="channelNo" label="閫氶亾鍙�"></el-table-column>
<el-table-column prop="regionName" label="鍖哄煙鍚嶇О"></el-table-column>
<el-table-column prop="hkDate" label="鍚屾鏃堕棿"></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="send(row)" icon="el-icon-edit" >鍙戦�佹挱鎶�</el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -37,7 +47,24 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
-<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
+ <el-dialog
+ :visible.sync="visibleSend"
+ style="z-index: 100000"
+ append-to-body
+ width="50%"
+ height="50%"
+ :title="'鍙戦�佹挱鎶�-'+ form.name"
+ >
+ <el-form :model="form" ref="form" >
+ <el-form-item label="鎾姤鍐呭" prop="name" required>
+ <el-input v-model="form.sendInfo" type="textarea" placeholder="璇疯緭鍏ユ挱鎶ュ唴瀹�" v-trim/>
+ </el-form-item>
+ </el-form>
+ <template v-slot:footer >
+ <el-button @click="sendBobao()" type="primary" :loading="isWorkSending">纭</el-button>
+ <el-button @click="sendClose()">杩斿洖</el-button>
+ </template>
+ </el-dialog>
</TableLayout>
</template>
@@ -45,12 +72,11 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
import { syncDevices, updateEntranceById } from '@/api/business/device'
export default {
name: 'Device',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaDeviceWindow },
+ components: { TableLayout, Pagination },
data () {
return {
// 鎼滅储
@@ -61,6 +87,14 @@
online: '',
type: 3
},
+ isWorkSending: false,
+ form: {
+ sendInfo: '',
+ id: '',
+ hkId: '',
+ name: ''
+ },
+ visibleSend: false,
options: []
}
},
@@ -74,7 +108,36 @@
this.search()
},
methods: {
- changeManufature(e, row) {
+ sendBobao () {
+ if (!this.form.sendInfo) {
+ return
+ }
+ this.$dialog.actionConfirm('纭杩涜骞挎挱鎾姤鍚楋紵', '鎿嶄綔纭鎻愰啋')
+ .then(() => {
+ this.isWorkSending = true
+ this.api.sendBobao(this.form)
+ .then(res => {
+ this.$tip.apiSuccess(res || '鎾姤璇锋眰鎴愬姛')
+ this.sendClose()
+ })
+ .catch(e => {
+ })
+ .finally(() => {
+ this.isWorkSending = false
+ })
+ })
+ .catch(() => {})
+ },
+ send (row) {
+ this.visibleSend = true
+ this.form = { sendInfo: '', id: row.id, hkId: row.hkId, name: row.name }
+ },
+ sendClose () {
+ this.visibleSend = false
+ this.isWorkSending = false
+ this.form = { sendInfo: '', id: '', hkId: '', name: '' }
+ },
+ changeManufature (e, row) {
updateEntranceById({
id: row.id,
isEntrance: e
@@ -84,13 +147,13 @@
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
this.isWorking.delete = true
- syncDevices({type: 3})
+ syncDevices({ type: 3 })
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
this.search()
})
.catch(e => {
- // this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
diff --git a/admin/whyc_admin/avatar/woman.png b/admin/whyc_admin/avatar/woman.png
deleted file mode 100644
index eef8695..0000000
--- a/admin/whyc_admin/avatar/woman.png
+++ /dev/null
Binary files differ
diff --git a/admin/whyc_admin/favicon.ico b/admin/whyc_admin/favicon.ico
deleted file mode 100644
index ec96d02..0000000
--- a/admin/whyc_admin/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/admin/whyc_admin/template/cars.xlsx b/admin/whyc_admin/template/cars.xlsx
deleted file mode 100644
index 1b3c485..0000000
--- a/admin/whyc_admin/template/cars.xlsx
+++ /dev/null
Binary files differ
diff --git a/admin/whyc_admin/template/member.xlsx b/admin/whyc_admin/template/member.xlsx
deleted file mode 100644
index 577efa0..0000000
--- a/admin/whyc_admin/template/member.xlsx
+++ /dev/null
Binary files differ
diff --git a/admin/whyc_admin/template/oil.xlsx b/admin/whyc_admin/template/oil.xlsx
deleted file mode 100644
index f4edb8a..0000000
--- a/admin/whyc_admin/template/oil.xlsx
+++ /dev/null
Binary files differ
diff --git a/admin/whyc_admin/template/traintime.xlsx b/admin/whyc_admin/template/traintime.xlsx
deleted file mode 100644
index 60a8379..0000000
--- a/admin/whyc_admin/template/traintime.xlsx
+++ /dev/null
Binary files differ
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
index 244f654..e11da63 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
@@ -8,10 +8,7 @@
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.methods.*;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -55,12 +52,14 @@
httpRequestBase.setConfig(requestConfig);
}
- public static String doPostHk(String host,int port,String UserName,String Password,String url, String Input) {
+ public static String doPutHk(String host,int port,String UserName,String Password,String url, String Input) {
try {
CloseableHttpResponse responseBody = null;
- HttpPost httpPost = new HttpPost("http://"+host+":"+port+url);
- setRequestConfig(httpPost);
- httpPost.setEntity(new StringEntity(Input, "UTF-8"));
+ HttpPut httpPut = new HttpPut("http://"+host+":"+port+url);
+ log.error("====================娴峰悍isapi鎺ュ彛锛歨ttp://"+host+":"+port+url);
+ httpPut.setHeader("Content-Type", "application/json");
+ setRequestConfig(httpPut);
+ httpPut.setEntity(new StringEntity(Input, "UTF-8"));
CredentialsProvider credsProvider = new BasicCredentialsProvider();
credsProvider.setCredentials(new AuthScope(host, port),
new UsernamePasswordCredentials(UserName, Password));
@@ -69,7 +68,7 @@
String response = "";
// 鐢卞鎴风鎵ц(鍙戦��)Post璇锋眰
- responseBody = httpClient.execute(httpPost);
+ responseBody = httpClient.execute(httpPut);
// 浠庡搷搴旀ā鍨嬩腑鑾峰彇鍝嶅簲瀹炰綋
HttpEntity responseEntity = responseBody.getEntity();
log.error("doPostHk鍝嶅簲鐘舵�佷负:" + responseBody.getStatusLine());
@@ -77,8 +76,8 @@
String redirectLocation = responseBody.getHeaders("Location")[0].getValue();
log.error("doPostHkRedirected to: " + redirectLocation);
// 鍦ㄨ繖閲岋紝浣犲彲浠ュ彂閫佷竴涓柊鐨勮姹傚埌redirectLocation
- httpPost.setURI(URI.create(redirectLocation));
- CloseableHttpResponse responseBody2 = httpClient.execute(httpPost);
+ httpPut.setURI(URI.create(redirectLocation));
+ CloseableHttpResponse responseBody2 = httpClient.execute(httpPut);
log.error("doPostHk閲嶅畾鍚戝悗鍝嶅簲鐘舵�佷负:" + responseBody2.getStatusLine());
HttpEntity responseEntity2 = responseBody2.getEntity();
log.error("doPostHk閲嶅畾鍚戝悗鍝嶅簲鍐呭闀垮害涓�:" + responseEntity2.getContentLength());
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 4edb06e..d03bda1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -116,7 +116,7 @@
//鍚屾LED
result = hkSyncDeviceService.syncHkLed(param);
}else if(Constants.equalsInteger(param.getType(),Constants.THREE)){
- //鍚屾骞挎挱
+ //鍚屾骞挎挱鐐�
result = hkSyncDeviceService.syncHkBroadcast(param);
}else if(Constants.equalsInteger(param.getType(),Constants.FOUR)){
//鍚屾骞挎挱
@@ -360,7 +360,7 @@
return ApiResponse.success( deviceService.setBroadcaseBobaoHttp(body));
}
@ApiOperation("銆愭捣搴枫�戝箍鎾挱鎶�")
- @PostMapping("/sendBobaoOpenapi")
+ @PostMapping("/sendBobaoOpenApi")
public ApiResponse<List<Map<String,Object>>> sendBobaoOpenapi(@RequestBody Device body , HttpServletResponse response) {
deviceService.setBroadcaseBobao(body);
return ApiResponse.success(null);
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 9dc10e9..2df12af 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
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 cb7c175..3a88eef 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
@@ -421,7 +421,6 @@
String[] minitorDataSearch= new String[]{"/api/fpms/v2/minitor/data/search","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
String[] monitorDataSearch= new String[]{"/api/fpms/v2/monitor/data/search","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
String[] fireMonitorData= new String[]{"/api/v2/monitor/fireMonitorData","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
-
String[] userOpenidSave= new String[]{"/api/v1/oa/userOpenId/saveV2","淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�"};//淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�
String[] userOpenidDel= new String[]{"/api/v1/oa/userOpenId/delete","閫氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭�"};//閫氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭�
String[] temperatureHumidityDataStatistic= new String[]{"/api/v2/public/monitor/sensor/list","娑堥槻鐪嬫澘-4娓╂箍搴︾粺璁�"};//娑堥槻鐪嬫澘-娓╂箍搴�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java
index 1ce91a7..f31b847 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java
@@ -17,6 +17,9 @@
private Integer state ;//Number false 骞挎挱鐐瑰湪绾跨姸鎬�0-鍦ㄧ嚎 1-绂荤嚎
private String regionName ;//String false 鍖哄煙鍚嶇О
private String volume ;//String false 骞挎挱鐐归煶閲�
+
+ private String ip ;//String false ip鍦板潃
+ private String port ;//String false 绔彛
private Integer isMachineSync ;//Number false 鏄惁骞挎挱涓绘満鏁版嵁锛�1-鍚屾鏁版嵁锛�0-鏈骇鏁版嵁
private Integer isCascadeSync;// Number false 鏄惁骞挎挱绾ц仈鏁版嵁锛�1-鍚屾鏁版嵁锛�0-鏈骇鏁版嵁
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java
index 6b0c07a..f77a7d7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.util.List;
+
@Data
public class FetchAudioDeviceInfoResponse {
@@ -16,5 +18,5 @@
private String deviceCode ;//String false 璁惧涓诲姩娉ㄥ唽缂栫爜
private String deviceUseType ;//String false 璁惧鍔熻兘绫诲瀷loudspeaker: '缃戠粶鍔熸斁', box: '缃戠粶闊崇', microphone: '缃戠粶瀵诲懠璇濈瓛', machine: '骞挎挱涓绘満'
private String desc ;//String false 骞挎挱璁惧鎻忚堪淇℃伅
-
+ private List<FetchAudioChannelInfoResponse> channels;
}
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( "灞忓箷鍐呭璁剧疆=======================缁撴潫========" );
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index 5ee45e1..3ab1b89 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -557,8 +557,12 @@
model.setChannelNo(device.getChannelNo());
model.setChannelInfo(device.getChannelType());
model.setResourceType(device.getAudioChannelType());
+ model.setIp(device.getIp());
+ model.setPort(device.getPort());
+ model.setDoorId(device.getParentDevIndexCode());
model.setStatus(device.getState());
model.setRegionName(device.getRegionName());
+ model.setRemark(JSONObject.toJSONString(device));
return model;
}
private Device initBroadcastDeviceDataByHkData(Device model, FetchAudioDeviceInfoResponse device, Date date) {
@@ -567,13 +571,17 @@
model.setHkId(device.getDeviceIndexCode());
model.setName(device.getDeviceName());
model.setHkStatus(Constants.ONE);
- model.setType(Constants.THREE);
- model.setChannelNo(device.getDeviceCode());
- model.setChannelInfo(device.getDeviceType());
+ model.setType(Constants.FOUR);
+ model.setIp(device.getIp());
+ model.setPort(device.getPort());
+// model.setChannelInfo(device.getDeviceType());
model.setResourceType(device.getDeviceType());
model.setStatus(Constants.ZERO);
model.setRemark(device.getDesc());
model.setRegionName(device.getRegionIndexCode());
+ if(device.getChannels()!=null &&device.getChannels().size()>0){
+ model.setRegionPathName(device.getChannels().get(0).getRegionName());
+ }
return model;
}
private Device initDoorDataByHkData(Device model, DoorsInfoResponse door, Date date, List<AcsDeviceInfoResponse> allHkList) {
--
Gitblit v1.9.3