up

client/src/main/java/com/ecep/contract/task/CompanyMergeClientTasker.java

@@ -0,0 +1,44 @@
+package com.ecep.contract.task;
+
+import com.ecep.contract.WebSocketClientTasker;
+import com.ecep.contract.MessageHolder;
+import com.ecep.contract.vo.CompanyVo;
+import javafx.application.Platform;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.logging.Level;
+
+/**
+ * 公司合并客户端任务器
+ * 通过WebSocket连接与服务器端通信，执行公司合并操作
+ */
+
+public class CompanyMergeClientTasker extends Tasker<Object> implements WebSocketClientTasker {
+
+    @Getter
+    @Setter
+    private CompanyVo company;
+
+    @Getter
+    @Setter
+    private List<String> nameList;
+
+    @Override
+    public String getTaskName() {
+        return "CompanyMergeTask";
+    }
+
+    @Override
+    public void updateProgress(long current, long total) {
+        super.updateProgress(current, total);
+    }
+
+    @Override
+    protected Object execute(MessageHolder holder) throws Exception {
+        return callRemoteTask(holder, getLocale(), company.getId(), nameList.toArray());
+    }
+}

client/src/main/java/com/ecep/contract/task/ContractGroupSyncTask.java

@@ -1,11 +1,21 @@
 package com.ecep.contract.task;
 
 import com.ecep.contract.MessageHolder;
+import com.ecep.contract.WebSocketClientTasker;
 
