diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java index ef142065a..da60ccf18 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java @@ -23,10 +23,9 @@ import com.ruoyi.system.service.ISysTenantService; import com.ruoyi.common.mybatis.core.page.TableDataInfo; /** - * 租户 + * 租户管理 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Validated @RequiredArgsConstructor diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java index 01dfa0b1c..9a204fce2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java @@ -23,10 +23,9 @@ import com.ruoyi.system.service.ISysTenantPackageService; import com.ruoyi.common.mybatis.core.page.TableDataInfo; /** - * 租户套餐 + * 租户套餐管理 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Validated @RequiredArgsConstructor diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java index 0b26af352..9dc65c41a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java @@ -11,8 +11,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity; /** * 租户对象 sys_tenant * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenantPackage.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenantPackage.java index 3bf576cba..ecbc385ec 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenantPackage.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenantPackage.java @@ -10,8 +10,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity; /** * 租户套餐对象 sys_tenant_package * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java index 280e4d13e..5f8e4c857 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java @@ -13,8 +13,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity; /** * 租户业务对象 sys_tenant * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java index 816613e4e..39d3b1f6f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java @@ -11,8 +11,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity; /** * 租户套餐业务对象 sys_tenant_package * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java index 7a1fcfd7f..3d2ee0f59 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java @@ -13,8 +13,7 @@ import java.io.Serializable; /** * 租户套餐视图对象 sys_tenant_package * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java index 0012295ed..f4b55673f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java @@ -14,8 +14,7 @@ import java.io.Serializable; /** * 租户视图对象 sys_tenant * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java index d5f5195b5..cc1e54f7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java @@ -7,8 +7,7 @@ import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus; /** * 租户Mapper接口 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ public interface SysTenantMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantPackageMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantPackageMapper.java index ea985459c..6f9415eb8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantPackageMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantPackageMapper.java @@ -7,8 +7,7 @@ import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus; /** * 租户套餐Mapper接口 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ public interface SysTenantPackageMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java index ae0b3e9d9..629e89340 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java @@ -11,8 +11,7 @@ import java.util.List; /** * 租户套餐Service接口 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ public interface ISysTenantPackageService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java index a7deb2613..ba0f8cdeb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java @@ -11,8 +11,7 @@ import java.util.List; /** * 租户Service接口 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ public interface ISysTenantService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java index e90a5017b..5d538a041 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java @@ -14,6 +14,7 @@ import com.ruoyi.system.domain.vo.SysTenantPackageVo; import com.ruoyi.system.domain.SysTenantPackage; import com.ruoyi.system.mapper.SysTenantPackageMapper; import com.ruoyi.system.service.ISysTenantPackageService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -22,8 +23,7 @@ import java.util.Collection; /** * 租户套餐Service业务层处理 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @RequiredArgsConstructor @Service @@ -70,6 +70,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * 新增租户套餐 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SysTenantPackageBo bo) { SysTenantPackage add = BeanUtil.toBean(bo, SysTenantPackage.class); validEntityBeforeSave(add); @@ -84,6 +85,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * 修改租户套餐 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(SysTenantPackageBo bo) { SysTenantPackage update = BeanUtil.toBean(bo, SysTenantPackage.class); validEntityBeforeSave(update); @@ -113,6 +115,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * 批量删除租户套餐 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index 9aa7ed669..c693a479b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -14,6 +14,7 @@ import com.ruoyi.system.domain.vo.SysTenantVo; import com.ruoyi.system.domain.SysTenant; import com.ruoyi.system.mapper.SysTenantMapper; import com.ruoyi.system.service.ISysTenantService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -22,8 +23,7 @@ import java.util.Collection; /** * 租户Service业务层处理 * - * @author ruoyi - * @date 2023-02-05 + * @author Michelle.Chung */ @RequiredArgsConstructor @Service @@ -79,6 +79,7 @@ public class SysTenantServiceImpl implements ISysTenantService { * 新增租户 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SysTenantBo bo) { SysTenant add = BeanUtil.toBean(bo, SysTenant.class); validEntityBeforeSave(add); @@ -93,6 +94,7 @@ public class SysTenantServiceImpl implements ISysTenantService { * 修改租户 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(SysTenantBo bo) { SysTenant update = BeanUtil.toBean(bo, SysTenant.class); validEntityBeforeSave(update); @@ -122,6 +124,7 @@ public class SysTenantServiceImpl implements ISysTenantService { * 批量删除租户 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验