sso

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/mapper/ext/ExtVppRTeamMemberRoleMapper.java

@@ -44,7 +44,7 @@ public interface ExtVppRTeamMemberRoleMapper extends VppRTeamMemberRoleMapper {
      * @param domain
      * @return
      */
-    List<VppTeamMemberVO> listForMember(@Param("teamIds") List<String> teamIds, @Param("email") String email, @Param("queryString") String queryString, @Param("status") String status, @Param("productCode") String productCode, @Param("isSso") String isSso, String domain);
+    List<VppTeamMemberVO> listForMember(@Param("teamIds") List<String> teamIds, @Param("email") String email, @Param("queryString") String queryString, @Param("status") String status, @Param("productCode") String productCode, @Param("isSso") String isSso, @Param("domain") String domain);
 
 
     /**

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/ScheduleSettingServiceImpl.java

@@ -85,7 +85,7 @@ public class ScheduleSettingServiceImpl implements ScheduleSettingService {
                 //创建定时任务
                 QuartzUtils.scheduleJob("syncJob" + scheduleSetting.getScheduleSettingId(), "syncJobGroup", SyncJob.class,
                         "syncTrigger_" + scheduleSetting.getScheduleSettingId(), "syncTriggerGroup",
-                        "0 * * * *", scheduleSetting.getDirectoryId());
+                        "0 * * * * ?", scheduleSetting.getDirectoryId());
             } else if (scheduleSetting.getType().equals(ScheduleSettingTypeEnum.SPECIFIED_TIME_EVERY_DAY.value())) {
                 //创建定时任务
                 QuartzUtils.scheduleJob("syncJob" + scheduleSetting.getScheduleSettingId(), "syncJobGroup", SyncJob.class,
@@ -95,4 +95,5 @@ public class ScheduleSettingServiceImpl implements ScheduleSettingService {
         }
         log.info("initJob finish:--------------");
     }
+
 }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/SyncServiceImpl.java

@@ -2,10 +2,7 @@ package cn.kdan.pdf.tech.core.service.impl;
 
 import cn.kdan.pdf.tech.core.constant.SSOConstant;
 import cn.kdan.pdf.tech.core.constant.VppTeamConstant;
-import cn.kdan.pdf.tech.core.enums.RoleEnum;
-import cn.kdan.pdf.tech.core.enums.ScpoeEnum;
-import cn.kdan.pdf.tech.core.enums.SyncStatusEnum;
-import cn.kdan.pdf.tech.core.enums.SyncUserEnum;
+import cn.kdan.pdf.tech.core.enums.*;
 import cn.kdan.pdf.tech.core.model.*;
 import cn.kdan.pdf.tech.core.model.Directory;
 import cn.kdan.pdf.tech.core.model.Domain;
@@ -14,6 +11,8 @@ import cn.kdan.pdf.tech.core.pojo.dto.AddSyncDTO;
 import cn.kdan.pdf.tech.core.pojo.dto.CreateTeamDTO;
 import cn.kdan.pdf.tech.core.pojo.vo.VppTeamMemberVO;
 import cn.kdan.pdf.tech.core.service.*;
+import cn.kdan.pdf.tech.core.utils.QuartzUtils;
+import cn.kdan.pdf.tech.core.utils.SyncJob;
 import cn.kdan.pdf.tech.core.utils.ThreadPoolSingleUtil;
 import com.azure.identity.ClientSecretCredential;
 import com.azure.identity.ClientSecretCredentialBuilder;
@@ -30,6 +29,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import utils.CommonUtils;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppRTeamMemberRoleServiceImpl.java

@@ -547,7 +547,7 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
             throw new BackendRuntimeException(VppDeviceConstant.EXCEPTION_MSG_NO_TEAM);
         }
         PageHelper.startPage(page, pageSize);
-        return new PageInfo<>(vppRTeamMemberRoleMapper.listForMember(teamIds, null, queryString, status, productCode, isSso,null ));
+        return new PageInfo<>(vppRTeamMemberRoleMapper.listForMember(teamIds, null, queryString, status, productCode, isSso,domain ));
     }
 
     @Override

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/utils/SyncJob.java

@@ -1,27 +1,35 @@
 package cn.kdan.pdf.tech.core.utils;
 
 import cn.kdan.pdf.tech.core.service.SyncService;
+import cn.kdan.pdf.tech.core.service.impl.SyncServiceImpl;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.scheduling.quartz.QuartzJobBean;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 @Component
-public class SyncJob implements Job, ApplicationContextAware {
+public class SyncJob extends QuartzJobBean implements ApplicationContextAware {
 
-    private SyncService syncService;
+    private static ApplicationContext applicationContext;
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) {
-        syncService = applicationContext.getBean(SyncService.class);
+        // FIXME 通过获取spring的上下文来getBean()就不需要另一种方式注入了
+        this.applicationContext = applicationContext;
     }
 
     @Override
-    public void execute(JobExecutionContext jobExecutionContext) {
+    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         JobDataMap dataMap = jobExecutionContext.getJobDetail().getJobDataMap();
         String directoryId = dataMap.getString("directoryId");
+        SyncService syncService = applicationContext.getBean(SyncService.class);
         syncService.startSync(directoryId);
     }
 }

pdf-tech-core/src/main/resources/sqlmap/ext/ExtVppRTeamMemberRoleMapper.xml

@@ -97,7 +97,7 @@
       and (vm.email like '%'||#{queryString}|| '%' or vm.full_name like '%'||#{queryString}|| '%')
     </if>
     <if test="domain != null and domain != ''">
-      and (vm.email like '%'||#{queryString}|| '%' )
+      and (vm.email like '%'||#{domain}|| '%' )
     </if>
     <if test="teamIds != null and teamIds.size > 0 ">
       and vt.id in