Skip to content

A
amos-boot-biz
Commit 97f6501c authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.app接口-获取人员权限-维保还是业主单位

parent 3653920a
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 121 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/UserController.java
View file @ 97f6501c
package com.yeejoin.amos.maintenance.business.controller;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import java.util.UUID;
import java.util.stream.Collectors;
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.core.env.Environment;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
......@@ -47,18 +14,28 @@ import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
import com.yeejoin.amos.maintenance.business.param.AppLoginUserParam;
import com.yeejoin.amos.maintenance.business.service.intfc.IAppService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.util.DepartmentUserTreeAppVo;
import com.yeejoin.amos.maintenance.business.util.DepartmentUserTreeWebVo;
import com.yeejoin.amos.maintenance.business.util.DesUtil;
import com.yeejoin.amos.maintenance.business.util.StringUtil;
import com.yeejoin.amos.maintenance.business.util.*;
import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
import com.yeejoin.amos.maintenance.jpush.AppMessagePushService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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.core.env.Environment;
import org.springframework.http.*;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
/**
* 获取用户信息
......@@ -104,8 +81,8 @@ public class UserController extends AbstractBaseController {
public CommonResponse queryDeptUser(@RequestParam(value = "deptId", required = false) String deptId) {
List<AgencyUserModel> userModels = remoteSecurityService.listUserByDepartmentId(getToken(), getProduct(), getAppKey(), deptId);
List<LinkedHashMap<String, Object>> userList =new ArrayList<>();
if("-1".equals(deptId)){
List<LinkedHashMap<String, Object>> userList = new ArrayList<>();
if ("-1".equals(deptId)) {
ReginParams reginParams = getSelectedOrgInfo();
String dep = reginParams.getCompany().getSequenceNbr().toString();
//查询没有部门的人员信息
......@@ -116,7 +93,7 @@ public class UserController extends AbstractBaseController {
for (int i = 0; i < children.size(); i++) {
Map<String, Object> map = (LinkedHashMap) children.get(i);
if("其他".equals((map.get("departmentName").toString()))){
if ("其他".equals((map.get("departmentName").toString()))) {
List<LinkedHashMap<String, Object>> user1 = (List<LinkedHashMap<String, Object>>) map.get("userModelList");
for (int j = 0; j < user1.size(); j++) {
......@@ -130,14 +107,14 @@ public class UserController extends AbstractBaseController {
user.put("desc", null);
user.put("writeable", 0);
user.put("userName", user1.get(j).get("realName").toString());
if(StringUtil.isNotEmpty( user1.get(j).get("mobile"))){
if (StringUtil.isNotEmpty(user1.get(j).get("mobile"))) {
user.put("mobile", user1.get(j).get("mobile").toString());
}else {
} else {
user.put("mobile", "");
}
if(StringUtil.isNotEmpty( user1.get(j).get("landlinePhone"))){
if (StringUtil.isNotEmpty(user1.get(j).get("landlinePhone"))) {
user.put("telephone", user1.get(j).get("landlinePhone").toString());
}else {
} else {
user.put("telephone", "");
}
......@@ -147,7 +124,7 @@ public class UserController extends AbstractBaseController {
}
}
}else{
} else {
userList = paraseData(userModels, null).stream().distinct().collect(Collectors.toList());
}
return CommonResponseUtil.success(userList);
......@@ -186,7 +163,7 @@ public class UserController extends AbstractBaseController {
CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), reginParams.getCompany().getSequenceNbr().toString());
List children = (List) companyModel.getChildren();
List<DepartmentUserTreeWebVo> list = Lists.newArrayList();
String loginOrgCode= getOrgCode(reginParams);
String loginOrgCode = getOrgCode(reginParams);
for (int i = 0; i < children.size(); i++) {
Map<String, Object> map = (LinkedHashMap) children.get(i);
JSONObject json = JSON.parseObject(JSON.toJSONString(map));
......@@ -199,7 +176,7 @@ public class UserController extends AbstractBaseController {
deptTreeWeb.setTitle(map.get("departmentName").toString());
deptTreeWeb.setValue(map.get("sequenceNbr").toString());
if (!ObjectUtils.isEmpty(map.get("userModelList"))) {
List userModalList= (List) ((List) map.get("userModelList")).stream().distinct().collect(Collectors.toList());
List userModalList = (List) ((List) map.get("userModelList")).stream().distinct().collect(Collectors.toList());
deptTreeWeb.setUserModelList(userModalList);
}
......@@ -227,17 +204,17 @@ public class UserController extends AbstractBaseController {
if (!ObjectUtils.isEmpty(x.getUserModelList())) {
List<DepartmentUserTreeWebVo> collects = x.getUserModelList().stream().collect(Collectors.toList());
List<Map<String, Object>> userModelList = (List)collects;
List<Map<String, Object>> userModelList = (List) collects;
userModelList.forEach(
userModel -> {
DepartmentUserTreeWebVo userTreeWeb = new DepartmentUserTreeWebVo();
userTreeWeb.setType("user");
userTreeWeb.setKey(userModel.get("userId").toString()+"*"+x.getValue()+"*"+UUID.randomUUID().toString());
userTreeWeb.setKey(userModel.get("userId").toString() + "*" + x.getValue() + "*" + UUID.randomUUID().toString());
userTreeWeb.setLabel(userModel.get("realName").toString());
userTreeWeb.setTitle(userModel.get("realName").toString());
userTreeWeb.setValue(userModel.get("userId").toString()+"*"+x.getValue()+"*"+UUID.randomUUID().toString());
userTreeWeb.setValue(userModel.get("userId").toString() + "*" + x.getValue() + "*" + UUID.randomUUID().toString());
users.add(userTreeWeb);
}
);
......@@ -249,6 +226,7 @@ public class UserController extends AbstractBaseController {
);
return list;
}
/**
* 部门数据预处理（获取所有子节点）
*
......@@ -287,9 +265,6 @@ public class UserController extends AbstractBaseController {
}
/**
* 查询用户权限人员
*
......@@ -352,8 +327,8 @@ public class UserController extends AbstractBaseController {
for (DepartmentUserTreeAppVo departmentUserTreeAppVo : list) {
LinkedHashMap<String, Object> otherDept = new LinkedHashMap<>();
if("其他".equals(departmentUserTreeAppVo.getName())){
otherDept1.put("children", paraseData1(getToken(), getProduct(), getAppKey(),departmentUserTreeAppVo.getChildren(),"其他", "-1",userName));
if ("其他".equals(departmentUserTreeAppVo.getName())) {
otherDept1.put("children", paraseData1(getToken(), getProduct(), getAppKey(), departmentUserTreeAppVo.getChildren(), "其他", "-1", userName));
otherDept1.put("id", -1);
otherDept1.put("key", -1);
otherDept1.put("value", -1);
......@@ -365,8 +340,8 @@ public class UserController extends AbstractBaseController {
otherDept1.put("desc", "其他");
otherDept1.put("writeable", 0);
otherDept1.put("attributes", "");
}else{
otherDept.put("children", paraseData1(getToken(), getProduct(), getAppKey(),departmentUserTreeAppVo.getChildren(),departmentUserTreeAppVo.getName(),departmentUserTreeAppVo.getId(),userName));
} else {
otherDept.put("children", paraseData1(getToken(), getProduct(), getAppKey(), departmentUserTreeAppVo.getChildren(), departmentUserTreeAppVo.getName(), departmentUserTreeAppVo.getId(), userName));
otherDept.put("id", departmentUserTreeAppVo.getId());
otherDept.put("key", departmentUserTreeAppVo.getId());
otherDept.put("value", departmentUserTreeAppVo.getId());
......@@ -382,7 +357,7 @@ public class UserController extends AbstractBaseController {
}
}
if(otherDept1!=null){
if (otherDept1 != null) {
content.add(otherDept1);
}
return CommonResponseUtil.success(content);
......@@ -393,22 +368,19 @@ public class UserController extends AbstractBaseController {
}
}
private List<LinkedHashMap<String, Object>> paraseData1(String toke, String product,String appKey, List<DepartmentUserTreeAppVo> map,String name,String depid,String username ) {
private List<LinkedHashMap<String, Object>> paraseData1(String toke, String product, String appKey, List<DepartmentUserTreeAppVo> map, String name, String depid, String username) {
List<LinkedHashMap<String, Object>> content = new ArrayList<>();
if(map!=null&&map.size()>0){
if (map != null && map.size() > 0) {
for (DepartmentUserTreeAppVo departmentUserTreeAppVo : map) {
if("dept".equals(departmentUserTreeAppVo.getType())){
if ("dept".equals(departmentUserTreeAppVo.getType())) {
LinkedHashMap<String, Object> otherDept = new LinkedHashMap<>();
otherDept.put("children", paraseData1(getToken(), getProduct(), getAppKey(),departmentUserTreeAppVo.getChildren(),departmentUserTreeAppVo.getName(),departmentUserTreeAppVo.getId(),username));
otherDept.put("children", paraseData1(getToken(), getProduct(), getAppKey(), departmentUserTreeAppVo.getChildren(), departmentUserTreeAppVo.getName(), departmentUserTreeAppVo.getId(), username));
otherDept.put("id", departmentUserTreeAppVo.getId());
otherDept.put("key", departmentUserTreeAppVo.getId());
otherDept.put("value", departmentUserTreeAppVo.getId());
......@@ -421,10 +393,10 @@ public class UserController extends AbstractBaseController {
otherDept.put("writeable", 0);
otherDept.put("attributes", "");
content.add(otherDept);
}else{
} else {
LinkedHashMap<String, Object> user = new LinkedHashMap<>();
user.put("id", departmentUserTreeAppVo.getId());
user.put("key",departmentUserTreeAppVo.getId());
user.put("key", departmentUserTreeAppVo.getId());
user.put("value", departmentUserTreeAppVo.getId());
user.put("checked", false);
user.put("state", "open");
......@@ -434,22 +406,22 @@ public class UserController extends AbstractBaseController {
user.put("name", departmentUserTreeAppVo.getName());
user.put("desc", null);
user.put("writeable", 0);
user.put("userName",departmentUserTreeAppVo.getName());
user.put("userName", departmentUserTreeAppVo.getName());
user.put("depid", depid);
//获取电话邮箱
Map<String,String> userObj = departmentUserTreeAppVo.getObject();
Map<String, String> userObj = departmentUserTreeAppVo.getObject();
if (userObj != null && userObj.get("telephone") != null) {
user.put("mobile",userObj.get("telephone"));
user.put("mobile", userObj.get("telephone"));
} else {
user.put("mobile", "");
}
if (userObj != null && userObj.get("email") != null) {
user.put("email",userObj.get("email"));
user.put("email", userObj.get("email"));
} else {
user.put("email", "");
}
if (userObj != null && userObj.get("mobile") != null) {
user.put("mobile",userObj.get("mobile"));
user.put("mobile", userObj.get("mobile"));
} else {
user.put("mobile", "");
}
......@@ -461,12 +433,12 @@ public class UserController extends AbstractBaseController {
// }else{
// user.put("mobile", "");
// }
user.put("departmentName",name);
if(username!=null&&!"".equals(username)){
if(!ObjectUtils.isEmpty(departmentUserTreeAppVo.getName()) && departmentUserTreeAppVo.getName().indexOf(username) != -1){
user.put("departmentName", name);
if (username != null && !"".equals(username)) {
if (!ObjectUtils.isEmpty(departmentUserTreeAppVo.getName()) && departmentUserTreeAppVo.getName().indexOf(username) != -1) {
content.add(user);
}
}else{
} else {
content.add(user);
}
}
......@@ -552,14 +524,6 @@ public class UserController extends AbstractBaseController {
}
private void buildUserDeptTree(DepartmentUserTreeAppVo deptUser, JSONArray childs) {
for (int i = 0; i < childs.size(); i++) {
JSONObject json = childs.getJSONObject(i);
......@@ -572,11 +536,11 @@ public class UserController extends AbstractBaseController {
buildUserDeptTree(treeDto, childrens);
}
JSONArray userModelList = json.getJSONArray("userModelList");
if(userModelList != null && userModelList.size() > 0){
if (userModelList != null && userModelList.size() > 0) {
List<HashMap> modelList = JSONObject.parseArray(userModelList.toJSONString(), HashMap.class);
modelList=modelList.stream().distinct().collect(Collectors.toList());
userModelList= JSONArray.parseArray(JSON.toJSONString(modelList));
UserDeptTree( treeDto, userModelList);
modelList = modelList.stream().distinct().collect(Collectors.toList());
userModelList = JSONArray.parseArray(JSON.toJSONString(modelList));
UserDeptTree(treeDto, userModelList);
}
deptUser.getChildren().add(treeDto);
......@@ -610,8 +574,8 @@ public class UserController extends AbstractBaseController {
@PostMapping(value = "/mobile/login")
public CommonResponse mobileLogin(@ApiParam(value = "账号", required = true) @RequestBody AppLoginUserParam param) {
try {
JSONObject jsonObject =null;
IdPasswordAuthModel dPasswordAuthModel=new IdPasswordAuthModel();
JSONObject jsonObject = null;
IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
dPasswordAuthModel.setLoginId(param.getUserName());
dPasswordAuthModel.setPassword(DesUtil.decode(param.getPassword(), "yeejoin"));
HttpHeaders headers = new HttpHeaders();
......@@ -619,14 +583,14 @@ public class UserController extends AbstractBaseController {
headers.set("Content-Type", "application/json");
headers.set("product", productApp);
HttpEntity httpEntity = new HttpEntity<>(dPasswordAuthModel, headers);
FeignClientResult feignClientResult = restTemplate.postForObject("http://"+SecurityName+"/privilege/v1/auth/idpassword",httpEntity, FeignClientResult.class);
if (feignClientResult.getStatus() ==200 ) {
FeignClientResult feignClientResult = restTemplate.postForObject("http://" + SecurityName + "/privilege/v1/auth/idpassword", httpEntity, FeignClientResult.class);
if (feignClientResult.getStatus() == 200) {
Map map = (Map) feignClientResult.getResult();
map.put("appKey", appKey);
map.put("product", productApp);
String jsonStr = JSON.toJSONString(map);
jsonObject = JSONObject.parseObject(jsonStr);
}else{
} else {
return CommonResponseUtil.failure(feignClientResult.getMessage());
}
if (jsonObject != null) {
......@@ -678,27 +642,27 @@ public class UserController extends AbstractBaseController {
JSONObject result = new JSONObject();
AgencyUserModel user = getUserInfo();
if (user != null) {
List<CompanyModel> list =user.getCompanys().stream().collect(
List<CompanyModel> list = user.getCompanys().stream().collect(
Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CompanyModel::getSequenceNbr))), ArrayList::new));
Map<Long, List<DepartmentModel>> mapDepartments= user.getCompanyDepartments();
Map<String, List<Map<String, Object>>> mapdate=new HashMap<String, List<Map<String, Object>>>();
Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
Map<String, List<Map<String, Object>>> mapdate = new HashMap<String, List<Map<String, Object>>>();
List<Map> listCompanyModel =new ArrayList();
if(list!=null&&list.size()>0){
List<Map> listCompanyModel = new ArrayList();
if (list != null && list.size() > 0) {
for (CompanyModel article : list) {
Map<String, Object> map= objectToMap(article);
map.put("companySeq", map.get("companySeq")+"");
map.put("parentId", map.get("parentId")+"");
Map<String, Object> map = objectToMap(article);
map.put("companySeq", map.get("companySeq") + "");
map.put("parentId", map.get("parentId") + "");
listCompanyModel.add(map);
long key= Long.valueOf( map.get("sequenceNbr").toString());
List<DepartmentModel> listdep=mapDepartments.get(key);
List<Map<String, Object>> dep =new ArrayList();
long key = Long.valueOf(map.get("sequenceNbr").toString());
List<DepartmentModel> listdep = mapDepartments.get(key);
List<Map<String, Object>> dep = new ArrayList();
for (DepartmentModel departmentModel : listdep) {
if(departmentModel!=null){
Map<String, Object> mapo= objectToMap(departmentModel);
if (departmentModel != null) {
Map<String, Object> mapo = objectToMap(departmentModel);
mapo.put("sequenceNbr", mapo.get("sequenceNbr").toString());
dep.add(mapo);
}
......@@ -722,8 +686,8 @@ public class UserController extends AbstractBaseController {
//对象转map
public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
Map<String, Object> map = new HashMap<String,Object>();
if(obj!=null){
Map<String, Object> map = new HashMap<String, Object>();
if (obj != null) {
Class<?> clazz = obj.getClass();
for (Field field : clazz.getDeclaredFields()) {
field.setAccessible(true);
......@@ -735,9 +699,11 @@ public class UserController extends AbstractBaseController {
}
return map;
}
public static Object nvl(Object param) {
return param != null ? param : "";
}
/**
* 保存登陆用户选择公司信息
*/
......@@ -748,21 +714,21 @@ public class UserController extends AbstractBaseController {
try {
AgencyUserModel user = getUserInfo();
// saveSelectedOrgInfo(reginParams);
return CommonResponseUtil.success(buildCurCompany(getToken(),getProduct(),getAppKey(),reginParams, user));
return CommonResponseUtil.success(buildCurCompany(getToken(), getProduct(), getAppKey(), reginParams, user));
} catch (Exception e) {
logger.error("保存登陆用户选择公司信息异常", e);
return CommonResponseUtil.failure("系统繁忙，请稍后再试");
}
}
private JSONObject buildCurCompany(String toke,String product,String appKey,ReginParams reginParams, AgencyUserModel user) {
private JSONObject buildCurCompany(String toke, String product, String appKey, ReginParams reginParams, AgencyUserModel user) {
JSONObject result = new JSONObject();
result.put("userId", user.getUserId());
result.put("realName", user.getRealName());
result.put("userMobile", user.getMobile());
result.put("userName", user.getUserName());
result.put("email", user.getEmail());
CommonResponse secResponse = remoteSecurityService.searchPermissionTree(Long.valueOf(reginParams.getRole().getSequenceNbr()),toke,product,appKey,appType);
CommonResponse secResponse = remoteSecurityService.searchPermissionTree(Long.valueOf(reginParams.getRole().getSequenceNbr()), toke, product, appKey, appType);
if (secResponse.isSuccess() && secResponse.getDataList() != null) {
JSONArray arr = JSON.parseArray(JSONArray.toJSONString(secResponse.getDataList()));
Map<String, JSONObject> map = Maps.newHashMap();
......@@ -815,13 +781,13 @@ public class UserController extends AbstractBaseController {
public CommonResponse editPassword(@ApiParam(value = "旧密码", required = true) @RequestParam String password,
@ApiParam(value = "新密码", required = true) @RequestParam String newPassword) {
AgencyUserModel userModel = getUserInfo();
boolean flag=false;
if(password.equals(newPassword)){
boolean flag = false;
if (password.equals(newPassword)) {
return CommonResponseUtil.failure("新密码不能跟旧密码相同！");
}
try {
//flag=remoteSecurityService.editPassword(getToken(), getProduct(), getAppKey(), userModel.getUserId(), password, newPassword);
AgencyUserModel agencyUserModel=new AgencyUserModel();
AgencyUserModel agencyUserModel = new AgencyUserModel();
agencyUserModel.setPassword(newPassword);
agencyUserModel.setRePassword(newPassword);
agencyUserModel.setOriginalPassword(password);
......@@ -832,12 +798,12 @@ public class UserController extends AbstractBaseController {
headers.set("token", getToken());
headers.set("appKey", getAppKey());
HttpEntity httpEntity = new HttpEntity<>(agencyUserModel, headers);
ResponseEntity<FeignClientResult> feignClientResult = restTemplate.exchange("http://"+SecurityName+"/privilege/v1/agencyuser/"+userModel.getUserId()+"/password", HttpMethod.PUT,httpEntity, FeignClientResult.class);
if (feignClientResult.getBody().getStatus() ==200 ) {
CommonResponse dates =CommonResponseUtil.success();
ResponseEntity<FeignClientResult> feignClientResult = restTemplate.exchange("http://" + SecurityName + "/privilege/v1/agencyuser/" + userModel.getUserId() + "/password", HttpMethod.PUT, httpEntity, FeignClientResult.class);
if (feignClientResult.getBody().getStatus() == 200) {
CommonResponse dates = CommonResponseUtil.success();
dates.setMessage("修改成功！");
return dates;
}else{
} else {
return CommonResponseUtil.failure(feignClientResult.getBody().getMessage());
}
......@@ -846,4 +812,12 @@ public class UserController extends AbstractBaseController {
return CommonResponseUtil.failure(e.getMessage());
}
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PersonIdentify(isNeedIdentity = true)
@ApiOperation(value = "获取人员身份信息", notes = " 获取人员身份信息")
@GetMapping(value = "/identify")
public CommonResponse personIdentity() {
return CommonResponseUtil.success(opIdentifyInfo());
}
}
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