优化

hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/TermExpressionParserTest.java

@@ -0,0 +1,56 @@
+package org.hswebframework.web.api.crud.entity;
+
+import org.hswebframework.ezorm.core.param.Term;
+import org.hswebframework.ezorm.core.param.TermType;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class TermExpressionParserTest {
+
+    @Test
+    public void test() {
+        {
+            List<Term> terms = TermExpressionParser.parse("name = 1");
+
+            assertEquals(terms.get(0).getTermType(), TermType.eq);
+
+        }
+
+//        {
+//            List<Term> terms = TermExpressionParser.parse("name = 1");
+//
+//            assertEquals(terms.get(0).getTermType(), TermType.not);
+//
+//        }
+        {
+            List<Term> terms = TermExpressionParser.parse("name > 1");
+
+            assertEquals(terms.get(0).getTermType(), TermType.gt);
+        }
+
+        {
+            List<Term> terms = TermExpressionParser.parse("name >= 1");
+
+            assertEquals(terms.get(0).getTermType(), TermType.gte);
+        }
+
+        {
+            List<Term> terms = TermExpressionParser.parse("name gte 1 and name not 1");
+
+            assertEquals(terms.get(0).getTermType(), TermType.gte);
+            assertEquals(terms.get(1).getTermType(), TermType.not);
+        }
+
+        {
+            List<Term> terms = TermExpressionParser.parse("name gte 1 and (name not 1 or age gt 0)");
+
+            assertEquals(terms.get(0).getTermType(), TermType.gte);
+            assertEquals(terms.get(1).getTerms().get(0).getTermType(), TermType.not);
+            assertEquals(terms.get(1).getTerms().get(1).getTermType(), TermType.gt);
+        }
+    }
+
+}

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/PermissionSynchronization.java

@@ -3,28 +3,22 @@ package org.hswebframework.web.system.authorization.defaults.service;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveRepository;
-import org.hswebframework.ezorm.rdb.mapping.annotation.Comment;
 import org.hswebframework.utils.ClassUtils;
 import org.hswebframework.web.api.crud.entity.Entity;
 import org.hswebframework.web.authorization.define.*;
-import org.hswebframework.web.crud.web.reactive.ReactiveCrudController;
 import org.hswebframework.web.crud.web.reactive.ReactiveQueryController;
-import org.hswebframework.web.crud.web.reactive.ReactiveServiceCrudController;
 import org.hswebframework.web.crud.web.reactive.ReactiveServiceQueryController;
 import org.hswebframework.web.system.authorization.api.entity.ActionEntity;
 import org.hswebframework.web.system.authorization.api.entity.OptionalField;
 import org.hswebframework.web.system.authorization.api.entity.PermissionEntity;
-import org.hswebframework.web.utils.AnnotationUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.event.EventListener;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ReflectionUtils;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 import javax.persistence.Column;
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;