租户逻辑拓展

bladex/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java

@@ -121,4 +121,9 @@ public class Tenant extends BaseEntity {
      */
     private String logoUrl;
 
+    /**
+     * 创建租户
+     */
+    private String createTenant;
+
 }

bladex/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -28,6 +28,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -88,9 +89,12 @@ public class TenantController extends BladeController {
     @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
     public R<IPage<Map<String, Object>>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
         QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
-        IPage<Tenant> pages = tenantService.page(Condition.getPage(query),
-                (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID))
-                        ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+
+        if (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) {
+            queryWrapper.lambda().eq(Tenant::getCreateTenant, AuthUtil.getTenantId());
+        }
+
+        IPage<Tenant> pages = tenantService.page(Condition.getPage(query), queryWrapper);
 
         IPage<Map<String, Object>> result = tenantService.listPackaging(pages);
 

bladex/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -28,6 +28,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.TenantId;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -91,6 +92,9 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 //            String tenantId = getTenantId(codes);
 //            tenant.setTenantId(tenantId);
 
+            // 赋值创建租户
+            tenant.setCreateTenant(AuthUtil.getTenantId());
+
             String tenantId = tenant.getTenantId();
             Assert.notEmpty(tenantId, "租户id不能为空");
 

hx-service-api/a-api/src/main/java/com/fjhx/entity/u/UMessage.java

@@ -1,80 +0,0 @@
-package com.fjhx.entity.message;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 消息提醒
- * </p>
- *
- * @author ${author}
- * @since 2022-07-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UMessage extends BaseEntity {
-
-
-    /**
-     * 软删除
-     */
-    @TableField("IsDelete")
-    private Boolean isdelete;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CreatedTime")
-    private Date createdtime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("UpdatedTime")
-    private Date updatedtime;
-
-    /**
-     * 提醒来源 （枚举定义：0=物料申购，1=入库管理，2=库存管理，3=出库管理，4=系统提醒，5=盘点提醒）
-     */
-    @TableField("SourceType")
-    private Integer sourcetype;
-
-    /**
-     * 提醒内容
-     */
-    @TableField("Content")
-    private String content;
-
-    /**
-     * 发送消息用户ID
-     */
-    @TableField("SenderId")
-    private String senderid;
-
-    /**
-     * 消息提醒对象 （枚举定义：0=用户，1=角色，2=全员）
-     */
-    @TableField("ObejctType")
-    private Integer obejcttype;
-
-    /**
-     * 关联编号
-     */
-    @TableField("LinkId")
-    private String linkid;
-
-    /**
-     * 待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）
-     */
-    @TableField("DealWithType")
-    private Integer dealwithtype;
-
-
-}

hx-service-api/a-api/src/main/java/com/fjhx/params/u/UMessageEx.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.u;
-
-import com.fjhx.entity.message.UMessage;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 消息提醒
- *
- * @author ${author}
- * @since 2022-07-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UMessageEx extends UMessage {
-
-}

hx-service-api/a-api/src/main/java/com/fjhx/params/u/UMessageVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.u;
-
-import com.fjhx.entity.message.UMessage;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 消息提醒
- *
- * @author ${author}
- * @since 2022-07-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UMessageVo extends UMessage {
-
-}

hx-service/a/src/main/java/com/fjhx/controller/u/UMessageController.java

@@ -1,56 +0,0 @@
-package com.fjhx.controller.u;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.message.UMessage;
-import com.fjhx.params.u.UMessageVo;
-import com.fjhx.service.u.UMessageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * <p>
- * 消息提醒 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-07-29
- */
-@RestController
-@RequestMapping("/uMessage")
-public class UMessageController {
-
-    @Autowired
-    private UMessageService uMessageService;
-
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition){
-        Page<UMessage> result = uMessageService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody UMessageVo uMessageVo){
-        uMessageService.add(uMessageVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody UMessageVo uMessageVo){
-        uMessageService.edit(uMessageVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody UMessageVo uMessageVo){
-        uMessageService.delete(uMessageVo);
-        return R.success();
-    }
-
-}
-

hx-service/a/src/main/java/com/fjhx/mapper/u/UMessageMapper.java

@@ -1,16 +0,0 @@
-package com.fjhx.mapper.u;
-
-import com.fjhx.entity.message.UMessage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 消息提醒 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-07-29
- */
-public interface UMessageMapper extends BaseMapper<UMessage> {
-
-}

hx-service/a/src/main/java/com/fjhx/mapper/u/UMessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.mapper.u.UMessageMapper">
-
-</mapper>

hx-service/a/src/main/java/com/fjhx/service/u/UMessageService.java

@@ -1,28 +0,0 @@
-package com.fjhx.service.u;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.message.UMessage;
-import com.fjhx.params.u.UMessageVo;
-import com.fjhx.base.BaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 消息提醒 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-29
- */
-public interface UMessageService extends BaseService<UMessage> {
-
-    Page<UMessage> getPage(Map<String, String> condition);
-
-    void add(UMessageVo uMessageVo);
-
-    void edit(UMessageVo uMessageVo);
-
-    void delete(UMessageVo uMessageVo);
-
-}

hx-service/a/src/main/java/com/fjhx/service/u/impl/UMessageServiceImpl.java

@@ -1,54 +0,0 @@
-package com.fjhx.service.u.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
-import com.fjhx.entity.message.UMessage;
-import com.fjhx.params.u.UMessageVo;
-import com.fjhx.mapper.u.UMessageMapper;
-import com.fjhx.service.u.UMessageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * <p>
- * 消息提醒 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-29
- */
-@Service
-public class UMessageServiceImpl extends ServiceImpl<UMessageMapper, UMessage> implements UMessageService {
-
-    @Override
-    public Page<UMessage> getPage(Map<String, String> condition) {
-
-        QueryWrapper<UMessage> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        Page<UMessage> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
-    public void add(UMessageVo uMessageVo) {
-        save(uMessageVo);
-    }
-
-    @Override
-    public void edit(UMessageVo uMessageVo) {
-        updateById(uMessageVo);
-    }
-
-    @Override
-    public void delete(UMessageVo uMessageVo) {
-        removeById(uMessageVo.getId());
-    }
-
-}