From 025c127707bd6d95366c0930be6fb8c66df62aac Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Thu, 28 Apr 2022 15:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E7=B1=BBId=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wumei-iot/src/main/resources/mapper/iot/NewsMapper.xml   | 1 +
 vue/src/views/iot/device/running-status.vue                  | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/NewsMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/NewsMapper.xml
index df37b90d..44a94112 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/NewsMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/NewsMapper.xml
@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isTop != null "> and is_top = #{isTop}</if>
             <if test="isBanner != null "> and is_banner = #{isBanner}</if>
             <if test="categoryName != null  and categoryName != ''"> and category_name like concat('%', #{categoryName}, '%')</if>
+            <if test="categoryId != null"> and category_Id  = #{categoryId})</if>
             <if test="status != null "> and status = #{status}</if>
         </where>
         order by create_time desc
diff --git a/vue/src/views/iot/device/running-status.vue b/vue/src/views/iot/device/running-status.vue
index 1f1d8b66..cefa9736 100644
--- a/vue/src/views/iot/device/running-status.vue
+++ b/vue/src/views/iot/device/running-status.vue
@@ -92,7 +92,7 @@
             <!---设备状态(影子模式，value值不会更新)-->
             <el-descriptions :column="1" border size="mini" v-if="deviceInfo.isShadow==1 && deviceInfo.status!=3">
                 <template slot="title">
-                    <span style="font-size:14px;color:#606266;">设备处于离线状态</span>
+                    <span style="font-size:14px;color:#606266;">设备离线时状态</span>
                 </template>
                 <!-- bool类型-->
                 <el-descriptions-item v-for="(item,index) in deviceInfo.boolList" :key="index">
@@ -180,7 +180,6 @@ import mqttClient from './mqtt-client.vue'
 
 export default {
     name: "running-status",
-    dicts: ['iot_yes_no'],
     components: {
         mqttClient
     },
@@ -242,7 +241,7 @@ export default {
     methods: {
         /** 发布物模型 类型(1=属性，2=功能) */
         publishThingsModel(device, model) {
-            // 获取缓存的Json物模型
+            // TODO 创建的时候过去一次即可。 获取缓存的Json物模型
             cacheJsonThingsModel(device.productId).then(response => {
                 let thingsModel = JSON.parse(response.data);
                 let type = 0;