diff --git a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java index 88af4bc0..89d90dbc 100644 --- a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java +++ b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java @@ -64,7 +64,7 @@ public class CodeGeneratorVer2 { /** * 需要生成的表名(两者只能取其一) */ - public static String[] INCLUDE_TABLES = { "QA_LIQUID_TANK_TASK_HI"}; + public static String[] INCLUDE_TABLES = {"QA_REMIND_MSG"}; /** * 需要排除的表名(两者只能取其一) */ diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl index f382b753..323ea875 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl @@ -81,6 +81,7 @@ public class ${table.controllerName!} { QueryWrapper<${entityKey!}> qw = Condition.getQueryWrapper(${entityKeyPath!}); ${entityKey!} detail = service.getOne(qw); ${entityKey!}VO detailVO = ${entityKey!}Wrapper.build().entityVO(detail); + service.setVOValue(detailVO); return R.data(detailVO); } @@ -95,6 +96,10 @@ public class ${table.controllerName!} { QueryWrapper<${entityKey!}> qw = Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}.class); IPage<${entityKey!}> pages = service.page(Condition.getPage(query), qw); IPage<${entityKey!}VO> pagesVO = ${entityKey!}Wrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); return R.data(pagesVO); } @@ -186,7 +191,7 @@ public class ${table.controllerName!} { } /** - * [工作中心] 修改批量 + * ${table.comment!} 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) @@ -251,7 +256,7 @@ public class ${table.controllerName!} { //} //queryWrapper.lambda().eq(${entityKey!}Entity::getIsDeleted, BladeConstant.DB_NOT_DELETED); List<${entityKey!}Excel> list = service.export${entityKey!}(qw); - ExcelUtil.export(response, "${table.comment!}数据" + DateUtil.time(), + ExcelUtil.export(response, "${table.comment!}数据" + org.springblade.core.tool.utils.DateUtil.time(), "${table.comment!}数据表", list, ${entityKey!}Excel.class); } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl index 9e84eec2..c1af5f21 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl @@ -42,4 +42,10 @@ public interface ${table.serviceName!} extends IService<${entity!}> { * @return List<${entityKey!}Excel> */ List<${entityKey!}Excel> export${entityKey!}(Wrapper<${entityKey!}> queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(${entityKey!}VO vo); } diff --git a/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl b/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl index cb885c8c..90d6dd6f 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl +++ b/blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl @@ -13,6 +13,7 @@ import ${packageName!}.pojo.vo.${entityKey!}VO; import ${packageName!}.excel.${entityKey!}Excel; import ${packageName!}.mapper.${table.mapperName!}; import ${packageName!}.service.${table.serviceName!}; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -40,6 +41,9 @@ public class ${table.serviceImplName!} extends ${superServiceImplClass!}<${table public class ${table.serviceImplName!} extends ServiceImpl<${table.mapperName!}, ${entity!}> implements ${table.serviceName!} { #} + @Resource + private IUserClient userClient; + @Override public IPage<${entityKey!}VO> select${entityKey!}Page(IPage<${entityKey!}VO> page, ${entityKey!}VO ${entityKeyPath!}) { return page.setRecords(baseMapper.select${entityKey!}Page(page, ${entityKeyPath!})); @@ -53,4 +57,9 @@ public class ${table.serviceImplName!} extends ServiceImpl<${table.mapperName!}, //}); return ${entityKeyPath!}List; } + + @Override + public void setVOValue(${entityKey!}VO vo) { + + } } diff --git a/blade-ops/blade-develop/src/test/resources/templates/code.properties b/blade-ops/blade-develop/src/test/resources/templates/code.properties index 0f392d89..2905be34 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/code.properties +++ b/blade-ops/blade-develop/src/test/resources/templates/code.properties @@ -6,8 +6,8 @@ # CodeGenerator spring.datasource.driver-class-name=oracle.jdbc.OracleDriver -spring.datasource.url=jdbc:oracle:thin:@192.168.0.221:1521/orcl -#spring.datasource.url=jdbc:oracle:thin:@172.18.80.50:1521/orcl +#spring.datasource.url=jdbc:oracle:thin:@192.168.0.221:1521/orcl +spring.datasource.url=jdbc:oracle:thin:@172.18.80.50:1521/orcl spring.datasource.username=JONHON_MES spring.datasource.password=oracle123456 author=Tom Shuo \ No newline at end of file