From 12f2fafc574afb4c534ab59244f2b954d1876e9f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:37:20 +0800
Subject: [PATCH] 解决回传工控网记录无法撤销的问题
---
blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java | 48 ++++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java b/blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java
index 8fdd08e..da09a03 100644
--- a/blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java
+++ b/blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java
@@ -2,22 +2,19 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
+import org.springblade.qinzhesync.utils.SnowflakeIdGenerator;
import org.springblade.system.feign.ISysClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* 鍕ゅ摬涓诲埗鍒嗗伐琛ㄦ暟鎹悓姝ョ殑鏈嶅姟
@@ -34,14 +31,19 @@
private JdbcTemplate qinzheJdbcTemplate;
@Autowired
private ISysClient sysClient;
+ @Autowired
+ private SnowflakeIdGenerator idGen;
+
+
private static final String DEFAULT_QUERY_SQL = "select 浜у搧鍙� cph,闆朵欢鍙� ljh,闆朵欢鍚嶇О ljmc,涓诲埗 zz,涓诲埗宸ユ zzgd,涓荤宸ヨ壓 zggy,鍓 fg,杞﹂棿璁″垝鍛� cjjhy,璁″垝鍛� jhy from v_寮犵珛铏巁2鍘備富鍒跺垎宸ヨ〃";
private static final String QINZHE_QUERY_KEY = "QINZHE_QUERY";
/**
* 鎵归噺鎻掑叆鏁版嵁鏁伴噺
*/
- static final int BATCH_SIZE = 4;//5000;
+ static final int BATCH_SIZE = 2000;//5000;
+ @Transactional
public void syncData(){
/*
Map mmdData = mdmJdbcTemplate.queryForMap("select count(*) n from mdm_machine");
@@ -50,33 +52,14 @@
log.info("qingzhe:{}",qinzheData);
*/
cleanLocalTable();
- saveQinzheFgbToLocalTable();
-
- updateProduceDivision();
+ //cleanQinzheDataInDivision();
+ saveQinzheFgb();
}
- /**
- * //qingzhe - mdm
- * 涓荤宸ヨ壓 - 涓撲笟缁勯暱
- * 缂栧埗锛屾牎瀵癸紝楂樺笀锛堢洰鍓嶉珮甯堟�诲叡6涓汉锛変篃閮芥病鏈�.鐩墠鍙尮閰嶄笓涓氱粍闀垮嵆鍙紝缂栧埗鏍″鍦╩dm涓淮鎶�
- * 鏇存柊mdm涓诲埗鍒嗗伐琛ㄦ暟鎹�,
- */
- void updateProduceDivision(){
-
-
- mdmJdbcTemplate.update("delete from mdm_produce_division where create_user=-1 and update_user=-1");
- }
-
- /**
- * 娓呴櫎mdm鍒嗗伐琛ㄥ唴鎵�鏈変粠鍕ゅ摬瀵煎叆鐨勬暟鎹�
- */
- void cleanQinzheDataInDivision(){
-
- }
/**
* 灏嗗嫟鍝茬郴缁熺殑鏁版嵁鍏堜竴娆℃�у鍏dm绯荤粺鏁版嵁搴撲复鏃惰〃
*/
- public void saveQinzheFgbToLocalTable(){
+ public void saveQinzheFgb(){
List<QinzheZzFgb> fgbList = this.qinzheJdbcTemplate.query(this.getQuerySql(),new RowMapper<QinzheZzFgb>(){
@Override
@@ -97,6 +80,8 @@
});
insertToLocalTable(fgbList);
+
+ //updateProduceDivision(fgbList);
}
/**
@@ -104,7 +89,6 @@
*/
private void cleanLocalTable(){
this.mdmJdbcTemplate.update("delete from mdm_qinzhe_fgb");
-
}
/**
@@ -112,7 +96,7 @@
* @param fgbList
*/
private void insertToLocalTable(List<QinzheZzFgb> fgbList) {
- String insSql = "insert into mdm_qinzhe_fgb (cph,ljh,ljmc,zz,zzgd,zggy,fg,cjjhy,jhy,update_time) values (?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)";
+ String insSql = "insert into mdm_qinzhe_fgb (cph,ljh,ljmc,zz,zzgd,zggy,fg,cjjhy,jhy,source,update_time) values (?,?,?,?,?,?,?,?,?,'QZ',CURRENT_TIMESTAMP)";
QinzheZzFgb fgb;
List<Object[]> args = new ArrayList<>();
@@ -132,6 +116,10 @@
}
}
+ /**
+ * 鏍规嵁閰嶇疆鑾峰彇鍕ゅ摬鏌ヨsql锛堝弬鏁扮鐞嗛噷鍙厤缃級
+ * @return
+ */
String getQuerySql(){
String querySql = DEFAULT_QUERY_SQL;
R<String> sqlResult = sysClient.getParamValue(QINZHE_QUERY_KEY);
--
Gitblit v1.9.3