From 0cbb588628da7bcdca146420a672916a76df2e0c Mon Sep 17 00:00:00 2001
From: niying <132>
Date: 星期一, 29 一月 2024 11:53:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/itstyle/mdm/job/MdmJob.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/itstyle/mdm/job/MdmJob.java b/src/main/java/com/itstyle/mdm/job/MdmJob.java
index 44a8fd1..729f48f 100644
--- a/src/main/java/com/itstyle/mdm/job/MdmJob.java
+++ b/src/main/java/com/itstyle/mdm/job/MdmJob.java
@@ -28,14 +28,16 @@
     public void execute(JobExecutionContext context) throws JobExecutionException {
         JobDetail jobDetail = context.getJobDetail();
         JobDataMap dataMap = jobDetail.getJobDataMap();
+        JobKey key = jobDetail.getKey();
+        String name = key.getName();//鏁版嵁鑾峰彇鍚嶇О
         /**
          * 鑾峰彇浠诲姟涓繚瀛樼殑鏂规硶鍚嶅瓧锛屽姩鎬佽皟鐢ㄦ柟娉�
          */
         String methodName = dataMap.getString("jobMethodName");
         try {
             MdmJob job = new MdmJob();
-            Method method = job.getClass().getMethod(methodName);
-            method.invoke(job);
+            Method method = job.getClass().getMethod(methodName,String.class);
+            method.invoke(job,name);
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {
@@ -50,10 +52,21 @@
      * 璋冪敤MDM鎺ュ彛杩涜鏁版嵁鑾峰彇鐗╂枡
      * @return
      */
-    public String obtainMdmData(){
+    public String obtainMdmData(String name){
         mdmUtils = (MdmUtils) applicationContext.getBean("mdmUtils");
         logger.info("MDM鏁版嵁鑾峰彇寮�濮�");
-        mdmUtils.queryMaterial();
+        mdmUtils.queryMaterial(name);
+        return "";
+    }
+
+    /**
+     * 璋冪敤MDM璁¢噺鍗曚綅鏁版嵁鑾峰彇
+     * @throws BeansException
+     */
+    public String obtainMdmUnitData(String name){
+        mdmUtils = (MdmUtils) applicationContext.getBean("mdmUtils");
+        logger.info("MDM璁¢噺鍗曚綅鏁版嵁鑾峰彇寮�濮�");
+        mdmUtils.queryUnit(name);
         return "";
     }
 

--
Gitblit v1.8.0