添加视频设备权限及运行监控详情sql调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/config/PmsDataPermissionConfiguration.java

@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyRep
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotsapstock.IotSapStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintenance.IotMaintenancePlanDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.device.YfIotDeviceDO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
@@ -55,6 +56,7 @@ public class PmsDataPermissionConfiguration {
             rule.addDeptColumn(IotSapStockDO.class, "dept_id");
             rule.addDeptColumn(IotRhDailyReportDO.class, "dept_id");
             rule.addDeptColumn(IotRdDailyReportDO.class, "dept_id");
+            rule.addDeptColumn(YfIotDeviceDO.class,"dept_id");
             // user
 //            rule.addUserColumn(SupplierDO.class);
             rule.addUserColumn(AdminUserDO.class, "id");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/TDDeviceMapper.java

@@ -124,7 +124,7 @@ public interface TDDeviceMapper extends BaseMapperX<TDDeviceDO> {
     List<DeviceTdVO> batchGetYesInfo(@Param("queries") List<DeviceTdVO> queries);
 
 
-    @Select("SELECT   _WSTART AS ts, AVG(CAST(log_value AS FLOAT)) as log_value,identity   FROM iot_log.device_${deviceName} " +
+    @Select("SELECT   _WSTART AS ts, AVG(CAST(log_value AS FLOAT)) as log_value   FROM iot_log.device_${deviceName} " +
             "WHERE ts between #{start} and #{end} and identity = #{identifier}  INTERVAL(1m) " )
     @DS("tdengine")
     @TenantIgnore