From 1b773db0cb72d477d31b84e18ce50d63d4d72611 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Tue, 27 Jul 2021 22:52:39 +0800
Subject: [PATCH] Synchronizers

---
 .../java/org/maxkey/entity/Synchronizers.java | 31 +++++++++++++++++--
 .../contorller/SynchronizersController.java   | 23 +++++---------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Synchronizers.java b/maxkey-core/src/main/java/org/maxkey/entity/Synchronizers.java
index 6cdffc72..28262060 100644
--- a/maxkey-core/src/main/java/org/maxkey/entity/Synchronizers.java
+++ b/maxkey-core/src/main/java/org/maxkey/entity/Synchronizers.java
@@ -40,7 +40,7 @@ public class Synchronizers extends JpaBaseEntity implements Serializable {
     @Column
     String name;
     @Column
-    String filters ;
+    String filters;
     @Column
     String sourceType;
     @Column
@@ -49,6 +49,11 @@ public class Synchronizers extends JpaBaseEntity implements Serializable {
     String suspendTime;
     @Column
     String scheduler;
+
+    //同步时间范围（单位天）
+	@Column
+	Integer syncStartTime;
+
     @Column
     String providerUrl;
     @Column
@@ -79,17 +84,27 @@ public class Synchronizers extends JpaBaseEntity implements Serializable {
     String modifiedDate;
     @Column
     String status;
+    
+    String service;
 
     public Synchronizers() {
     }
 
+
+
     public Synchronizers(String id) {
         this.id = id;
     }
 
+	public Integer getSyncStartTime() {
+		return syncStartTime;
+	}
 
+	public void setSyncStartTime(Integer syncStartTime) {
+		this.syncStartTime = syncStartTime;
+	}
 
-    public String getId() {
+	public String getId() {
 		return id;
 	}
 
@@ -267,6 +282,18 @@ public class Synchronizers extends JpaBaseEntity implements Serializable {
 		this.status = status;
 	}
 
+	public String getService() {
+		return service;
+	}
+
+
+
+	public void setService(String service) {
+		this.service = service;
+	}
+
+
+
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/SynchronizersController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/SynchronizersController.java
index 20e173c0..79ea26fe 100644
--- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/SynchronizersController.java
+++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/SynchronizersController.java
@@ -17,8 +17,8 @@
 
 package org.maxkey.web.contorller;
 
-import java.util.HashMap;
 import java.util.List;
+
 import org.apache.mybatis.jpa.persistence.JpaPageResults;
 import org.maxkey.constants.ConstantsOperateMessage;
 import org.maxkey.entity.Synchronizers;
@@ -48,16 +48,7 @@ public class SynchronizersController {
 	
 	@Autowired
 	@Qualifier("synchronizersService")
-	SynchronizersService synchronizerssService;
-	
-	private static HashMap<String,String> synchronizerMap =new HashMap<String,String>();
-
-	static {
-		synchronizerMap.put("1", "ldapSynchronizerService");
-		synchronizerMap.put("2", "activeDirectorySynchronizerService");
-		synchronizerMap.put("3", "dingdingSynchronizerService");
-		synchronizerMap.put("4", "workweixinSynchronizerService");
-	}
+	SynchronizersService synchronizersService;
 	
 	@RequestMapping(value={"/list"})
 	public ModelAndView groupsList(){
@@ -70,7 +61,7 @@ public class SynchronizersController {
 	@ResponseBody
 	public JpaPageResults<Synchronizers> queryDataGrid(@ModelAttribute("synchronizers") Synchronizers synchronizers) {
 		_logger.debug(""+synchronizers);
-		return synchronizerssService.queryPageResults(synchronizers);
+		return synchronizersService.queryPageResults(synchronizers);
 	}
 
 	
@@ -79,7 +70,7 @@ public class SynchronizersController {
 	@RequestMapping(value = { "/forwardUpdate/{id}" })
 	public ModelAndView forwardUpdate(@PathVariable("id") String id) {
 		ModelAndView modelAndView=new ModelAndView("synchronizers/synchronizerUpdate");
-		Synchronizers synchronizers=synchronizerssService.get(id);
+		Synchronizers synchronizers=synchronizersService.get(id);
 		modelAndView.addObject("model",synchronizers);
 		return modelAndView;
 	}
@@ -96,7 +87,7 @@ public class SynchronizersController {
 	public Message update(@ModelAttribute("synchronizers") Synchronizers synchronizers) {
 		_logger.debug("-update  synchronizers :" + synchronizers);
 		
-		if (synchronizerssService.update(synchronizers)) {
+		if (synchronizersService.update(synchronizers)) {
 			return  new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS),MessageType.success);
 			
 		} else {
@@ -118,9 +109,9 @@ public class SynchronizersController {
 		List<String> ids = StringUtils.string2List(id, ",");
 		try {
 			for(String sysId : ids) {
-				Synchronizers  synchronizer  = synchronizerssService.get(sysId);
+				Synchronizers  synchronizer  = synchronizersService.get(sysId);
 				_logger.debug("synchronizer " + synchronizer);
-				ISynchronizerService synchronizerService = (ISynchronizerService)WebContext.getBean(synchronizerMap.get(sysId));
+				ISynchronizerService synchronizerService = (ISynchronizerService)WebContext.getBean(synchronizer.getService());
 				synchronizerService.setSynchronizer(synchronizer);
 				synchronizerService.sync();
 			}
-- 
GitLab