manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对一大波idea提醒需要优化的地方进行处理

Browse Source
This commit is contained in:
handy
2023-11-23 16:25:59 +08:00
parent 8b1fb129ce
commit efa2538736
98 changed files with 195 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataSourceAuthController.java
View File

@@ -40,7 +40,7 @@ import java.util.stream.Stream;
@AuthMan(DocAuthConst.DB_DATASOURCE_MANAGE)
@RequestMapping("/zyplayer-doc-db/auth")
public class DbDataSourceAuthController {
private static Logger logger = LoggerFactory.getLogger(DbDataSourceAuthController.class);
private static final Logger logger = LoggerFactory.getLogger(DbDataSourceAuthController.class);
@Resource
UserInfoService userInfoService;

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java
View File

@@ -43,7 +43,7 @@ import java.util.*;
@RestController
@RequestMapping("/zyplayer-doc-db/data-view")
public class DbDataViewController {
private static Logger logger = LoggerFactory.getLogger(DbDataViewController.class);
private static final Logger logger = LoggerFactory.getLogger(DbDataViewController.class);
@Resource
ExecuteAuthService executeAuthService;

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java
View File

@@ -40,7 +40,7 @@ import java.util.List;
@RestController
@RequestMapping("/zyplayer-doc-db/procedure")
public class DbProcedureController {
private static Logger logger = LoggerFactory.getLogger(DbProcedureController.class);
private static final Logger logger = LoggerFactory.getLogger(DbProcedureController.class);
@Resource
DatabaseServiceFactory databaseServiceFactory;

8
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java
View File

@@ -46,7 +46,7 @@ import java.util.*;
@RestController
@RequestMapping("/zyplayer-doc-db/executor")
public class DbSqlExecutorController {
private static Logger logger = LoggerFactory.getLogger(DbSqlExecutorController.class);
private static final Logger logger = LoggerFactory.getLogger(DbSqlExecutorController.class);
@Resource
ColumnSqlExecutor columnSqlExecutor;
@@ -87,10 +87,10 @@ public class DbSqlExecutorController {
// 参数处理
Map<String, Object> paramMap = JSON.parseObject(params);
// 解析出多个执行的SQL
List<Map<String,Object>> analysisQuerySqlList = new LinkedList<Map<String,Object>>();
List<Map<String,Object>> analysisQuerySqlList = new LinkedList<>();
try {
String driverClassName = dbBaseService.getDatabaseProduct().getDriverClassName();
List<SQLStatement> sqlStatements = new ArrayList<SQLStatement>();
List<SQLStatement> sqlStatements;
//根据驱动程序类名获取数据库类型
DbType dbType = SQLTransformUtils.getDbTypeByDriverClassName(driverClassName);
sqlStatements = new SQLStatementParser(sql,dbType).parseStatementList();
@@ -99,7 +99,7 @@ public class DbSqlExecutorController {
if(sb.length()>0&&';' == (sb.charAt(sb.length()-1))){
sb.deleteCharAt(sb.length()-1);
}
Map<String,Object> map = new HashMap<String,Object>();
Map<String,Object> map = new HashMap<>();
//原始sql
map.put("originalSql",sb);
//sql解析类型

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java
View File

@@ -32,7 +32,7 @@ import java.util.*;
@RestController
@RequestMapping("/zyplayer-doc-db/table-relation")
public class DbTableRelationController {
private static Logger logger = LoggerFactory.getLogger(DbTableRelationController.class);
private static final Logger logger = LoggerFactory.getLogger(DbTableRelationController.class);
@Resource
DatabaseServiceFactory databaseServiceFactory;

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/CommonFormatDownloadService.java
View File

@@ -61,7 +61,7 @@ public class CommonFormatDownloadService implements FormatDownloadService {
StringBuilder resultSb = new StringBuilder("/*\n" +
" 数据库 : " + param.getDbName() + "\n" +
" 数据库类型 : " + dbBaseService.getDatabaseProduct().name() + "\n" +
" 导出时间 : " + DateTime.now().toString() + "\n" +
" 导出时间 : " + DateTime.now() + "\n" +
" 导出软件 : zyplayer-doc\n" +
" 软件版本 : " + ZyplayerDocVersion.version + "\n" +
"*/\n\n");

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/ExcelFormatDownloadService.java
View File

@@ -43,7 +43,7 @@ import java.util.stream.Stream;
*/
@Service(FormatDownloadConst.EXCEL)
public class ExcelFormatDownloadService implements FormatDownloadService {
private static Logger logger = LoggerFactory.getLogger(ExcelFormatDownloadService.class);
private static final Logger logger = LoggerFactory.getLogger(ExcelFormatDownloadService.class);
@Resource
ExecuteAuthService executeAuthService;

1
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java
View File

@@ -16,5 +16,4 @@ public class FormatDownloadConst {
public static final String JSON = "json";
public static final String EXCEL = "excel";
public static final String CVS = "cvs";
;
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java
View File

@@ -12,6 +12,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public interface FormatDownloadService {
public void download(HttpServletResponse response, DataViewParam param, String[] tableNameArr) throws Exception;
void download(HttpServletResponse response, DataViewParam param, String[] tableNameArr) throws Exception;
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java
View File

@@ -50,7 +50,7 @@ public class DatasourceUtil {
SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
sqlSessionFactoryBean.setDataSource(dataSource);
sqlSessionFactoryBean.setMapperLocations(resources);
sqlSessionFactoryBean.setPlugins(new Interceptor[]{sqlLogInterceptor});
sqlSessionFactoryBean.setPlugins(sqlLogInterceptor);
SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactoryBean.getObject());
// 组装自定义的bean
databaseFactoryBean.setId(dbDatasource.getId());

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogInterceptor.java
View File

@@ -67,7 +67,7 @@ public class SqlLogInterceptor implements Interceptor {
private String getParameterValue(Object obj) {
String value = null;
if (obj instanceof String) {
value = "'" + obj.toString() + "'";
value = "'" + obj + "'";
} else if (obj instanceof Date) {
DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.CHINA);
value = "'" + formatter.format(obj) + "'";
@@ -87,7 +87,7 @@ public class SqlLogInterceptor implements Interceptor {
List<ParameterMapping> parameterMappings = boundSql.getParameterMappings();
StringBuilder sqlSb = new StringBuilder(boundSql.getSql().replaceAll("[\\s]+", " "));
int fromIndex = 0;
if (parameterMappings.size() > 0 && parameterObject != null) {
if (!parameterMappings.isEmpty() && parameterObject != null) {
TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
//sqlSb = sqlSb.replaceFirst("\\?", getParameterValue(parameterObject));

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/job/BackupJob.java
View File

@@ -23,7 +23,7 @@ public class BackupJob implements Job {
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
public void execute(JobExecutionContext context) {
// 解析参数
BackupJobVO jobVO = JSONObject.parseObject(context.getJobDetail().getJobDataMap().getString(QuartzManagerUtils.PARAM_KEY), BackupJobVO.class);
// TODO 保存备份记录

6
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnExecuteResult.java
View File

@@ -53,9 +53,9 @@ public class ColumnExecuteResult {
}
public static class ExecuteResultCode {
public static Integer SUCCESS = 0;
public static Integer WARN = -1;
public static Integer ERROR = -2;
public static final Integer SUCCESS = 0;
public static final Integer WARN = -1;
public static final Integer ERROR = -2;
}
/**

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnSqlExecutor.java
View File

@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
@Repository
public class ColumnSqlExecutor {
private static Logger logger = LoggerFactory.getLogger(SqlExecutor.class);
private static final Logger logger = LoggerFactory.getLogger(SqlExecutor.class);
@Resource
DatabaseRegistrationBean databaseRegistrationBean;
@@ -119,7 +119,7 @@ public class ColumnSqlExecutor {
statementMap.put(executeParam.getExecuteId(), preparedStatement);
List<ParameterMapping> parameterMappings = executeParam.getParameterMappings();
List<Object> paramDataList = executeParam.getParamList();
if (parameterMappings.size() > 0 && paramDataList.size() > 0) {
if (!parameterMappings.isEmpty() && !paramDataList.isEmpty()) {
int parameterCount = 99999;
try {
parameterCount = preparedStatement.getParameterMetaData().getParameterCount();

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java
View File

@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
@Repository
public class SqlExecutor {
private static Logger logger = LoggerFactory.getLogger(SqlExecutor.class);
private static final Logger logger = LoggerFactory.getLogger(SqlExecutor.class);
@Resource
DatabaseRegistrationBean databaseRegistrationBean;
@@ -113,7 +113,7 @@ public class SqlExecutor {
statementMap.put(executeParam.getExecuteId(), preparedStatement);
List<ParameterMapping> parameterMappings = executeParam.getParameterMappings();
List<Object> paramDataList = executeParam.getParamList();
if (parameterMappings != null && paramDataList != null && parameterMappings.size() > 0 && paramDataList.size() > 0) {
if (parameterMappings != null && paramDataList != null && !parameterMappings.isEmpty() && !paramDataList.isEmpty()) {
for (int i = 0; i < parameterMappings.size(); i++) {
preparedStatement.setObject(i + 1, paramDataList.get(i));
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/GenericTokenParser.java
View File

@@ -40,7 +40,7 @@ public class GenericTokenParser {
if (text == null || text.isEmpty()) {
return "";
}
int start = text.indexOf(openToken, 0);
int start = text.indexOf(openToken);
if (start == -1) {
return text;
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/MethodInvoke.java
View File

@@ -32,7 +32,7 @@ public interface MethodInvoke {
Method method = ReflectionUtils.findMethod(this.getClass(), expr.getMethodName().toLowerCase(), SQLMethodInvokeExpr.class);
if (null != method) {
try {
method.invoke(this, new Object[]{expr});
method.invoke(this, expr);
} catch (Exception e) {
log.error("method invoke error", e);
e.printStackTrace();

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToOracleOutputVisitor.java
View File

@@ -113,8 +113,8 @@ public class MySqlToOracleOutputVisitor extends MySqlOutputVisitor {
}else if(sqlTableElement instanceof MySqlPrimaryKey){
OraclePrimaryKey oraclePrimaryKey = new OraclePrimaryKey();
List<SQLSelectOrderByItem> list = ((MySqlPrimaryKey) sqlTableElement).getIndexDefinition().getColumns();
for(int i=0;i<list.size();i++){
SQLIdentifierExpr sQLIdentifierExpr = (SQLIdentifierExpr)list.get(i).getExpr();
for (SQLSelectOrderByItem sqlSelectOrderByItem : list) {
SQLIdentifierExpr sQLIdentifierExpr = (SQLIdentifierExpr) sqlSelectOrderByItem.getExpr();
sQLIdentifierExpr.setName(sQLIdentifierExpr.getName().replaceAll("`", ""));
oraclePrimaryKey.addColumn(sQLIdentifierExpr);
}

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToSqlServerOutputVisitor.java
View File

@@ -88,8 +88,8 @@ public class MySqlToSqlServerOutputVisitor extends MySqlOutputVisitor {
}else if(sqlTableElement instanceof MySqlPrimaryKey){
SQLPrimaryKeyImpl sqlserverPrimaryKey = new SQLPrimaryKeyImpl();
List<SQLSelectOrderByItem> list = ((MySqlPrimaryKey) sqlTableElement).getIndexDefinition().getColumns();
for(int i=0;i<list.size();i++){
SQLIdentifierExpr sQLIdentifierExpr = (SQLIdentifierExpr)list.get(i).getExpr();
for (SQLSelectOrderByItem sqlSelectOrderByItem : list) {
SQLIdentifierExpr sQLIdentifierExpr = (SQLIdentifierExpr) sqlSelectOrderByItem.getExpr();
sQLIdentifierExpr.setName(sQLIdentifierExpr.getName().replaceAll("`", ""));
sqlserverPrimaryKey.addColumn(sQLIdentifierExpr);
}

6
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/util/MySqlSQLDataTypeTransformUtil.java
View File

@@ -36,7 +36,7 @@ public class MySqlSQLDataTypeTransformUtil extends SQLTransformUtils {
|| nameHash == FnvHash.Constants.INT
|| nameHash == FnvHash.Constants.BIGINT
|| nameHash == FnvHash.Constants.TINYINT) {
if(argumentns.size() > 0){
if(!argumentns.isEmpty()){
int len;
SQLExpr arg0 = argumentns.get(0);
if (arg0 instanceof SQLNumericLiteralExpr) {
@@ -54,7 +54,7 @@ public class MySqlSQLDataTypeTransformUtil extends SQLTransformUtils {
|| nameHash == FnvHash.Constants.DECIMAL) {
dataType = new SQLDataTypeImpl("DECIMAL");
int precision = 0;
if (argumentns.size() > 0) {
if (!argumentns.isEmpty()) {
precision = ((SQLIntegerExpr) argumentns.get(0)).getNumber().intValue();
dataType = new SQLDataTypeImpl("DECIMAL",precision);
}
@@ -74,7 +74,7 @@ public class MySqlSQLDataTypeTransformUtil extends SQLTransformUtils {
} else if (nameHash == FnvHash.Constants.VARCHAR
||nameHash == FnvHash.Constants.CHAR) {
if(argumentns.size() > 0){
if(!argumentns.isEmpty()){
int len;
SQLExpr arg0 = argumentns.get(0);
if (arg0 instanceof SQLNumericLiteralExpr) {

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/OracleToMySqlOutputVisitor.java
View File

@@ -108,8 +108,8 @@ public class OracleToMySqlOutputVisitor extends OracleOutputVisitor {
MySqlPrimaryKey mySqlPrimaryKey = new MySqlPrimaryKey();
mySqlPrimaryKey.setName("primary key");
List<SQLSelectOrderByItem> list = ((OraclePrimaryKey) sqlTableElement).getIndexDefinition().getColumns();
for(int i=0;i<list.size();i++){
mySqlPrimaryKey.addColumn(list.get(i));
for (SQLSelectOrderByItem sqlSelectOrderByItem : list) {
mySqlPrimaryKey.addColumn(sqlSelectOrderByItem);
}
mySqlCreateTableStatement.getTableElementList().add(mySqlPrimaryKey);
}else if(sqlTableElement instanceof OracleUnique) {

16
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/util/OracleSQLDataTypeTransformUtil.java
View File

@@ -61,7 +61,7 @@ public class OracleSQLDataTypeTransformUtil extends SQLTransformUtils {
dataType = new SQLDataTypeImpl("double");
} else if (nameHash == FnvHash.Constants.NUMBER) {
if (argumentns.size() == 0) {
if (argumentns.isEmpty()) {
dataType = new SQLDataTypeImpl("decimal", 38);
} else {
SQLExpr arg0 = argumentns.get(0);
@@ -112,7 +112,7 @@ public class OracleSQLDataTypeTransformUtil extends SQLTransformUtils {
dataType.setName("decimal");
int precision = 0;
if (argumentns.size() > 0) {
if (!argumentns.isEmpty()) {
precision = ((SQLIntegerExpr) argumentns.get(0)).getNumber().intValue();
}
@@ -126,7 +126,7 @@ public class OracleSQLDataTypeTransformUtil extends SQLTransformUtils {
} else if (nameHash == FnvHash.Constants.RAW) {
int len;
if (argumentns.size() == 0) {
if (argumentns.isEmpty()) {
len = -1;
} else if (argumentns.size() == 1) {
SQLExpr arg0 = argumentns.get(0);
@@ -163,7 +163,7 @@ public class OracleSQLDataTypeTransformUtil extends SQLTransformUtils {
} else {
dataType = new SQLCharacterDataType("varchar", len);
}
} else if (argumentns.size() == 0) {
} else if (argumentns.isEmpty()) {
dataType = new SQLCharacterDataType("char");
} else {
throw new UnsupportedOperationException(SQLUtils.toOracleString(x));
@@ -185,14 +185,14 @@ public class OracleSQLDataTypeTransformUtil extends SQLTransformUtils {
} else {
dataType = new SQLCharacterDataType("nvarchar", len);
}
} else if (argumentns.size() == 0) {
} else if (argumentns.isEmpty()) {
dataType = new SQLCharacterDataType("nchar");
} else {
throw new UnsupportedOperationException(SQLUtils.toOracleString(x));
}
} else if (nameHash == FnvHash.Constants.VARCHAR2) {
if (argumentns.size() > 0) {
if (!argumentns.isEmpty()) {
int len;
SQLExpr arg0 = argumentns.get(0);
if (arg0 instanceof SQLNumericLiteralExpr) {
@@ -210,7 +210,7 @@ public class OracleSQLDataTypeTransformUtil extends SQLTransformUtils {
}
} else if (nameHash == FnvHash.Constants.NVARCHAR2) {
if (argumentns.size() > 0) {
if (!argumentns.isEmpty()) {
int len;
SQLExpr arg0 = argumentns.get(0);
if (arg0 instanceof SQLNumericLiteralExpr) {
@@ -229,7 +229,7 @@ public class OracleSQLDataTypeTransformUtil extends SQLTransformUtils {
} else if (nameHash == FnvHash.Constants.DATE
|| nameHash == FnvHash.Constants.TIMESTAMP) {
int len = -1;
if (argumentns.size() > 0) {
if (!argumentns.isEmpty()) {
SQLExpr arg0 = argumentns.get(0);
if (arg0 instanceof SQLNumericLiteralExpr) {
len = ((SQLNumericLiteralExpr) arg0).getNumber().intValue();

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/SqlServerToMySqlOutputVisitor.java
View File

@@ -119,8 +119,8 @@ public class SqlServerToMySqlOutputVisitor extends SQLServerOutputVisitor {
SQLPrimaryKeyImpl sQLPrimaryKeyImpl = (SQLPrimaryKeyImpl) ((SQLAlterTableAddConstraint) item).getConstraint();
SQLIndexDefinition sQLIndexDefinition = sQLPrimaryKeyImpl.getIndexDefinition();
List<SQLSelectOrderByItem> list = sQLIndexDefinition.getColumns();
for(int i=0;i<list.size();i++){
SQLIdentifierExpr sQLIdentifierExpr = (SQLIdentifierExpr)list.get(i).getExpr();
for (SQLSelectOrderByItem sqlSelectOrderByItem : list) {
SQLIdentifierExpr sQLIdentifierExpr = (SQLIdentifierExpr) sqlSelectOrderByItem.getExpr();
sQLIdentifierExpr.setName(sQLIdentifierExpr.getName().replaceAll("\\[", "").replaceAll("\\]", ""));
}
}

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/util/SqlServerSQLDataTypeTransformUtil.java
View File

@@ -30,7 +30,7 @@ public class SqlServerSQLDataTypeTransformUtil extends SQLTransformUtils {
SQLDataType dataType;
if (nameHash == FnvHash.Constants.SMALLINT) {
int precision = 0;
if (argumentns.size() > 0) {
if (!argumentns.isEmpty()) {
precision = ((SQLIntegerExpr) argumentns.get(0)).getNumber().intValue();
}
dataType = new SQLDataTypeImpl("int", precision);
@@ -43,7 +43,7 @@ public class SqlServerSQLDataTypeTransformUtil extends SQLTransformUtils {
} else if(nameHash == FnvHash.Constants.NVARCHAR){
int precision = 0;
if (argumentns.size() > 0) {
if (!argumentns.isEmpty()) {
precision = ((SQLIntegerExpr) argumentns.get(0)).getNumber().intValue();
}
dataType = new SQLDataTypeImpl("varchar", precision);

18
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/SqlParseUtil.java
View File

@@ -109,7 +109,7 @@ public class SqlParseUtil {
resultParamList.add(paramMap.get(parameterMapping.getProperty()));
}
}
sqlBuilder.append(itemsSb.toString());
sqlBuilder.append(itemsSb);
}
// pagehelper 使用了jsqlparser包，而且版本很低，，低版本没这个方法
// if (insert.isUseSet()) {
@@ -232,15 +232,13 @@ public class SqlParseUtil {
if (select.getFromItem() != null) {
countSql.append(" FROM ").append(select.getFromItem());
if (select.getJoins() != null) {
Iterator<Join> it = select.getJoins().iterator();
while (it.hasNext()) {
Join join = it.next();
if (join.isSimple()) {
countSql.append(", ").append(join);
} else {
countSql.append(" ").append(join);
}
}
for (Join join : select.getJoins()) {
if (join.isSimple()) {
countSql.append(", ").append(join);
} else {
countSql.append(" ").append(join);
}
}
}
if (select.getWhere() != null) {
countSql.append(" WHERE ").append(select.getWhere());

5
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java
View File

@@ -2,7 +2,6 @@ package com.zyplayer.doc.db.framework.db.transfer;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import com.zyplayer.doc.core.exception.ConfirmException;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
@@ -42,7 +41,7 @@ import java.util.concurrent.atomic.AtomicLong;
*/
@Service
public class TransferDataServer {
private static Logger logger = LoggerFactory.getLogger(TransferDataServer.class);
private static final Logger logger = LoggerFactory.getLogger(TransferDataServer.class);
@Resource
SqlExecutor sqlExecutor;
@@ -163,7 +162,7 @@ public class TransferDataServer {
}
});
// 不足100的数据
if (selectResultList.size() > 0) {
if (!selectResultList.isEmpty()) {
this.writeData(storageSourceId, storageSql, selectResultList);
}
if (StringUtils.isNotBlank(executeResult.getErrMsg())) {

8
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/service/DbSseEmitterService.java
View File

@@ -23,7 +23,7 @@ public interface DbSseEmitterService {
* @author diantu
* @date 2023/7/17
**/
public SseEmitter createSseConnect(String clientId, Boolean setHeartBeat, Boolean defaultHeartbeat, Consumer<DbCommonSseParam> consumer);
SseEmitter createSseConnect(String clientId, Boolean setHeartBeat, Boolean defaultHeartbeat, Consumer<DbCommonSseParam> consumer);
/**
* 关闭连接
@@ -31,7 +31,7 @@ public interface DbSseEmitterService {
* @author diantu
* @date 2023/7/17
**/
public void closeSseConnect(String clientId);
void closeSseConnect(String clientId);
/**
* 推送消息到所有客户端
@@ -39,7 +39,7 @@ public interface DbSseEmitterService {
* @author diantu
* @date 2023/7/17
**/
public void sendMessageToAllClient(String msg);
void sendMessageToAllClient(String msg);
/**
* 根据clientId发送消息给某一客户端
@@ -47,5 +47,5 @@ public interface DbSseEmitterService {
* @author diantu
* @date 2023/7/17
**/
public void sendMessageToOneClient(String clientId, String msg);
void sendMessageToOneClient(String clientId, String msg);
}

6
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/util/DbSseCacheUtil.java
View File

@@ -25,7 +25,7 @@ public class DbSseCacheUtil {
/**
* 创建一个容器来存储所有的 SseEmitter(使用ConcurrentHashMap是因为它是线程安全的)。
*/
public static Map<String, Map<String,Object>> sseCache = new ConcurrentHashMap<>();
public static final Map<String, Map<String,Object>> sseCache = new ConcurrentHashMap<>();
/**
@@ -96,7 +96,7 @@ public class DbSseCacheUtil {
* @date 2023/7/17
**/
public static boolean existSseCache() {
return sseCache.size()>0;
return !sseCache.isEmpty();
}
/**
@@ -249,7 +249,7 @@ public class DbSseCacheUtil {
**/
public static void sendMessageToClientByClientId(String clientId, DocDbResponseJson message) {
Map<String, Object> map = sseCache.get(clientId);
if (map==null||map.size()==0) {
if (map==null|| map.isEmpty()) {
log.error("推送消息失败:客户端{}未创建长链接,失败消息:{}",clientId, message.toString());
return;
}

1
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/DatabaseBackupUtils.java
View File

@@ -63,7 +63,6 @@ public class DatabaseBackupUtils {
//@TODO 存入备份记录信息
// 备份文件上传至文件服务器
if (!jobVO.getIsUpload()) {
return;
}
//@TODO 备份文件上传至文件服务器
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java
View File

@@ -14,7 +14,7 @@ import java.util.Date;
*/
public class JSONUtil {
public static SerializeConfig serializeConfig = new SerializeConfig();
public static final SerializeConfig serializeConfig = new SerializeConfig();
static {
serializeConfig.put(Date.class, new SimpleDateFormatSerializer("yyyy-MM-dd HH:mm:ss"));

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/MapCacheUtil.java
View File

@@ -15,7 +15,7 @@ public class MapCacheUtil {
private static Map<String,Object> cacheMap;
private MapCacheUtil(){
cacheMap = new HashMap<String, Object>();
cacheMap = new HashMap<>();
}
public static MapCacheUtil getInstance(){

10
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/PoiUtil.java
View File

@@ -47,14 +47,12 @@ public class PoiUtil {
"\n" +
" 数据库 : " + dbName + "\n" +
" 数据库类型 : " + dbType + "\n" +
" 导出时间 : " + DateTime.now().toString() + "\n" +
" 导出时间 : " + DateTime.now() + "\n" +
" 软件版本 : " + ZyplayerDocVersion.version + "\n" +
"*/\n\n");
for (Map.Entry<String, String> entry : ddlSqlMap.entrySet()) {
ddlSqlSb.append("-- ----------------------------\n")
.append("-- 表结构：" + entry.getKey() + "\n")
.append("-- ----------------------------\n")
.append("DROP TABLE IF EXISTS `" + entry.getKey() + "`;\n")
ddlSqlSb.append("-- ----------------------------\n").append("-- 表结构：").append(entry.getKey()).append("\n")
.append("-- ----------------------------\n").append("DROP TABLE IF EXISTS `").append(entry.getKey()).append("`;\n")
.append(entry.getValue()).append("\n\n");
}
IoUtil.write(response.getOutputStream(), "utf-8", true, ddlSqlSb.toString());
@@ -121,7 +119,7 @@ public class PoiUtil {
// 写入表信息
PoiUtil.createEmptyLine(document);
document.createParagraph().createRun().setText("数据库名：" + dbName);
document.createParagraph().createRun().setText("导出时间：" + DateTime.now().toString());
document.createParagraph().createRun().setText("导出时间：" + DateTime.now());
document.createParagraph().createRun().setText("导出说明：本文档使用zyplayer-doc生成并导出");
document.createParagraph().createRun().setText("所有库表：");
List<List<String>> baseDataList = new LinkedList<>();

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/QuartzManagerUtils.java
View File

@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
*/
public class QuartzManagerUtils {
private static Logger logger = LoggerFactory.getLogger(QuartzManagerUtils.class);
private static final Logger logger = LoggerFactory.getLogger(QuartzManagerUtils.class);
/**
* 参数传递key

30
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SQLTransformUtils.java
View File

@@ -38,12 +38,11 @@ public class SQLTransformUtils {
StringBuilder out = new StringBuilder();
OracleToMySqlOutputVisitor visitor = new OracleToMySqlOutputVisitor(out, false);
for(int i = 0; i < stmtList.size(); ++i) {
((SQLStatement)stmtList.get(i)).accept(visitor);
for (SQLStatement sqlStatement : stmtList) {
sqlStatement.accept(visitor);
}
String mysqlSql = out.toString();
return mysqlSql;
return out.toString();
}
/**
@@ -56,12 +55,11 @@ public class SQLTransformUtils {
StringBuilder out = new StringBuilder();
SqlServerToMySqlOutputVisitor visitor = new SqlServerToMySqlOutputVisitor(out, false);
for(int i = 0; i < stmtList.size(); ++i) {
((SQLStatement)stmtList.get(i)).accept(visitor);
for (SQLStatement sqlStatement : stmtList) {
sqlStatement.accept(visitor);
}
String mysqlSql = out.toString();
return mysqlSql;
return out.toString();
}
/**
@@ -74,12 +72,11 @@ public class SQLTransformUtils {
StringBuilder out = new StringBuilder();
MySqlToOracleOutputVisitor visitor = new MySqlToOracleOutputVisitor(out, false);
for(int i = 0; i < stmtList.size(); ++i) {
((SQLStatement)stmtList.get(i)).accept(visitor);
for (SQLStatement sqlStatement : stmtList) {
sqlStatement.accept(visitor);
}
String oracleSql = out.toString();
return oracleSql;
return out.toString();
}
/**
@@ -92,12 +89,11 @@ public class SQLTransformUtils {
StringBuilder out = new StringBuilder();
MySqlToSqlServerOutputVisitor visitor = new MySqlToSqlServerOutputVisitor(out, false);
for(int i = 0; i < stmtList.size(); ++i) {
((SQLStatement)stmtList.get(i)).accept(visitor);
for (SQLStatement sqlStatement : stmtList) {
sqlStatement.accept(visitor);
}
String sqlserverSql = out.toString();
return sqlserverSql;
return out.toString();
}
/**
@@ -114,7 +110,7 @@ public class SQLTransformUtils {
java.io.Reader is = clob.getCharacterStream();
BufferedReader br = new BufferedReader(is);
String s = br.readLine();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
// 执行循环将字符串全部取出付值给StringBuffer由StringBuffer转成STRING
while (s != null) {
sb.append(s);

4
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SqlLogUtil.java
View File

@@ -20,7 +20,7 @@ public class SqlLogUtil {
private static String getParameterValue(Object obj) {
String value;
if (obj instanceof String) {
value = "'" + obj.toString() + "'";
value = "'" + obj + "'";
} else if (obj instanceof Number) {
value = obj.toString();
} else if (obj instanceof Date) {
@@ -35,7 +35,7 @@ public class SqlLogUtil {
public static String parseLogSql(String sql, List<ParameterMapping> parameterMappings, List<Object> paramList) {
StringBuilder sqlSb = new StringBuilder(sql.replaceAll(" {2,}", " "));
int fromIndex = 0;
if (parameterMappings.size() > 0) {
if (!parameterMappings.isEmpty()) {
for (int i = 0; i < parameterMappings.size(); i++) {
Object obj = paramList.get(i);
fromIndex = replacePlaceholder(sqlSb, fromIndex, getParameterValue(obj));

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/backup/impl/BackupTaskServiceImpl.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
*/
public class BackupTaskServiceImpl implements BackupTaskService {
private static Logger logger = LoggerFactory.getLogger(BackupTaskServiceImpl.class);
private static final Logger logger = LoggerFactory.getLogger(BackupTaskServiceImpl.class);
@Autowired
private Scheduler scheduler;

11
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DbBaseService.java
View File

@@ -41,7 +41,7 @@ import java.util.Set;
* @since 2018年8月8日
*/
public abstract class DbBaseService {
private static Logger logger = LoggerFactory.getLogger(DbBaseService.class);
private static final Logger logger = LoggerFactory.getLogger(DbBaseService.class);
@Resource
SqlExecutor sqlExecutor;
@@ -140,7 +140,7 @@ public abstract class DbBaseService {
TableColumnVo.TableInfoVo tableInfoVo = new TableColumnVo.TableInfoVo();
List<TableDescDto> tableDescList = baseMapper.getTableDescList(dbName, tableName);
String description = null;
if (tableDescList.size() > 0) {
if (!tableDescList.isEmpty()) {
TableDescDto descDto = tableDescList.get(0);
description = descDto.getDescription();
}
@@ -334,11 +334,10 @@ public abstract class DbBaseService {
* @since 2023年2月22日
*/
public String getQueryPageSqlBySql(String sql,Integer pageSize,Integer pageNum) {
StringBuilder sqlSb = new StringBuilder();
sqlSb.append(String.format("select * from (%s) r", sql));
Integer offset = (pageNum-1)*pageSize;
sqlSb.append(String.format(" limit %s offset %s", pageSize, offset));
return sqlSb.toString();
String sqlSb = String.format("select * from (%s) r", sql) +
String.format(" limit %s offset %s", pageSize, offset);
return sqlSb;
}
/**

16
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java
View File

@@ -65,8 +65,8 @@ public class OracleServiceImpl extends DbBaseService {
sqlSb.append(String.format(" order by %s %s", "\""+dataViewParam.getOrderColumn()+"\"", dataViewParam.getOrderType()));
}
StringBuilder sqlSbFinal = new StringBuilder();
Integer pageSize = dataViewParam.getPageSize() * dataViewParam.getPageNum();
Integer pageNum = dataViewParam.getPageSize() * (dataViewParam.getPageNum() - 1) + 1;
int pageSize = dataViewParam.getPageSize() * dataViewParam.getPageNum();
int pageNum = dataViewParam.getPageSize() * (dataViewParam.getPageNum() - 1) + 1;
sqlSbFinal.append(String.format("select %s ,ZYPLAYDBROWID from ( select %s ,rowidtochar(rowid) as ZYPLAYDBROWID from %s",queryColumns, queryColumns + ",rownum rn", "(" + sqlSb + ") where rownum<=" + pageSize + " ) t2 where t2.rn >=" + pageNum));
return sqlSbFinal.toString();
}
@@ -80,11 +80,9 @@ public class OracleServiceImpl extends DbBaseService {
*/
@Override
public String getQueryPageSqlBySql(String sql,Integer pageSize,Integer pageNum) {
StringBuilder sqlSb = new StringBuilder();
Integer pageSizeFinal = pageSize * pageNum;
Integer pageNumFinal = pageSize * (pageNum - 1) + 1;
sqlSb.append(String.format("select * from ( select r.*,rownum rn from %s", "(" + sql + ") r where rownum<=" + pageSizeFinal + " ) t2 where t2.rn >=" + pageNumFinal));
return sqlSb.toString();
int pageSizeFinal = pageSize * pageNum;
int pageNumFinal = pageSize * (pageNum - 1) + 1;
return String.format("select * from ( select r.*,rownum rn from %s", "(" + sql + ") r where rownum<=" + pageSizeFinal + " ) t2 where t2.rn >=" + pageNumFinal);
}
/**
@@ -103,9 +101,7 @@ public class OracleServiceImpl extends DbBaseService {
String oracleSql = "";
try {
oracleSql = SQLTransformUtils.ClobToString((Clob)tableDdlList.get(0).get("CREATETABLE"));
} catch (SQLException e) {
throw new RuntimeException(e);
} catch (IOException e) {
} catch (SQLException | IOException e) {
throw new RuntimeException(e);
}
tableDdlVo.setOracle(SQLUtils.formatOracle(oracleSql));

8
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java
View File

@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
*/
@Service
public class BaseDownloadService implements DownloadService {
private static Logger logger = LoggerFactory.getLogger(BaseDownloadService.class);
private static final Logger logger = LoggerFactory.getLogger(BaseDownloadService.class);
@Resource
SqlExecutor sqlExecutor;
@@ -55,7 +55,7 @@ public class BaseDownloadService implements DownloadService {
* @since 2020年6月5日
*/
@Override
public String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception {
public String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) {
String dbTableName = String.format("`%s`.`%s`", param.getDbName(), param.getTableName());
StringBuilder resultSb = new StringBuilder();
if (Objects.equals(param.getCreateTableFlag(), 1)) {
@@ -109,7 +109,7 @@ public class BaseDownloadService implements DownloadService {
* @since 2020年6月5日
*/
@Override
public String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception {
public String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) {
String dbTableName = String.format("`%s`.`%s`", param.getDbName(), param.getTableName());
StringBuilder resultSb = new StringBuilder();
Pattern pattern = Pattern.compile("\t|\r\n|\r|\n|\\s+");
@@ -157,7 +157,7 @@ public class BaseDownloadService implements DownloadService {
* @since 2020年6月5日
*/
@Override
public String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception {
public String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) {
StringBuilder resultSb = new StringBuilder();
resultSb.append("[");
sqlExecutor.execute(executeParam, item -> {

6
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java
View File

@@ -26,7 +26,7 @@ public interface DownloadService {
* @author 暮光：城中城
* @since 2020年6月5日
*/
String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception;
String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet);
/**
* 导出数据为update语句格式
@@ -34,7 +34,7 @@ public interface DownloadService {
* @author 暮光：城中城
* @since 2020年6月5日
*/
String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception;
String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet);
/**
* 导出数据为json格式
@@ -42,7 +42,7 @@ public interface DownloadService {
* @author 暮光：城中城
* @since 2020年6月5日
*/
String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception;
String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet);
/**

8
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java
View File

@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
*/
@Service
public class SqlserverDownloadService implements DownloadService {
private static Logger logger = LoggerFactory.getLogger(SqlserverDownloadService.class);
private static final Logger logger = LoggerFactory.getLogger(SqlserverDownloadService.class);
@Resource
SqlExecutor sqlExecutor;
@@ -46,7 +46,7 @@ public class SqlserverDownloadService implements DownloadService {
* @since 2020年6月5日
*/
@Override
public String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception {
public String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) {
String dbTableName = String.format("%s..%s", param.getDbName(), param.getTableName());
StringBuilder resultSb = new StringBuilder();
if (Objects.equals(param.getCreateTableFlag(), 1)) {
@@ -100,7 +100,7 @@ public class SqlserverDownloadService implements DownloadService {
* @since 2020年6月5日
*/
@Override
public String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception {
public String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) {
String dbTableName = String.format("%s..%s", param.getDbName(), param.getTableName());
StringBuilder resultSb = new StringBuilder();
Pattern pattern = Pattern.compile("\t|\r\n|\r|\n|\\s+");
@@ -148,7 +148,7 @@ public class SqlserverDownloadService implements DownloadService {
* @since 2020年6月5日
*/
@Override
public String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) throws Exception {
public String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List<TableColumnDescDto> dataCols, Set<String> conditionSet) {
StringBuilder resultSb = new StringBuilder();
resultSb.append("[");
sqlExecutor.execute(executeParam, item -> {