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" and is_top = #{isTop} and is_banner = #{isBanner} and category_name like concat('%', #{categoryName}, '%') + and category_Id = #{categoryId}) and status = #{status} 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 @@ @@ -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;