From 9a5abe507d6602f2311ffbe1d7bf25e2b58d3a7a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 00:17:30 +0800
Subject: [PATCH] 优化审批界面
---
blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java | 85 +++++-------------------------------------
1 files changed, 10 insertions(+), 75 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 e0bfb71..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,25 +2,19 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
-import org.springblade.qinzhesync.entity.ProduceDivision;
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.cloud.commons.util.IdUtils;
-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;
/**
* 鍕ゅ摬涓诲埗鍒嗗伐琛ㄦ暟鎹悓姝ョ殑鏈嶅姟
@@ -47,8 +41,9 @@
/**
* 鎵归噺鎻掑叆鏁版嵁鏁伴噺
*/
- 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");
@@ -57,32 +52,10 @@
log.info("qingzhe:{}",qinzheData);
*/
cleanLocalTable();
-
- cleanQinzheDataInDivision();
-
-
+ //cleanQinzheDataInDivision();
saveQinzheFgb();
-
}
-
-
- /**
- * 鍥惧彿鏄惁瀛樺湪浜嶮DM鍒嗗伐琛�
- * @param drawingNo
- * @return 瀛樺湪涓庡惁
- */
- public boolean drawingNoExists(String drawingNo){
- Long cnt = mdmJdbcTemplate.queryForObject("select count(*) from mdm_produce_division where drawing_no=?",Long.class,drawingNo);
- return cnt > 0;
- }
- /**
- * 娓呴櫎mdm鍒嗗伐琛ㄥ唴浠庡嫟鍝插鍏ョ殑銆佷笖鏈粡杩囦慨鏀圭殑鏁版嵁
- */
- void cleanQinzheDataInDivision(){
- //update_user =-1 姝ゆ爣蹇椾负鍕ゅ摬鍚屾鏁版嵁涓旀湭淇敼杩囥��
- mdmJdbcTemplate.update("delete from mdm_produce_division where create_user=-1 and update_user=-1");
- }
/**
* 灏嗗嫟鍝茬郴缁熺殑鏁版嵁鍏堜竴娆℃�у鍏dm绯荤粺鏁版嵁搴撲复鏃惰〃
*/
@@ -108,51 +81,9 @@
insertToLocalTable(fgbList);
- updateProduceDivision(fgbList);
- }
- /**
- * //qingzhe - mdm
- * 涓荤宸ヨ壓 - 涓撲笟缁勯暱
- * 缂栧埗锛屾牎瀵癸紝楂樺笀锛堢洰鍓嶉珮甯堟�诲叡6涓汉锛変篃閮芥病鏈�.鐩墠鍙尮閰嶄笓涓氱粍闀垮嵆鍙紝缂栧埗鏍″鍦╩dm涓淮鎶�
- * 鏇存柊mdm涓诲埗鍒嗗伐琛ㄦ暟鎹�,
- */
- void updateProduceDivision(List<QinzheZzFgb> fgbList){
- String sql = "insert into mdm_produce_division (id,drawing_no,team_leader_id,create_user,update_user,create_time,update_time,status,is_deleted) values (?,?,?,-1,-1,CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,1,0)";
- String ljh,zggy;
- for(QinzheZzFgb fgb : fgbList){
- if(drawingNoExists(fgb.getLjh())){
- //鍥惧彿宸插瓨鍦紝璇存槑mdm绯荤粺涓凡缁忓綍鍏ヨ繃浜�
- continue;
- }
-
- Long zuzhangId = getUserIdByName(fgb.getZggy());
- /*
- ProduceDivision pd = new ProduceDivision();
- pd.setDrawingNo(fgb.getLjh());
- pd.setTeamLeaderId(zuzhangId);
- pd.setUpdateUser(-1L);
- pd.setCreateUser(-1L);
- */
- //Long id = ;
- mdmJdbcTemplate.update(sql, new Object[]{idGen.nextId(),fgb.getLjh(),zuzhangId});
- //produceDivisionService.save(pd);
- }
-
+ //updateProduceDivision(fgbList);
}
- void insertProduceDivision(String drawingNo,Long zuzhangId){
- String sql = "insert into mdm_produce_division () values ";
- }
-
- Long getUserIdByName(String zuzhangName){
- String sql = "select id from blade_user where name=? and is_deleted=0 order by update_time limit 1";
- List<Long> idList = this.mdmJdbcTemplate.queryForList(sql,Long.class,zuzhangName);
- if(idList.isEmpty()){
- return null;
- }else{
- return idList.get(0);
- }
- }
/**
* 娓呴櫎鏈湴涓存椂琛ㄦ暟鎹�
*/
@@ -165,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<>();
@@ -185,6 +116,10 @@
}
}
+ /**
+ * 鏍规嵁閰嶇疆鑾峰彇鍕ゅ摬鏌ヨsql锛堝弬鏁扮鐞嗛噷鍙厤缃級
+ * @return
+ */
String getQuerySql(){
String querySql = DEFAULT_QUERY_SQL;
R<String> sqlResult = sysClient.getParamValue(QINZHE_QUERY_KEY);
--
Gitblit v1.9.3