Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-system-qinghai into dev

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -109,8 +109,6 @@ public class UserInfoController {
 	@Value("${KEY}")
 	private String KEY;
 	
-	@Value("${wsdlUrl}")
-	private String wsdlUrl;
 
 	/**
 	 * 查找用户信息
@@ -129,39 +127,30 @@ public class UserInfoController {
 	public PageInfo<UserInfo> getUserInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
                                           String username, String realName, Integer roleId, String orgIds) {
 		
-		if (pageNum!=null && pageSize!=null) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
 		
-		HashMap<Object, Object> map = new HashMap<Object, Object>();
+		
+		/*HashMap<Object, Object> map = new HashMap<Object, Object>();
 		map.put("username", username);
 		map.put("realName", realName);
 		map.put("roleId", roleId);
-		List<UserInfo> listAll=userInfoService.queryAll(map);
+		List<UserInfo> listAll=userInfoService.queryAll(map);*/
 		
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
-			try {
-				ExchangeServer wb = new ExchangeServer();
-				IExchangeService action = wb.getExchangeServiceImplPort();
-				for(UserInfo userInfo:listAll) {
-					String roleNames = userInfo.getRoleNames();
-					String userRolesInfo = action.getUserRolesInfo(FLATID, KEY, Integer.toString(userInfo.getUserId()) );
-					JSONObject obj = JSONObject.parseObject(userRolesInfo);  
-					String result = obj.getString("result");
-					JSONArray data = JSONArray.parseArray(result);
-					for(int i=0;i<data.size();i++) {
-						Map<String,Object> maps = (Map<String,Object>)data.get(i);
-						if(roleNames != null && !roleNames.isEmpty()) {
-							roleNames = roleNames + "," + ObjectUtils.toString(maps.get("roleName"),"");
-						}else {
-							roleNames = ObjectUtils.toString(maps.get("roleName"),"");
-						}
-					}
-					userInfo.setRoleNames(roleNames);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
+		UserInfoExample example = new UserInfoExample();
+		Criteria criteria = example.createCriteria();
+		if(null != username && ""!= username){
+			criteria.andUsernameLike(username);
+		}
+        if(null != realName && ""!= realName){
+        	criteria.andRealNameLike(realName);
+		}
+        if(null != orgIds && ""!= orgIds){
+        	criteria.andOrgIdEqualTo(Integer.valueOf(orgIds));
+        }
+		
+		List<UserInfo> listAll = userInfoService.queryByExample(example);
+		
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
 		}
 		
 		PageInfo<UserInfo> pageInfo = new PageInfo<UserInfo>(listAll);
@@ -539,7 +528,7 @@ public class UserInfoController {
 		if (userId != null) {
 			userInfo = userInfoService.findById(userId);
 		}
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+		/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 			try {
 				List<String> roleIds = userInfo.getRoleIds();
 				ExchangeServer wb = new ExchangeServer();
@@ -556,7 +545,7 @@ public class UserInfoController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
+		}*/
 		return userInfo;
 	}
 
@@ -578,7 +567,7 @@ public class UserInfoController {
 	public Map<String, Object> save(String userInfoJson , String userRoleIds, String crkRoleIds) {
 		Map<String, Object> modelMap = new HashMap<>();
 		try {
-			modelMap = userInfoService.save(userInfoJson, userRoleIds, crkRoleIds, wsdlUrl, FLATID, KEY);
+			modelMap = userInfoService.save(userInfoJson, userRoleIds, crkRoleIds, null, FLATID, KEY);
 		} catch (Exception e) {
 			modelMap.put("status", "error");
 			e.printStackTrace();

src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -313,7 +313,7 @@ public class UserInfoServiceImpl implements UserInfoService {
 		}
 
 		if (StringUtils.isNotBlank(crkRoleIds) && !"[]".equals(crkRoleIds)) {//保存出入库用户角色信息
-			if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+			//if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 				try {
 					String json = "{userId:\""+userInfo.getUserId()+"\", roleIds:"+crkRoleIds+"}";
 					ExchangeServer wb = new ExchangeServer();
@@ -322,7 +322,7 @@ public class UserInfoServiceImpl implements UserInfoService {
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-			}
+			//}
 
 		}