From 8ffacfb6664009006fe5c6ade939f73c211c3648 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 10:51:40 +0800
Subject: [PATCH] 勤哲增加根据编程员查询功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/QinzheFgbController.java | 4 ++--
blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/task/QincheViewSyncTask.java | 27 +++++++++++++++++++++++++++
blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/service/QinzheSyncService.java | 21 ++++++---------------
3 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/QinzheFgbController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/QinzheFgbController.java
index 6acfd82..5ca9460 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/QinzheFgbController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/QinzheFgbController.java
@@ -39,8 +39,8 @@
*/
@Operation(summary = "鍕ゅ摬鍒嗛〉鏌ヨ", description = "鏌ヨ鍕ゅ摬鍒嗗伐琛ㄦ暟鎹�")
@GetMapping("/qinzhe-page")
- public R<IPage<QinzheFgb>> page(String ljh, Query query) {
- return R.data(qinzheFgbService.lambdaQuery().like(StringUtils.isNotBlank(ljh), QinzheFgb::getLjh,ljh).page(Condition.getPage(query)));
+ public R<IPage<QinzheFgb>> page(String ljh,String zggy, Query query) {
+ return R.data(qinzheFgbService.lambdaQuery().like(StringUtils.isNotBlank(ljh), QinzheFgb::getLjh,ljh).like(StringUtils.isNotBlank(zggy), QinzheFgb::getZggy,zggy).page(Condition.getPage(query)));
}
}
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..7250a6f 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
@@ -14,6 +14,7 @@
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;
@@ -49,6 +50,7 @@
*/
static final int BATCH_SIZE = 4;//5000;
+ @Transactional
public void syncData(){
/*
Map mmdData = mdmJdbcTemplate.queryForMap("select count(*) n from mdm_machine");
@@ -57,12 +59,8 @@
log.info("qingzhe:{}",qinzheData);
*/
cleanLocalTable();
-
- cleanQinzheDataInDivision();
-
-
+ //cleanQinzheDataInDivision();
saveQinzheFgb();
-
}
@@ -108,7 +106,7 @@
insertToLocalTable(fgbList);
- updateProduceDivision(fgbList);
+ //updateProduceDivision(fgbList);
}
/**
* //qingzhe - mdm
@@ -126,16 +124,9 @@
}
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);
+
}
}
diff --git a/blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/task/QincheViewSyncTask.java b/blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/task/QincheViewSyncTask.java
new file mode 100644
index 0000000..719deb1
--- /dev/null
+++ b/blade-service/blade-qinzhesync/src/main/java/org/springblade/qinzhesync/task/QincheViewSyncTask.java
@@ -0,0 +1,27 @@
+package org.springblade.qinzhesync.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springblade.qinzhesync.service.QinzheSyncService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+@Slf4j
+@Component
+@EnableScheduling
+public class QincheViewSyncTask {
+ @Autowired
+ private QinzheSyncService service;
+ // 姣�5绉掓墽琛屼竴娆�
+ //@Scheduled(fixedRate = 1000000)
+ //@Scheduled(cron = "0 1 0 * * ?") // 姣忓ぉ涓婂崍0鐐�1鍒嗘墽琛�
+ //@Scheduled(cron = "0 */5 * * * ?")
+ @Scheduled(cron = "0 1 0 * * ?") //test
+ public void executeSync() {
+ service.syncData();
+ }
+
+}
--
Gitblit v1.9.3