Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java

@@ -11,47 +11,47 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
  * 
  * @author ruoyi
  */
-@Configuration
-public class ScheduleConfig
-{
-    @Bean
-    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
-    {
-        SchedulerFactoryBean factory = new SchedulerFactoryBean();
-        factory.setDataSource(dataSource);
-
-        // quartz参数
-        Properties prop = new Properties();
-        prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
-        prop.put("org.quartz.scheduler.instanceId", "AUTO");
-        // 线程池配置
-        prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
-        prop.put("org.quartz.threadPool.threadCount", "20");
-        prop.put("org.quartz.threadPool.threadPriority", "5");
-        // JobStore配置
-        prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
-        // 集群配置
-        prop.put("org.quartz.jobStore.isClustered", "true");
-        prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
-        prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
-        prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
-
-        // sqlserver 启用
-        // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
-        prop.put("org.quartz.jobStore.misfireThreshold", "12000");
-        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
-        factory.setQuartzProperties(prop);
-
-        factory.setSchedulerName("RuoyiScheduler");
-        // 延时启动
-        factory.setStartupDelay(1);
-        factory.setApplicationContextSchedulerContextKey("applicationContextKey");
-        // 可选，QuartzScheduler
-        // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
-        factory.setOverwriteExistingJobs(true);
-        // 设置自动启动，默认为true
-        factory.setAutoStartup(true);
-
-        return factory;
-    }
-}
+//@Configuration
+//public class ScheduleConfig
+//{
+//    @Bean
+//    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
+//    {
+//        SchedulerFactoryBean factory = new SchedulerFactoryBean();
+//        factory.setDataSource(dataSource);
+//
+//        // quartz参数
+//        Properties prop = new Properties();
+//        prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
+//        prop.put("org.quartz.scheduler.instanceId", "AUTO");
+//        // 线程池配置
+//        prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
+//        prop.put("org.quartz.threadPool.threadCount", "20");
+//        prop.put("org.quartz.threadPool.threadPriority", "5");
+//        // JobStore配置
+//        prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
+//        // 集群配置
+//        prop.put("org.quartz.jobStore.isClustered", "true");
+//        prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
+//        prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
+//        prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
+//
+//        // sqlserver 启用
+//        // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+//        prop.put("org.quartz.jobStore.misfireThreshold", "12000");
+//        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
+//        factory.setQuartzProperties(prop);
+//
+//        factory.setSchedulerName("RuoyiScheduler");
+//        // 延时启动
+//        factory.setStartupDelay(1);
+//        factory.setApplicationContextSchedulerContextKey("applicationContextKey");
+//        // 可选，QuartzScheduler
+//        // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
+//        factory.setOverwriteExistingJobs(true);
+//        // 设置自动启动，默认为true
+//        factory.setAutoStartup(true);
+//
+//        return factory;
+//    }
+//}

base-modules/service-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java

@@ -2,12 +2,14 @@ package com.ruoyi.job.mapper;
 
 import java.util.List;
 import com.ruoyi.job.domain.SysJob;
+import org.springframework.stereotype.Repository;
 
 /**
  * 调度任务信息 数据层
  * 
  * @author ruoyi
  */
+@Repository
 public interface SysJobMapper
 {
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -21,7 +21,6 @@ import com.usky.system.service.ISysDeptService;
 import com.usky.system.service.vo.TreeNode;
 import com.usky.system.service.vo.TreeSelect;
 import com.usky.system.service.vo.UserPostVo;
-import org.omg.CORBA.StringHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantServiceImpl.java

@@ -103,7 +103,6 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         SysDept sysDept = new SysDept();
         sysDept.setTenantId(tenantId);
         sysDept.setDeptName(sysTenant.getTenantName());
-        sysDept.setParentId((long)0);
         sysDept.setOrderNum("0");
         sysDept.setEmail(sysTenant.getEmail());
         sysDept.setPhone(sysTenant.getPhoneNumber());

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -523,7 +523,10 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
            sysUser = userMapper.selectUserDataOne(tenantId,phone);
        }
        if(Objects.isNull(sysUser)){
-           throw new BusinessException("用户信息未注册");
+           sysUser = userMapper.selectUserDataOne(tenantId,username);
+           if (Objects.isNull(sysUser)){
+               throw new BusinessException("用户信息未注册");
+           }
        }
        List<SysRole> sysRoles = roleMapper.selectRolePermissionByUserId(sysUser.getUserId());
        List<SysRoleVO> collect = sysRoles.stream().map(sysRole -> {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/TreeNode.java

@@ -30,15 +30,15 @@ public class TreeNode implements Serializable {
      */
     private String label;
 
-    /**
-     * 用户头像
-     */
-    private String avatar;
-
-    /**
-     * 用户职位
-     */
-    private String post;
+//    /**
+//     * 用户头像
+//     */
+//    private String avatar;
+//
+//    /**
+//     * 用户职位
+//     */
+//    private String post;
 
     /**
      * 子节点
@@ -55,13 +55,13 @@ public class TreeNode implements Serializable {
         this.children = children;
     }
 
-    public TreeNode(SysUser user) {
-        this.id = user.getUserId();
-        this.label = user.getNickName();
-        this.avatar = user.getAvatar();
-        this.post = user.getPost();
-        this.children = new ArrayList<>();
-    }
+//    public TreeNode(SysUser user) {
+//        this.id = user.getUserId();
+//        this.label = user.getNickName();
+//        this.avatar = user.getAvatar();
+//        this.post = user.getPost();
+//        this.children = new ArrayList<>();
+//    }
 
     public TreeNode(SysDept dept) {
         this.id = dept.getDeptId();
@@ -70,7 +70,7 @@ public class TreeNode implements Serializable {
         if (dept.getChildren() != null && !dept.getChildren().isEmpty()) {
             this.children = dept.getChildren().stream().map(TreeNode::new).collect(Collectors.toList());
         } else if (dept.getUsers() != null && !dept.getUsers().isEmpty()) {
-            this.children = dept.getUsers().stream().map(TreeNode::new).collect(Collectors.toList());
+            this.children = dept.getUsers().stream().map(UserTreeNode::new).collect(Collectors.toList());
         }
     }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/UserTreeNode.java

@@ -0,0 +1,62 @@
+package com.usky.system.service.vo;
+import com.usky.system.domain.SysDeptVO;
+import com.usky.system.domain.SysUser;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * @description：TODO
+ * @author： fu
+ * @create： 2024-08-01 11:40
+ */
+@Data
+public class UserTreeNode extends TreeNode {
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 用户账号 */
+    private String userName;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 用户邮箱 */
+    private String email;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 用户性别 */
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 地址 */
+    private String address;
+
+    /** 岗位 */
+    private String post;
+
+
+    public UserTreeNode(SysUser user) {
+        super(user.getUserId(), user.getNickName(), new ArrayList<>());
+        this.userId = user.getUserId();
+        this.deptId = user.getDeptId();
+        this.userName = user.getUserName();
+        this.nickName = user.getNickName();
+        this.email = user.getEmail();
+        this.phonenumber = user.getPhonenumber();
+        this.sex = user.getSex();
+        this.avatar = user.getAvatar();
+        this.address = user.getAddress();
+        this.post = user.getPost();
+    }
+}
+