From 09faa36132c8cbada5327649875534ef01c1a3b1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 11 十二月 2025 20:44:31 +0800
Subject: [PATCH] feat: 优化任务里程统计
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java
index 6b9cb51..2701b55 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OaSyncTask.java
@@ -1,18 +1,17 @@
package com.ruoyi.quartz.task;
import com.ruoyi.system.domain.DepartmentSyncDTO;
+import com.ruoyi.system.domain.OrderClassDTO;
import com.ruoyi.system.domain.UserSyncDTO;
-import com.ruoyi.system.service.IDepartmentSyncDataService;
-import com.ruoyi.system.service.IUserSyncDataService;
+import com.ruoyi.system.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.service.IDepartmentSyncService;
-import com.ruoyi.system.service.IUserSyncService;
import java.util.List;
+import java.util.Map;
/**
* OA鏁版嵁鍚屾瀹氭椂浠诲姟锛堢粍鍚堜换鍔★級
@@ -46,6 +45,19 @@
private List<UserSyncDTO> getUserData(){
return userSyncDataService.getOaUsers();
}
+
+ @Autowired
+ private IOrderClassDataService orderClassDataService;
+ private List<OrderClassDTO> getServiceOrdCode() {
+ return orderClassDataService.getServiceOrderClass();
+ }
+ private List<OrderClassDTO> getDispatchOrdCode() {
+ return orderClassDataService.getDispatchOrderClass();
+ }
+
+ private List<Map<String,Object>> getAddressList() {
+ return departmentSyncDataService.getAddressList();
+ }
/**
* 鍚屾OA鏁版嵁锛堥儴闂�+鐢ㄦ埛锛�
* 鎸夐『搴忔墽琛岋細1. 閮ㄩ棬鍚屾 2. 鐢ㄦ埛鍚屾
@@ -62,29 +74,29 @@
log.info("##########寮�濮嬫墽琛孫A鏁版嵁鍚屾瀹氭椂浠诲姟##########");
// 绗竴姝ワ細鍚屾閮ㄩ棬
- log.info("銆愭楠�1/2銆戝紑濮嬪悓姝ラ儴闂ㄦ暟鎹�...");
- AjaxResult deptResult = departmentSyncService.syncBranchDepartments(this.getDept());
+// log.info("銆愭楠�1/2銆戝紑濮嬪悓姝ラ儴闂ㄦ暟鎹�...");
+ AjaxResult deptResult = departmentSyncService.syncBranchDepartments(this.getDept(),this.getServiceOrdCode(),this.getDispatchOrdCode(),this.getAddressList());
if (deptResult.get("code").equals(200))
{
- log.info("銆愭楠�1/2銆戦儴闂ㄥ悓姝ユ垚鍔�: {}", deptResult.get("msg"));
+// log.info("銆愭楠�1/2銆戦儴闂ㄥ悓姝ユ垚鍔�: {}", deptResult.get("msg"));
// 绗簩姝ワ細鍚屾鐢ㄦ埛锛堝彧鏈夐儴闂ㄥ悓姝ユ垚鍔熸墠鎵ц锛�
- log.info("銆愭楠�2/2銆戝紑濮嬪悓姝ョ敤鎴锋暟鎹�...");
+// log.info("銆愭楠�2/2銆戝紑濮嬪悓姝ョ敤鎴锋暟鎹�...");
AjaxResult userResult = userSyncService.syncOaUsers(this.getUserData());
- if (userResult.get("code").equals(200))
- {
- log.info("銆愭楠�2/2銆戠敤鎴峰悓姝ユ垚鍔�: {}", userResult.get("msg"));
- log.info("##########OA鏁版嵁鍚屾瀹氭椂浠诲姟鎵ц瀹屾垚##########");
- log.info("鎬荤粨锛氶儴闂ㄥ悓姝ユ垚鍔燂紝鐢ㄦ埛鍚屾鎴愬姛");
- }
- else
- {
- log.error("銆愭楠�2/2銆戠敤鎴峰悓姝ュけ璐�: {}", userResult.get("msg"));
- log.warn("##########OA鏁版嵁鍚屾瀹氭椂浠诲姟閮ㄥ垎瀹屾垚##########");
- log.warn("鎬荤粨锛氶儴闂ㄥ悓姝ユ垚鍔燂紝鐢ㄦ埛鍚屾澶辫触");
- }
+// if (userResult.get("code").equals(200))
+// {
+// log.info("銆愭楠�2/2銆戠敤鎴峰悓姝ユ垚鍔�: {}", userResult.get("msg"));
+// log.info("##########OA鏁版嵁鍚屾瀹氭椂浠诲姟鎵ц瀹屾垚##########");
+// log.info("鎬荤粨锛氶儴闂ㄥ悓姝ユ垚鍔燂紝鐢ㄦ埛鍚屾鎴愬姛");
+// }
+// else
+// {
+// log.error("銆愭楠�2/2銆戠敤鎴峰悓姝ュけ璐�: {}", userResult.get("msg"));
+// log.warn("##########OA鏁版嵁鍚屾瀹氭椂浠诲姟閮ㄥ垎瀹屾垚##########");
+// log.warn("鎬荤粨锛氶儴闂ㄥ悓姝ユ垚鍔燂紝鐢ㄦ埛鍚屾澶辫触");
+// }
}
else
{
@@ -106,7 +118,7 @@
*/
public void syncOaData(String params)
{
- log.info("OA鏁版嵁鍚屾浠诲姟鍙傛暟: {}", params);
+// log.info("OA鏁版嵁鍚屾浠诲姟鍙傛暟: {}", params);
syncOaData();
}
@@ -117,8 +129,8 @@
{
try
{
- log.info("==========寮�濮嬫墽琛岄儴闂ㄥ悓姝ヤ换鍔�==========");
- AjaxResult result = departmentSyncService.syncBranchDepartments(this.getDept());
+// log.info("==========寮�濮嬫墽琛岄儴闂ㄥ悓姝ヤ换鍔�==========");
+ AjaxResult result = departmentSyncService.syncBranchDepartments(this.getDept(),this.getServiceOrdCode(),this.getDispatchOrdCode(),this.getAddressList());
if (result.get("code").equals(200))
{
--
Gitblit v1.9.1