部门修改

src/main/java/com/kiisoo/ic/department/controller/DepartmentConreoller.java

@@ -36,4 +36,15 @@ public class DepartmentConreoller extends BaseController {
             return fail();
         }
     }
+
+    @RequestMapping(value = "sync",method = RequestMethod.GET)
+    public Map<String,Object> syncDepartment(){
+        try {
+            Boolean hasAdd = departmentService.syncDepartment();
+            return data(hasAdd);
+        }catch (Exception e){
+            log.error("添加部门失败",e);
+            return fail();
+        }
+    }
 }

src/main/java/com/kiisoo/ic/department/mapper/PrivilageDepartmentDOMapper.java

@@ -0,0 +1,9 @@
+package com.kiisoo.ic.department.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kiisoo.ic.department.entity.DepartmentDO;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PrivilageDepartmentDOMapper extends BaseMapper<DepartmentDO> {
+}

src/main/java/com/kiisoo/ic/department/service/DepartmentService.java

@@ -1,12 +1,18 @@
 package com.kiisoo.ic.department.service;
 
 import com.kiisoo.ic.department.entity.DepartmentDO;
+import com.kiisoo.ic.department.mapper.PrivilageDepartmentDOMapper;
 import com.kiisoo.ic.wx.service.QWMailListManageService;
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.bean.WxCpDepart;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * @Description: 部门管理service
  * @Auther: yechenhao
@@ -19,6 +25,9 @@ public class DepartmentService {
     @Autowired
     private QWMailListManageService qwMailListManageService;
 
+    @Autowired
+    private PrivilageDepartmentDOMapper departmentDOMapper;
+
     @Transactional(rollbackFor = Exception.class)
     public Boolean addDepartment(DepartmentDO departmentDO) throws WxErrorException {
         //数据库创建部门（需要返回部门id）
@@ -28,4 +37,19 @@ public class DepartmentService {
         
         return true;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean syncDepartment() throws WxErrorException {
+        //获取企业微信部门架构
+        List<WxCpDepart> wxCpDeparts = qwMailListManageService.syncDepartment();
+        if (CollectionUtils.isNotEmpty(wxCpDeparts)){
+            wxCpDeparts.forEach(wxDept -> {
+                DepartmentDO departmentDO = new DepartmentDO();
+                BeanUtils.copyProperties(wxDept,departmentDO);
+
+            });
+        }
+//        departmentDOMapper.insert(departmentDO);
+        return true;
+    }
 }

src/main/java/com/kiisoo/ic/employee/entity/PrivilageCpUserDO.java

@@ -1,31 +1,68 @@
 package com.kiisoo.ic.employee.entity;
 
+
+public class PrivilageCpUserDO {
+
   /**
- * 用户对应企业微信
+   * 主键id
+   */
+  private Long id;
+  /**
+   * 企业微信账号（userId）
    */
-public class PrivilageCpUserDO {
-  private long id;
-  /**'成员名'*/
-  private String name;
-  /**企业微信userId（账号）*/
   private String cpUserId;
-  /**privilage_user中id*/
-  private long userId;
-  /**'手机号(唯一)'*/
+  /**
+   * 姓名
+   */
+  private String name;
+  /**
+   * 别名
+   */
+  private String alias;
+  /**
+   * '性别。1表示男性，2表示女性
+   */
+  private Integer gender;
+  /**
+   * 邮箱。长度6~64个字节，且为有效的email格式。企业内必须唯一，mobile/email二者不能同时为空
+   */
+  private String email;
+  /**
+   * 地址
+   */
+  private String address;
+  /**
+   * 职务信息。长度为0~128个字符
+   */
+  private String position;
+  /**
+   * 手机号(唯一)
+   */
   private String mobile;
-  /**'成员状态'*/
-  private long status;
+  /**
+   * 成员状态
+   */
+  private Integer status;
 
 
-  public long getId() {
+  public Long getId() {
     return id;
   }
 
-  public void setId(long id) {
+  public void setId(Long id) {
     this.id = id;
   }
 
 
+  public String getCpUserId() {
+    return cpUserId;
+  }
+
+  public void setCpUserId(String cpUserId) {
+    this.cpUserId = cpUserId;
+  }
+
+
   public String getName() {
     return name;
   }
@@ -35,39 +72,47 @@ public class PrivilageCpUserDO {
   }
 
 
-  public String getCpUserId() {
-    return cpUserId;
+  public String getAlias() {
+    return alias;
   }
 
-  public void setCpUserId(String cpUserId) {
-    this.cpUserId = cpUserId;
+  public void setAlias(String alias) {
+    this.alias = alias;
   }
 
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
 
-  public long getUserId() {
-    return userId;
+
+  public String getAddress() {
+    return address;
   }
 
-  public void setUserId(long userId) {
-    this.userId = userId;
+  public void setAddress(String address) {
+    this.address = address;
   }
 
 
-  public String getMobile() {
-    return mobile;
+  public String getPosition() {
+    return position;
   }
 
-  public void setMobile(String mobile) {
-    this.mobile = mobile;
+  public void setPosition(String position) {
+    this.position = position;
   }
 
 
-  public long getStatus() {
-    return status;
+  public String getMobile() {
+    return mobile;
   }
 
-  public void setStatus(long status) {
-    this.status = status;
+  public void setMobile(String mobile) {
+    this.mobile = mobile;
   }
 
 }

src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java

@@ -27,9 +27,8 @@ public class EmployeeService {
 
     @Transactional(rollbackFor = Exception.class)
     public Boolean addUser(EmployeeDO employee) throws WxErrorException {
-        //数据库创建用户
+        PrivilageCpUserDO privilageCpUserDO = new PrivilageCpUserDO();
 
-        //数据库创建登录account
 
         //成功则添加用户到企业微信
         qwMailListManageService.addUser(employee);

src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java

@@ -7,14 +7,14 @@ import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.WxCpDepartmentService;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.api.WxCpUserService;
-import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
 import me.chanjar.weixin.cp.bean.WxCpDepart;
 import me.chanjar.weixin.cp.bean.WxCpUser;
-import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 企业微信用户管理service
  * @Auther: yechenhao
@@ -41,7 +41,7 @@ public class QWMailListManageService {
     }
 
     /**
-     * 增加企业微信用户
+     * 增加企业微信部门
      */
     public void addDepartment(DepartmentDO departmentDO) throws WxErrorException {
         wxCpService = WxCpConfiguration.getCpService(applicationid);
@@ -50,4 +50,13 @@ public class QWMailListManageService {
         BeanUtils.copyProperties(departmentDO,wxCpDepart);
         departmentService.create(wxCpDepart);
     }
+
+    /**
+     * 获取企业微信所有部门架构
+     */
+    public List<WxCpDepart> syncDepartment() throws WxErrorException {
+        wxCpService = WxCpConfiguration.getCpService(applicationid);
+        WxCpDepartmentService departmentService = wxCpService.getDepartmentService();
+        return departmentService.list(null);
+    }
 }