Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

saas-module/src/main/java/com/makeit/controller/saas/PlatTenantController.java → saas-module/src/main/java/com/makeit/controller/saas/SaasPlatTenantController.java

@@ -37,7 +37,7 @@ import java.util.List;
 @Api(tags = "租户管理-租户")
 @RestController
 @RequestMapping("/saas/tenant")
-public class PlatTenantController {
+public class SaasPlatTenantController {
 
     @Autowired
     private PlatTenantService platTenantService;

server-common/src/main/java/com/makeit/module/admin/vo/plat/PlatTenantVO.java

@@ -50,4 +50,10 @@ public class PlatTenantVO extends BaseIdDTO implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateDate;
 
+    /**
+     * 告警渠道 1-短信 2-邮件 3-语音短信 4-云龄工单 5-晶奇工单
+     */
+    @ApiModelProperty(value = "告警渠道 1-短信 2-邮件 3-语音短信 4-云龄工单 5-晶奇工单")
+    private String alertChannel;
+
 }

server-service/src/main/java/com/makeit/service/platform/auth/PlatUserService.java

@@ -116,11 +116,11 @@ public interface PlatUserService extends IService<PlatUser> {
     List<PlatOrg> getDeptList();
 
     /**
-     * 更新用户的tenantId
+     * 更新绑定的用户A的tenantId  重置原本绑定的用户B， 和重置绑定用户B的租户
      * @param tenantId
      * @param platUserId
      */
-    void updatePlatUserTenantId(String tenantId,String platUserId);
+    void updatePlatUserTenantId(String tenantId,String platUserId,String oriUserId);
 
     void delBatch(List<String> idList);
 

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -315,16 +315,13 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
             dto.setPath(parent.getPath() + "," + parent.getId());
         }
 
-        if(!StringUtils.equals(dto.getType(),platOrg.getType())){
+        if(StringUtils.isNotBlank(dto.getType()) && !StringUtils.equals(dto.getType(),platOrg.getType())){
             LambdaUpdateWrapper<PlatSpace> platSpaceLambdaUpdateWrapper = Wrappers.lambdaUpdate(PlatSpace.class)
                     .set(PlatSpace::getAttribute, dto.getType())
                     .eq(PlatSpace::getOrgId, dto.getId())
                     ;
             platSpaceService.update(platSpaceLambdaUpdateWrapper);
         }
-
-
-
         updateById(dto);
     }
 

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -186,10 +186,11 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                 list(listTenantLambdaQueryWrapper(dto, qw -> qw
                         .eq(PlatUser::getIsTenant, IsTenantAccountEnum.YES.getValue())
                         .and(StringUtils.equals(dto.getLinkTenant(), CommonEnum.NO.getValue())
-                                        && StringUtils.isNotBlank(dto.getTenantId()),
-                                sq -> sq.isNull(PlatUser::getTenantId)
-                                        .or()
-                                        .eq(PlatUser::getTenantId, dto.getTenantId())
+                                        || StringUtils.isNotBlank(dto.getTenantId()),
+                                sq -> {
+                                    sq.isNull(PlatUser::getTenantId);
+                                    sq.or().eq(PlatUser::getTenantId, dto.getTenantId());
+                                }
                         )
                 )),
                 PlatUserDTOVO.class);
@@ -1060,7 +1061,21 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
      * @param platUserId
      */
     @Transactional
-    public void updatePlatUserTenantId(String tenantId, String platUserId) {
+    public void updatePlatUserTenantId(String tenantId, String platUserId,String oriUserId) {
+        if (!StringUtils.equals(platUserId, oriUserId)) {
+            LambdaUpdateWrapper<PlatUser> userLambdaUpdateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
+                    .eq(PlatUser::getTenantId, tenantId)
+                    .set(PlatUser::getOrgId, null)
+                    .set(PlatUser::getOrgPath, null)
+                    .set(PlatUser::getTenantId, null);
+            this.update(userLambdaUpdateWrapper);
+
+            LambdaUpdateWrapper<PlatTenant> tenantLambdaUpdateWrapper = Wrappers.lambdaUpdate(PlatTenant.class)
+                    .eq(PlatTenant::getPlatUserId, oriUserId)
+                    .set(PlatTenant::getPlatUserId, null);
+            platTenantService.update(tenantLambdaUpdateWrapper);
+        }
+
         LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
                 .set(PlatUser::getTenantId, tenantId)
                 .set(PlatUser::getOrgId, tenantId)

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java

@@ -117,7 +117,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
         //上级空间
         PlatSpace parentSpace = this.getById(dto.getParentId());
 	    if (parentSpace!=null && parentSpace.getParentPath()!=null && parentSpace.getParentPath().contains(dto.getId())) {
-            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_NOT_DEL);
+            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_NOT_AUTH_PARENT);
         }
 
         this.updateById(space);

server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java

@@ -269,7 +269,7 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
         sysConfigService.copyForTenant(dto);
 
         //更新用户的tenantId
-        platUserService.updatePlatUserTenantId(tntTenant.getId(), dto.getPlatUserId());
+        platUserService.updatePlatUserTenantId(tntTenant.getId(), dto.getPlatUserId(),null);
 
         //组织表增加一条数据
         PlatOrg platOrg = convertToPlatOrg(tntTenant);
@@ -296,10 +296,7 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
         updateById(tntTenant);
 
         //更新用户的tenantId
-        if (!StringUtils.equals(dto.getPlatUserId(), platTenant.getPlatUserId())) {
-            platUserService.updatePlatUserTenantId(null, dto.getPlatUserId());
-        }
-        platUserService.updatePlatUserTenantId(tntTenant.getId(), dto.getPlatUserId());
+        platUserService.updatePlatUserTenantId(tntTenant.getId(), dto.getPlatUserId(),platTenant.getPlatUserId());
 
         PlatOrg platOrg = convertToPlatOrg(tntTenant);
         //更新组织表