From 3be3b49cb70154e1c11a4275ce7b41ac15b47ff1 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 20 Aug 2020 15:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/dao/DepartmentsStaffRelateDao.java | 3 +- .../DepartmentsStaffRelateService.java | 3 +- .../lz/modules/app/service/StaffService.java | 2 +- .../DepartmentsStaffRelateServiceImpl.java | 5 ++- .../app/service/impl/StaffServiceImpl.java | 9 ++--- .../job/business/DingtalkBusiness.java | 12 +++--- .../modules/job/business/FeishuBusiness.java | 12 +++--- .../model/responseBo/DepartmentStaffBo.java | 4 ++ .../modules/third/entity/ThirdAppConfig.java | 38 ++++++++++++++++++- .../third/entity/ThirdAppConfigReq.java | 38 ++++++++++++++++++- .../resources/mapper/generator/StaffDao.xml | 13 +------ .../mapper/third/ThirdAppConfigMapper.xml | 16 ++++++-- src/test/java/com/lz/mysql/MysqlMain.java | 2 +- 13 files changed, 119 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java index 20d0b7f1..66b826b5 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java @@ -3,6 +3,7 @@ package com.lz.modules.app.dao; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.job.model.responseBo.DepartmentStaffBo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -38,7 +39,7 @@ public interface DepartmentsStaffRelateDao extends BaseMapper staffIds); + void addRelateInfos(String departmentId, List staffs); void deleteAllRelates(); diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index 977e2fef..13fe5b4b 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -23,7 +23,7 @@ public interface StaffService extends IService { PageUtils queryPage(Map params); - List updateStaffsInfo(List staffs); + boolean updateStaffsInfo(List staffs); StaffEntity getStaffInfoByOpenId(String openId); diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java index 14e78b22..fc56b76a 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java @@ -3,6 +3,7 @@ package com.lz.modules.app.service.impl; import com.google.common.collect.Lists; import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.job.model.responseBo.DepartmentStaffBo; import org.springframework.stereotype.Service; import java.util.List; @@ -37,9 +38,9 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl staffIds) { + public void addRelateInfos(String departmentId, List staffs) { List departStaffRelateList = Lists.newArrayList(); - for (StaffEntity staffId : staffIds) { + for (DepartmentStaffBo staffId : staffs) { String departId = departmentsStaffRelateDao.getRelateByStaffIdAndDepartmentId(staffId.getId(), departmentId); if (StringUtil.isEmpty(departId)) { DepartmentsStaffRelateEntity departmentsStaffRelateBo = new DepartmentsStaffRelateEntity(); diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index 5af85208..52f70de2 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -98,9 +98,8 @@ public class StaffServiceImpl extends ServiceImpl impleme } @Override - public List updateStaffsInfo(List staffs) { + public boolean updateStaffsInfo(List staffs) { try { - List staffEntitys = Lists.newArrayList(); for (DepartmentStaffBo staffBo : staffs) { StaffEntity staffEntity = staffDao.getStaffInfoByOpenId(staffBo.getOpenId()); StaffEntity staff = convertStaffEntity(staffBo); @@ -113,13 +112,13 @@ public class StaffServiceImpl extends ServiceImpl impleme staffDao.addStaff(staff); } - staffEntitys.add(staff); + staffBo.setId(staff.getId()); } - return staffEntitys; + return true; } catch (Exception e) { logger.info("updateDepartmentInfos error : " + e); - return null; } + return false; } @Override diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 25c23dfe..68c3016a 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -127,12 +127,14 @@ public class DingtalkBusiness { if(staffs.size() > 0){ //循环录入到员工信息表中 - List staffIds = staffService.updateStaffsInfo(staffs); + if(staffService.updateStaffsInfo(staffs)){ + //加入到部门和员工关系表，同时更新leader关系 + departmentsStaffRelateService.addRelateInfos(departmentInfo.getId(), staffs); + //录入员工职业信息表 + enterStaffOccupationInfos(staffs); + } + - //加入到部门和员工关系表，同时更新leader关系 - departmentsStaffRelateService.addRelateInfos(departmentInfo.getId(), staffIds); - //录入员工职业信息表 - enterStaffOccupationInfos(staffs); } } for (String key : departmentInfosBos.keySet()) { diff --git a/src/main/java/com/lz/modules/job/business/FeishuBusiness.java b/src/main/java/com/lz/modules/job/business/FeishuBusiness.java index 33c7a2fb..c8c8b3b2 100644 --- a/src/main/java/com/lz/modules/job/business/FeishuBusiness.java +++ b/src/main/java/com/lz/modules/job/business/FeishuBusiness.java @@ -85,12 +85,14 @@ public class FeishuBusiness { // for (DepartmentStaffBo staff : staffs) // logger.info(staff.getName()); //循环录入到员工信息表中 - List staffIds = staffService.updateStaffsInfo(staffs); + if(staffService.updateStaffsInfo(staffs)){ + //加入到部门和员工关系表 + departmentsStaffRelateService.addRelateInfos(departmentInfo.getId(), staffs); + //录入员工职业信息表 + enterStaffOccupationInfos(staffs); + } + - //加入到部门和员工关系表 - departmentsStaffRelateService.addRelateInfos(departmentInfo.getId(), staffIds); - //录入员工职业信息表 - enterStaffOccupationInfos(staffs); } diff --git a/src/main/java/com/lz/modules/job/model/responseBo/DepartmentStaffBo.java b/src/main/java/com/lz/modules/job/model/responseBo/DepartmentStaffBo.java index e308cf1e..990fe21b 100644 --- a/src/main/java/com/lz/modules/job/model/responseBo/DepartmentStaffBo.java +++ b/src/main/java/com/lz/modules/job/model/responseBo/DepartmentStaffBo.java @@ -16,6 +16,10 @@ import java.util.List; @Data public class DepartmentStaffBo implements Serializable { private static final long serialVersionUID = 1L; + /** + * 插入数据库之后的ID，lz_staff表中的id + */ + private Long id; /** * 用户名 diff --git a/src/main/java/com/lz/modules/third/entity/ThirdAppConfig.java b/src/main/java/com/lz/modules/third/entity/ThirdAppConfig.java index 73eae622..1f5bb4dd 100644 --- a/src/main/java/com/lz/modules/third/entity/ThirdAppConfig.java +++ b/src/main/java/com/lz/modules/third/entity/ThirdAppConfig.java @@ -9,7 +9,7 @@ import java.util.Date; * 菜单权限表 *

*第三方应用配置表 * @author quyixiao -* @since 2020-08-17 +* @since 2020-08-20 */ @Data @@ -38,6 +38,10 @@ public class ThirdAppConfig implements java.io.Serializable { private String thirdAppName; //程序入口，如果有 private String appUrl; + //企业的钉钉corpId + private Long corpId; + //备注说明 + private String remark; /** * * @return @@ -203,6 +207,36 @@ public class ThirdAppConfig implements java.io.Serializable { this.appUrl = appUrl; } + /** + * 企业的钉钉corpId + * @return + */ + public Long getCorpId() { + return corpId; + } + /** + * 企业的钉钉corpId + * @param corpId + */ + public void setCorpId(Long corpId) { + this.corpId = corpId; + } + + /** + * 备注说明 + * @return + */ + public String getRemark() { + return remark; + } + /** + * 备注说明 + * @param remark + */ + public void setRemark(String remark) { + this.remark = remark; + } + @Override public String toString() { return "ThirdAppConfig{" + @@ -217,6 +251,8 @@ public class ThirdAppConfig implements java.io.Serializable { ",appType=" + appType + ",thirdAppName=" + thirdAppName + ",appUrl=" + appUrl + + ",corpId=" + corpId + + ",remark=" + remark + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/third/entity/ThirdAppConfigReq.java b/src/main/java/com/lz/modules/third/entity/ThirdAppConfigReq.java index f0ae0831..2409de48 100644 --- a/src/main/java/com/lz/modules/third/entity/ThirdAppConfigReq.java +++ b/src/main/java/com/lz/modules/third/entity/ThirdAppConfigReq.java @@ -6,7 +6,7 @@ import java.util.Date; * 菜单权限表 *

*第三方应用配置表 * @author quyixiao -* @since 2020-08-17 +* @since 2020-08-20 */ @@ -39,6 +39,10 @@ public class ThirdAppConfigReq implements java.io.Serializable { private String thirdAppName; //程序入口，如果有 private String appUrl; + //企业的钉钉corpId + private Long corpId; + //备注说明 + private String remark; /** * * @return @@ -204,6 +208,36 @@ public class ThirdAppConfigReq implements java.io.Serializable { this.appUrl = appUrl; } + /** + * 企业的钉钉corpId + * @return + */ + public Long getCorpId() { + return corpId; + } + /** + * 企业的钉钉corpId + * @param corpId + */ + public void setCorpId(Long corpId) { + this.corpId = corpId; + } + + /** + * 备注说明 + * @return + */ + public String getRemark() { + return remark; + } + /** + * 备注说明 + * @param remark + */ + public void setRemark(String remark) { + this.remark = remark; + } + @Override public String toString() { return "ThirdAppConfig{" + @@ -218,6 +252,8 @@ public class ThirdAppConfigReq implements java.io.Serializable { ",appType=" + appType + ",thirdAppName=" + thirdAppName + ",appUrl=" + appUrl + + ",corpId=" + corpId + + ",remark=" + remark + "}"; } } \ No newline at end of file diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 5db531ea..f33e04e8 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -261,18 +261,7 @@ and ls.name like concat('%',#{name},'%') - and (ls.id in ( - select dsr.staff_id from lz_departments_staff_relate dsr where dsr.is_delete=0 - - and dsr.department_id=#{departmentId} - - ) - or ls.employee_id in ( - select sr.leader_employee_id from lz_departments sr where sr.is_delete=0 - - and sr.department_id=#{departmentId} - - )) order by department_leader desc + order by department_leader desc limit #{startIndex}, #{pageLimit} diff --git a/src/main/resources/mapper/third/ThirdAppConfigMapper.xml b/src/main/resources/mapper/third/ThirdAppConfigMapper.xml index eae4b9fd..a99a6d97 100644 --- a/src/main/resources/mapper/third/ThirdAppConfigMapper.xml +++ b/src/main/resources/mapper/third/ThirdAppConfigMapper.xml @@ -15,12 +15,14 @@ + + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, app_id AS appId, app_key AS appKey, app_secret AS appSecret, app_name AS appName, app_type AS appType, third_app_name AS thirdAppName, app_url AS appUrl + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, app_id AS appId, app_key AS appKey, app_secret AS appSecret, app_name AS appName, app_type AS appType, third_app_name AS thirdAppName, app_url AS appUrl, corp_id AS corpId, remark AS remark @@ -40,6 +42,8 @@ app_type, third_app_name, app_url, + corp_id, + remark, is_delete, gmt_create, gmt_modified @@ -51,6 +55,8 @@ #{ appType}, #{ thirdAppName}, #{ appUrl}, + #{ corpId}, + #{ remark}, 0, now(), now() @@ -70,7 +76,9 @@ app_name = #{appName}, app_type = #{appType}, third_app_name = #{thirdAppName}, - app_url = #{appUrl} + app_url = #{appUrl} + corp_id = #{corpId}, + remark = #{remark} ,gmt_modified = now() where id = #{id} @@ -89,7 +97,9 @@ app_name = #{appName}, app_type = #{appType}, third_app_name = #{thirdAppName}, - app_url = #{appUrl} + app_url = #{appUrl}, + corp_id = #{corpId}, + remark = #{remark} ,gmt_modified = now() where id = #{id} diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 15abafc2..3fc61f71 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -61,7 +61,7 @@ public class MysqlMain { } List list = new ArrayList(); - list.add(new TablesBean("third_msg_send_record")); + list.add(new TablesBean("third_app_config")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();