Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseAlarmMapper.java

@@ -29,5 +29,6 @@ public interface BaseAlarmMapper extends CrudMapper<BaseAlarm> {
     List<BaseAlarm> getDeviceAlarmList(@Param("devList") List<String> devList);
 
     List<Map<String,Object>> getAlarmStatisticDay(@Param("startTime") String startTime,
-                                                  @Param("endTime") String endTime);
+                                                  @Param("endTime") String endTime,
+                                                  @Param("tenantId") Integer tenantId);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -758,7 +758,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     }
     @Override
     public List<Map<String,Object>> alarmStatisticDay(String startTime,String endTime) {
-        List<Map<String,Object>> list = baseMapper.getAlarmStatisticDay(startTime,endTime);
+        List<Map<String,Object>> list = baseMapper.getAlarmStatisticDay(startTime,endTime,SecurityUtils.getTenantId());
         return list;
     }
 }

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAlarmMapper.xml

@@ -116,7 +116,7 @@
                 DATE DESC
             ) _tmpAllTable
             WHERE
-               `date` BETWEEN #{startTime} AND #{endTime}
+               `date` BETWEEN #{startTime} AND #{endTime} AND tenant_id = #{tenantId}
         GROUP BY
             `date` DESC
     </select>