From ecc1f1f70da17f9672d4fd5b830ca7f5c18a3aa1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:00:39 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/warningRule.vue | 7 --
admin/src/components/business/OperaWarningRuleWindow.vue | 132 ++++----------------------------------------
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 6 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 19 ++----
admin/.env.development | 2
6 files changed, 23 insertions(+), 145 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index c574b58..a4b9744 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -5,7 +5,7 @@
# VUE_APP_API_URL = 'http://192.168.1.45:10010'
-VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+#VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
# VUE_APP_API_URL = 'http://localhost:10010'
diff --git a/admin/src/components/business/OperaWarningRuleWindow.vue b/admin/src/components/business/OperaWarningRuleWindow.vue
index f6cff81..226c5e7 100644
--- a/admin/src/components/business/OperaWarningRuleWindow.vue
+++ b/admin/src/components/business/OperaWarningRuleWindow.vue
@@ -11,7 +11,7 @@
2.鍙戠敓鍖哄煙闈炲繀濉紝涓嶅～鍒欒〃绀鸿瑙勫垯涓嬫墍鏈夊尯鍩熺殑鐩稿簲鎶ヨ绫诲瀷鍧囬�氱煡;<br>
</p>
<el-form :model="form" ref="form" :rules="rules">
- <div style="display: flex;" v-for="(item,index) in form.detailList" :key="'warning_'+index" >
+ <div style="display: flex;" v-for="(item,index) in form.detailList" :key="'region_'+item.random" >
<span style="line-height: 32px;font-size: 14px;"><b style="color: #F56C6C;margin-right: 4px;font-size: 11px;">*</b>{{'瑙勫垯'+(index +1)}}</span>
<el-form-item label="" style="display: inline-block;margin-left: 10px; " >
<el-select v-model="item.warningId" filterable placeholder="璇烽�夋嫨鎶ヨ绫诲瀷" >
@@ -19,7 +19,7 @@
</el-select>
</el-form-item>
<el-form-item label="" style="display: inline-block;margin-left: 10px">
-<!-- <el-select v-model="item.regionId" filterable multiple clearable placeholder="璇烽�夋嫨鍙戠敓鍖哄煙" >
+<!-- <el-select v-model="item.regionId" filterable multiple clearable placeholder="璇烽�夋嫨鍙戠敓鍖哄煙" >
<el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>-->
@@ -35,23 +35,9 @@
noOptionsText="娌℃湁鍙�夐」"
noResultsText="娌℃湁鍖归厤鐨勭粨鏋�" />
</el-form-item>
- <el-form-item label="" style="display: inline-block;margin-left: 10px;width: 120px; " >
- <el-select v-model="item.deviceType" filterable placeholder="璇烽�夋嫨璁惧绫诲瀷" clearable @change="changeDeviceType(item)" >
- <el-option label="鐩戞帶鐐�" :value="0" ></el-option>
- <el-option label="娑堥槻璁惧" :value="1" ></el-option>
- <el-option label="娑堥槻浼犳劅鍣�" :value="2" ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" v-if="item.deviceType>=0 || item.deviceType <=2" style="display: inline-block;margin-left: 10px; " >
- <el-select v-model="item.deviceId" filterable placeholder="璇烽�夋嫨鐩戞帶鐐�" clearable @change="changeCamera(item)" >
- <el-option v-for="item1 in item.carmeraList" :label="item1.name" :value="item1.indexCode" ></el-option>
- </el-select>
- </el-form-item>
<el-button type="danger" style="margin-left: 10px;height: 32px; " @click="delDo(index)" v-if="index>0 || form.detailList.length>1">鍒犻櫎</el-button>
</div>
- <el-form-item label="" prop="detailList" style="width: 150px">
- <el-button type="primary" style="margin-left: 10px;margin-bottom: 20px;" @click="addDo">澧炲姞瑙勫垯</el-button>
- </el-form-item>
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 20px;" @click="addDo">澧炲姞瑙勫垯</el-button>
<el-form-item label="鐘舵��" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="0" :value="0">绂佺敤</el-radio>
@@ -61,7 +47,7 @@
<el-form-item label="鍙戠敓闂撮殧鏃堕棿(绉掞級" prop="intervalSec">
<el-input type="number" v-model="form.intervalSec" placeholder="璇疯緭鍏ュ瑙勫垯闂撮殧鏃堕棿(绉掞級" v-trim/>
</el-form-item>
- <el-form-item label="閽夐拤閫氱煡" prop="memberNotice" >
+ <el-form-item label="閽夐拤閫氱煡" prop="memberNotice" style="display:inline-block;width: 50%;">
<el-switch style="margin-right:30px;width:100px" v-model="form.memberNotice" :active-value="1" :inactive-value="0" active-text="寮�" inactive-text="鍏�"></el-switch>
</el-form-item>
<el-form-item label="閫夋嫨閽夐拤閫氱煡浜哄憳" v-if="form.memberNotice ==1" prop="memberIds" style="margin-bottom: 30px" >
@@ -70,7 +56,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="骞挎挱閫氱煡" prop="deviceNotice" >
+ <el-form-item label="骞挎挱閫氱煡" prop="deviceNotice" style="display:inline-block;width: 50%;" >
<el-switch style="margin-right:30px;width: 100px" v-model="form.deviceNotice" :active-value="1" :inactive-value="0" active-text="寮�" inactive-text="鍏�">></el-switch>
</el-form-item>
<el-form-item label="閫夋嫨鎾姤骞挎挱" v-if="form.deviceNotice ==1" prop="deviceIds" style="margin-bottom: 30px" >
@@ -97,20 +83,6 @@
extends: BaseOpera,
components: { GlobalWindow },
data () {
- var validIdDetals = (rule, value, callback) => {
- if (this.form.detailList == null || this.form.detailList.length == 0) {
- callback(new Error('璇烽厤缃鍒�'))
- return
- }
- for (let i = 0; i < this.form.detailList.length; i++) {
- var item = this.form.detailList[i]
- if (!item || item.warningId === undefined || !item.warningId || item.warningId == null) {
- callback(new Error('璇锋纭厤缃鍒�'))
- return
- }
- }
- callback()
- }
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -123,7 +95,7 @@
intervalSec: '',
sortnum: '',
status: 0,
- detailList: [{ random: Math.random(), regionId: null, regionName: null, deviceId: null, deviceName: null, regionCode: null, warningId: null }]
+ detailList: [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
},
deviceSelect: [],
memberSelect: [],
@@ -133,11 +105,10 @@
regionList: [],
// 楠岃瘉瑙勫垯
rules: {
- detailList: [{ required: true, validator: validIdDetals, message: '璇锋纭厤缃鍒�', tigger: 'blur' }],
memberNotice: [{ required: true, message: '璇烽�夋嫨閽夐拤閫氱煡' }],
deviceNotice: [{ required: true, message: '璇烽�夋嫨鏄惁骞挎挱閫氱煡' }],
- deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱' }],
- memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳' }],
+ deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱', tigger: 'blur' }],
+ memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳', tigger: 'blur' }],
status: [{ required: true, message: '璇烽�夋嫨鐘舵��' }]
}
}
@@ -147,7 +118,6 @@
api: '/business/warningRule',
'field.id': 'id'
})
- this.loadRegions()
},
methods: {
normalizeOptions (node) {
@@ -161,77 +131,18 @@
children: node.childList
}
},
- changeDeviceType (item) {
- if (item.regionId) {
- var reg = this.getSelectedObject(item.regionId)
- if (reg) {
- item.carmeraList = []
- if (item.deviceType === 1) {
- item.carmeraList = reg.deviceList
- } else if (item.deviceType === 2) {
- item.carmeraList = reg.sensorList
- }else if (item.deviceType === 0){
- item.carmeraList = reg.carmeraList
- }
- }
- }else{
- item.carmeraList = []
- }
- this.$nextTick(() => {
- if (!item.deviceType || this.notInCarmeraList(item.carmeraList, item.deviceId)) {
- item.deviceId = null
- item.deviceName = null
- }
- })
- },
- changeCamera (curitem) {
- var list = curitem.carmeraList
- if (list && list.length) {
- list.forEach(item => {
- if (curitem.deviceId === item.indexCode) {
- curitem.deviceName = item.name
- }
- })
- }
- },
changeSel (opt) {
- console.log('=================changeSel', opt, this.form.detailList)
var item = this.form.detailList[opt]
this.form.detailList[opt].regionCode = null
this.form.detailList[opt].regionName = null
- this.form.detailList[opt].carmeraList = []
if (item.regionId) {
var reg = this.getSelectedObject(item.regionId)
if (reg) {
this.form.detailList[opt].regionCode = reg.indexCode
this.form.detailList[opt].regionName = reg.name
- if (item.deviceType === 1) {
- this.form.detailList[opt].carmeraList = reg.deviceList
- } else if (item.deviceType === 2) {
- this.form.detailList[opt].carmeraList = reg.sensorList
- }else{
- this.form.detailList[opt].carmeraList = reg.carmeraList
- }
}
}
- this.$nextTick(() => {
- console.log('=================changeSel1', this.form.detailList[opt].carmeraList, this.form.detailList[opt].deviceId)
- if (this.notInCarmeraList(this.form.detailList[opt].carmeraList, this.form.detailList[opt].deviceId)) {
- this.form.detailList[opt].deviceId = null
- this.form.detailList[opt].deviceName = null
- }
- })
- },
- notInCarmeraList (list, id) {
- var r = true
- if (list && list.length) {
- for (const item of list) {
- if (item.indexCode === id) {
- r = false
- }
- }
- }
- return r
+ console.log(' this.form.detailList[opt]', reg, this.form.detailList[opt])
},
getSelectedObject (id) {
if (!id) {
@@ -251,7 +162,7 @@
return findSelected(this.regionList) // 寮�濮嬫悳绱㈠苟杩斿洖缁撴灉
},
addDo () {
- this.form.detailList.push({ random: Math.random(), deviceId: null, deviceName: null, regionId: null, regionName: null, regionCode: null, warningId: null })
+ this.form.detailList.push({ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null })
},
delDo (index) {
if (this.form.detailList.length > 1 && this.form.detailList.length > index) {
@@ -293,7 +204,7 @@
deviceNoticeContent: '',
memberNotice: 1,
status: 0,
- detailList: [{ random: Math.random(), deviceId: null, deviceName: null, regionId: null, regionName: null, regionCode: null, warningId: null }]
+ detailList: [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
}
// 鏂板缓
if (target == null) {
@@ -305,30 +216,11 @@
}
// 缂栬緫
this.$nextTick(() => {
- this.form.detailList = target.detailList
for (const key in this.form) {
this.form[key] = target[key]
- this.form.memberNotice = this.form.memberNotice || 0
- this.form.deviceNotice = this.form.deviceNotice || 0
- this.form.status = this.form.status || 0
}
- console.log('===========================', this.form.detailList, target.detailList)
if (!this.form.detailList || !this.form.detailList.length) {
- this.form.detailList = [{ random: Math.random(), deviceId: null, deviceName: null, regionId: null, regionName: null, regionCode: null, warningId: null }]
- } else {
- this.form.detailList.forEach((item, index) => {
- if (item.regionId != null) {
- var region = this.getSelectedObject(item.regionId)
- if (region) {
- item.carmeraList = region.carmeraList || []
- if(item.deviceType === 1){
- item.carmeraList = region.deviceList || []
- }else if(item.deviceType === 2){
- item.carmeraList = region.sensorList || []
- }
- }
- }
- })
+ this.form.detailList = [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
}
if (this.form.memberIds) {
this.memberSelect = this.form.memberIds.split(',')
diff --git a/admin/src/views/business/warningRule.vue b/admin/src/views/business/warningRule.vue
index 7773aaf..db5eb91 100644
--- a/admin/src/views/business/warningRule.vue
+++ b/admin/src/views/business/warningRule.vue
@@ -37,13 +37,6 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="title" label="鎶ヨ瑙勫垯" min-width="200px" show-tooltip-when-overflow></el-table-column>
- <el-table-column prop="detailList" label="瑙勫垯鏄庣粏" min-width="360px" show-tooltip-when-overflow>
- <template slot-scope="{row}">
- <div v-if="row.detailList && row.detailList.length">
- <div style="display: block;" v-for="item in row.detailList"> {{item.warningName||''}} {{item.regionName||''}} {{item.deviceName||''}};</div>
- </div>
- </template>
- </el-table-column>
<el-table-column prop="memberNames" label="鎶ヨ鎺ユ敹浜�" min-width="200px" show-tooltip-when-overflow>
<template slot-scope="{row}">
<span v-if="row.memberNotice === 1">{{row.memberNames}}</span>
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 d03bda1..024312b 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
@@ -323,9 +323,9 @@
param.setWithCameras(0);
List<PageRegionInfoResponse> result = new ArrayList<>();
try {
-// result = boardService.getRegionTree( param);
+ result = boardService.getRegionTree( param);
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----start-----
- for (int i = 0; i < 5; i++) {
+ /* for (int i = 0; i < 5; i++) {
PageRegionInfoResponse t = new PageRegionInfoResponse();
t.setName("鎬诲尯鍩焈"+i);
t.setIndexCode(i+"_code");
@@ -338,7 +338,7 @@
t.getChildList().add(t1);
}
result.add(t);
- }
+ }*/
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----end-----
}catch (Exception e){
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 2df12af..9dc10e9 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: pro
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
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 8f017ef..72f6c8f 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
@@ -123,6 +123,7 @@
@Override
public List<Device> findList(Device device) {
+ device.setIsdeleted(Constants.ZERO);
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
return deviceMapper.selectList(wrapper);
}
@@ -277,22 +278,14 @@
}
String input = "";
+ model.setSendInfo(param.getSendInfo());
+ return sendBroadcaseBobaoHttpBiz(model);
+ }
+ public static String sendBroadcaseBobaoHttpBiz(Device model){
//閲嶆柊涓嬪彂璁″垝
JSONObject jsonObject = new JSONObject();
-
- /* {
- "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("TTSContent",model.getSendInfo());
jsonObject.put("audioLevel",6);
jsonObject.put("audioVolume",100);
jsonObject.put("TTSLanguageType","chinese");
--
Gitblit v1.9.3