From 69311b06d7093db7e7eeabe4d37962d1660a50f8 Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Fri, 16 Jul 2021 10:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5Ecology?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E6=80=A7=E5=88=AB=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDeptServiceImpl.java | 17 +++---- .../service/impl/SysUserServiceImpl.java | 44 +++++++++---------- 2 files changed, 28 insertions(+), 33 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 6e0d34157..cfd1beca5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -329,19 +329,17 @@ public class SysDeptServiceImpl implements ISysDeptService public int deptSync(Map mapResult){ //如果接口返回状态码不为200，则不做同步处理 - String statusCode=mapResult.get("statusCode"); - String result= mapResult.get("result"); - if(!statusCode.equals("200")) + if(!mapResult.get("statusCode").equals("200")) { return 0; } //取Ecology返回信息中的部门信息 - Map map = (Map) JSON.parse(result); + Map map = (Map) JSON.parse(mapResult.get("result")); Map dataMap= (Map) map.get("data"); - //JSONArray json = (JSONArray) o.get("dataList"); - //List depts = JSONArray.parseArray(json.toJSONString(), EcologyDept.class); - List depts= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType()); + List deptList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType()); + /*JSONArray json = (JSONArray) o.get("dataList"); + List depts = JSONArray.parseArray(json.toJSONString(), EcologyDept.class);*/ //清空部门表 deptMapper.truncateDept(); @@ -359,7 +357,7 @@ public class SysDeptServiceImpl implements ISysDeptService //同步Ecology部门信息 List list=new ArrayList<>(); - for(EcologyDept ecologyDept:depts){ + for(EcologyDept ecologyDept:deptList){ if(ecologyDept.getSubcompanyid1().equals("1")) { //只取分部ID为“1”的部门，排除代理商 SysDept dept= insertEcologyDept(ecologyDept); list.add(dept); @@ -403,7 +401,4 @@ public class SysDeptServiceImpl implements ISysDeptService } updateAncestors(list); } - - - } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b1484d2f0..aa2142944 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -541,41 +541,41 @@ public class SysUserServiceImpl implements ISysUserService public int userSync(Map mapResult){ //如果接口返回状态码不为200，则不做同步处理 - String statusCode=mapResult.get("statusCode"); - String result= mapResult.get("result"); - if(!statusCode.equals("200")) + if(!mapResult.get("statusCode").equals("200")) { return 0; } + //取Ecology返回信息中的部门信息 - Map map = (Map) JSON.parse(result); + Map map = (Map) JSON.parse(mapResult.get("result")); Map dataMap= (Map) map.get("data"); + List ecologyUserList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType()); /*JSONArray json = (JSONArray) dataMap.get("dataList"); List ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class);*/ - List ecologyUserList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType()); + //删除从Ecology同步过来（用户类型为02）的用户 userMapper.deleteEcologySyncUser(); - SysUser user = new SysUser(); + //同步Ecology部门信息 - for(EcologyUser ecologyuser:ecologyUserList){ - if(ecologyuser.getSubcompanyid1().equals("1") && StringUtils.isNotEmpty(ecologyuser.getLoginid())) { //只取分部ID为“1”的员工 - String sex=ecologyuser.getSex(); - if(sex.equals("男")){ + SysUser user = new SysUser(); + for(EcologyUser ecologyUser:ecologyUserList){ + if(ecologyUser.getSubcompanyid1().equals("1") && StringUtils.isNotEmpty(ecologyUser.getLoginid())) { //只取分部ID为“1”的员工 + String sex="2"; + if(ecologyUser.getSex().equals("男")){ sex="0"; - }else if(sex.equals("女")){ + } + if(ecologyUser.getSex().equals("女")){ sex="1"; - }else{ - sex="2"; - }; - user.setUserId(Long.parseLong(ecologyuser.getId())); - user.setDeptId(Long.parseLong(ecologyuser.getDepartmentid())); - user.setLoginName(ecologyuser.getLoginid()); - user.setUserName(ecologyuser.getLastname()); - user.setUserType("02"); - user.setEmail(ecologyuser.getEmail()); + } + user.setUserId(Long.parseLong(ecologyUser.getId())); + user.setDeptId(Long.parseLong(ecologyUser.getDepartmentid())); + user.setLoginName(ecologyUser.getLoginid()); + user.setUserName(ecologyUser.getLastname()); + user.setUserType("02"); //设置从Ecology同步的用户类型为02 + user.setEmail(ecologyUser.getEmail()); user.setSex(sex); - user.setPhonenumber(ecologyuser.getMobile()); - user.setStatus(ecologyuser.getStatus().equals("5")?"1":"0"); //Ecology为离职状态5，则无效 + user.setPhonenumber(ecologyUser.getMobile()); + user.setStatus(ecologyUser.getStatus().equals("5")?"1":"0"); //Ecology为离职状态5，则无效 user.setDelFlag("0"); userMapper.insertUser(user); }