1024-lab/smart-admin
1
0
Fork 0
mirror of https://github.com/1024-lab/smart-admin.git synced 2025-09-01 18:34:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

v3.22.0 【新增】优化代码生成;【新增】优化角色列宽

Browse Source
This commit is contained in:
zhuoda
2025-05-27 20:01:56 +08:00
parent 110d998dda
commit 921ab8023f
14 changed files with 55 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
smart-admin-api-java8-springboot2/sa-base/pom.xml
View File

@@ -208,16 +208,6 @@
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>jwks-rsa</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>

17
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java
View File

@@ -40,6 +40,12 @@ import java.util.Optional;
@Service
public class CodeGeneratorService {
private static final String COLUMN_NULLABLE_IDENTIFY = "NO";
private static final String COLUMN_PRIMARY_KEY = "PRI";
private static final String COLUMN_AUTO_INCREASE = "auto_increment";
@Resource
private CodeGeneratorDao codeGeneratorDao;
@@ -57,7 +63,13 @@ public class CodeGeneratorService {
* @return
*/
public List<TableColumnVO> getTableColumns(String tableName) {
return codeGeneratorDao.selectTableColumn(tableName);
List<TableColumnVO> tableColumns = codeGeneratorDao.selectTableColumn(tableName);
for (TableColumnVO tableColumn : tableColumns) {
tableColumn.setNullableFlag(!COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable()));
tableColumn.setPrimaryKeyFlag(COLUMN_PRIMARY_KEY.equalsIgnoreCase(tableColumn.getColumnKey()));
tableColumn.setAutoIncreaseFlag(SmartStringUtil.isNotEmpty(tableColumn.getExtra()) && COLUMN_AUTO_INCREASE.equalsIgnoreCase(tableColumn.getExtra()));
}
return tableColumns;
}
@@ -150,7 +162,7 @@ public class CodeGeneratorService {
}
// 校验表必须有主键
if(!tableColumns.stream().filter( e -> "PRI".equalsIgnoreCase(e.getColumnKey())).findAny().isPresent()){
if (tableColumns.stream().noneMatch(e -> COLUMN_PRIMARY_KEY.equalsIgnoreCase(e.getColumnKey()))) {
return ResponseDTO.userErrorParam("表必须有主键，请联系后端查看下数据库表结构");
}
@@ -199,6 +211,7 @@ public class CodeGeneratorService {
/**
* 下载代码
*
* @param tableName
* @return
*/

19
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
View File

@@ -128,16 +128,6 @@ public class DataTracerChangeContentService {
return this.getAddDeleteContent(object);
}
/**
* 解析批量bean的内容
*
* @param objectList 对象列表
* @return 单个内容
*/
public <T> String getChangeContent(List<T> objectList) {
return this.getObjectListContent(objectList);
}
// ---------------------------- 以下 是 私有private 方法 ----------------------------
/**
@@ -170,6 +160,15 @@ public class DataTracerChangeContentService {
return "【原数据】:<br/>" + oldContent + "<br/>" + "【新数据】:<br/>" + newContent;
}
/**
* 解析批量bean的内容
*
* @param objectList 对象列表
* @return 单个内容
*/
public <T> String getChangeContent(List<T> objectList) {
return this.getObjectListContent(objectList);
}
/**
* 获取一个对象的内容信息