diff --git a/pom.xml b/pom.xml
index 830290859..41e0cddd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,6 +262,7 @@
${java.version}
${java.version}
${project.build.sourceEncoding}
+ -Xlint:unchecked
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 cfd1beca5..e8cebe16e 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
@@ -1,19 +1,7 @@
package com.ruoyi.system.service.impl;
-import java.util.*;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.system.domain.EcologyDept;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.Ztree;
@@ -22,10 +10,16 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.system.domain.EcologyDept;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.service.ISysDeptService;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
/**
* 部门管理 服务实现
@@ -327,6 +321,7 @@ public class SysDeptServiceImpl implements ISysDeptService
return result;
}
+ @SuppressWarnings("unchecked")
public int deptSync(Map mapResult){
//如果接口返回状态码不为200,则不做同步处理
if(!mapResult.get("statusCode").equals("200"))
@@ -335,11 +330,13 @@ public class SysDeptServiceImpl implements ISysDeptService
}
//取Ecology返回信息中的部门信息
- Map map = (Map) JSON.parse(mapResult.get("result"));
+ /*Map mapTest = (Map) JSON.parse(mapResult.get("result"));
Map dataMap= (Map) map.get("data");
- 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);*/
+ JSONArray json = (JSONArray) o.get("dataList");
+ List deptList = JSONArray.parseArray(json.toJSONString(), EcologyDept.class);*/
+ Map map = new Gson().fromJson(new Gson().toJson(mapResult.get("result")), HashMap.class);
+ Map dataMap= new Gson().fromJson(new Gson().toJson(map.get("data")),HashMap.class);
+ List deptList= new Gson().fromJson(new Gson().toJson(dataMap.get("dataList")), new TypeToken>(){}.getType());
//清空部门表
deptMapper.truncateDept();
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 aa2142944..2dadd5b76 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
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -539,6 +540,7 @@ public class SysUserServiceImpl implements ISysUserService
return result;
}
+ @SuppressWarnings("unchecked")
public int userSync(Map mapResult){
//如果接口返回状态码不为200,则不做同步处理
if(!mapResult.get("statusCode").equals("200"))
@@ -547,11 +549,14 @@ public class SysUserServiceImpl implements ISysUserService
}
//取Ecology返回信息中的部门信息
- Map map = (Map) JSON.parse(mapResult.get("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");
+ JSONArray json = (JSONArray) dataMap.get("dataList");
List ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class);*/
+ Map map = new Gson().fromJson(new Gson().toJson(mapResult.get("result")), HashMap.class);
+ Map dataMap= new Gson().fromJson(new Gson().toJson(map.get("data")),HashMap.class);
+ List ecologyUserList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType());
+
//删除从Ecology同步过来(用户类型为02)的用户
userMapper.deleteEcologySyncUser();