报表

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/DeviceAttributeMapper.xml

@@ -42,7 +42,7 @@
         <include refid="deviceAttributeColumns"/>
         FROM sms_device_attribute a
 
-        WHERE a.id = #{id}
+        WHERE a.id = #{id} AND status=1
     </select>
 
     <!--  根据获取实体List   -->

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/MonitorInfoController.java

@@ -207,7 +207,7 @@ public class MonitorInfoController {
                         }
                     }
                 } else {
-                    DeviceAttributeEntity deviceAttributeEntity = deviceAttributeService.getById(item.getAttributeId());
+                    DeviceAttributeEntity deviceAttributeEntity = deviceAttributeService.findDeviceAttributeById(item.getAttributeId());
                     String unit = "";
                     if (deviceAttributeEntity != null && deviceAttributeEntity.getUnit() != null) {
                         unit = deviceAttributeEntity.getUnit();

zoniot-water/zoniot-water-web/src/main/resources/bootstrap-sit.yml

@@ -5,6 +5,7 @@ spring:
     active: sit
   cloud:
     nacos:
+
       config:
         namespace: 33c2968d-5b0c-4da2-bfd7-af8ef5a8f669
         server-addr: 10.0.0.63:8848