From 1a963a78d597da87836d7d2c5238a5bb4e39f4b3 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 24 Feb 2022 15:06:53 +0800 Subject: [PATCH 1/4] 1.5.6 --- gen/src/main/resources/gen.db | Bin 69632 -> 69632 bytes script/startup.bat | 5 ++ templates/fastmybatis-v2.0/columns.vm | 19 ++++++ templates/fastmybatis-v2.0/controller.vm | 78 +++++++++++++++++++++++ templates/fastmybatis-v2.0/entity.vm | 45 +++++++++++++ templates/fastmybatis-v2.0/mapper.vm | 12 ++++ templates/fastmybatis-v2.0/service.vm | 16 +++++ 7 files changed, 175 insertions(+) create mode 100644 script/startup.bat create mode 100644 templates/fastmybatis-v2.0/columns.vm create mode 100644 templates/fastmybatis-v2.0/controller.vm create mode 100644 templates/fastmybatis-v2.0/entity.vm create mode 100644 templates/fastmybatis-v2.0/mapper.vm create mode 100644 templates/fastmybatis-v2.0/service.vm diff --git a/gen/src/main/resources/gen.db b/gen/src/main/resources/gen.db index ca3318427aeb2d7088c6259a0fca21808d002214..ce2ce8681d96638240768ca5f96c72b23e1bf6ac 100644 GIT binary patch delta 3946 zcma)9Z%iBK8NV~e_8r)Ug@h5x^72QE56qclOK3{~lY~`dfjWg~+NzBl_G{;g?Q_m& z0z-_@q@}G&3wfcetrQV;(jrZZnpsh|B~z1cllCQ>)=m46tyOE1Y9G>QQC4Z$vgf@! z{{ttgrL+CM&+|V2pWpl3sWt1VHS1!1bsNJl)$mlnV}obwlJ{G+ZH)N!-#aVqOgUF( zas8ph!#8lAZOUgcKZ?B6u_|#W0$X)ZlSR_3Y~C z5WFaaqoWBGhvmr}VYg0*s7fj^Du<99*SshhJdR^hDFISSJFckt!+Z7!!dw?;uN4IL z#a)^-wl9h`97{wc4Ug(Vi&u^V&-M3>^rMl!{fGNeF%5ah4cD#~9wEb;V*7VLDWIWe zN6^sG!-u_Ov0^KiTat9eh}Aj6yhbW2fAT#WN8`pYa}kHVw!NJ_&4O7`9Kms{Qmc;3 zNlj6wHm+?&mTjaOw(($FP>F}-$SCP`ZVSLN7TPm9Aw^U9Nbmi&fDZP5r|;-t(^%?I zR=FlaPC{UY{wM1XFHnQoAu{Lu(!#z0@?{s<1pkz~2DnxoF z!%8%S^BDqb(huF1Dq2%z?z>bE=l+lTuKWJd+_m(d&`$T(Y7RE-Wlo*rI^+JQ`y==D zw5ucSuK8M7nZOoj$wEHrZDlKe<+mY+i?P4!s$yN|=UDdwU&b+8j=bIJ;Oaw?Le8%= zqz^Uzz_ulX!%`}$y{@txQ`i5t6X@x4@>q_r)@|XK`e(1zQo_ZZAG1|ph?81lao=Rz z|8n0t6$jIj>_g{6qciyR#!K<-c?I{_xU>U1!+R^A|rU+kYi0%qEW2! zfb{U(U~TJC%u2ICGiy}1op?a%quT{e*W_6n>_o(5#3_w2Kaz36>BLqZZ3WL zum2gGm+ebH2tgcWPo&18au9(zP)Yl;vE4`0H{8<$h!?>gx~oS5mJkmCO&hY|xE@-h zhYfWbWKmP}U60U}V=IzdX^5pcL{KN4+sWd6yHC_r>5>W#8m^e;iORT#a?z8d`o9h2 z8(lW?uyfnlUfYjSNhm4m(4ztnPzs{!OG*=^BhWIP7}ra7WGaF8E0Z%l2zbef-tBg( z0(>V|+INs+|En0IG6o`XsL7#JH0sgGd6#`Ybo;~Q%)95-Ke&>4Z7s9-#;teGeD>=r zpD$m`oVuEe%q9n^7%_sifsjW4C!0+NyXZc;ef~mbVP$>g{q=>5kM}lJkZyA9K@D$a zxVHz9yAK+;8C2}f6RjKU-(;AXl^Gt98(-Ft+uv+j{RPi*J~{MQON_qB)wPfKAJ%yC z#=yM^ZROb%b|i-iVjVWv_D?}nfRK;!W2}Ty;Aboa@S&qx9&AqUsof->0MS`1?byAEM~Xm`?I#cC-YS2Vaxl(-leFA2VR>@DIQ*61)1DGk_#XF78VM(7xlkA75%jVa^eK}nNf zGaFFaJBtf%iXD1aqP3G_VH7vk?#nhG29W>>nBt z1l~{G$=v`}NH0%z9cq}>n-6LRnI26Wl0kuCeiLd0%bJ9ijRY_C3mI6F`7O!(a&`UU zW!?Xrgq(@=%A)cMgqXB2ou}nl+3nhw)OHu4{ch#FxP*&mU;h7=B4zl z^p$;MY7gzk&wlset>p{rZ~Z27^-U;Ty0s79!F1ZRKMLccDn;pTc1oFrIS^_rj!zm} z9znz>JR?WJ9n&&V4tddDdcm|JeIIF*3WrSGhMRf+)Nld^<*{srFD2CZ*&K1bWWpe2olr@hJn xguobCNX+-L4pc$C`3hmE$+%UG7Atje>Zv-5>>M5Y2OSo!{sS2MtGH}i{2y&d8R!52 delta 686 zcmbV}OK1~87{_P!G5gBy>{?5W6`c0qdu6lTG>sx=jhlm5Ew%_AJk-a@7idZklG;T) zd1*6|fTv&tk6Op#)r)s4~7c@4anBAWY?@^r{>g{=bkd|-LE2JAeB=YKDbt$zI6R+TrLJD z!$ROkxpLW$lCi*#3%SIPN0M^BSjmNjT*VKgAd37T2#RC*Fpk2gG8*NhEu^0B<)ZSr zB%VshRD9xeLWZ|cs#j^4?6Yaf+R5e&4boTEq~grNDz!3m+rx0QP}$Up?#LWfdO7sF zU2~9z_`?ZHXBCa6_Adz_de@ntZ|x)Wp|Q^XV9E9HPaxs0ka>6mcX4+yeZ$_9y|`ah zxl@yEzDu|R@K@Y9GtHcUVcIJ8!7H?L`~cKmmJrbiFdEuZNS4xVkddJkhpyki^$BGc zRJ(vLlh+Vv9Pyn3nUT_p%DSJi`Q(LbiZ)PP1L_(x7e1);W79Aj9@4h1b~xL##w=SHU0v*8lk`d diff --git a/script/startup.bat b/script/startup.bat new file mode 100644 index 0000000..11a8499 --- /dev/null +++ b/script/startup.bat @@ -0,0 +1,5 @@ +@echo off + +set app_name=gen + +java -Duser.timezone=Asia/Shanghai -jar -Xms128m -Xmx128m %app_name%.jar \ No newline at end of file diff --git a/templates/fastmybatis-v2.0/columns.vm b/templates/fastmybatis-v2.0/columns.vm new file mode 100644 index 0000000..fc8832d --- /dev/null +++ b/templates/fastmybatis-v2.0/columns.vm @@ -0,0 +1,19 @@ +## filename=${context.javaBeanName}Columns, folder=columns +/** + * ${table.tableName}表字段映射关系
+ * 使用方式： + * 
+ * {@literal
+ * Query query = new Query().eq(TUserColumns.id, 6);
+ * TUser tUser = mapper.getBySpecifiedColumns(Arrays.asList(TUserColumns.id, TUserColumns.username), query);
+ * }
+ *
+ * @author xxx + */ +public interface ${context.javaBeanName}Columns { +#foreach($column in $columns) + /** ${column.comment} */ + String ${column.columnName} = "${column.columnName}"; + +#end +} \ No newline at end of file diff --git a/templates/fastmybatis-v2.0/controller.vm b/templates/fastmybatis-v2.0/controller.vm new file mode 100644 index 0000000..59dcd1a --- /dev/null +++ b/templates/fastmybatis-v2.0/controller.vm @@ -0,0 +1,78 @@ +## filename=${context.javaBeanName}Controller.java, folder=controller +package ${context.packageName}.web.controller; + +import com.gitee.fastmybatis.core.PageInfo; +import com.gitee.fastmybatis.core.query.Query; +import com.gitee.fastmybatis.core.query.param.PageParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import ${context.packageName}.dao.entity.${context.javaBeanName}; +import ${context.packageName}.service.${context.javaBeanName}Service; + +/** + * @author xxx + */ +@RestController +@RequestMapping("${table.tableName}") +public class ${context.javaBeanName}Controller { + + @Autowired + private ${context.javaBeanName}Service ${context.javaBeanNameLF}Service; + + /** + * 分页查询 + * + * @param param + * @return + */ + @GetMapping("/page") + public Result> page(PageParam param) { + Query query = param.toQuery(); + PageInfo<${context.javaBeanName}> pageInfo = ${context.javaBeanNameLF}Service.page(query); + return Result.ok(pageInfo); + } + + /** + * 新增记录 + * + * @param user + * @return + */ + @PostMapping("/save") + public Result<${pk.javaTypeBox}> save(${context.javaBeanName} user) { + ${context.javaBeanNameLF}Service.saveIgnoreNull(user); + // 返回添加后的主键值 + return Result.ok(user.getId()); + } + + /** + * 修改记录 + * + * @param user 表单数据 + * @return + */ + @PutMapping("/update") + public Result update(${context.javaBeanName} user) { + ${context.javaBeanNameLF}Service.updateIgnoreNull(user); + return Result.ok(); + } + + /** + * 删除记录 + * + * @param id 主键id + * @return + */ + @DeleteMapping("/delete") + public Result delete(${pk.javaTypeBox} id) { + ${context.javaBeanNameLF}Service.deleteById(id); + return Result.ok(); + } + +} \ No newline at end of file diff --git a/templates/fastmybatis-v2.0/entity.vm b/templates/fastmybatis-v2.0/entity.vm new file mode 100644 index 0000000..2be70a3 --- /dev/null +++ b/templates/fastmybatis-v2.0/entity.vm @@ -0,0 +1,45 @@ +## filename=${context.javaBeanName}.java, folder=entity +package ${context.packageName}.dao.entity; + +#if(${table.hasDateField}) +import java.util.Date; +#end +#if(${table.hasLocalDateField}) +import java.time.LocalDate; +#end +#if(${table.hasLocalDateTimeField}) +import java.time.LocalDateTime; +#end +#if(${table.hasBigDecimalField}) +import java.math.BigDecimal; +#end + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：${table.tableName} +#if("$!{table.comment}" != "") + * 备注：${table.comment} +#end + * + * @author xxx + */ +@Table(name = "${table.tableName}", pk = @Pk(name = "${pk.columnName}", strategy = PkStrategy.INCREMENT)) +@Data +public class ${context.javaBeanName} { + +#foreach($column in $columns) + /** #if("$!{column.comment}" != "")${column.comment},#end 数据库字段：${column.columnName} */ +#if(${column.columnName} == "is_deleted") + @com.gitee.fastmybatis.annotation.Column(logicDelete = true) +#end + private ${column.javaTypeBox} ${column.javaFieldName}; + +#end + +} \ No newline at end of file diff --git a/templates/fastmybatis-v2.0/mapper.vm b/templates/fastmybatis-v2.0/mapper.vm new file mode 100644 index 0000000..b212933 --- /dev/null +++ b/templates/fastmybatis-v2.0/mapper.vm @@ -0,0 +1,12 @@ +## filename=${context.javaBeanName}Mapper.java, folder=mapper +package ${context.packageName}.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.CrudMapper; +import ${context.packageName}.dao.entity.${context.javaBeanName}; + +/** + * @author xxx + */ +public interface ${context.javaBeanName}Mapper extends CrudMapper<${context.javaBeanName}, ${pk.javaTypeBox}> { + +} \ No newline at end of file diff --git a/templates/fastmybatis-v2.0/service.vm b/templates/fastmybatis-v2.0/service.vm new file mode 100644 index 0000000..bbbc8c9 --- /dev/null +++ b/templates/fastmybatis-v2.0/service.vm @@ -0,0 +1,16 @@ +## filename=${context.javaBeanName}Service.java, folder=service +package ${context.packageName}.mapper; + +import com.gitee.fastmybatis.core.support.IService; +import ${context.packageName}.dao.entity.${context.javaBeanName}; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author xxx + */ +@Service +public class ${context.javaBeanName}Service implements IService<${context.javaBeanName}, ${pk.javaTypeBox}> { + +} \ No newline at end of file -- Gitee From 4098ea15a2adecbfea624603ef8b4deaff15dbb3 Mon Sep 17 00:00:00 2001 From: zhuguojian <984737666@qq.com> Date: Fri, 25 Feb 2022 13:17:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=201=E3=80=81sqlite=E5=9C=A8mac=20m1?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E4=B8=8B=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=822=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5Oracle=E6=95=B0=E6=8D=AE=E5=BA=93=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5sql=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gen/pom.xml | 2 +- .../java/com/gitee/gen/gen/oracle/OracleColumnSelector.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gen/pom.xml b/gen/pom.xml index 4997474..51a2bb8 100644 --- a/gen/pom.xml +++ b/gen/pom.xml @@ -51,7 +51,7 @@ org.xerial sqlite-jdbc - 3.21.0.1 + 3.34.0 mysql diff --git a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java index d43a9cc..3092bac 100644 --- a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java +++ b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java @@ -40,7 +40,7 @@ public class OracleColumnSelector extends ColumnSelector { private static final String COLUMN_SQL = " SELECT " + " atc.COLUMN_NAME FIELD, atc.DATA_TYPE TYPE, atc.DATA_SCALE SCALE, atc.DATA_LENGTH MAXLENGTH, " + - " CASE atc.NULLABLE NULLABLE , " + + " atc.NULLABLE NULLABLE , " + " atc.DATA_DEFAULT 默认值, acc.COMMENTS COMMENTS, atc.TABLE_NAME 表名, " + " CASE atc.COLUMN_NAME " + " WHEN " + @@ -48,7 +48,7 @@ public class OracleColumnSelector extends ColumnSelector { " LEFT JOIN all_cons_columns col ON con.table_name = col.table_name " + " AND con.OWNER = col.OWNER AND con.CONSTRAINT_NAME = col.CONSTRAINT_NAME " + " WHERE con.constraint_type = 'P' " + - " AND col.table_name = '%s' AND con.OWNER = '%s' ) " + + " AND col.table_name = '%s' AND con.OWNER = '%s' AND col.column_name = atc.COLUMN_NAME ) " + " THEN 'true' ELSE 'false' END AS KEY " + " FROM ALL_TAB_COLUMNS atc " + " LEFT JOIN ALL_COL_COMMENTS acc " + -- Gitee From 4c5a51e22782db05f2c5ca81f3aaad9b105b7218 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 28 Feb 2022 19:51:18 +0800 Subject: [PATCH 3/4] 1.5.6 --- gen/src/main/resources/gen.db | Bin 69632 -> 69632 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gen/src/main/resources/gen.db b/gen/src/main/resources/gen.db index ce2ce8681d96638240768ca5f96c72b23e1bf6ac..27310455e2b2514b87372f360a74ad5aa1827f4c 100644 GIT binary patch delta 127 zcmZozz|ydQWr8%L&O{k!MxBib3+s8g6Bw8oq8Yd=Iae@5Pi*wv9Noamt;WE>Aju%< zI?<7XQCBiGuOzdiQl&aMKd+>dg^LR$!4Hy{JWo?;bAPuz^W7 delta 147 zcmZozz|ydQWr8%L_Cy(HM(vFW3+s6q7#Nrtq8YdoI9D)4Pi*wv9Noam&D$x<#l;}$ zI?<7XQCD*EJWZv|E4uBOITV0EUrS42^7B4<2bJpN{G8Il3E?*)Vvgh qXHz#k>s|MB*W{;br$1Y__5Ge%ND4vf{StFiYZbKgH=FjKZU6vD=rxc4 -- Gitee From 7c546da4c2119222ff5716b7bffcc028ef18a5db Mon Sep 17 00:00:00 2001 From: zhloong Date: Sat, 7 May 2022 21:41:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Doracle=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=EF=BC=8C=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E8=BD=BD=E4=B8=8D=E5=88=B0=E8=A1=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gitee/gen/gen/oracle/OracleTableSelector.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java index 0b4573c..67a0be1 100644 --- a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java +++ b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java @@ -29,18 +29,18 @@ public class OracleTableSelector extends TableSelector { */ @Override protected String getShowTablesSQL(GeneratorConfig generatorConfig) { - String owner = generatorConfig.getSchemaName().toUpperCase(); StringBuilder sb = new StringBuilder(""); - sb.append(" SELECT TABLE_NAME AS NAME, COMMENTS FROM all_tab_comments "); - sb.append(" WHERE 1=1 "); + sb.append(" SELECT a.TABLE_NAME as NAME,b.COMMENTS" + + " FROM ALL_TABLES a,USER_TAB_COMMENTS b" + + " WHERE a.TABLE_NAME=b.TABLE_NAME"); + sb.append(" AND 1=1 "); if(this.getSchTableNames() != null && this.getSchTableNames().size() > 0) { StringBuilder tables = new StringBuilder(); for (String table : this.getSchTableNames()) { tables.append(",'").append(table).append("'"); } - sb.append(" AND TABLE_NAME IN (" + tables.substring(1) + ")"); + sb.append(" AND a.TABLE_NAME IN (" + tables.substring(1) + ")"); } - sb.append(" AND OWNER='"+owner+"'"); return sb.toString(); } -- Gitee