站点管理-列表查询

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SiteMapper.java

@@ -24,7 +24,8 @@ public interface SiteMapper extends CrudMapper<Site> {
                     @Param("siteStatus") Integer siteStatus);
 
     List<Site> list(@Param("userId") Integer userId,
-                    @Param("name") String name);
+                    @Param("name") String name,
+                    @Param("tenantId") Integer tenantId);
 
     List<SiteTwo> list2(@Param("userId") Integer userId,
                         @Param("name") String name);

fiveep-persistence/src/main/resources/mapper/mysql/SiteMapper.xml

@@ -19,6 +19,7 @@
         <result column="creator" property="creator"/>
         <result column="enable" property="enable"/>
         <result column="grouping_id" property="groupingId"/>
+        <result column="tenant_id" property="tenantId"/>
     </resultMap>
     <select id="selectCount" resultType="java.lang.Integer">
         select count(*)
@@ -50,6 +51,7 @@
         on us.site_id = s.id
         <where>
             s.enable=1
+            and tenant_id=#{tenantId}
             <if test="userId != null and userId != 0">
                 and us.user_id = #{userId}
             </if>

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -12,6 +12,7 @@ import com.bizmatics.model.vo.DeviceOneVo;
 import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.SiteMapper;
+import com.bizmatics.persistence.mapper.system.SysUserMapper;
 import com.bizmatics.service.*;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.util.SecurityUtils;
@@ -53,6 +54,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     private SiteDynamicPropertiesService siteDynamicPropertiesService;
     @Autowired
     private RouteService routeService;
+    @Autowired
+    private SysUserMapper userMapper;
 
     @Override
     public DeviceCountVO selectCount() {
@@ -69,7 +72,11 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     @Override
     public List<Site> list(String name) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
-        return baseMapper.list(userId, name);
+        List<SysUser> tenantDaya = userMapper.getTenantId(SecurityUtils.getLoginUser().getUser().getUserId());
+        if (tenantDaya.size()<0) {
+            throw new BusinessException("无此租户，请联系管理员");
+        }
+        return baseMapper.list(userId, name,tenantDaya.get(0).getTenantId());
     }
 
     @Override
@@ -94,7 +101,11 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     public List<SiteVO> siteAndStatusList(String name) {
         List<SiteVO> list = new ArrayList<>();
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
-        List<Site> sites = baseMapper.list(userId, name);
+        List<SysUser> tenantDaya = userMapper.getTenantId(SecurityUtils.getLoginUser().getUser().getUserId());
+        if (tenantDaya.size()<0) {
+            throw new BusinessException("无此租户，请联系管理员");
+        }
+        List<Site> sites = baseMapper.list(userId, name,tenantDaya.get(0).getTenantId());
         List<Device> deviceList = deviceMapper.list(userId, null, null, null, null, null);
         List<AlarmPower> alarmPowers = alarmPowerMapper.list(userId, null, null, null, null, null, 1);
         sites.forEach(site -> list.add(enhanceSite(deviceList, site, alarmPowers)));