停电计划、设备管理、台区管理租户数据隔离

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

@@ -20,5 +20,6 @@ public interface DeviceAttributeMapper extends CrudMapper<DeviceAttribute> {
                                                 @Param("userName") String userName,
                                                 @Param("phone") String phone,
                                                 @Param("startCurrent") Integer startCurrent,
-                                                @Param("size") Integer size);
+                                                @Param("size") Integer size,
+                                                @Param("userId") Long userId);
 }

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

@@ -21,7 +21,8 @@ public interface PlatformAreaMapper extends CrudMapper<PlatformArea> {
 
     List<PlatformAreaVo> siteCount(@Param("platformAreaName") String platformAreaName,
                                    @Param("startCurrent") Integer startCurrent,
-                                   @Param("size") Integer size);
+                                   @Param("size") Integer size,
+                                   @Param("userId") Long userId);
 
     List<PlatformAreaVo> deviceCount(@Param("platformAreaName") String platformAreaName);
 

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

@@ -23,5 +23,6 @@ public interface WcBlackoutPlanMapper extends CrudMapper<WcBlackoutPlan> {
                                              @Param("type") Integer type,
                                              @Param("id") Integer id,
                                              @Param("size") Integer size,
-                                             @Param("startCurrent") Integer startCurrent);
+                                             @Param("startCurrent") Integer startCurrent,
+                                             @Param("userId") Long  userId);
 }

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

@@ -44,8 +44,10 @@
         GROUP BY
         site_id
         ) AS b ON a.id = b.site_id
+        join user_site as i on  b.site_id=i.site_id
         <where>
             a.enable =1
+            and i.user_id=#{userId}
             <if test="siteName != null and siteName !=''">
                 and a.site_name LIKE CONCAT(CONCAT('%', #{siteName}), '%')
             </if>

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

@@ -15,6 +15,8 @@
         s.*,IFNULL(siteCount,0) as siteCount
         FROM
         platform_area AS s
+        join site as j on  j.station_area_id = s.id
+        join user_site as i on j.id=i.site_id
         LEFT JOIN (
         SELECT
         a.id as idone,COUNT(b.id) AS siteCount
@@ -28,6 +30,7 @@
         ) AS o ON s.id = o.idone
         <where>
             s.enable = 1
+            and i.user_id=#{userId}
             <if test="platformAreaName != null and platformAreaName != ''">
                 and s.platform_area_name LIKE CONCAT(CONCAT('%', #{platformAreaName}), '%')
             </if>

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

@@ -22,8 +22,10 @@
         FROM
         wc_blackout_plan AS a
         JOIN site AS b ON a.site_id = b.id
+        join user_site as i on b.id=i.site_id
         <where>
             a.enable =1
+            and i.user_id=#{userId}
             <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
                 and a.create_time between #{startTime} and #{endTime}
             </if>

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

@@ -106,13 +106,14 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
 
     @Override
     public CommonPage<MonitorDeviceListVO> monitorDeviceList(String siteName ,String userName,String phone,Integer size,Integer current) {
-        List<MonitorDeviceListVO> monitorDeviceListOne = baseMapper.monitorDeviceList(siteName,userName,phone,null,0);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<MonitorDeviceListVO> monitorDeviceListOne = baseMapper.monitorDeviceList(siteName,userName,phone,null,0,user.getUserId());
         Integer total = 0;
         if (monitorDeviceListOne.size()>0){
             total = monitorDeviceListOne.size();
         }
         Integer startCurrent = (current - 1) * size;
-        List<MonitorDeviceListVO> monitorDeviceList = baseMapper.monitorDeviceList(siteName,userName,phone,startCurrent,size);
+        List<MonitorDeviceListVO> monitorDeviceList = baseMapper.monitorDeviceList(siteName,userName,phone,startCurrent,size,user.getUserId());
         return new CommonPage<>(monitorDeviceList, total, size,current);
     }
 

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

@@ -9,9 +9,11 @@ import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.PlatformArea;
 import com.bizmatics.model.Site;
+import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.*;
 import com.bizmatics.persistence.mapper.PlatformAreaMapper;
 import com.bizmatics.service.PlatformAreaService;
+import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -98,9 +100,10 @@ public class PlatformAreaServiceImpl extends AbstractCrudService<PlatformAreaMap
 
     @Override
     public CommonPage<PlatformAreaVo> platformAreaListOne(String platformAreaName,Integer current,Integer size){
-        List<PlatformAreaVo> platformAreaVoSiteOne = baseMapper.siteCount(platformAreaName,null,0);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<PlatformAreaVo> platformAreaVoSiteOne = baseMapper.siteCount(platformAreaName,null,0,user.getUserId());
         int startCurrent = (current - 1) * size;
-        List<PlatformAreaVo> platformAreaVoSite = baseMapper.siteCount(platformAreaName,startCurrent,size);
+        List<PlatformAreaVo> platformAreaVoSite = baseMapper.siteCount(platformAreaName,startCurrent,size,user.getUserId());
         List<PlatformAreaVo> platformAreaVoDevice =baseMapper.deviceCount(platformAreaName);
         List<PlatformAreaVo> platformAreaList = new ArrayList<>();
         for (int i = 0; i < platformAreaVoSite.size(); i++) {

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

@@ -75,7 +75,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         String uuid = UUID.randomUUID().toString();
         uuid = uuid.replace("-", "");
         sysTenant.setTenantCode(uuid);
-        sysTenant.setStatus("0");
+//        sysTenant.setStatus("0");
         sysTenant.setCreateBy(user.getUserName());
         sysTenant.setCreateTime(LocalDateTime.now());
         this.save(sysTenant);

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

@@ -62,14 +62,15 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
 
     @Override
     public CommonPage<WcBlackoutPlanVo> plannedOutageList(PlannedOutageVo plannedOutageVo) {
-        List<WcBlackoutPlanVo> wcBlackoutPlanVoListOne = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(), 0, null);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<WcBlackoutPlanVo> wcBlackoutPlanVoListOne = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(), 0, null,user.getUserId());
         int total = 0;
         if (wcBlackoutPlanVoListOne.size() > 0) {
             total = wcBlackoutPlanVoListOne.size();
         }
         int startCurrent = (plannedOutageVo.getCurrent() - 1) * plannedOutageVo.getSize();
 
-        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(), plannedOutageVo.getSize(), startCurrent);
+        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(), plannedOutageVo.getSize(), startCurrent,user.getUserId());
         List<WcBlackoutPlanVo> plannedOutageListOne = new ArrayList<>();
         if (plannedOutageList.size() > 0) {
             for (int i = 0; i < plannedOutageList.size(); i++) {
@@ -137,10 +138,11 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
 
     @Override
     public List<WcBlackoutPlanOneVo> wcBlackoutPlanOneVolist(String startTime, String endTime, Integer type, Integer startCurrent) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
         List<WcBlackoutPlanOneVo> plannedOutageListOne = new ArrayList<>();
         DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(startTime, endTime, type, 0, 30, startCurrent);
+        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(startTime, endTime, type, 0, 30, startCurrent,user.getUserId());
         if (plannedOutageList.size() > 0) {
             for (int j = 0; j < plannedOutageList.size(); j++) {
                 WcBlackoutPlanOneVo wcBlackoutPlanVo = new WcBlackoutPlanOneVo();