From f0437d6f376a6fcd4e3b3ab047dec041085c810d Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 6 Jun 2024 10:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E6=AD=A3=E4=B9=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zdxt/app/task/UserInfoAndDeptTask.java | 37 ------------------- .../system/dept/service/DeptServiceImpl.java | 19 ++++++++-- 2 files changed, 15 insertions(+), 41 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java index c870b5fd..88aecfc9 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java @@ -80,8 +80,6 @@ public class UserInfoAndDeptTask { params = map; } String token = ""; - String userInfo = ""; - String deptInfo = ""; String destroyTken = ""; try { // 获取 access_token @@ -136,8 +134,6 @@ public class UserInfoAndDeptTask { params = map; } String token = ""; - String userInfo = ""; - String deptInfo = ""; String destroyTken = ""; try { // 获取 access_token @@ -152,39 +148,6 @@ public class UserInfoAndDeptTask { int page = 0; int pageSize = 500; List> sumMap = new ArrayList<>(); -// while (true) { -// String userInfoJson = connect("/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0"); -// JSONObject sourceObj = JSONObject.parseObject(userInfoJson); -// JSONObject tmpJsonObj = sourceObj.getJSONObject("data"); -// if(null==tmpJsonObj) { -// log.info("=====================> tmpJsonObj 为空"); -// break; -// } -// JSONArray dataArr = tmpJsonObj.getJSONArray("data"); -// if (null == dataArr || dataArr.size()==0) { break; } -// Map resMap = userService.addSrzUser(dataArr, token); -// sumMap.add(resMap); -// page++; -// } - -// int insertNum = 0; -// int updateNum = 0; -// for (Map item : sumMap) { -// insertNum += item.get("insertNum"); -// updateNum += item.get("updateNum"); -// } -// log.info("新增用户数量 : {} / 更新用户数量 : {}", insertNum, updateNum); - - -// String userInfoJson = connect("/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0"); -// System.out.println("====================== userInfoJson ======================"); -// System.out.println(userInfoJson); -// System.out.println("====================== userInfoJson ======================"); -// -// String deptInfoJson = connect("/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0"); -// System.out.println("====================== deptInfoJson ======================"); -// System.out.println(deptInfoJson); -// System.out.println("====================== deptInfoJson ======================"); int insertNum = 0; int updateNum = 0; diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java index 2b6a1c84..2b3d7262 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java @@ -7,6 +7,7 @@ import com.zdxt.auth.common.exception.BusinessException; import com.zdxt.auth.common.utils.StringUtils; import com.zdxt.auth.common.utils.security.ShiroUtils; import com.zdxt.auth.project.system.dept.mapper.DeptMapper; +import com.zdxt.auth.project.system.user.service.UserServiceImpl; import com.zdxt.common.annotation.DataScope; import com.zdxt.common.domain.Ztree; import com.zdxt.domain.auth.Dept; @@ -22,6 +23,8 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -41,6 +44,8 @@ import java.util.Map; @Service public class DeptServiceImpl implements IDeptService { + private static final Logger log = LoggerFactory.getLogger(DeptServiceImpl.class); + @Autowired private DeptMapper deptMapper; @@ -438,10 +443,16 @@ public class DeptServiceImpl implements IDeptService for (int i = 0; i < dataArr.size(); i++) { JSONObject jsonObject = dataArr.getJSONObject(i); if (StringUtils.isEmpty(jsonObject.getString("organizationId"))) { continue; } - // 返回每条拉取的成功情况 - String taskId = jsonObject.getString("taskId"); - String params = "{\"token\":\""+token+"\",[{\"taskId\":\""+taskId+"\",\"result\":\"SUCCESS\"}]}"; - connect("/ebus/sfrzhqxglmk/sysDoneTacc", params); + + try { + // 返回每条拉取的成功情况 + String taskId = jsonObject.getString("taskId"); + String params = "{\"token\":\"" + token + "\",[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}"; + connect("/ebus/sfrzhqxglmk/sysDoneTorg", params); + } catch (Exception e) { + log.info("部门数据下拉完成异常，异常任务id：{}",jsonObject.getString("taskId")); + e.printStackTrace(); + } Dept dept = new Dept(); dept.setDeptId(jsonObject.getString("organizationId")); dept.setParentId(jsonObject.getString("parentId"));