Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-cloud into fu-dev

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysConfigController.java

@@ -64,11 +64,12 @@ public class SysConfigController extends BaseController
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysConfig config)
     {
+        config.setCreateBy(SecurityUtils.getUsername());
+        config.setTenantId(SecurityUtils.getTenantId());
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
-        config.setCreateBy(SecurityUtils.getUsername());
         return toAjax(configService.insertConfig(config));
     }
 
@@ -79,6 +80,7 @@ public class SysConfigController extends BaseController
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysConfig config)
     {
+        config.setTenantId(SecurityUtils.getTenantId());
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改参数'" + config.getConfigName() + "'失败，参数键名已存在");

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysProfileController.java

@@ -50,7 +50,9 @@ public class SysProfileController extends BaseController {
                 .eq(SysUserPerson::getUserId, user.getUserId())
                 .select(SysUserPerson::getIsLoginNotify)
                 .one();
-        user.setIsLoginNotify(one.getIsLoginNotify());
+        if(one != null) {
+            user.setIsLoginNotify(one.getIsLoginNotify());
+        }
 
         Map<String, Object> map = new HashMap<>();
         map.put("user", user);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysConfig.java

@@ -43,6 +43,21 @@ public class SysConfig extends BaseEntity
         this.configId = configId;
     }
 
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    public Integer getTenantId()
+    {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId)
+    {
+        this.tenantId = tenantId;
+    }
+
     @NotBlank(message = "参数名称不能为空")
     @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
     public String getConfigName()

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysTenant.java

@@ -116,6 +116,11 @@ public class SysTenant implements Serializable {
      */
     private String systemName;
 
+    /**
+     * 涉及领域(1、消防 2、楼宇 3、人防 4、能耗)
+     */
+    private String field;
+
     /**
      * 原租户Id
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysConfigMapper.java

@@ -38,7 +38,7 @@ public interface SysConfigMapper extends CrudMapper<SysConfig>
      * @param configKey 参数键名
      * @return 参数配置信息
      */
-    public SysConfig checkConfigKeyUnique(@Param("configKey") String configKey);
+    public SysConfig checkConfigKeyUnique(@Param("configKey") String configKey, @Param("tenantId") Integer tenantId);
 
     /**
      * 新增参数配置

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysTenantMapper.java

@@ -50,8 +50,10 @@ public interface SysTenantMapper extends CrudMapper<SysTenant> {
     List<SysUserRole> selectSysUserRoleList(@Param("originalTenantId") Integer originalTenantId, @Param("UserId") long UserId);
     void cloneSysRoleMenu(@Param("originalRoleId") long originalRoleId,@Param("roleId") long roleId);
     void insertSysUserRole(@Param("UserId") long UserId,@Param("roleId") long roleId,@Param("tenantId") long tenantId);
+    void insertBaseSpace(@Param("tenantName") String tenantName,@Param("tenantId") long tenantId);
 
     void delSysTenant(@Param("tenantId") Integer tenantId);
+    void delBaseSpace(@Param("tenantId") Integer tenantId);
     void delSysDept(@Param("tenantId") Integer tenantId);
     void delSysUser(@Param("tenantId") Integer tenantId);
     void delSysUserTenant(@Param("tenantId") Integer tenantId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysConfigServiceImpl.java

@@ -7,6 +7,7 @@ import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.redis.core.RedisHelper;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysConfig;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysConfigMapper;
@@ -65,17 +66,20 @@ public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, S
     @Override
     public String selectConfigByKey(String configKey)
     {
-        String configValue = Convert.toStr(redisHelper.get(getCacheKey(configKey)));
+        Integer tenantId = SecurityUtils.getTenantId();
+        String configKey1 = configKey+tenantId;
+        String configValue = Convert.toStr(redisHelper.get(getCacheKey(configKey1)));
         if (StringUtils.isNotEmpty(configValue))
         {
             return configValue;
         }
         SysConfig config = new SysConfig();
         config.setConfigKey(configKey);
+        config.setTenantId(tenantId);
         SysConfig retConfig = configMapper.selectConfig(config);
         if (Objects.nonNull(retConfig))
         {
-            redisHelper.set(getCacheKey(configKey), retConfig.getConfigValue());
+            redisHelper.set(getCacheKey(configKey1), retConfig.getConfigValue());
             return retConfig.getConfigValue();
         }
         return StringUtils.EMPTY;
@@ -106,6 +110,7 @@ public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, S
     @Override
     public List<SysConfig> selectConfigList(SysConfig config)
     {
+        config.setTenantId(SecurityUtils.getTenantId());
         return configMapper.selectConfigList(config);
     }
 
@@ -121,7 +126,7 @@ public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, S
         int row = configMapper.insertConfig(config);
         if (row > 0)
         {
-            redisHelper.set(getCacheKey(config.getConfigKey()), config.getConfigValue());
+            redisHelper.set(getCacheKey(config.getConfigKey()+SecurityUtils.getTenantId()), config.getConfigValue());
         }
         return row;
     }
@@ -138,7 +143,7 @@ public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, S
         int row = configMapper.updateConfig(config);
         if (row > 0)
         {
-            redisHelper.set(getCacheKey(config.getConfigKey()), config.getConfigValue());
+            redisHelper.set(getCacheKey(config.getConfigKey()+SecurityUtils.getTenantId()), config.getConfigValue());
         }
         return row;
     }
@@ -160,7 +165,7 @@ public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, S
                 throw new BusinessException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
             configMapper.deleteConfigById(configId);
-            redisHelper.delete(getCacheKey(config.getConfigKey()));
+            redisHelper.delete(getCacheKey(config.getConfigKey()+SecurityUtils.getTenantId()));
         }
     }
 
@@ -170,10 +175,12 @@ public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, S
     @Override
     public void loadingConfigCache()
     {
-        List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
+        SysConfig config1 = new SysConfig();
+        config1.setTenantId(SecurityUtils.getTenantId());
+        List<SysConfig> configsList = configMapper.selectConfigList(config1);
         for (SysConfig config : configsList)
         {
-            redisHelper.set(getCacheKey(config.getConfigKey()), config.getConfigValue());
+            redisHelper.set(getCacheKey(config.getConfigKey()+SecurityUtils.getTenantId()), config.getConfigValue());
         }
     }
 
@@ -207,7 +214,7 @@ public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, S
     public String checkConfigKeyUnique(SysConfig config)
     {
         Long configId = Objects.isNull(config.getConfigId()) ? -1L : config.getConfigId();
-        SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
+        SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey(), config.getTenantId());
         if (Objects.nonNull(info) && info.getConfigId().longValue() != configId.longValue())
         {
             return UserConstants.NOT_UNIQUE;

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantServiceImpl.java

@@ -124,6 +124,9 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         sysDept.setCreateBy(SecurityUtils.getUsername());
         iSysDeptService.insertDept(sysDept);
 
+        //base_space
+        sysTenantMapper.insertBaseSpace(sysTenant.getTenantName(),tenantId);
+
         TenantPlatformVo tenantPlatformVo = new TenantPlatformVo();
         tenantPlatformVo.setPlatformIds(new Integer[]{Integer.parseInt(sysTenant.getSystemName())});
         tenantPlatformVo.setRequestId(0);
@@ -152,6 +155,9 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         sysDept.setCreateBy(SecurityUtils.getUsername());
         iSysDeptService.insertDept(sysDept);
 
+        //base_space
+        sysTenantMapper.insertBaseSpace(sysTenant.getTenantName(),tenantId);
+
         //在用户租户表中添加克隆账号id与租户id绑定关系
         SysUserTenant sysUserTenant = new SysUserTenant();
         sysUserTenant.setUserId(SecurityUtils.getUserId());
@@ -209,6 +215,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
     @Override
     public void delTenantData(Integer tenantId) {
         sysTenantMapper.delSysTenant(tenantId);
+        sysTenantMapper.delBaseSpace(tenantId);
         sysTenantMapper.delSysDept(tenantId);
         sysTenantMapper.delSysUser(tenantId);
         sysTenantMapper.delSysUserTenant(tenantId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -660,14 +660,18 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         if (!StringUtils.isBlank(username)) {
             if (!StringUtils.isBlank(method) && method.equals("switch")){
                 sysUser = userMapper.selectUserTenantData1(username, tenantId);
-                sysUser.setTenantId(tenantId);
+                if(sysUser != null){
+                    sysUser.setTenantId(tenantId);
+                }
             }else {
                 sysUser = userMapper.selectUserTenantData(username, tenantId);
             }
         } else if (!StringUtils.isBlank(phone)) {
             if (!StringUtils.isBlank(method) && method.equals("switch")){
                 sysUser = userMapper.selectUserTenantDataOne1(tenantId, phone);
-                sysUser.setTenantId(tenantId);
+                if(sysUser != null){
+                    sysUser.setTenantId(tenantId);
+                }
             }else {
                 sysUser = userMapper.selectUserTenantDataOne(tenantId, phone);
             }
@@ -675,7 +679,9 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         if (Objects.isNull(sysUser)) {
             if (!StringUtils.isBlank(method) && method.equals("switch")){
                 sysUser = userMapper.selectUserTenantDataOne1(tenantId, username);
-                sysUser.setTenantId(tenantId);
+                if(sysUser != null){
+                    sysUser.setTenantId(tenantId);
+                }
             }else {
                 sysUser = userMapper.selectUserTenantDataOne(tenantId, username);
             }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SysTenantTwoVo.java

@@ -115,6 +115,11 @@ public class SysTenantTwoVo implements Serializable {
      */
     private String systemName;
 
+    /**
+     * 涉及领域(1、消防 2、楼宇 3、人防 4、能耗)
+     */
+    private String field;
+
 
     /**
      * 系统名称

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -56,12 +56,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 			</if>
+            <if test="tenantId != null and tenantId != '' and tenantId != 0">
+                AND tenant_id = #{tenantId}
+            </if>
 		</where>
     </select>
     
     <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
-        where config_key = #{configKey} limit 1
+        where config_key = #{configKey}
+        <if test="tenantId != null and tenantId != '' and tenantId != 0">
+            AND tenant_id = #{tenantId}
+        </if>
+        limit 1
     </select>
     
     <insert id="insertConfig" parameterType="com.usky.system.domain.SysConfig">
@@ -72,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="configType != null and configType != '' ">config_type,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			<if test="remark != null and remark != ''">remark,</if>
+            <if test="tenantId != null and tenantId != '' and tenantId != 0">tenant_id,</if>
  			create_time
         )values(
 			<if test="configName != null and configName != ''">#{configName},</if>
@@ -80,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="configType != null and configType != ''">#{configType},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
+            <if test="tenantId != null and tenantId != '' and tenantId != 0">#{tenantId},</if>
  			sysdate()
 		)
     </insert>

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -168,10 +168,17 @@
         insert into sys_user_role (user_id,role_id,tenant_id)
         values(#{UserId},#{roleId},#{tenantId})
     </insert>
+    <insert id="insertBaseSpace">
+        insert into base_space (name,parent_id,type,root_id,path,deep,created_by,create_time,updated_by,update_time,tenant_id)
+        values(#{tenantName},0,1,0,"",1,`root`,sysdate(),`root`,sysdate(),#{tenantId})
+    </insert>
 
     <delete id="delSysTenant">
         delete from sys_tenant WHERE id = #{tenantId}
     </delete>
+    <delete id="delBaseSpace">
+        delete from base_space where tenant_id = #{tenantId}
+    </delete>
     <delete id="delSysDept">
         delete from sys_dept WHERE tenant_id = #{tenantId}
     </delete>