租户隔离恢复，修改设施编号生成规则

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

@@ -24,10 +24,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -52,10 +49,19 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
 
     @Override
     public boolean add(BaseGgpFacility baseGgpFacility) {
+        Calendar Cld = Calendar.getInstance();
+        int YY = Cld.get(Calendar.YEAR) ;
+        int MM = Cld.get(Calendar.MONTH)+1;
+        int DD = Cld.get(Calendar.DATE);
+        int HH = Cld.get(Calendar.HOUR_OF_DAY);
+        int mm = Cld.get(Calendar.MINUTE);
+        int SS = Cld.get(Calendar.SECOND);
+        int MI = Cld.get(Calendar.MILLISECOND);
         List<BaseFacilityType> typeList = baseFacilityTypeMapper.typeList(baseGgpFacility.getFacilityType());
-        baseGgpFacility.setFacilityNum(typeList.get(0).getTypeAbbrevia()+System.currentTimeMillis());
+        baseGgpFacility.setFacilityNum(typeList.get(0).getTypeAbbrevia()+'-'+YY+MM+DD+HH+mm+SS+MI);
         baseGgpFacility.setCreator(SecurityUtils.getUsername());
         baseGgpFacility.setCreateTime(LocalDateTime.now());
+        baseGgpFacility.setTenantId(SecurityUtils.getTenantId());
         return this.save(baseGgpFacility);
     }
 
@@ -76,7 +82,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 .eq(StringUtils.isNotBlank(piRequest.getFacilityNum()),BaseGgpFacility::getFacilityNum,piRequest.getFacilityNum())
                 .eq(null != piRequest.getFacilityType(),BaseGgpFacility::getFacilityType,piRequest.getFacilityType())
                 .eq(null != piRequest.getId(),BaseGgpFacility::getId,piRequest.getId())
-//                .eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId())
+                .eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId())
                 .orderByDesc(BaseGgpFacility::getId);
         page = this.page(page,lambdaQuery);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
@@ -92,7 +98,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LambdaQueryWrapper<BaseGgpFacility> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper
-//                .eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId())
+                .eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId())
                 .like(StringUtils.isNotBlank(exRequest.getFacilityName()), BaseGgpFacility::getFacilityName, exRequest.getFacilityName())
                 .eq(StringUtils.isNotBlank(exRequest.getFacilityNum()), BaseGgpFacility::getFacilityNum, exRequest.getFacilityNum())
                 .eq(exRequest.getFacilityType() != 0,BaseGgpFacility::getFacilityType,exRequest.getFacilityType())