diff --git a/CodeBuilder.WinForm/CodeBuilder.WinForm.csproj b/CodeBuilder.WinForm/CodeBuilder.WinForm.csproj index 224a7ef..f5e9538 100644 --- a/CodeBuilder.WinForm/CodeBuilder.WinForm.csproj +++ b/CodeBuilder.WinForm/CodeBuilder.WinForm.csproj @@ -239,6 +239,9 @@ + + + diff --git a/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-controller.nv b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-controller.nv index c295e80..2634acf 100644 --- a/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-controller.nv +++ b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-controller.nv @@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController; * @date $tdo.Date */ @RestController -@RequestMapping(value = "/rest/${tdo.ModelObject.OriginalName}s") +@RequestMapping(value = "/v1/${tdo.ModelObject.OriginalName}") public class ${tdo.Name}Controller extends BaseController<${tdo.Name}Service, ${tdo.Name}, ${tdo.Name}Example, ${keyColumn.LanguageType}> { diff --git a/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-repository.nv b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-repository.nv new file mode 100644 index 0000000..b65b69a --- /dev/null +++ b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-repository.nv @@ -0,0 +1,29 @@ +package ${tdo.Package}.data; + +import com.easytoolsoft.mybatis.data.CrudRepository; +import ${tdo.Package}.domain.${tdo.Name}; +import ${tdo.Package}.domain.example.${tdo.Name}Example; +import org.springframework.stereotype.Repository; + +#set($isAutoIncremented = false) +#foreach($column in $tdo.ModelObject.Columns.Values) + #if($column.IsAutoIncremented) + #set($keyColumn = $column) + #set($isAutoIncremented = true) + #end +#end +#if(!$isAutoIncremented) + #foreach($column in $tdo.ModelObject.PrimaryKeys.Values) + #set($keyColumn = $column) + #end + #set($keyColumn = $tdo.ModelObject.Columns.get_Item($keyColumn.Id)) +#end +/** + * $tdo.ModelObject.Comment 数据访问类 + * @author $tdo.Author + * @date $tdo.Date + */ +@Repository +public interface ${tdo.Name}Repository + extends CrudRepository<${tdo.Name}, ${tdo.Name}Example, ${keyColumn.LanguageType}> { +} \ No newline at end of file diff --git a/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-service-impl.nv b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-service-impl.nv new file mode 100644 index 0000000..b242e03 --- /dev/null +++ b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-service-impl.nv @@ -0,0 +1,48 @@ +package ${tdo.Package}.service.impl; + +import java.util.List; + +import com.easytoolsoft.mybatis.service.AbstractCrudService; +import ${tdo.Package}.data.${tdo.Name}Repository; +import ${tdo.Package}.domain.${tdo.Name}; +import ${tdo.Package}.domain.example.${tdo.Name}Example; +import ${tdo.Package}.domain.example.${tdo.Name}Example.Criteria; +import ${tdo.Package}.service.${tdo.Name}Service; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +#set($isAutoIncremented = false) +#foreach($column in $tdo.ModelObject.Columns.Values) + #if($column.IsAutoIncremented) + #set($keyColumn = $column) + #set($isAutoIncremented = true) + #end +#end +#if(!$isAutoIncremented) + #foreach($column in $tdo.ModelObject.PrimaryKeys.Values) + #set($keyColumn = $column) + #end + #set($keyColumn = $tdo.ModelObject.Columns.get_Item($keyColumn.Id)) +#end +/** + * $tdo.ModelObject.Comment 服务实现 + * @author $tdo.Author + * @date $tdo.Date + */ +@Slf4j +@Service +public class ${tdo.Name}ServiceImpl + extends AbstractCrudService<${tdo.Name}Repository, ${tdo.Name}, ${tdo.Name}Example, ${keyColumn.LanguageType}> + implements ${tdo.Name}Service { + + @Autowired + private ${tdo.Name}Repository ${tdo.LowerCamelName}Repos; + + @Override + protected ${tdo.Name}Example getPageExample(final String fieldName, final String keyword) { + final ${tdo.Name}Example example = new ${tdo.Name}Example(); + example.createCriteria().andFieldLike(fieldName, keyword); + return example; + } +} \ No newline at end of file diff --git a/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-service.nv b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-service.nv new file mode 100644 index 0000000..fd0b222 --- /dev/null +++ b/CodeBuilder.WinForm/Templates/java/NVelocity/mybatis-sharding-service.nv @@ -0,0 +1,29 @@ +package ${tdo.Package}.service; + +import java.util.List; + +import com.easytoolsoft.mybatis.service.CrudService; +import ${tdo.Package}.domain.${tdo.Name}; +import ${tdo.Package}.domain.example.${tdo.Name}Example; + +#set($isAutoIncremented = false) +#foreach($column in $tdo.ModelObject.Columns.Values) + #if($column.IsAutoIncremented) + #set($keyColumn = $column) + #set($isAutoIncremented = true) + #end +#end +#if(!$isAutoIncremented) + #foreach($column in $tdo.ModelObject.PrimaryKeys.Values) + #set($keyColumn = $column) + #end + #set($keyColumn = $tdo.ModelObject.Columns.get_Item($keyColumn.Id)) +#end +/** + * $tdo.ModelObject.Comment 服务接口 + * @author $tdo.Author + * @date $tdo.Date + */ +public interface ${tdo.Name}Service + extends CrudService<${tdo.Name}, ${tdo.Name}Example, ${keyColumn.LanguageType}> { +} diff --git a/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-mapper.nv b/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-mapper.nv index 721502c..d0e7326 100644 --- a/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-mapper.nv +++ b/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-mapper.nv @@ -112,7 +112,7 @@ #if($isAutoIncremented) - + SELECT LAST_INSERT_ID() #end diff --git a/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-sharding-mapper.nv b/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-sharding-mapper.nv index ad3a5b7..1fcc3c7 100644 --- a/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-sharding-mapper.nv +++ b/CodeBuilder.WinForm/Templates/mybatisMapper/NVelocity/mybatis-sharding-mapper.nv @@ -112,11 +112,11 @@ #if($isAutoIncremented) - + SELECT LAST_INSERT_ID() #end - insert into ${shardTable.name} + insert into ${tdo.ModelObject.OriginalName}_${shardTable.suffix} @@ -125,7 +125,7 @@ - insert into ${shardTable.name} + insert into ${tdo.ModelObject.OriginalName}_${shardTable.suffix} @@ -137,7 +137,7 @@ - insert into ${shardTable.name} + insert into ${tdo.ModelObject.OriginalName}_${shardTable.suffix} @@ -159,16 +159,16 @@ - delete from ${shardTable.name} where ${keyColumn.OriginalName} = #{id,jdbcType=${keyColumn.LanguageType}} + delete from ${tdo.ModelObject.OriginalName}_${shardTable.suffix} where ${keyColumn.OriginalName} = #{id,jdbcType=${keyColumn.LanguageType}} - delete from ${shardTable.name} + delete from ${tdo.ModelObject.OriginalName}_${shardTable.suffix} - delete from ${shardTable.name} where ${keyColumn.OriginalName} in + delete from ${tdo.ModelObject.OriginalName}_${shardTable.suffix} where ${keyColumn.OriginalName} in #{record.${keyColumn.LowerCamelName},jdbcType=${keyColumn.LanguageType}} @@ -176,14 +176,14 @@ - update ${shardTable.name} + update ${tdo.ModelObject.OriginalName}_${shardTable.suffix} where ${keyColumn.OriginalName} = #{record.${keyColumn.LowerCamelName},jdbcType=${keyColumn.LanguageType}} - update ${shardTable.name} + update ${tdo.ModelObject.OriginalName}_${shardTable.suffix} @@ -193,7 +193,7 @@ - update ${shardTable.name} + update ${tdo.ModelObject.OriginalName}_${shardTable.suffix} @@ -205,7 +205,7 @@ select - from ${shardTable.name} + from ${tdo.ModelObject.OriginalName}_${shardTable.suffix} @@ -234,20 +234,20 @@ select - from ${shardTable.name} + from ${tdo.ModelObject.OriginalName}_${shardTable.suffix}