From cb38789006b411b29fba27a6a60493dc78946e17 Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期六, 22 六月 2024 09:49:27 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
src/main/java/com/hx/mybatis/aes/springbean/InitMysqlData.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/hx/mybatis/aes/springbean/InitMysqlData.java b/src/main/java/com/hx/mybatis/aes/springbean/InitMysqlData.java
index 6e6b5fc..4975d2b 100644
--- a/src/main/java/com/hx/mybatis/aes/springbean/InitMysqlData.java
+++ b/src/main/java/com/hx/mybatis/aes/springbean/InitMysqlData.java
@@ -10,7 +10,6 @@
import com.hx.util.StringUtils;
import com.hx.util.mysql.aes.MysqlHexAesTool;
-import javax.annotation.PostConstruct;
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.ExecutorService;
@@ -21,7 +20,7 @@
/**
* 椤圭洰鍚姩灏辨墽琛屽悗灏辨墽琛岃鏂规硶
*/
- @PostConstruct
+ //@PostConstruct 2022-06-17灞忔帀锛屾殏鏃剁敤涓嶄笂
public static void initData(String packPath, CommonService commonService){
//椤圭洰鍚姩鐨勬椂鍊欏～鍏�
@@ -41,7 +40,6 @@
for(FieldData fieldData:fieldDatas){
//鑾峰彇鏉℃暟
sqlSentence.sqlSentence("SELECT COUNT(0) FROM "+fieldData.getTableName(),values);
- System.out.println("sqlSentence3:"+sqlSentence.getSqlSentence());
int total = commonService.selectCountSql(sqlSentence);
if(total ==0 ){
continue;
@@ -77,11 +75,14 @@
for(String fieldName:fieldData.getEncrypFields()){
selectField.append(","+fieldName);
}
+ pageNum = pageNum*pageSize;
+
sqlSentence.sqlSentence("SELECT "+selectField.toString()+" FROM "+fieldData.getTableName()+" LIMIT "+pageNum+","+pageSize,values);
- System.out.println("sqlSentence:"+sqlSentence.getSqlSentence());
List<Map<String,Object>> list = commonService.selectListMap(CommonMapper.class,sqlSentence);
+ boolean isUpdate = false;
for (Map<String,Object> map:list){
+ isUpdate = false;
StringBuilder setField = new StringBuilder();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String mapKey = entry.getKey();
@@ -99,14 +100,16 @@
setField.append(",");
}
setField.append(mapKey+" = #{m."+mapKey+"}");
+ isUpdate = true;
}
- values = map;
- sqlSentence.sqlSentence("UPDATE "+fieldData.getTableName()+" SET "+setField.toString()+" WHERE "+fieldData.getId()+" = #{m."+fieldData.getId()+"}",values);
- System.out.println("sqlSentence2:"+sqlSentence.getSqlSentence());
+ if(isUpdate){
+ values = map;
+ sqlSentence.sqlSentence("UPDATE "+fieldData.getTableName()+" SET "+setField.toString()+" WHERE "+fieldData.getId()+" = #{m."+fieldData.getId()+"}",values);
- if(commonService.updateSentence(sqlSentence)!=1){
- throw new ServiceException("鏇存柊瓒呰繃1鏉★紝鏇存柊澶辫触锛�");
+ if(commonService.updateSentence(sqlSentence)!=1){
+ throw new ServiceException("鏇存柊瓒呰繃1鏉★紝鏇存柊澶辫触锛�");
+ }
}
}
--
Gitblit v1.8.0