From 3f80af66414d3148a7ae560bd67c392b3d9292da Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Tue, 19 Nov 2019 12:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8D=87=E7=BA=A7=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E5=89=A9=E4=BD=99=EF=BC=9A=E9=A2=84=E8=A7=88=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=8C=85=E4=B8=8B=E8=BD=BD=EF=BC=8C=E5=85=B3=E8=81=94=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/domain/ColumnInfo.java | 11 +- .../me/zhengjie/rest/GeneratorController.java | 18 +- .../me/zhengjie/service/GeneratorService.java | 22 ++- .../service/impl/GeneratorServiceImpl.java | 18 +- .../main/java/me/zhengjie/utils/GenUtil.java | 178 +++++++++++++----- .../java/me/zhengjie/gen/domain/GenTest.java | 51 +++++ .../gen/repository/GenTestRepository.java | 12 ++ .../zhengjie/gen/rest/GenTestController.java | 73 +++++++ .../zhengjie/gen/service/GenTestService.java | 47 +++++ .../zhengjie/gen/service/dto/GenTestDTO.java | 33 ++++ .../gen/service/dto/GenTestQueryCriteria.java | 35 ++++ .../gen/service/impl/GenTestServiceImpl.java | 109 +++++++++++ .../gen/service/mapper/GenTestMapper.java | 16 ++ .../template/generator/admin/Dto.ftl | 4 +- .../template/generator/admin/Entity.ftl | 28 ++- .../generator/admin/QueryCriteria.ftl | 39 +++- .../template/generator/admin/ServiceImpl.ftl | 4 +- .../template/generator/front/eForm.ftl | 64 +++++-- .../template/generator/front/index.ftl | 49 ++++- 19 files changed, 710 insertions(+), 101 deletions(-) create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java index 52f83da..727be0a 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java @@ -1,9 +1,8 @@ package me.zhengjie.domain; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; - +import me.zhengjie.utils.GenUtil; import javax.persistence.*; /** @@ -60,14 +59,20 @@ public class ColumnInfo { // 关联表名 private String joinName; + // 日期注解 + private String dateAnnotation; + public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) { this.tableName = tableName; this.columnName = columnName; this.columnType = columnType; this.keyType = keyType; this.extra = extra; - this.remark = remark; this.notNull = notNull; + if(GenUtil.PK.equalsIgnoreCase(keyType) && GenUtil.EXTRA.equalsIgnoreCase(extra)){ + this.notNull = false; + } + this.remark = remark; this.listShow = true; this.formShow = true; } diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index 8043881..497766a 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -34,6 +34,12 @@ public class GeneratorController { this.genConfigService = genConfigService; } + @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables/all") + public ResponseEntity getTables(){ + return new ResponseEntity<>(generatorService.getTables(), HttpStatus.OK); + } + @ApiOperation("查询数据库数据") @GetMapping(value = "/tables") public ResponseEntity getTables(@RequestParam(defaultValue = "") String name, @@ -55,18 +61,22 @@ public class GeneratorController { @ApiOperation("保存字段数据") @PutMapping public ResponseEntity save(@RequestBody List columnInfos){ - // 异步同步表信息 generatorService.save(columnInfos); return new ResponseEntity(HttpStatus.OK); } @ApiOperation("生成代码") - @PostMapping - public ResponseEntity generator(@RequestBody List columnInfos, @RequestParam String tableName){ + @PostMapping(value = "/{tableName}/{type}") + public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type){ if(!generatorEnabled){ throw new BadRequestException("此环境不允许生成代码！"); } - generatorService.generator(columnInfos,genConfigService.find(tableName),tableName); + switch (type){ + // 生成代码 + case 0: generatorService.generator(genConfigService.find(tableName), generatorService.getColumns(tableName)); + break; + default: break; + } return new ResponseEntity(HttpStatus.OK); } } diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index 79d0971..027d2bd 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -27,14 +27,6 @@ public interface GeneratorService { */ List getColumns(String name); - /** - * 生成代码 - * @param columnInfos 表字段数据 - * @param genConfig 代码生成配置 - * @param tableName 表名 - */ - void generator(List columnInfos, GenConfig genConfig, String tableName); - /** * 同步表数据 * @param columnInfos / @@ -47,4 +39,18 @@ public interface GeneratorService { * @param columnInfos / */ void save(List columnInfos); + + /** + * 获取所有table + * @return / + */ + Object getTables(); + + /** + * 代码生成 + * @param genConfig 配置信息 + * @param columns 字段信息 + * @return / + */ + Object generator(GenConfig genConfig, List columns); } diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index a687d9b..678a1ae 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -24,6 +24,7 @@ import java.util.List; * @date 2019-01-02 */ @Service +@SuppressWarnings("all") public class GeneratorServiceImpl implements GeneratorService { @PersistenceContext @@ -36,7 +37,16 @@ public class GeneratorServiceImpl implements GeneratorService { } @Override - @SuppressWarnings("all") + public Object getTables() { + // 使用预编译防止sql注入 + String sql = "select table_name ,create_time , engine, table_collation, table_comment from information_schema.tables " + + "where table_schema = (select database()) " + + "order by create_time desc"; + Query query = em.createNativeQuery(sql); + return query.getResultList(); + } + + @Override public Object getTables(String name, int[] startEnd) { // 使用预编译防止sql注入 String sql = "select table_name ,create_time , engine, table_collation, table_comment from information_schema.tables " + @@ -68,7 +78,6 @@ public class GeneratorServiceImpl implements GeneratorService { } } - @SuppressWarnings("all") public List query(String tableName){ // 使用预编译防止sql注入 String sql = "select column_name, is_nullable, data_type, column_comment, column_key, extra from information_schema.columns " + @@ -104,14 +113,15 @@ public class GeneratorServiceImpl implements GeneratorService { } @Override - public void generator(List columnInfos, GenConfig genConfig, String tableName) { + public Object generator(GenConfig genConfig, List columns) { if(genConfig.getId() == null){ throw new BadRequestException("请先配置生成器"); } try { - GenUtil.generatorCode(columnInfos,genConfig,tableName); + GenUtil.generatorCode(columns,genConfig); } catch (IOException e) { throw new RuntimeException(e); } + return null; } } diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index 91c2d7b..a886810 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -28,9 +28,9 @@ public class GenUtil { private static final String BIGDECIMAL = "BigDecimal"; - private static final String PK = "PRI"; + public static final String PK = "PRI"; - private static final String EXTRA = "auto_increment"; + public static final String EXTRA = "auto_increment"; /** * 获取后端代码模板名称 @@ -61,85 +61,161 @@ public class GenUtil { return templateNames; } - /** - * 生成代码 - * @param columnInfos 表元数据 - * @param genConfig 生成代码的参数配置，如包路径，作者 - */ - public static void generatorCode(List columnInfos, GenConfig genConfig, String tableName) throws IOException { - Map map = new HashMap<>(); - map.put("package",genConfig.getPack()); - map.put("moduleName",genConfig.getModuleName()); - map.put("author",genConfig.getAuthor()); - map.put("date", LocalDate.now().toString()); - map.put("tableName",tableName); - String className = StringUtils.toCapitalizeCamelCase(tableName); - String changeClassName = StringUtils.toCamelCase(tableName); - + public static void generatorCode(List columnInfos, GenConfig genConfig) throws IOException { + // 存储模版字段数据 + Map genMap = new HashMap<>(); + // 包名称 + genMap.put("package",genConfig.getPack()); + // 模块名称 + genMap.put("moduleName",genConfig.getModuleName()); + // 作者 + genMap.put("author",genConfig.getAuthor()); + // 创建日期 + genMap.put("date", LocalDate.now().toString()); + // 表名 + genMap.put("tableName",genConfig.getTableName()); + // 大写开头的类名 + String className = StringUtils.toCapitalizeCamelCase(genConfig.getTableName()); + // 小写开头的类名 + String changeClassName = StringUtils.toCamelCase(genConfig.getTableName()); // 判断是否去除表前缀 if (StringUtils.isNotEmpty(genConfig.getPrefix())) { - className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(tableName,genConfig.getPrefix())); - changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(tableName,genConfig.getPrefix())); + className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(genConfig.getTableName(),genConfig.getPrefix())); + changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(genConfig.getTableName(),genConfig.getPrefix())); } - map.put("className", className); - map.put("upperCaseClassName", className.toUpperCase()); - map.put("changeClassName", changeClassName); - map.put("hasTimestamp",false); - map.put("queryHasTimestamp",false); - map.put("queryHasBigDecimal",false); - map.put("hasBigDecimal",false); - map.put("hasQuery",false); - map.put("auto",false); - + // 保存类名 + genMap.put("className", className); + // 保存小写开头的类名 + genMap.put("changeClassName", changeClassName); + // 存在 Timestamp 字段 + genMap.put("hasTimestamp",false); + // 查询类中存在 Timestamp 字段 + genMap.put("queryHasTimestamp",false); + // 存在 BigDecimal 字段 + genMap.put("hasBigDecimal",false); + // 查询类中存在 BigDecimal 字段 + genMap.put("queryHasBigDecimal",false); + // 是否需要创建查询 + genMap.put("hasQuery",false); + // 自增主键 + genMap.put("auto",false); + // 存在字典 + genMap.put("hasDict",false); + // 存在日期注解 + genMap.put("hasDateAnnotation",false); + // 保存字段信息 List> columns = new ArrayList<>(); + // 保存查询字段的信息 List> queryColumns = new ArrayList<>(); + // 存储字典信息 + List dicts = new ArrayList<>(); + // 存储 DateRange 信息 + List> dateRanges = new ArrayList<>(); + // 存储不为空的字段信息 + List> isNotNullColumns = new ArrayList<>(); + for (ColumnInfo column : columnInfos) { Map listMap = new HashMap<>(); - listMap.put("columnComment",column.getRemark()); + // 字段描述 + listMap.put("remark",column.getRemark()); + // 字段类型 listMap.put("columnKey",column.getKeyType()); - - String colType = ColUtil.cloToJava(column.getColumnType().toString()); + // 主键类型 + String colType = ColUtil.cloToJava(column.getColumnType()); + // 小写开头的字段名 String changeColumnName = StringUtils.toCamelCase(column.getColumnName().toString()); + // 大写开头的字段名 String capitalColumnName = StringUtils.toCapitalizeCamelCase(column.getColumnName().toString()); if(PK.equals(column.getKeyType())){ - map.put("pkColumnType",colType); - map.put("pkChangeColName",changeColumnName); - map.put("pkCapitalColName",capitalColumnName); + // 存储主键类型 + genMap.put("pkColumnType",colType); + // 存储小写开头的字段名 + genMap.put("pkChangeColName",changeColumnName); + // 存储大写开头的字段名 + genMap.put("pkCapitalColName",capitalColumnName); } + // 是否存在 Timestamp 类型的字段 if(TIMESTAMP.equals(colType)){ - map.put("hasTimestamp",true); + genMap.put("hasTimestamp",true); } + // 是否存在 BigDecimal 类型的字段 if(BIGDECIMAL.equals(colType)){ - map.put("hasBigDecimal",true); + genMap.put("hasBigDecimal",true); } + // 主键是否自增 if(EXTRA.equals(column.getExtra())){ - map.put("auto",true); + genMap.put("auto",true); + } + // 主键存在字典 + if(StringUtils.isNotBlank(column.getDictName())){ + genMap.put("hasDict",true); + dicts.add(column.getDictName()); } + + // 存储字段类型 listMap.put("columnType",colType); + // 存储字原始段名称 listMap.put("columnName",column.getColumnName()); - listMap.put("isNullable",column.getNotNull()); + // 不为空 + listMap.put("istNotNull",column.getNotNull()); + // 字段列表显示 listMap.put("columnShow",column.getListShow()); + // 表单显示 + listMap.put("formShow",column.getFormShow()); + // 表单组件类型 + listMap.put("formType",column.getFormType()); + // 小写开头的字段名称 listMap.put("changeColumnName",changeColumnName); + //大写开头的字段名称 listMap.put("capitalColumnName",capitalColumnName); - + // 字典名称 + listMap.put("dictName",column.getDictName()); + // 关联字段 + listMap.put("joinName",column.getJoinName()); + // 日期注解 + listMap.put("dateAnnotation",column.getDateAnnotation()); + if(StringUtils.isNotBlank(column.getDateAnnotation())){ + genMap.put("hasDateAnnotation",true); + } + // 添加非空字段信息 + if(column.getNotNull()){ + isNotNullColumns.add(listMap); + } // 判断是否有查询，如有则把查询的字段set进columnQuery if(!StringUtils.isBlank(column.getQueryType())){ - listMap.put("columnQuery",column.getQueryType()); - map.put("hasQuery",true); + // 查询类型 + listMap.put("queryType",column.getQueryType()); + // 是否存在查询 + genMap.put("hasQuery",true); if(TIMESTAMP.equals(colType)){ - map.put("queryHasTimestamp",true); + // 查询中存储 Timestamp 类型 + genMap.put("queryHasTimestamp",true); } if(BIGDECIMAL.equals(colType)){ - map.put("queryHasBigDecimal",true); + // 查询中存储 BigDecimal 类型 + genMap.put("queryHasBigDecimal",true); + } + if("DateRange".equalsIgnoreCase(column.getQueryType())){ + dateRanges.add(listMap); + } else { + // 添加到查询列表中 + queryColumns.add(listMap); } - queryColumns.add(listMap); } + // 添加到字段列表中 columns.add(listMap); } - map.put("columns",columns); - map.put("queryColumns",queryColumns); + // 保存字段列表 + genMap.put("columns",columns); + // 保存查询列表 + genMap.put("queryColumns",queryColumns); + // 保存字段列表 + genMap.put("dicts",dicts); + // 保存查询列表 + genMap.put("dateRanges",dateRanges); + // 保存非空字段信息 + genMap.put("isNotNullColumns",isNotNullColumns); TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); - // 生成后端代码 List templates = getAdminTemplateNames(); for (String templateName : templates) { @@ -154,14 +230,14 @@ public class GenUtil { continue; } // 生成代码 - genFile(file, template, map); + genFile(file, template, genMap); } // 生成前端代码 templates = getFrontTemplateNames(); for (String templateName : templates) { Template template = engine.getTemplate("generator/front/"+templateName+".ftl"); - String filePath = getFrontFilePath(templateName,genConfig,map.get("changeClassName").toString()); + String filePath = getFrontFilePath(templateName,genConfig,genMap.get("changeClassName").toString()); assert filePath != null; File file = new File(filePath); @@ -171,7 +247,7 @@ public class GenUtil { continue; } // 生成代码 - genFile(file, template, map); + genFile(file, template, genMap); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java b/eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java new file mode 100644 index 0000000..f16ebea --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/domain/GenTest.java @@ -0,0 +1,51 @@ +package me.zhengjie.gen.domain; + +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import javax.validation.constraints.*; +import javax.persistence.Entity; +import javax.persistence.Table; +import org.hibernate.annotations.*; +import java.sql.Timestamp; +import java.io.Serializable; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Entity +@Data +@Table(name="gen_test") +public class GenTest implements Serializable { + + // ID + @Id + @Column(name = "id") + private Long id; + + // 名称 + @Column(name = "name",nullable = false) + @NotBlank + private String name; + + // 状态 + @Column(name = "status",nullable = false) + @NotNull + private Boolean status; + + // 日期 + @Column(name = "date",nullable = false) + @NotNull + private Timestamp date; + + // 创建日期 + @Column(name = "create_time") + @CreationTimestamp + private Timestamp createTime; + + public void copy(GenTest source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java b/eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java new file mode 100644 index 0000000..e52586d --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/repository/GenTestRepository.java @@ -0,0 +1,12 @@ +package me.zhengjie.gen.repository; + +import me.zhengjie.gen.domain.GenTest; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +public interface GenTestRepository extends JpaRepository, JpaSpecificationExecutor { +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java b/eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java new file mode 100644 index 0000000..d5a37a8 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/rest/GenTestController.java @@ -0,0 +1,73 @@ +package me.zhengjie.gen.rest; + +import me.zhengjie.aop.log.Log; +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.gen.service.GenTestService; +import me.zhengjie.gen.service.dto.GenTestQueryCriteria; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Api(tags = "GenTest管理") +@RestController +@RequestMapping("/api/genTest") +public class GenTestController { + + private final GenTestService genTestService; + + public GenTestController(GenTestService genTestService) { + this.genTestService = genTestService; + } + + @Log("导出数据") + @ApiOperation("导出数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('genTest:list')") + public void download(HttpServletResponse response, GenTestQueryCriteria criteria) throws IOException { + genTestService.download(genTestService.queryAll(criteria), response); + } + + @GetMapping + @Log("查询GenTest") + @ApiOperation("查询GenTest") + @PreAuthorize("@el.check('genTest:list')") + public ResponseEntity getGenTests(GenTestQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity<>(genTestService.queryAll(criteria,pageable),HttpStatus.OK); + } + + @PostMapping + @Log("新增GenTest") + @ApiOperation("新增GenTest") + @PreAuthorize("@el.check('genTest:add')") + public ResponseEntity create(@Validated @RequestBody GenTest resources){ + return new ResponseEntity<>(genTestService.create(resources),HttpStatus.CREATED); + } + + @PutMapping + @Log("修改GenTest") + @ApiOperation("修改GenTest") + @PreAuthorize("@el.check('genTest:edit')") + public ResponseEntity update(@Validated @RequestBody GenTest resources){ + genTestService.update(resources); + return new ResponseEntity(HttpStatus.NO_CONTENT); + } + + @DeleteMapping(value = "/{id}") + @Log("删除GenTest") + @ApiOperation("删除GenTest") + @PreAuthorize("@el.check('genTest:del')") + public ResponseEntity delete(@PathVariable Long id){ + genTestService.delete(id); + return new ResponseEntity(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java new file mode 100644 index 0000000..4c6c612 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/GenTestService.java @@ -0,0 +1,47 @@ +package me.zhengjie.gen.service; + +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.gen.service.dto.GenTestDTO; +import me.zhengjie.gen.service.dto.GenTestQueryCriteria; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +public interface GenTestService { + + /** + * 查询数据分页 + * @param criteria 条件参数 + * @param pageable 分页参数 + * @return Map + */ + Map queryAll(GenTestQueryCriteria criteria, Pageable pageable); + + /** + * 查询所有数据不分页 + * @param criteria 条件参数 + * @return List + */ + List queryAll(GenTestQueryCriteria criteria); + + /** + * 根据ID查询 + * @param id ID + * @return GenTestDTO + */ + GenTestDTO findById(Long id); + + GenTestDTO create(GenTest resources); + + void update(GenTest resources); + + void delete(Long id); + + void download(List all, HttpServletResponse response) throws IOException; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java new file mode 100644 index 0000000..d1239b5 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestDTO.java @@ -0,0 +1,33 @@ +package me.zhengjie.gen.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import java.io.Serializable; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Data +public class GenTestDTO implements Serializable { + + // ID + // 处理精度丢失问题 + @JsonSerialize(using= ToStringSerializer.class) + private Long id; + + // 名称 + private String name; + + // 状态 + private Boolean status; + + // 日期 + private Timestamp date; + + // 创建日期 + private Timestamp createTime; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java new file mode 100644 index 0000000..55b00ec --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/dto/GenTestQueryCriteria.java @@ -0,0 +1,35 @@ +package me.zhengjie.gen.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import me.zhengjie.annotation.Query; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Data +public class GenTestQueryCriteria{ + + // 模糊 + @Query(type = Query.Type.INNER_LIKE) + private String name; + + // 精确 + @Query + private Boolean status; + + // 时间段查询 + @Query(type = Query.Type.GREATER_THAN, propName = "date") + private Timestamp dateStart; + + @Query(type = Query.Type.LESS_THAN, propName = "date") + private Timestamp dateEnd; + + // 时间段查询 + @Query(type = Query.Type.GREATER_THAN, propName = "createTime") + private Timestamp createTimeStart; + + @Query(type = Query.Type.LESS_THAN, propName = "createTime") + private Timestamp createTimeEnd; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java new file mode 100644 index 0000000..6f65d30 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/impl/GenTestServiceImpl.java @@ -0,0 +1,109 @@ +package me.zhengjie.gen.service.impl; + +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.utils.ValidationUtil; +import me.zhengjie.utils.FileUtil; +import me.zhengjie.gen.repository.GenTestRepository; +import me.zhengjie.gen.service.GenTestService; +import me.zhengjie.gen.service.dto.GenTestDTO; +import me.zhengjie.gen.service.dto.GenTestQueryCriteria; +import me.zhengjie.gen.service.mapper.GenTestMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import me.zhengjie.utils.PageUtil; +import me.zhengjie.utils.QueryHelp; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Service +@CacheConfig(cacheNames = "genTest") +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class GenTestServiceImpl implements GenTestService { + + private final GenTestRepository genTestRepository; + + private final GenTestMapper genTestMapper; + + public GenTestServiceImpl(GenTestRepository genTestRepository, GenTestMapper genTestMapper) { + this.genTestRepository = genTestRepository; + this.genTestMapper = genTestMapper; + } + + @Override + @Cacheable + public Map queryAll(GenTestQueryCriteria criteria, Pageable pageable){ + Page page = genTestRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + return PageUtil.toPage(page.map(genTestMapper::toDto)); + } + + @Override + @Cacheable + public List queryAll(GenTestQueryCriteria criteria){ + return genTestMapper.toDto(genTestRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + } + + @Override + @Cacheable(key = "#p0") + public GenTestDTO findById(Long id) { + GenTest genTest = genTestRepository.findById(id).orElseGet(GenTest::new); + ValidationUtil.isNull(genTest.getId(),"GenTest","id",id); + return genTestMapper.toDto(genTest); + } + + @Override + @CacheEvict(allEntries = true) + @Transactional(rollbackFor = Exception.class) + public GenTestDTO create(GenTest resources) { + Snowflake snowflake = IdUtil.createSnowflake(1, 1); + resources.setId(snowflake.nextId()); + return genTestMapper.toDto(genTestRepository.save(resources)); + } + + @Override + @CacheEvict(allEntries = true) + @Transactional(rollbackFor = Exception.class) + public void update(GenTest resources) { + GenTest genTest = genTestRepository.findById(resources.getId()).orElseGet(GenTest::new); + ValidationUtil.isNull( genTest.getId(),"GenTest","id",resources.getId()); + genTest.copy(resources); + genTestRepository.save(genTest); + } + + @Override + @CacheEvict(allEntries = true) + @Transactional(rollbackFor = Exception.class) + public void delete(Long id) { + genTestRepository.deleteById(id); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (GenTestDTO genTest : all) { + Map map = new LinkedHashMap<>(); + map.put("名称", genTest.getName()); + map.put("状态", genTest.getStatus()); + map.put("日期", genTest.getDate()); + map.put("创建日期", genTest.getCreateTime()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java b/eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java new file mode 100644 index 0000000..4ffcebe --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/gen/service/mapper/GenTestMapper.java @@ -0,0 +1,16 @@ +package me.zhengjie.gen.service.mapper; + +import me.zhengjie.base.BaseMapper; +import me.zhengjie.gen.domain.GenTest; +import me.zhengjie.gen.service.dto.GenTestDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** +* @author Zheng Jie +* @date 2019-11-19 +*/ +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface GenTestMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl index d57910b..c97b19f 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl @@ -23,8 +23,8 @@ public class ${className}DTO implements Serializable { <#if columns??> <#list columns as column> - <#if column.columnComment != ''> - // ${column.columnComment} + <#if column.remark != ''> + // ${column.remark} <#if column.columnKey = 'PRI'> <#if !auto && pkColumnType = 'Long'> diff --git a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl b/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl index 5bf7eab..d2a1494 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl @@ -4,6 +4,14 @@ import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; +<#if isNotNullColumns??> +import javax.validation.constraints.*; + +<#if hasDateAnnotation> +import javax.persistence.Entity; +import javax.persistence.Table; +import org.hibernate.annotations.*; + <#if hasTimestamp> import java.sql.Timestamp; @@ -23,8 +31,8 @@ public class ${className} implements Serializable { <#if columns??> <#list columns as column> - <#if column.columnComment != ''> - // ${column.columnComment} + <#if column.remark != ''> + // ${column.remark} <#if column.columnKey = 'PRI'> @Id @@ -32,7 +40,21 @@ public class ${className} implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "${column.columnName}"<#if column.columnKey = 'UNI'>,unique = true<#if column.isNullable = 'NO' && column.columnKey != 'PRI'>,nullable = false) + @Column(name = "${column.columnName}"<#if column.columnKey = 'UNI'>,unique = true<#if column.istNotNull && column.columnKey != 'PRI'>,nullable = false) + <#if column.istNotNull && column.columnKey != 'PRI'> + <#if column.columnType = 'String'> + @NotBlank + <#else> + @NotNull + + + <#if column.dateAnnotation??> + <#if column.dateAnnotation = 'CreationTimestamp'> + @CreationTimestamp + <#else> + @UpdateTimestamp + + private ${column.columnType} ${column.changeColumnName}; diff --git a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl index 2f5e20a..d46682e 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl @@ -20,15 +20,42 @@ public class ${className}QueryCriteria{ <#if queryColumns??> <#list queryColumns as column> - <#if column.columnQuery = '1'> - // 模糊 - @Query(type = Query.Type.INNER_LIKE) - - <#if column.columnQuery = '2'> +<#if column.queryType = '='> // 精确 @Query - private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = 'Like'> + // 模糊 + @Query(type = Query.Type.INNER_LIKE) + private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = '!='> + // 不等于 + @Query(type = Query.Type.NOT_EQUAL) + private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = '>='> + // 大于等于 + @Query(type = Query.Type.GREATER_THAN) + private ${column.columnType} ${column.changeColumnName}; + +<#if column.queryType = '<='> + // 小于等于 + @Query(type = Query.Type.LESS_THAN) + private ${column.columnType} ${column.changeColumnName}; + + + +<#if dateRanges??> + <#list dateRanges as column> + + // 时间段查询 + @Query(type = Query.Type.GREATER_THAN, propName = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName}Start; + + @Query(type = Query.Type.LESS_THAN, propName = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName}End; } \ No newline at end of file diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl index b81db3b..29cd908 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -141,8 +141,8 @@ public class ${className}ServiceImpl implements ${className}Service { Map map = new LinkedHashMap<>(); <#list columns as column> <#if column.columnKey != 'PRI'> - <#if column.columnComment != ''> - map.put("${column.columnComment}", ${changeClassName}.get${column.capitalColumnName}()); + <#if column.remark != ''> + map.put("${column.remark}", ${changeClassName}.get${column.capitalColumnName}()); <#else> map.put(" ${column.changeColumnName}", ${changeClassName}.get${column.capitalColumnName}()); diff --git a/eladmin-system/src/main/resources/template/generator/front/eForm.ftl b/eladmin-system/src/main/resources/template/generator/front/eForm.ftl index de44a6a..4a1d933 100644 --- a/eladmin-system/src/main/resources/template/generator/front/eForm.ftl +++ b/eladmin-system/src/main/resources/template/generator/front/eForm.ftl @@ -1,13 +1,33 @@