Pārlūkot izejas kodu

优化方法返回,增加参数验证

zhouhao 8 gadi atpakaļ
vecāks
revīzija
e583fbcce9

+ 2 - 2
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-api/src/main/java/org/hswebframework/web/service/authorization/RoleService.java

@@ -19,9 +19,9 @@ public interface RoleService extends
 
     <T extends PermissionRoleEntity> void updateByPrimaryKey(BindPermissionRoleEntity<T> roleEntity);
 
-    boolean enable(String roleId);
+    void enable(String roleId);
 
-    boolean disable(String roleId);
+    void disable(String roleId);
 
     <T extends PermissionRoleEntity> boolean update(BindPermissionRoleEntity<T> roleEntity);
 

+ 21 - 6
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleRoleService.java

@@ -91,21 +91,36 @@ public class SimpleRoleService extends AbstractService<RoleEntity, String>
     }
 
     @Override
-    public boolean enable(String roleId) {
-        return DefaultDSLUpdateService.createUpdate(getDao()).set("enabled", true).where(RoleEntity.id, roleId).exec() > 0;
+    public void enable(String roleId) {
+        tryValidateProperty(StringUtils.hasLength(roleId), RoleEntity.id, "{id_is_null}");
+        DefaultDSLUpdateService.createUpdate(getDao())
+                .set(RoleEntity.enabled, true)
+                .where(RoleEntity.id, roleId)
+                .exec();
     }
 
     @Override
-    public boolean disable(String roleId) {
-        return DefaultDSLUpdateService.createUpdate(getDao()).set("enabled", false).where(RoleEntity.id, roleId).exec() > 0;
+    public void disable(String roleId) {
+        tryValidateProperty(StringUtils.hasLength(roleId), RoleEntity.id, "{id_is_null}");
+        DefaultDSLUpdateService.createUpdate(getDao())
+                .set(RoleEntity.enabled, false)
+                .where(RoleEntity.id, roleId)
+                .exec();
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public RoleEntity selectByPk(String roleId) {
+        tryValidateProperty(StringUtils.hasLength(roleId), RoleEntity.id, "{id_is_null}");
         return createQuery().where(RoleEntity.id, roleId).single();
     }
 
+    @Override
+    public List<RoleEntity> selectByPk(List<String> id) {
+        tryValidateProperty(id == null || id.isEmpty(), RoleEntity.id, "{id_is_null}");
+        return createQuery().where().in(RoleEntity.id, id).listNoPaging();
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public <T extends PermissionRoleEntity> BindPermissionRoleEntity<T> selectDetailByPk(String roleId) {
@@ -125,8 +140,8 @@ public class SimpleRoleService extends AbstractService<RoleEntity, String>
         tryValidateProperty(null == selectByPk(roleEntity.getId()), RoleEntity.id, "{role_not_exists}");
         tryValidate(roleEntity);
         DefaultDSLUpdateService.createUpdate(roleDao)
-                .set("name", roleEntity.getName())
-                .set("describe", roleEntity.getDescribe())
+                .set(RoleEntity.name, roleEntity.getName())
+                .set(RoleEntity.describe, roleEntity.getDescribe())
                 .where(RoleEntity.id, roleEntity.getId()).exec();
         if (roleEntity.getProperties() != null) {
             permissionRoleDao.deleteByRoleId(roleEntity.getId());