diff --git a/code-generator/src/main/java/com/qmrz/generator/MapperFPGenerator.java b/code-generator/src/main/java/com/qmrz/generator/MapperFPGenerator.java index 6d1127b..1d9cc24 100644 --- a/code-generator/src/main/java/com/qmrz/generator/MapperFPGenerator.java +++ b/code-generator/src/main/java/com/qmrz/generator/MapperFPGenerator.java @@ -4,9 +4,7 @@ import com.qmrz.exception.ABException; import com.qmrz.service.TableService; import com.qmrz.utils.CGHelper; import com.qmrz.utils.Fn; -import com.qmrz.utils.MapUtil; import com.qmrz.utils.SpringContextUtil; -import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; @@ -16,11 +14,11 @@ import java.util.stream.Collectors; /** * Mapper生成 */ -public class MapperGenerator { +public class MapperFPGenerator { private TableService tableService; private String dbName; - public MapperGenerator(String dbName) { + public MapperFPGenerator(String dbName) { tableService = SpringContextUtil.getBean(TableService.class); this.dbName = dbName; } @@ -31,7 +29,7 @@ public class MapperGenerator { Map> result = columnList.stream().collect(Collectors.groupingBy(map -> Fn.toString(map.get("table_name")), Collectors.toList())); - CGHelper cgHelper = new CGHelper("mapper2.ftl", dbName);//无同步代码版本 + CGHelper cgHelper = new CGHelper("mapper_fp.ftl", dbName);//无同步代码版本 // CGHelper cgHelper = new CGHelper("mapper_sync.ftl", dbName);//有同步代码版本 tableList.forEach(item -> { @@ -76,7 +74,7 @@ public class MapperGenerator { item.put("table_name2", table_name2);//首字母大写 item.put("orderBy", orderBy); item.put("primaryKeyName", primaryKeyName.toString()); - cgHelper.generator("mapper2", table_name2 + "Mapper.xml", item); + cgHelper.generator("mapper_fp", table_name2 + "Mapper.xml", item); }); } } diff --git a/code-generator/src/main/java/com/qmrz/generator/MapperFPRGenerator.java b/code-generator/src/main/java/com/qmrz/generator/MapperFPRGenerator.java index 1d9cc24..acc8ba8 100644 --- a/code-generator/src/main/java/com/qmrz/generator/MapperFPRGenerator.java +++ b/code-generator/src/main/java/com/qmrz/generator/MapperFPRGenerator.java @@ -14,11 +14,11 @@ import java.util.stream.Collectors; /** * Mapper生成 */ -public class MapperFPGenerator { +public class MapperFPRGenerator { private TableService tableService; private String dbName; - public MapperFPGenerator(String dbName) { + public MapperFPRGenerator(String dbName) { tableService = SpringContextUtil.getBean(TableService.class); this.dbName = dbName; } @@ -29,7 +29,7 @@ public class MapperFPGenerator { Map> result = columnList.stream().collect(Collectors.groupingBy(map -> Fn.toString(map.get("table_name")), Collectors.toList())); - CGHelper cgHelper = new CGHelper("mapper_fp.ftl", dbName);//无同步代码版本 + CGHelper cgHelper = new CGHelper("mapper_fpr.ftl", dbName);//无同步代码版本 // CGHelper cgHelper = new CGHelper("mapper_sync.ftl", dbName);//有同步代码版本 tableList.forEach(item -> { @@ -74,7 +74,7 @@ public class MapperFPGenerator { item.put("table_name2", table_name2);//首字母大写 item.put("orderBy", orderBy); item.put("primaryKeyName", primaryKeyName.toString()); - cgHelper.generator("mapper_fp", table_name2 + "Mapper.xml", item); + cgHelper.generator("mapper_fpr", table_name2 + "Mapper.xml", item); }); } } diff --git a/code-generator/src/main/java/com/qmrz/generator/MapperGenerator.java b/code-generator/src/main/java/com/qmrz/generator/MapperGenerator.java index 327e9fc..6d1127b 100644 --- a/code-generator/src/main/java/com/qmrz/generator/MapperGenerator.java +++ b/code-generator/src/main/java/com/qmrz/generator/MapperGenerator.java @@ -43,7 +43,7 @@ public class MapperGenerator { List orderByList = new ArrayList<>(); tmpColumnList.stream().filter(i -> { String tmpColumnName = Fn.toString(i.get("column_name")); - if ("createdatetime".equals(tmpColumnName)) { + if ("createtime".equals(tmpColumnName)) { orderByList.add("t."+tmpColumnName + " desc"); return true; } diff --git a/code-generator/src/main/resources/template/mapper_fp.ftl b/code-generator/src/main/resources/template/mapper_fp.ftl index a0459ea..f25c04c 100644 --- a/code-generator/src/main/resources/template/mapper_fp.ftl +++ b/code-generator/src/main/resources/template/mapper_fp.ftl @@ -8,6 +8,223 @@ ${table_name}(${table_comment}) --> + - + select t.lnid ,t.status ,t.currpoliceid, p.roletype from ${table_name} t - left join zonepubinfo zp2 on zp2.pubcode = t.gldw - left join zonepubinfo zp3 on zp3.pubcode = t.gldw2 - left join zoneadmin za on za.id = t.xzqh - left join ${table_name}relation th on t.${primaryKeyName}=th.lnid - left join police p on p.id=th.currpoliceid - - - - left join police fpP1 on fpP1.id=th.fppoliceid - left join police jsP1 on jsP1.id=th.jspoliceid - - - - - left join zonepubinfo fkzp2 on fkzp2.pubcode = th.gldw and th.memo=4 - - + left join police p on p.id=t.currpoliceid - - - - - - - and ifnull(th.status,0) = 0 - - - and th.status in ( ${'$'}{where_status} ) - - - - - - - - - - - - - and DATEDIFF(th.operationtime,now())=0 - - - - - - - - - - = ${'#'}{where_fkbegintime} ]]> - - - - - - - - - and fpP1.fullname like concat('%',${'#'}{like_fppolicename},'%') - - - - - - - and p.fullname like concat('%',${'#'}{like_jspolicename},'%') - - - - and p.fullname like concat('%',${'#'}{like_chpolicename},'%') - - - - and p.fullname like concat('%',${'#'}{like_thpolicename},'%') - - - - and p.fullname like concat('%',${'#'}{like_chthpolicename},'%') - - - - and p.fullname like concat('%',${'#'}{like_fkpolicename},'%') - - - - and p.fullname like concat('%',${'#'}{like_wxclpolicename},'%') - - - - - and th.fppoliceid = ${'#'}{where_fppoliceid} - - - - - and th.currpoliceid = ${'#'}{where_jspoliceid} - - - - and th.currpoliceid = ${'#'}{where_chpoliceid} - - - and th.currpoliceid = ${'#'}{where_thpoliceid} - - - and th.currpoliceid = ${'#'}{where_chthpoliceid} - - - - and th.currpoliceid = ${'#'}{where_fkpoliceid} - - - and th.currpoliceid = ${'#'}{where_wxclpoliceid} - - - - - - and th.memo = ${'#'}{where_memo} - - - - - and t.${primaryKeyName} in ( - - ${'#'}{item} - - ) - - - - - and th.currpoliceid= ${'#'}{policeid} - - - and t.gldw2 in ( - - ${'#'}{item} - - ) - + and t.lnid in ( + + ${'#'}{item} + + ) - - - ${orderBy} - - - order by th.operationtime desc , t.${primaryKeyName} desc - diff --git a/code-generator/src/test/TestCodeGenerator.java b/code-generator/src/test/TestCodeGenerator.java index 357b34f..54f62d4 100644 --- a/code-generator/src/test/TestCodeGenerator.java +++ b/code-generator/src/test/TestCodeGenerator.java @@ -11,8 +11,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest(classes = CodeGenerator.class) public class TestCodeGenerator { // private String dbname="ga-dp-dev"; -//private String dbname="qmrz"; - private String dbname="ga-lock-dev"; +private String dbname="qmrz"; +// private String dbname="ga-lock-dev"; // private String dbname="psbd-dev"; // private String dbname="ga-hotelmanage-dev"; /** @@ -23,6 +23,8 @@ public class TestCodeGenerator { readme(); mapper(); mapperSync(); + mapperFP(); + mapperFPR(); javaSync(); // service(); service2(); @@ -64,6 +66,18 @@ public class TestCodeGenerator { generator.generator(); } + @Test + public void mapperFP() { + MapperFPGenerator generator = new MapperFPGenerator(dbname); + generator.generator(); + } + + @Test + public void mapperFPR() { + MapperFPRGenerator generator = new MapperFPRGenerator(dbname); + generator.generator(); + } + @Test public void javaSync() { JavaSyncGenerator generator = new JavaSyncGenerator(dbname);