-public class ContractGroupSyncTask  extends Tasker<Object>{
+public class ContractGroupSyncTask extends Tasker<Object> implements WebSocketClientTasker {
     @Override
-    public Object execute(MessageHolder holder) {
-        return null;
+    public String getTaskName() {
+        return "ContractGroupSyncTask";
     }
 
+    @Override
+    public Object execute(MessageHolder holder) {
+        return callRemoteTask(holder, getLocale());
+    }
+
+    @Override
+    public void updateProgress(long current, long total) {
+        super.updateProgress(current, total);
+    }
 }

client/src/main/java/com/ecep/contract/task/ContractKindSyncTask.java

@@ -1,10 +1,23 @@
 package com.ecep.contract.task;
 
 import com.ecep.contract.MessageHolder;
+import com.ecep.contract.WebSocketClientTasker;
+
+public class ContractKindSyncTask extends Tasker<Object> implements WebSocketClientTasker {
+    public static final String TASK_NAME = "ContractKindSyncTask";
+
+    @Override
+    public String getTaskName() {
+        return TASK_NAME;
+    }
+
+    @Override
+    public void updateProgress(long workDone, long max) {
+        super.updateProgress(workDone, max);
+    }
 
-public class ContractKindSyncTask extends Tasker<Object> {
     @Override
     public Object execute(MessageHolder holder) {
-        return null;
+        return callRemoteTask(holder, getLocale());
     }
 }

client/src/main/java/com/ecep/contract/task/ContractSyncTask.java

@@ -4,9 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.ecep.contract.MessageHolder;
-import com.ecep.contract.SpringApp;
 import com.ecep.contract.WebSocketClientTasker;
-import com.ecep.contract.service.YongYouU8Service;
 
 /**
  * 合同同步任务
@@ -14,15 +12,6 @@ import com.ecep.contract.service.YongYouU8Service;
 public class ContractSyncTask extends Tasker<Object> implements WebSocketClientTasker {
     private static final Logger logger = LoggerFactory.getLogger(ContractSyncTask.class);
 
-    private YongYouU8Service yongYouU8Service;
-
-    private YongYouU8Service getYongYouU8Service() {
-        if (yongYouU8Service == null) {
-            yongYouU8Service = SpringApp.getBean(YongYouU8Service.class);
-        }
-        return yongYouU8Service;
-    }
-
     public String getTaskName() {
         return "ContractSyncTask";
     }

client/src/main/java/com/ecep/contract/task/ContractTypeSyncTask.java

@@ -1,10 +1,27 @@
 package com.ecep.contract.task;
 
-import com.ecep.contract.MessageHolder;
+import java.util.Locale;
+
+import com.ecep.contract.MessageHolder;
+import com.ecep.contract.WebSocketClientTasker;
+
+/**
+ * 合同类型同步任务
+ */
+public class ContractTypeSyncTask extends Tasker<Object> implements WebSocketClientTasker {
+    @Override
+    public String getTaskName() {
+        return "ContractTypeSyncTask";
+    }
+
+    @Override
+    public void updateProgress(long current, long total) {
+        super.updateProgress(current, total);
+    }
 
-public class ContractTypeSyncTask extends Tasker<Object> {
     @Override
     public Object execute(MessageHolder holder) {
-        return null;
+        // 调用远程WebSocket任务
+        return callRemoteTask(holder, Locale.getDefault());
     }
 }

client/src/main/java/com/ecep/contract/task/CustomerClassSyncTask.java

@@ -1,13 +1,32 @@
 package com.ecep.contract.task;
 
-import com.ecep.contract.MessageHolder;
+import java.util.Locale;
 
-public class CustomerClassSyncTask extends Tasker<Object> {
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ecep.contract.MessageHolder;
+import com.ecep.contract.WebSocketClientTasker;
+
+public class CustomerClassSyncTask extends Tasker<Object> implements WebSocketClientTasker {
+    public static final String TASK_NAME = "CustomerClassSyncTask";
+    private static final Logger logger = LoggerFactory.getLogger(CustomerClassSyncTask.class);
+
+    @Override
+    public String getTaskName() {
+        return TASK_NAME;
+    }
 
     @Override
     protected Object execute(MessageHolder holder) throws Exception {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'execute'");
+        updateTitle("用友U8系统-同步客户分类");
+        return callRemoteTask(holder, Locale.getDefault());
+    }
+
+    // 显式重写 updateProgress 以解决方法隐藏冲突
+    @Override
+    public void updateProgress(long workDone, long max) {
+        super.updateProgress(workDone, max);
     }
 
 }

client/src/main/java/com/ecep/contract/task/CustomerSyncTask.java

@@ -1,20 +1,36 @@
 package com.ecep.contract.task;
 
+import java.util.Locale;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.ecep.contract.MessageHolder;
+import com.ecep.contract.WebSocketClientTasker;
 
 /**
  * 同步客户任务
  */
-public class CustomerSyncTask extends Tasker<Object> {
+public class CustomerSyncTask extends Tasker<Object> implements WebSocketClientTasker {
+
+    public static final String TASK_NAME = "CustomerSyncTask";
     private static final Logger logger = LoggerFactory.getLogger(CustomerSyncTask.class);
 
+    @Override
+    public String getTaskName() {
+        return TASK_NAME;
+    }
+
+    // 显式重写 updateProgress 以解决方法隐藏冲突
+    @Override
+    public void updateProgress(long workDone, long max) {
+        super.updateProgress(workDone, max);
+    }
+
     @Override
     protected Object execute(MessageHolder holder) throws Exception {
         updateTitle("用友U8系统-同步客户");
-        return null;
+        return callRemoteTask(holder, Locale.getDefault());
     }
 
 }

client/src/main/java/com/ecep/contract/task/VendorClassSyncTask.java

@@ -1,10 +1,28 @@
 package com.ecep.contract.task;
 
-import com.ecep.contract.MessageHolder;
+import java.util.Locale;
+
+import com.ecep.contract.MessageHolder;
+import com.ecep.contract.WebSocketClientTasker;
+
+public class VendorClassSyncTask extends Tasker<Object> implements WebSocketClientTasker {
+    public static final String TASK_NAME = "VendorClassSyncTask";
+
+    @Override
+    public String getTaskName() {
+        return TASK_NAME;
+    }
+
+    @Override
+    public void updateProgress(long current, long total) {
+        // 直接使用父类的updateProgress方法
+        super.updateProgress(current, total);
+    }
 
-public class VendorClassSyncTask extends Tasker<Object> {
     @Override
     public Object execute(MessageHolder holder) {
-        return null;
+        // 使用callRemoteTask调用远程任务
+        updateTitle("用友U8系统-同步供应商分类");
+        return callRemoteTask(holder, Locale.getDefault());
     }
 }

client/src/main/java/com/ecep/contract/task/VendorSyncTask.java

@@ -4,16 +4,28 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.ecep.contract.MessageHolder;
+import com.ecep.contract.WebSocketClientTasker;
 
 /**
  * 供应商同步任务
  */
-public class VendorSyncTask extends Tasker<Object> {
+public class VendorSyncTask extends Tasker<Object> implements WebSocketClientTasker {
     private static final Logger logger = LoggerFactory.getLogger(VendorSyncTask.class);
+    private static final String TASK_NAME = "VendorSyncTask";
+
+    @Override
+    public String getTaskName() {
+        return TASK_NAME;
+    }
+
+    @Override
+    public void updateProgress(long current, long total) {
+        super.updateProgress(current, total);
+    }
 
     @Override
     protected Object execute(MessageHolder holder) throws Exception {
         updateTitle("用友U8系统-同步供应商");
-        return null;
+        return callRemoteTask(holder, getLocale());
     }
 }