v1.1.0

smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java

@@ -1,45 +0,0 @@
-package com.gangquan360.smartadmin.module.codegenerator;
-
-import com.gangquan360.smartadmin.BaseTest;
-import com.gangquan360.smartadmin.module.codegenerator.constant.SqlOperateTypeEnum;
-import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorDTO;
-import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorQueryColumnDTO;
-import com.gangquan360.smartadmin.module.codegenerator.service.CodeGeneratorService;
-import com.google.common.collect.Lists;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-/**
- * IdGeneratorService Tester.
- *
- * @author lizongliang
- * @version 1.0
- */
-public class CodeGeneratorServiceTest extends BaseTest {
-
-    @Autowired
-    private CodeGeneratorService codeGeneratorService;
-
-    @Test
-    public void testGenerate() throws Exception {
-                CodeGeneratorQueryColumnDTO createTimeBetween = CodeGeneratorQueryColumnDTO.builder()
-                        .columnName("create_time")
-                        .sqlOperate(SqlOperateTypeEnum.TIME_BETWEEN).build();
-                CodeGeneratorQueryColumnDTO like = CodeGeneratorQueryColumnDTO.builder()
-                        .columnName("title")
-                        .sqlOperate(SqlOperateTypeEnum.LIKE).build();
-
-                List<CodeGeneratorQueryColumnDTO> queryColumnList = Lists.newArrayList(createTimeBetween,like);
-                CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder()
-                        .author("zhuoda")
-                        .company("1024创新( www.1024lab.net )")
-                        .tableName("t_notice")
-                        .tablePrefix("t_")
-                        .basePackage("com.gangquan360.smartadmin")
-                        .queryColumnList(queryColumnList).build();
-                codeGeneratorService.codeGenerator(codeGenerator);
-    }
-
-}

smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/BaseTest.java

@@ -1,8 +1,7 @@
-package com.gangquan360.smartadmin;
+package net.lab1024.smartadmin;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;

smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/SmartAdminApplicationTests.java

@@ -1,4 +1,4 @@
-package com.gangquan360.smartadmin;
+package net.lab1024.smartadmin;
 
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;

smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/module/support/codegenerator/CodeGeneratorServiceTest.java

@@ -0,0 +1,66 @@
+package net.lab1024.smartadmin.module.support.codegenerator;
+
+import net.lab1024.smartadmin.BaseTest;
+import net.lab1024.smartadmin.module.support.codegenerator.constant.SqlOperateTypeEnum;
+import net.lab1024.smartadmin.module.support.codegenerator.domain.CodeGeneratorDTO;
+import net.lab1024.smartadmin.module.support.codegenerator.domain.CodeGeneratorQueryColumnDTO;
+import net.lab1024.smartadmin.module.support.codegenerator.service.CodeGeneratorService;
+import com.google.common.collect.Lists;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * IdGeneratorService Tester.
+ *
+ * @author zhuoda
+ * @version 1.0
+ */
+public class CodeGeneratorServiceTest extends BaseTest {
+
+    @Autowired
+    private CodeGeneratorService codeGeneratorService;
+
+    @Test
+    public void testGenerate() throws Exception {
+        /**
+         * !!! 所有查询条件均包含了createTime和updateTime的 范围查询 !!!
+         */
+
+        // t_peony 牡丹花表
+
+        //搜索字段 kind， 使用like搜索
+        CodeGeneratorQueryColumnDTO kind = CodeGeneratorQueryColumnDTO.builder()
+                .columnName("kind")
+                .sqlOperate(SqlOperateTypeEnum.LIKE).build();
+        //搜索字段 kind， 使用 == 搜索
+        CodeGeneratorQueryColumnDTO id = CodeGeneratorQueryColumnDTO.builder()
+                .columnName("id")
+                .sqlOperate(SqlOperateTypeEnum.EQUALS).build();
+        //搜索字段 name， 使用like搜索
+        CodeGeneratorQueryColumnDTO name = CodeGeneratorQueryColumnDTO.builder()
+                .columnName("name")
+                .sqlOperate(SqlOperateTypeEnum.LIKE).build();
+        //搜索字段 color， 使用like搜索
+        CodeGeneratorQueryColumnDTO color = CodeGeneratorQueryColumnDTO.builder()
+                .columnName("color")
+                .sqlOperate(SqlOperateTypeEnum.LIKE).build();
+
+        List<CodeGeneratorQueryColumnDTO> queryColumnList = Lists.newArrayList(id, kind, name, color);
+
+        CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder()
+                .author("卓大")//class 注释作者
+                .company("1024创新实验室( www.1024lab.net )")//class注释公司名字
+                .tableName("t_peony")//表名
+                .tablePrefix("t_")//表名前缀
+                .basePackage("net.lab1024.smartadmin")//包名
+                .modulePackage("business.peony")//业务子包名
+                .queryColumnList(queryColumnList)//加入搜搜字段
+                .build();//构建
+
+        //当需要代码生成的时候，请将注释去掉
+//        codeGeneratorService.codeGenerator(codeGenerator);
+    }
+
+}