Skip to content

D
dd_school
Commit e84cb5d5 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents 1223932e 4e3d2fc9
Showing with 17 additions and 15 deletions
smart-campus/src/main/java/yangtz/cs/liu/dingding/service/impl/dingDept/DdDeptServcieImpl.java
...@@ -219,14 +219,18 @@ public class DdDeptServcieImpl implements IDdDeptService { ...@@ -219,14 +219,18 @@ public class DdDeptServcieImpl implements IDdDeptService {
@Override @Override
@Transactional @Transactional
public String syncDdDept() { public String syncDdDept() {
//获取系统所有部门列表
List<SysDdDept> deptList = ddDeptMapper.selectDdDeptList(new SysDdDept());
if (deptList.size() <= 0){
addDdDept();
}else{
//获取钉钉所有部门列表 //获取钉钉所有部门列表
List<OapiV2DepartmentListsubResponse.DeptBaseResponse> ddDeptList = getDeptList(); List<OapiV2DepartmentListsubResponse.DeptBaseResponse> ddDeptList = getDeptList();
//存放钉钉部门不存在系统库集合 //存放钉钉部门不存在系统库集合
List<OapiV2DepartmentListsubResponse.DeptBaseResponse> ddDeptList1 = new ArrayList<>(); List<OapiV2DepartmentListsubResponse.DeptBaseResponse> ddDeptList1 = new ArrayList<>();
ddDeptList1.addAll(ddDeptList); ddDeptList1.addAll(ddDeptList);
//获取系统所有部门列表
List<SysDdDept> deptList = ddDeptMapper.selectDdDeptList(new SysDdDept());
//存放钉钉删除了的部门集合 //存放钉钉删除了的部门集合
List<SysDdDept> deptList1 = new ArrayList<>(); List<SysDdDept> deptList1 = new ArrayList<>();
deptList1.addAll(deptList); deptList1.addAll(deptList);
...@@ -264,7 +268,7 @@ public class DdDeptServcieImpl implements IDdDeptService { ...@@ -264,7 +268,7 @@ public class DdDeptServcieImpl implements IDdDeptService {
//判断钉钉中删除的部门是否还存在系统部门中 //判断钉钉中删除的部门是否还存在系统部门中
for (SysDdDept dept : deptList) { for (SysDdDept dept : deptList) {
for (OapiV2DepartmentListsubResponse.DeptBaseResponse ddDept : ddDeptList) { for (OapiV2DepartmentListsubResponse.DeptBaseResponse ddDept : ddDeptList) {
if (dept.getDdDeptId().equals(ddDept.getDeptId())){ if (ddDept.getDeptId().equals(dept.getDdDeptId())){
deptList1.remove(dept); deptList1.remove(dept);
} }
} }
...@@ -311,6 +315,7 @@ public class DdDeptServcieImpl implements IDdDeptService { ...@@ -311,6 +315,7 @@ public class DdDeptServcieImpl implements IDdDeptService {
} }
} }
} }
}
return "同步成功"; return "同步成功";
} }
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/service/impl/dingUser/DdUserServiceImpl.java
...@@ -390,7 +390,7 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -390,7 +390,7 @@ public class DdUserServiceImpl implements IDdUserService {
//设置主部门和任职部门 //设置主部门和任职部门
if (deptPositionList.size()>0){ if (deptPositionList.size()>0){
for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) { for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) {
if (deptPosition.getIsMain()){ if (StringUtils.isNotNull(deptPosition.getIsMain()) && deptPosition.getIsMain()){
SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId()); SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId());
if (StringUtils.isNotNull(dept)){ if (StringUtils.isNotNull(dept)){
sysDdUser.setDeptId(dept.getDeptId()); sysDdUser.setDeptId(dept.getDeptId());
...@@ -533,7 +533,7 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -533,7 +533,7 @@ public class DdUserServiceImpl implements IDdUserService {
//判断钉钉已删除的用户 //判断钉钉已删除的用户
for (SysDdUser ddUser : userList) { for (SysDdUser ddUser : userList) {
for (String ddUserId : ddUserIdList) { for (String ddUserId : ddUserIdList) {
if (ddUser.getDdUserId().equals(ddUserId)){ if (ddUserId.equals(ddUser.getDdUserId())){
//存在从集合中剔除 //存在从集合中剔除
userList1.remove(ddUser); userList1.remove(ddUser);
} }
...@@ -593,7 +593,7 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -593,7 +593,7 @@ public class DdUserServiceImpl implements IDdUserService {
//设置主部门和任职部门 //设置主部门和任职部门
if (deptPositionList.size()>0){ if (deptPositionList.size()>0){
for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) { for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) {
if (deptPosition.getIsMain()){ if (StringUtils.isNotNull(deptPosition.getIsMain()) && deptPosition.getIsMain()){
SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId()); SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId());
if (StringUtils.isNotNull(dept)){ if (StringUtils.isNotNull(dept)){
sysDdUser.setDeptId(dept.getDeptId()); sysDdUser.setDeptId(dept.getDeptId());
...@@ -772,7 +772,7 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -772,7 +772,7 @@ public class DdUserServiceImpl implements IDdUserService {
//设置主部门和任职部门 //设置主部门和任职部门
if (deptPositionList.size()>0){ if (deptPositionList.size()>0){
for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) { for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) {
if (deptPosition.getIsMain()){ if (StringUtils.isNotNull(deptPosition.getIsMain()) && deptPosition.getIsMain()){
SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId()); SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId());
if (StringUtils.isNotNull(dept)){ if (StringUtils.isNotNull(dept)){
sysDdUser.setDeptId(dept.getDeptId()); sysDdUser.setDeptId(dept.getDeptId());
...@@ -948,7 +948,7 @@ public class DdUserServiceImpl implements IDdUserService { ...@@ -948,7 +948,7 @@ public class DdUserServiceImpl implements IDdUserService {
//设置主部门和任职部门 //设置主部门和任职部门
if (deptPositionList.size()>0){ if (deptPositionList.size()>0){
for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) { for (OapiV2UserGetResponse.DeptPosition deptPosition : deptPositionList) {
if (deptPosition.getIsMain()){ if (StringUtils.isNotNull(deptPosition.getIsMain()) && deptPosition.getIsMain()){
SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId()); SysDdDept dept = ddDeptMapper.selectDeptByDdDeptId(deptPosition.getDeptId());
if (StringUtils.isNotNull(dept)){ if (StringUtils.isNotNull(dept)){
sysDdUser.setDeptId(dept.getDeptId()); sysDdUser.setDeptId(dept.getDeptId());
......
smart-campus/src/main/resources/mapper/ddTeacher/DdTeacherMapper.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</resultMap> </resultMap>
<insert id="addTeacherList" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id"> <insert id="addTeacherList" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id">
insert into sys_teacher insert into school_teacher
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>
<if test="teacherName != null">teacher_name,</if> <if test="teacherName != null">teacher_name,</if>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</insert> </insert>
<update id="updateDdTeacher" parameterType="SysDdTeacher"> <update id="updateDdTeacher" parameterType="SysDdTeacher">
update sys_teacher update school_teacher
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="teacherName != null">teacher_name = #{teacherName},</if> <if test="teacherName != null">teacher_name = #{teacherName},</if>
<if test="teacherTel != null">teacher_tel = #{teacherTel},</if> <if test="teacherTel != null">teacher_tel = #{teacherTel},</if>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<!--批量新增教师--> <!--批量新增教师-->
<insert id="batchInsertTeacher" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id"> <insert id="batchInsertTeacher" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id">
<foreach collection="list" item="data" separator=";"> <foreach collection="list" item="data" separator=";">
insert into sys_teacher insert into school_teacher
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="data.id != null">id,</if> <if test="data.id != null">id,</if>
<if test="data.teacherName != null">teacher_name,</if> <if test="data.teacherName != null">teacher_name,</if>
...@@ -147,7 +147,4 @@ ...@@ -147,7 +147,4 @@
</trim> </trim>
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>
smart-campus/src/main/resources/mapper/ddUser/DdUserMapper.xml
...@@ -310,7 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -310,7 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<update id="deleteDdTeacher" parameterType="Long"> <update id="deleteDdTeacher" parameterType="Long">
update sys_teacher set del_flag = "2" where id = #{userId} update school_teacher set del_flag = "2" where id = #{userId}
</update> </update>
<select id="selectDeptIdByUserId" parameterType="Long" resultType="Long"> <select id="selectDeptIdByUserId" parameterType="Long" resultType="Long">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment