From cef990730c07e7fcdbe015bdfb0f0e27f7e06e27 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 01 八月 2025 16:52:56 +0800
Subject: [PATCH] 机床管理bug修复；勤哲对接完善
---
blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 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..e0bfb71 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,9 +2,12 @@
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;
@@ -34,6 +37,10 @@
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";
@@ -50,33 +57,36 @@
log.info("qingzhe:{}",qinzheData);
*/
cleanLocalTable();
- saveQinzheFgbToLocalTable();
- updateProduceDivision();
+ cleanQinzheDataInDivision();
+
+
+ saveQinzheFgb();
+
}
+
+
/**
- * //qingzhe - mdm
- * 涓荤宸ヨ壓 - 涓撲笟缁勯暱
- * 缂栧埗锛屾牎瀵癸紝楂樺笀锛堢洰鍓嶉珮甯堟�诲叡6涓汉锛変篃閮芥病鏈�.鐩墠鍙尮閰嶄笓涓氱粍闀垮嵆鍙紝缂栧埗鏍″鍦╩dm涓淮鎶�
- * 鏇存柊mdm涓诲埗鍒嗗伐琛ㄦ暟鎹�,
+ * 鍥惧彿鏄惁瀛樺湪浜嶮DM鍒嗗伐琛�
+ * @param drawingNo
+ * @return 瀛樺湪涓庡惁
*/
- void updateProduceDivision(){
-
-
- mdmJdbcTemplate.update("delete from mdm_produce_division where create_user=-1 and update_user=-1");
+ 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鍒嗗伐琛ㄥ唴鎵�鏈変粠鍕ゅ摬瀵煎叆鐨勬暟鎹�
+ * 娓呴櫎mdm鍒嗗伐琛ㄥ唴浠庡嫟鍝插鍏ョ殑銆佷笖鏈粡杩囦慨鏀圭殑鏁版嵁
*/
void cleanQinzheDataInDivision(){
-
+ //update_user =-1 姝ゆ爣蹇椾负鍕ゅ摬鍚屾鏁版嵁涓旀湭淇敼杩囥��
+ mdmJdbcTemplate.update("delete from mdm_produce_division where create_user=-1 and update_user=-1");
}
/**
* 灏嗗嫟鍝茬郴缁熺殑鏁版嵁鍏堜竴娆℃�у鍏dm绯荤粺鏁版嵁搴撲复鏃惰〃
*/
- public void saveQinzheFgbToLocalTable(){
+ public void saveQinzheFgb(){
List<QinzheZzFgb> fgbList = this.qinzheJdbcTemplate.query(this.getQuerySql(),new RowMapper<QinzheZzFgb>(){
@Override
@@ -97,14 +107,57 @@
});
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);
+ }
+
}
+ 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);
+ }
+ }
/**
* 娓呴櫎鏈湴涓存椂琛ㄦ暟鎹�
*/
private void cleanLocalTable(){
this.mdmJdbcTemplate.update("delete from mdm_qinzhe_fgb");
-
}
/**
--
Gitblit v1.9.3