Merge branch 'master' of http://47.92.245.94:8000/r/RR_IOTWater_JAVA

admin

2023-11-01 5deef39ff5a315f18edb928b68dd2d1b1cd8b86c

Merge branch 'master' of http://47.92.245.94:8000/r/RR_IOTWater_JAVA

 wumei-smart-master/vue/src/views/Inventory/InventoryList.vue

@@ -9,10 +9,10 @@
                </el-table-column>
                <el-table-column prop="tenantName" label="联营商名称">
                </el-table-column>
                <el-table-column prop="activeTime" label="分派时间" width="120">
                <el-table-column prop="assignTime" label="分派时间" width="120">
                    <template slot-scope="scope">
                        <div>
                            {{ scope.row.activeTime ? scope.row.activeTime : '--' }}
                            {{ scope.row.assignTime ? scope.row.assignTime : '--' }}
                        </div>
                    </template>
                </el-table-column>

 wumei-smart-master/vue/src/views/equipmentManagement/equipment.vue

@@ -336,6 +336,7 @@
             * @model 物模型
             * */
            mqttPublish(type, device, model) {
                console.log(type, device, model);
                let topic = "";
                let message = ""
                if (type == 1) {
@@ -365,14 +366,20 @@
                    // 实时监测
                    topic = "/" + device.productId + "/" + device.serialNumber + "/monitor/get";
                    message = '{"count":' + model.value + ',"interval":' + this.monitorInterval + '}'
                    console.log(topic,message);
                } else {
                    return;
                }
                if (topic != "") {
                    // 发布
                    this.$mqttTool.publish(topic, message, model.name).then(res => {
                        // console.log(this.$modal);
                        this.$modal.notifySuccess(res);
                        this.chartLoading = false;

                        // this.connectMqtt()
                    }).catch(res => {
                        
                        this.$modal.notifyError(res);
                    });
                }
@@ -497,6 +504,7 @@
            },
            /* 订阅消息 */
            mqttSubscribe(list) {
                console.log(list);
                // 订阅当前页面设备状态和实时监测
                let topics = [];
                for (let i = 0; i < list.length; i++) {
@@ -545,7 +553,7 @@
            /** 查看监测数据 */
            handleMonitor(item) {
                this.open = true;
                this.monitorLoading = true;
                // this.monitorLoading = true;
                this.monitorDevice = item;
                // 获取物模型
                this.getCacheThingsModdel(item.productId);
@@ -724,7 +732,9 @@
            getCacheThingsModdel(productId) {
                // 获取缓存的Json物模型
                cacheJsonThingsModel(productId).then(response => {
                    
                    let thingsModel = JSON.parse(response.data);
                  
                    // 筛选监测数据
                    this.monitorThings = thingsModel.properties.filter(item => item.isMonitor == 1);
                    // 监测数据集合初始化
@@ -737,6 +747,7 @@
                        });
                        // this.dataList[i].data.push(["2022-03-14 23:32:09", "30"]);
                    }
                    console.log(thingsModel,this.monitorThings,this.dataList,);
                    // 绘制监测图表
                    this.$nextTick(function () {
                        this.getMonitorChart();

 wumei-smart-master/vue/src/views/iot/product/product-alert.vue

@@ -21,7 +21,7 @@
                    <el-tag type="danger" v-if="scope.row.status == 2">暂停</el-tag>
                </template>
            </el-table-column>
            <el-table-column label="告警级别" align="center" prop="alertLevel">
            <el-table-column label="告警级别" align="center" prop="alertLevel" width="120">
                <template slot-scope="scope">
                    <dict-tag :options="dict.type.iot_alert_level" :value="scope.row.alertLevel" />
                </template>
@@ -156,8 +156,8 @@
                                    placeholder="选择执行时间" @change="timeChange"
                                    :disabled="item.isAdvance == 1"></el-time-picker>
                            </el-col>
                            <el-col :span="2" :offset="item.source == 1 ? 17 : 1" v-if="index != 0"><a style="color:#F56C6C"
                                    @click="removeTriggerItem(index)">删除</a></el-col>
                            <el-tag style="float: right;" type="success" :span="2"  @click="removeTriggerItem(index)" :offset="item.source == 1 ? 17 : 1" v-if="index != 0"><i style="color:#F56C6C" class="el-icon-delete"></i><a style="color:#F56C6C"
                                   >删除</a></el-tag>
                        </el-row>

                        <!--定时-->
@@ -213,8 +213,8 @@
                                    </el-option>
                                </el-select>
                            </el-col>
                            <el-col :span="4" :offset="1" v-if="item.modelType != 4 && item.modelType != 5">
                                <el-select v-model="item.id" placeholder="请选择" size="small" @change="changevalue">
                            <el-col :span="5" :offset="1" v-if="item.modelType != 4 && item.modelType != 5">
                                <el-select v-model="item.id" placeholder="请选择" size="small" @change="changevalue(index,item.id)">
                                    <el-option v-for="subItem in item.modelType1Data" :key="subItem.id"
                                        :label="subItem.name" :value="subItem.id">
                                    </el-option>
@@ -268,22 +268,22 @@
                <el-form-item label="执行动作">
                    <el-row v-for="(item, index) in form.actions" :key="index" style="margin-bottom:10px;">
                        <el-col :span="4">
                            <el-select v-model="item.type" placeholder="请选择" @change="changeModelType2(index, item.type)">
                                <el-option v-for="subItem in modelTypes" :key="subItem.value" :label="subItem.label"
                            <el-select v-model="item.type" placeholder="请选择" @change="changeModelType2(index, item.type)" size="small">
                                <el-option v-for="subItem in modelTypes2" :key="subItem.value" :label="subItem.label"
                                    :value="subItem.value">
                                </el-option>
                            </el-select>
                        </el-col>
                        <el-col :span="4" :offset="1" v-if="item.modelType != 4 && item.modelType != 5">
                            <el-select v-model="item.id" placeholder="请选择" @change="changevalue2">
                        <el-col :span="5" :offset="1" v-if="item.modelType != 4 && item.modelType != 5">
                            <el-select v-model="item.id" placeholder="请选择" @change="changevalue2(index,item.id)">
                                <el-option v-for="subItem in item.modelType2Data" :key="subItem.id" :label="subItem.name"
                                    :value="subItem.id">
                                </el-option>
                            </el-select>
                        </el-col>
                        <el-col :span="11" :offset="1" v-if="item.modelType != 4 && item.modelType != 5">
                        <el-col :span="10" :offset="1" v-if="item.modelType != 4 && item.modelType != 5">
                            <!-- <el-input v-model="item.value" placeholder="值" /> -->
                            <el-input placeholder="值" v-model="item.value"
                            <el-input placeholder="值" v-model="item.value" size="small"
                                v-if="(item.dataValue.type == 'integer' || item.dataValue.type == 'decimal') && !item.dataValue.enumList"
                                :max="item.dataValue.max" :min="item.dataValue.min" :step="item.dataValue.step">
                                <!-- <template>
@@ -308,8 +308,9 @@
                                    :inactive-value="0" />
                            </div>
                        </el-col>
                        <el-col :span="2" :offset="1" v-if="index != 0"><a style="color:#F56C6C"
                                @click="removeActionItem(index)">删除</a></el-col>
                        <!-- v-if="index != 0" -->
                        <el-tag type="success" style="margin-left: 10px;"  @click="removeActionItem(index)" :span="2" :offset="1" ><i class="el-icon-delete"></i> <a style="color:#F56C6C"
                               >删除</a></el-tag>
                    </el-row>
                    <div>+ <a style="color:#409EFF" @click="addActionItem()">添加执行动作</a></div>
                </el-form-item>
@@ -495,6 +496,13 @@
                value: 5,
                label: '设备下线'
            }],
            modelTypes2: [{
                value: 1,
                label: '属性'
            }, {
                value: 2,
                label: '功能'
            }],
            // 触发器条件
            triggerConditions: [{
                value: "all",
@@ -596,6 +604,9 @@
            } else if (e == 3) {
                this.form.triggers[index].modelType1Data = this.thingsModel.events
            }
            this.form.triggers[index].id = this.form.triggers[index].modelType1Data[0].id
            this.form.triggers[index].dataValue=this.form.triggers[index].modelType1Data[0].datatype

        },
        editTriggers(index, e) {
            this.selectIndex1 = index
@@ -633,8 +644,8 @@


        },
        changevalue(e) {

        changevalue(index,e) {
            this.selectIndex1=index
            this.form.triggers[this.selectIndex1].dataValue = {}
            for (let i = 0; i < this.form.triggers[this.selectIndex1].modelType1Data.length; i++) {
                if (e == this.form.triggers[this.selectIndex1].modelType1Data[i].id) {
@@ -642,23 +653,27 @@
                    this.form.triggers[this.selectIndex1].id = e
                    this.form.triggers[this.selectIndex1].dataValue = this.form.triggers[this.selectIndex1].modelType1Data[i].datatype
                    this.form.triggers[this.selectIndex1].name = this.form.triggers[this.selectIndex1].modelType1Data[i].name
                    this.form.triggers[this.selectIndex1].value = ''
                }
            }
        },
        changeModelType2(index, e) {
            this.selectIndex2 = index

            this.form.actions[index].id = ''
            // this.form.actions[index].id = ''
            this.form.actions[index].value = ''
            this.form.actions[index].type = e
            this.form.actions[index].dataValue = {}
            if (e == 1) {
                this.form.actions[index].modelType2Data = this.thingsModel.properties
                
            } else if (e == 2) {
                this.form.actions[index].modelType2Data = this.thingsModel.functions
            } else if (e == 3) {
                this.form.actions[index].modelType2Data = this.thingsModel.events
            }
            this.form.actions[index].id = this.form.actions[index].modelType2Data[0].id
            this.form.actions[index].dataValue=this.form.actions[index].modelType2Data[0].datatype


        },
        editactions(index, e) {
@@ -688,13 +703,15 @@
                }
            }
        },
        changevalue2(e) {
        changevalue2(index,e) {
            this.selectIndex2=index
            this.form.actions[this.selectIndex2].dataValue = {}
            for (let i = 0; i < this.form.actions[this.selectIndex2].modelType2Data.length; i++) {
                if (e == this.form.actions[this.selectIndex2].modelType2Data[i].id) {
                    this.form.actions[this.selectIndex1].id = e
                    this.form.actions[this.selectIndex2].id = e
                    this.form.actions[this.selectIndex2].dataValue = this.form.actions[this.selectIndex2].modelType2Data[i].datatype
                    this.form.actions[this.selectIndex1].name = this.form.actions[this.selectIndex2].modelType2Data[i].name
                    this.form.actions[this.selectIndex2].name = this.form.actions[this.selectIndex2].modelType2Data[i].name
                    this.form.actions[this.selectIndex2].value = ''
                }
            }
        },
@@ -814,13 +831,13 @@
                for (let i = 0; i < this.form.triggers.length; i++) {
                    this.editTriggers(i, this.form.triggers[i].type)
                    this.selectIndex1 = i
                    this.changevalue(this.form.triggers[i].id)
                    this.changevalue(i,this.form.triggers[i].id)
                }
                this.form.actions = JSON.parse(this.form.actions)
                for (let i = 0; i < this.form.actions.length; i++) {
                    this.editactions(i, this.form.actions[i].type)
                    this.selectIndex2 = i
                    this.changevalue2(this.form.actions[i].id)
                    this.changevalue2(i,this.form.actions[i].id)
                }
                this.open = true;
                this.title = "修改设备告警";
@@ -908,6 +925,7 @@
                productName: this.productInfo.productName,
                type: 1
            })
            this.changeModelType2(this.form.actions.length-1, 1)
        },
        /** 删除动作 */
        removeActionItem(index) {
@@ -962,7 +980,7 @@
                type: 1,
                operator: '='
            })

            this.changeModelType1(this.form.triggers.length-1, 1)
        },
        /** 删除触发器 */
        removeTriggerItem(index) {

 wumei-smart-master/vue/src/views/iot/product/product-things-model.vue

@@ -2,7 +2,8 @@
<div style="padding-left:20px;">
    <el-row :gutter="10" class="mb8">
        <el-col :span="1.5">
            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-if="productInfo.status==1">新增</el-button>
            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" >新增</el-button>
            <!-- v-if="productInfo.status==1" -->
        </el-col>
        <el-col :span="1.5">
            <el-button type="success" plain icon="el-icon-upload2" size="mini" @click="handleSelect" v-if="productInfo.status==1">导入通用物模型</el-button>