Merge remote-tracking branch 'origin/master'

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/ScheduledTasksServiceBySqlServer.java

@@ -4,8 +4,9 @@ package com.rongwei.bscommon.sys.service;
 /**
  *
  */
-public interface ScheduledTasksServiceBySqlServer {
+public interface ScheduledTasksServiceBySqlServerService {
 
     void projectAboutSync();
 
+    void userAndOrgSync();
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ScheduledTasksServiceBySqlServerImpl.java

@@ -2,14 +2,13 @@ package com.rongwei.bscommon.sys.service.impl;
 
 
 import com.rongwei.bscommon.sys.dao.SqlServerMapper;
-import com.rongwei.bscommon.sys.service.ScheduledTasksServiceBySqlServer;
+import com.rongwei.bscommon.sys.service.ScheduledTasksServiceBySqlServerService;
 import com.rongwei.bsentity.domain.PmProject;
 import com.rongwei.bsentity.domain.ZProject;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,7 +19,7 @@ import java.util.stream.Collectors;
  * @date 2024/12/04
  */
 @Service
-public class ScheduledTasksServiceBySqlServerImpl implements ScheduledTasksServiceBySqlServer {
+public class ScheduledTasksServiceBySqlServerServiceImpl implements ScheduledTasksServiceBySqlServerService {
     @Autowired
     private SqlServerMapper sqlServerMapper;
     @Autowired
@@ -58,6 +57,11 @@ public class ScheduledTasksServiceBySqlServerImpl implements ScheduledTasksServi
         });
 
     }
+
+    @Override
+    public void userAndOrgSync() {
+
+    }
 }
 
 

jsglkh-server/src/main/java/com/rongwei/controller/ScheduledTasksServiceController.java

@@ -1,6 +1,7 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.impl.ScheduledTasksServiceBySqlServerImpl;
+import com.rongwei.bscommon.sys.service.ScheduledTasksServiceBySqlServerService;
+import com.rongwei.bscommon.sys.service.impl.ScheduledTasksServiceBySqlServerServiceImpl;
 import com.rongwei.rwcommon.base.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/scheduled")
 public class ScheduledTasksServiceController {
     @Autowired
-    private ScheduledTasksServiceBySqlServerImpl scheduledTasksServiceBySqlServer;
+    private ScheduledTasksServiceBySqlServerService scheduledTasksServiceBySqlServer;
 
     /**
      * 新增和修改接口同步方法
@@ -29,4 +30,13 @@ public class ScheduledTasksServiceController {
         scheduledTasksServiceBySqlServer.projectAboutSync();
         return R.ok();
     }
+
+    /**
+     * 从sql server同步人员、组织机构、关系
+     */
+    @PostMapping("/userAndOrgSync")
+    public R userAndOrgSync() {
+        scheduledTasksServiceBySqlServer.userAndOrgSync();
+        return R.ok();
+    }
 }