合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/dao/PasUserDao.java

@@ -22,45 +22,6 @@ public interface PasUserDao extends MongoRepository<User, String> {
      */
     User findAllByUsernameEqualsAndStatusEquals(String username,Integer status);
 
-    /**
-     * 根据用户姓名查询用户对象
-     * @param name 用户姓名
-     * @param status 删除状态
-     * @return User
-     */
-    List<User> findAllByNameEqualsAndStatusEquals(String name,Integer status);
-
-    /**
-     * 根据用户名查询用户对象
-     * @param status 状态
-     * @return User
-     */
-    List<User> findAllByStatusEquals(Integer status);
-
-    /**
-     * 根据id集合搜索用户
-     * @param ids id集合
-     * @param status 删除状态
-     * @return list
-     */
-    List<User> findAllByIdInAndStatusEquals(List<String> ids,Integer status);
-
-    /**
-     * 根据部门id查询用户
-     * @param ids 部门id
-     * @param status 删除状态
-     * @return User
-     */
-    List<User> findAllByDepartIdInAndStatusEquals(List<String> ids,Integer status);
-
-    /**
-     * 查询未删除的人员
-     * @param id 用户id
-     * @param status 删除状态
-     * @return User
-     */
-    User findAllByIdEqualsAndStatusEquals(String id,Integer status);
-
     /**
      * 根据id列表查询
      * @param ids id列表

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/User.java

@@ -19,6 +19,7 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -147,4 +148,16 @@ public class User implements UserDetails, Serializable {
         if (!(obj instanceof com.zjty.tynotes.pas.entity.User)) {return false;}
         return this.toString().equals(obj.toString());
     }
+
+    public User createUser() {
+        this.setAddress("address");
+        this.setIdCard("1231245325325");
+        ArrayList<String> list = new ArrayList<>();
+        list.add("1");
+        this.setDepartmentId("1");
+        this.setUsername("zhangsan");
+        this.setPassword("123456");
+        return this;
+    }
+
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/task/Init.java

+package com.zjty.tynotes.pas.task;
+
+import com.zjty.tynotes.pas.dao.PasUserDao;
+import com.zjty.tynotes.pas.entity.Authority;
+import com.zjty.tynotes.pas.entity.Role;
+import com.zjty.tynotes.pas.entity.User;
+import com.zjty.tynotes.pas.service.IAuthorityService;
+import com.zjty.tynotes.pas.service.IDepartmentService;
+import com.zjty.tynotes.pas.service.IRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: mcj
+ * @Date: 19-4-30 下午2:01
+ * @Version 1.0
+ */
+@Component
+public class Init implements CommandLineRunner {
+
+    @Autowired
+    PasUserDao pasUserDao;
+    @Autowired
+    private IAuthorityService iAuthorityService;
+
+    @Autowired
+    private IRoleService iRoleService;
+
+    @Override
+    public void run(String... args) throws Exception {
+//        iRoleService.deleteAll();
+
+        List<Authority> all = iAuthorityService.findAuthority();
+        List<String> list = all.stream().map(Authority::getId).collect(Collectors.toList());
+        Role role = new Role();
+        role.setName("管理员");
+
+        Role role1 = null;
+        if (iRoleService.findAll().size() == 0) {
+            role1 = iRoleService.addRole(role);
+        }
+        if (pasUserDao.findAllByUsername("root") == null) {
+            User user = new User();
+            user.createUser();
+            user.setUsername("root");
+            user.setPassword("root");
+            if (role1 != null) {
+                List<Role> roles = new ArrayList<>();
+                roles.add(role1);
+                user.setRoles(roles);
+            }
+            user.setDepartmentId("1");
+            pasUserDao.save(user);
+        }
+
+
+//        User user1 = new User();
+//        user1.createUser();
+//        user1.setUsername("mcj1");
+//        user1.setPassword("mcj1");
+//        user1.setClock(0);
+//        user1.setRoleId(role1.getId());
+//        user1.setDepartId("2");
+//
+//
+//        User user2 = new User();
+//        user2.createUser();
+//        user2.setUsername("mcj2");
+//        user2.setPassword("mcj2");
+//        user2.setClock(0);
+//        user2.setRoleId(role1.getId());
+//        user2.setDepartId("1");
+//
+//        User user3 = new User();
+//        user3.createUser();
+//        user3.setUsername("mcj3");
+//        user3.setPassword("mcj3");
+//        user3.setClock(0);
+//        user3.setRoleId(role1.getId());
+//        user3.setDepartId("2");
+//
+//
+//        User user4 = new User();
+//        user4.createUser();
+//        user4.setUsername("mcj4");
+//        user4.setPassword("mcj4");
+//        user4.setClock(0);
+//        user4.setRoleId(role1.getId());
+//        user4.setDepartId("1");
+//
+//          pasUserDao.deleteAll();
+//        pasUserDao.save(user1);
+//        pasUserDao.save(user2);
+//        pasUserDao.save(user3);
+//        pasUserDao.save(user4);
+//
+//
+//        iDepartmentService.deleteAll();
+//        iDepartmentService.addDepartments(new ArrayList<>());
+//
+//        iGroupService.deleteAll();
+//        ArrayList<Group> arrayList = new ArrayList<>();
+//        Group group1 = new Group();
+//        Group group2 = new Group();
+//        group1.setName("1号小组");
+//        group2.setName("2号小组");
+//        arrayList.add(group1);
+//        arrayList.add(group2);
+//        iGroupService.addGroup(arrayList);
+//
+//        iJobService.deleteAll();
+//        Job job = new Job();
+//        job.setName("岗位1");
+//
+//        iJobService.addJob(job);
+    }
+}