Skip to content

A
amos-boot-biz
Commit 77df8035 authored by KeYong's avatar KeYong
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 4cede486 627e4f06
Hide whitespace changes
Inline Side-by-side
Showing with 933 additions and 775 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/publics/BaseTreeNode.java
View file @ 77df8035
...@@ -27,6 +27,8 @@ public class BaseTreeNode { ...@@ -27,6 +27,8 @@ public class BaseTreeNode {
private List<BaseTreeNode> children; private List<BaseTreeNode> children;
private String companyId;
public BaseTreeNode() { public BaseTreeNode() {
} }
...@@ -37,7 +39,12 @@ public class BaseTreeNode { ...@@ -37,7 +39,12 @@ public class BaseTreeNode {
public void setId(String id) { public void setId(String id) {
this.id = id; this.id = id;
} }
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCompanyId() {
return companyId;
}
public String getParentId() { public String getParentId() {
return parentId; return parentId;
} }
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/TreeNodeUtil.java
View file @ 77df8035
...@@ -296,6 +296,60 @@ public class TreeNodeUtil { ...@@ -296,6 +296,60 @@ public class TreeNodeUtil {
} }
} }
} }
/**
* 封装整个树状图数据
*
* @param listNodes 要处理列表集合节点数据
*/
public static <T extends BaseTreeNode> List<T> assembleTreeTs(List<T> listNodes) {
List<T> newTreeNodes = new ArrayList<>();
// 循环赋值最上面的节点数据
// 赋值最上面节点的值
List<T> collect = listNodes.stream()
.filter(t -> StringUtils.isEmpty(t.getParentId()) || "null".equals(t.getParentId()) || "0".equals(t.getParentId()) || "-1".equals(t.getParentId()))
.collect(Collectors.toList());
newTreeNodes.addAll(collect);
// 循环处理子节点数据
for (T t : newTreeNodes) {
//递归
assembleTree2(t, listNodes);
}
return newTreeNodes;
}
static <T extends BaseTreeNode> void assembleTree2(T node, List<T> listNodes) {
if (node != null && !CollectionUtils.isEmpty(listNodes)) {
// 循环节点数据，如果是子节点则添加起来
listNodes.stream().filter(t -> Objects.equals(t.getParentId(), node.getId())).forEachOrdered(node::addChild);
// 循环处理子节点数据,递归
if (!CollectionUtils.isEmpty(node.getChildren())) {
for (Object t : node.getChildren()) {
//递归
//listNodes.remove(t);
assembleTreeSon((T) t, listNodes);
}
}
}
}
static <T extends BaseTreeNode> void assembleTreeSon(T node, List<T> listNodes) {
if (node != null && !CollectionUtils.isEmpty(listNodes)) {
// 循环节点数据，如果是子节点则添加起来
listNodes.stream().filter(t -> t.getParentId().equals(node.getId()) && t.getCompanyId().equals(node.getCompanyId() == null ?node.getParentId():node.getCompanyId() ) ).forEachOrdered(node::addChild);
// 循环处理子节点数据,递归
if (!CollectionUtils.isEmpty(node.getChildren())) {
for (Object t : node.getChildren()) {
//递归
//listNodes.remove(t);
assembleTreeSon((T) t, listNodes);
}
}
}
}
static <T extends BaseTreeNode> void assembleTree_1(T node, List<T> listNodes) { static <T extends BaseTreeNode> void assembleTree_1(T node, List<T> listNodes) {
if (node != null && !CollectionUtils.isEmpty(listNodes)) { if (node != null && !CollectionUtils.isEmpty(listNodes)) {
// 循环节点数据，如果是子节点则添加起来 // 循环节点数据，如果是子节点则添加起来
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ 77df8035
package com.yeejoin.amos.boot.module.common.biz.controller; package com.yeejoin.amos.boot.module.common.biz.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
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.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -15,7 +38,15 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController; ...@@ -15,7 +38,15 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext; import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify; import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
import com.yeejoin.amos.boot.module.common.api.dto.*; import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
import com.yeejoin.amos.boot.module.common.api.entity.FireTeam; import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient; import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
...@@ -24,25 +55,9 @@ import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService; ...@@ -24,25 +55,9 @@ import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService; import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* 部门信息修改 * 部门信息修改
...@@ -55,755 +70,766 @@ import java.util.Set; ...@@ -55,755 +70,766 @@ import java.util.Set;
@RequestMapping(value = "/org-usr") @RequestMapping(value = "/org-usr")
public class OrgUsrController extends BaseController { public class OrgUsrController extends BaseController {
@Autowired @Autowired
OrgUsrServiceImpl iOrgUsrService; OrgUsrServiceImpl iOrgUsrService;
@Autowired @Autowired
private IOrgUsrService orgUsrService; private IOrgUsrService orgUsrService;
@Autowired @Autowired
ESOrgUsrService eSOrgUsrService; ESOrgUsrService eSOrgUsrService;
@Autowired @Autowired
FireTeamMapper fireTeamMapper; FireTeamMapper fireTeamMapper;
@Autowired @Autowired
EmqKeeper emqKeeper; EmqKeeper emqKeeper;
@Value("${jcs.company.topic.delete:jcs/company/topic/delete}") @Value("${jcs.company.topic.delete:jcs/company/topic/delete}")
private String airportDeleteTopic; private String airportDeleteTopic;
@Autowired @Autowired
EquipFeignClient equipFeignClient; EquipFeignClient equipFeignClient;
/** /**
* 新增单位信息 * 新增单位信息
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息") @ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo) throws Exception { public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo)
OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY); throws Exception {
OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(OrgUsrVo));
} return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(OrgUsrVo));
}
/**
* 根据id删除 /**
* * 根据id删除
* @param id *
* @return * @param id
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
public ResponseModel<String> deleteById(HttpServletRequest request, @PathVariable Long id) { @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public ResponseModel<String> deleteById(HttpServletRequest request, @PathVariable Long id) {
// 删除时，只作逻辑删除
// BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm // 删除时，只作逻辑删除
//bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
OrgUsr tempOrg = iOrgUsrService.getById(id.toString()); // bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start
//当前登录人不能删除自己 OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
AgencyUserModel user = getUserInfo(); // 当前登录人不能删除自己
AgencyUserModel user = getUserInfo();
if(tempOrg.getAmosOrgId()!=null&&tempOrg.getAmosOrgId().equals(user.getUserId())){
if (tempOrg.getAmosOrgId() != null && tempOrg.getAmosOrgId().equals(user.getUserId())) {
return ResponseHelper.buildResponse("-1");
} return ResponseHelper.buildResponse("-1");
}
if (tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId, id).eq(OrgUsr::getIsDelete, false)); if (tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
/*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 start*/ List<OrgUsr> tempList = iOrgUsrService
List<FireTeam> fireTeams = fireTeamMapper.byTeamId(id); .list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId, id).eq(OrgUsr::getIsDelete, false));
if (tempList.size() > 0 || fireTeams.size() > 0) { /* bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 start */
return ResponseHelper.buildResponse("-1"); List<FireTeam> fireTeams = fireTeamMapper.byTeamId(id);
} if (tempList.size() > 0 || fireTeams.size() > 0) {
/*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 end*/ return ResponseHelper.buildResponse("-1");
} }
//bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end /* bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 end */
}
// bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end
// iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01)); // iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
/*bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 开始*/ /* bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 开始 */
iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete", CommonConstant.IS_DELETE_01)); iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete",
/*bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 结束*/ CommonConstant.IS_DELETE_01));
try { /* bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 结束 */
eSOrgUsrService.deleteById(id); try {
emqKeeper.getMqttClient().publish(airportDeleteTopic, JSON.toJSONString(id).getBytes(), 2, false); eSOrgUsrService.deleteById(id);
} catch (Exception e) { emqKeeper.getMqttClient().publish(airportDeleteTopic, JSON.toJSONString(id).getBytes(), 2, false);
e.printStackTrace(); } catch (Exception e) {
throw new RuntimeException(); e.printStackTrace();
} throw new RuntimeException();
return ResponseHelper.buildResponse("0"); }
} return ResponseHelper.buildResponse("0");
}
/** /**
* 更新单位数据 * 更新单位数据
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.PUT) @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据") @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo, @PathVariable Long id) throws Exception { public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo,
OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY); @PathVariable Long id) throws Exception {
OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
// iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id); // iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id);
return ResponseHelper.buildResponse(iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id)); return ResponseHelper.buildResponse(iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id));
} }
/**
/** * 根据id查询单位
* 根据id查询单位 *
* * @param id
* @param id * @return
* @return */
*/ @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @RequestMapping(value = "/getUnit/{id}", method = RequestMethod.GET)
@RequestMapping(value = "/getUnit/{id}", method = RequestMethod.GET) @ApiOperation(httpMethod = "GET", value = "获取单位详情", notes = "获取单位详情")
@ApiOperation(httpMethod = "GET", value = "获取单位详情", notes = "获取单位详情") public ResponseModel<OrgUsrFormDto> selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
public ResponseModel<OrgUsrFormDto> selectById(HttpServletRequest request, @PathVariable Long id) throws Exception { return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(id));
return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(id)); }
}
/**
* 根据bizOrgType分页查询
/** *
* 根据bizOrgType分页查询 * @param bizOrgType
* * @return
* @param bizOrgType */
* @return @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
*/ @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
@RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET) public ResponseModel<IPage<OrgUsr>> bizOrgTypeListPage(String pageNum, String pageSize,
@ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询") @PathVariable String bizOrgType) throws Exception {
public ResponseModel<IPage<OrgUsr>> bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) throws Exception { return ResponseHelper
return ResponseHelper.buildResponse(iOrgUsrService.page(iOrgUsrService.bizOrgTypeListPage(pageNum, pageSize, bizOrgType))); .buildResponse(iOrgUsrService.page(iOrgUsrService.bizOrgTypeListPage(pageNum, pageSize, bizOrgType)));
} }
/**
/** * 获取单位部门树
* 获取单位部门树 *
* * @param
* @param * @return
* @return */
*/ @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
@RequestMapping(value = "/companyTree", method = RequestMethod.GET) @ApiOperation(httpMethod = "GET", value = "获取单位部门树(key为物理主键)", notes = "获取单位部门树(key为物理主键)\"")
@ApiOperation(httpMethod = "GET", value = "获取单位部门树(key为物理主键)", notes = "获取单位部门树(key为物理主键)\"") public ResponseModel<List<OrgMenuDto>> selectCompanyTree() throws Exception {
public ResponseModel<List<OrgMenuDto>> selectCompanyTree() throws Exception { List<OrgMenuDto> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(),
List<OrgMenuDto> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType"); OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
return ResponseHelper.buildResponse(menus); return ResponseHelper.buildResponse(menus);
} }
/** /**
* 获取单位部门树 * 获取单位部门树
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/orgTree", method = RequestMethod.GET) @RequestMapping(value = "/orgTree", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取单位部门树(bizOrgCode为物理主键)", notes = "获取单位部门树(bizOrgCode为物理主键)\"") @ApiOperation(httpMethod = "GET", value = "获取单位部门树(bizOrgCode为物理主键)", notes = "获取单位部门树(bizOrgCode为物理主键)\"")
public ResponseModel<List<OrgMenuDto>> selectCompanyTreeCode() throws Exception { public ResponseModel<List<OrgMenuDto>> selectCompanyTreeCode() throws Exception {
List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg()); List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
return ResponseHelper.buildResponse(menus); return ResponseHelper.buildResponse(menus);
} }
/** /**
* 获取单位部门树 * 获取单位部门树
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/org/company/tree", method = RequestMethod.GET) @RequestMapping(value = "/org/company/tree", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取单位树(bizOrgCode为物理主键)", notes = "获取单位树(bizOrgCode为物理主键)") @ApiOperation(httpMethod = "GET", value = "获取单位树(bizOrgCode为物理主键)", notes = "获取单位树(bizOrgCode为物理主键)")
public ResponseModel<List<OrgMenuDto>> getCompanyTree() { public ResponseModel<List<OrgMenuDto>> getCompanyTree() {
List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyList()); List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyList());
return ResponseHelper.buildResponse(menus); return ResponseHelper.buildResponse(menus);
} }
/** /**
* 列表分页查询 * 列表分页查询
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<OrgUsr> listPage(String pageNum, String pageSize, OrgUsr orgUsr) { public IPage<OrgUsr> listPage(String pageNum, String pageSize, OrgUsr orgUsr) {
Page<OrgUsr> pageBean; Page<OrgUsr> pageBean;
QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>(); QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
Class<? extends OrgUsr> aClass = orgUsr.getClass(); Class<? extends OrgUsr> aClass = orgUsr.getClass();
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> { Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
try { try {
field.setAccessible(true); field.setAccessible(true);
Object o = field.get(orgUsr); Object o = field.get(orgUsr);
if (o != null) { if (o != null) {
Class<?> type = field.getType(); Class<?> type = field.getType();
String name = NameUtils.camel2Underline(field.getName()); String name = NameUtils.camel2Underline(field.getName());
if (type.equals(Integer.class)) { if (type.equals(Integer.class)) {
Integer fileValue = (Integer) field.get(orgUsr); Integer fileValue = (Integer) field.get(orgUsr);
orgUsrQueryWrapper.eq(name, fileValue); orgUsrQueryWrapper.eq(name, fileValue);
} else if (type.equals(Long.class)) { } else if (type.equals(Long.class)) {
Long fileValue = (Long) field.get(orgUsr); Long fileValue = (Long) field.get(orgUsr);
orgUsrQueryWrapper.eq(name, fileValue); orgUsrQueryWrapper.eq(name, fileValue);
} else if (type.equals(String.class)) { } else if (type.equals(String.class)) {
String fileValue = (String) field.get(orgUsr); String fileValue = (String) field.get(orgUsr);
orgUsrQueryWrapper.eq(name, fileValue); orgUsrQueryWrapper.eq(name, fileValue);
} else { } else {
String fileValue = (String) field.get(orgUsr); String fileValue = (String) field.get(orgUsr);
orgUsrQueryWrapper.eq(name, fileValue); orgUsrQueryWrapper.eq(name, fileValue);
} }
} }
} catch (Exception e) { } catch (Exception e) {
} }
}); });
orgUsrQueryWrapper.eq("is_delete", 0); orgUsrQueryWrapper.eq("is_delete", 0);
IPage<OrgUsr> page; IPage<OrgUsr> page;
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) { if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
pageBean = new Page<>(0, Long.MAX_VALUE); pageBean = new Page<>(0, Long.MAX_VALUE);
} else { } else {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize)); pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
} }
page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper); page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
return page; return page;
} }
/**
* 列表分页查询 /**
* * 列表分页查询
* @return *
*/ * @return
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/new-list", method = RequestMethod.GET) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "新列表分页查询---只查询当前登录人本单位下的对应数据信息", notes = "新列表分页查询---只查询当前登录人本单位下的对应数据信息") @RequestMapping(value = "/new-list", method = RequestMethod.GET)
public IPage<OrgUsr> newlistPage(String pageNum, String pageSize, OrgUsr orgUsr) { @ApiOperation(httpMethod = "GET", value = "新列表分页查询---只查询当前登录人本单位下的对应数据信息", notes = "新列表分页查询---只查询当前登录人本单位下的对应数据信息")
ReginParams reginParams = getSelectedOrgInfo(); public IPage<OrgUsr> newlistPage(String pageNum, String pageSize, OrgUsr orgUsr) {
String companyIdString= reginParams.getPersonIdentity().getCompanyId(); ReginParams reginParams = getSelectedOrgInfo();
orgUsr.setParentId(companyIdString); String companyIdString = reginParams.getPersonIdentity().getCompanyId();
Page<OrgUsr> pageBean; orgUsr.setParentId(companyIdString);
QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>(); Page<OrgUsr> pageBean;
Class<? extends OrgUsr> aClass = orgUsr.getClass(); QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> { Class<? extends OrgUsr> aClass = orgUsr.getClass();
try { Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
field.setAccessible(true); try {
Object o = field.get(orgUsr); field.setAccessible(true);
if (o != null) { Object o = field.get(orgUsr);
Class<?> type = field.getType(); if (o != null) {
String name = NameUtils.camel2Underline(field.getName()); Class<?> type = field.getType();
if (type.equals(Integer.class)) { String name = NameUtils.camel2Underline(field.getName());
Integer fileValue = (Integer) field.get(orgUsr); if (type.equals(Integer.class)) {
orgUsrQueryWrapper.eq(name, fileValue); Integer fileValue = (Integer) field.get(orgUsr);
} else if (type.equals(Long.class)) { orgUsrQueryWrapper.eq(name, fileValue);
Long fileValue = (Long) field.get(orgUsr); } else if (type.equals(Long.class)) {
orgUsrQueryWrapper.eq(name, fileValue); Long fileValue = (Long) field.get(orgUsr);
} else if (type.equals(String.class)) { orgUsrQueryWrapper.eq(name, fileValue);
String fileValue = (String) field.get(orgUsr); } else if (type.equals(String.class)) {
orgUsrQueryWrapper.eq(name, fileValue); String fileValue = (String) field.get(orgUsr);
} else { orgUsrQueryWrapper.eq(name, fileValue);
String fileValue = (String) field.get(orgUsr); } else {
orgUsrQueryWrapper.eq(name, fileValue); String fileValue = (String) field.get(orgUsr);
} orgUsrQueryWrapper.eq(name, fileValue);
} }
} catch (Exception e) { }
} } catch (Exception e) {
}); }
orgUsrQueryWrapper.eq("is_delete", 0); });
IPage<OrgUsr> page; orgUsrQueryWrapper.eq("is_delete", 0);
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) { IPage<OrgUsr> page;
pageBean = new Page<>(0, Long.MAX_VALUE); if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
} else { pageBean = new Page<>(0, Long.MAX_VALUE);
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize)); } else {
} pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper); }
return page; page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
} return page;
}
/**
* 导入部门信息 /**
* * 导入部门信息
* @return *
*/ * @return
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/saveDepartment", method = RequestMethod.POST) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "导入部门信息", notes = "导入部门信息") @RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
public ResponseModel<?> saveDepartment(HttpServletRequest request, @RequestBody List<OrgDepartmentDto> OrgDepartmentVo, @PathVariable Long id) throws Exception { @ApiOperation(httpMethod = "POST", value = "导入部门信息", notes = "导入部门信息")
iOrgUsrService.saveDepartment(OrgDepartmentVo, id); public ResponseModel<?> saveDepartment(HttpServletRequest request,
return ResponseHelper.buildResponse(null); @RequestBody List<OrgDepartmentDto> OrgDepartmentVo, @PathVariable Long id) throws Exception {
} iOrgUsrService.saveDepartment(OrgDepartmentVo, id);
return ResponseHelper.buildResponse(null);
/** }
* 导入单位信息
* /**
* @return * 导入单位信息
*/ *
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) * @return
@RequestMapping(value = "/saveCompany", method = RequestMethod.POST) */
@ApiOperation(httpMethod = "POST", value = "导入单位信息", notes = "导入单位信息") @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
public ResponseModel<?> saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrDto> OrgUsrVo) throws Exception { @RequestMapping(value = "/saveCompany", method = RequestMethod.POST)
iOrgUsrService.saveCompany(OrgUsrVo); @ApiOperation(httpMethod = "POST", value = "导入单位信息", notes = "导入单位信息")
return ResponseHelper.buildResponse(null); public ResponseModel<?> saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrDto> OrgUsrVo)
} throws Exception {
iOrgUsrService.saveCompany(OrgUsrVo);
/** return ResponseHelper.buildResponse(null);
* 根据id获取单位人员列表 }
*
* @param ids /**
* @return * 根据id获取单位人员列表
*/ *
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) * @param ids
@RequestMapping(value = "/{ids}/users", method = RequestMethod.GET) * @return
@ApiOperation(httpMethod = "GET", value = "根据id获取单位人员列表", notes = "根据id获取单位人员列表") */
public ResponseModel<List<Map<String, Object>>> selectUsersByOrgCode(HttpServletRequest request, @PathVariable List<Long> ids) throws Exception { @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPersonMsg(ids)); @RequestMapping(value = "/{ids}/users", method = RequestMethod.GET)
} @ApiOperation(httpMethod = "GET", value = "根据id获取单位人员列表", notes = "根据id获取单位人员列表")
public ResponseModel<List<Map<String, Object>>> selectUsersByOrgCode(HttpServletRequest request,
/** @PathVariable List<Long> ids) throws Exception {
* 根据id获取单位人员列表 return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPersonMsg(ids));
* }
* @param ids
* @return /**
*/ * 根据id获取单位人员列表
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) *
@RequestMapping(value = "/company/{ids}/person", method = RequestMethod.GET) * @param ids
@ApiOperation(httpMethod = "GET", value = "根据id获取单位人员列表", notes = "根据id获取单位人员列表") * @return
public ResponseModel<List<CompanyPerson>> selectCompanyPerson(@PathVariable List<Long> ids) throws Exception { */
return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPerson(ids)); @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
} @RequestMapping(value = "/company/{ids}/person", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id获取单位人员列表", notes = "根据id获取单位人员列表")
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) public ResponseModel<List<CompanyPerson>> selectCompanyPerson(@PathVariable List<Long> ids) throws Exception {
@RequestMapping(value = "/company/person/{amosUserId}", method = RequestMethod.GET) return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPerson(ids));
@ApiOperation(httpMethod = "GET", value = "根据amosUserId获取单位ID", notes = "根据amosUserId获取单位ID") }
public ResponseModel<String> selectPersonId(@PathVariable String amosUserId) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getParentId(amosUserId)); @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
} @RequestMapping(value = "/company/person/{amosUserId}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据amosUserId获取单位ID", notes = "根据amosUserId获取单位ID")
public ResponseModel<String> selectPersonId(@PathVariable String amosUserId) throws Exception {
/** return ResponseHelper.buildResponse(iOrgUsrService.getParentId(amosUserId));
* 根据id获取单位人员列表 }
*
* @param amosUserId /**
* @return * 根据id获取单位人员列表
*/ *
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) * @param amosUserId
@RequestMapping(value = "/company/{amosUserId}", method = RequestMethod.GET) * @return
@ApiOperation(httpMethod = "GET", value = "根据amos userid获取单位", notes = "根据amos userid获取单位") */
public ResponseModel<OrgUsrDto> selectCompany(@PathVariable String amosUserId) throws Exception { @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
return ResponseHelper.buildResponse(iOrgUsrService.getOrg(amosUserId)); @RequestMapping(value = "/company/{amosUserId}", method = RequestMethod.GET)
} @ApiOperation(httpMethod = "GET", value = "根据amos userid获取单位", notes = "根据amos userid获取单位")
public ResponseModel<OrgUsrDto> selectCompany(@PathVariable String amosUserId) throws Exception {
/** return ResponseHelper.buildResponse(iOrgUsrService.getOrg(amosUserId));
* 获取当前登陆人所在机场单位人员 }
*
* @return /**
*/ * 获取当前登陆人所在机场单位人员
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) *
@RequestMapping(value = "/company/users/{orgUnitId}", method = RequestMethod.GET) * @return
@ApiOperation(httpMethod = "GET", value = "根据amos userid获取单位", notes = "根据amos userid获取单位") */
public ResponseModel<List<OrgUsr>> selectCompanyUsers(@PathVariable Long orgUnitId) throws Exception { @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/company/users/{orgUnitId}", method = RequestMethod.GET)
return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyUsers(orgUnitId)); @ApiOperation(httpMethod = "GET", value = "根据amos userid获取单位", notes = "根据amos userid获取单位")
} public ResponseModel<List<OrgUsr>> selectCompanyUsers(@PathVariable Long orgUnitId) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyUsers(orgUnitId));
/** }
* 根据名称模糊匹配
* /**
* @param name * 根据名称模糊匹配
* @return *
*/ * @param name
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) * @return
@RequestMapping(value = "/getdataList/unit", method = RequestMethod.GET) */
@ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配单位", notes = "根据名称模糊匹配单位") @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
public ResponseModel<Set<ESOrgUsrDto>> selectByIddata(HttpServletRequest request, String name) throws Exception { @RequestMapping(value = "/getdataList/unit", method = RequestMethod.GET)
return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name)); @ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配单位", notes = "根据名称模糊匹配单位")
} public ResponseModel<Set<ESOrgUsrDto>> selectByIddata(HttpServletRequest request, String name) throws Exception {
return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
}
/**
* 获取单位部门树 /**
* * 获取单位部门树
* @param *
* @return * @param
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/companyTreeByUser", method = RequestMethod.GET) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门树", notes = "根据登陆人获取单位部门树") @RequestMapping(value = "/companyTreeByUser", method = RequestMethod.GET)
public ResponseModel<List<OrgMenuDto>> selectCompanyTreeByUser() throws Exception { @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门树", notes = "根据登陆人获取单位部门树")
// 获取登陆人角色 public ResponseModel<List<OrgMenuDto>> selectCompanyTreeByUser() throws Exception {
AgencyUserModel user = getUserInfo(); // 获取登陆人角色
List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUser(user); AgencyUserModel user = getUserInfo();
return ResponseHelper.buildResponse(menus); List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUser(user);
} return ResponseHelper.buildResponse(menus);
}
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY) @PersonIdentify
@RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树") @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType() { @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
// 获取登陆人角色 public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType() {
ReginParams reginParams = getSelectedOrgInfo(); // 获取登陆人角色
List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserNumber(reginParams); ReginParams reginParams = getSelectedOrgInfo();
return ResponseHelper.buildResponse(menus); List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserNumber(reginParams);
} return ResponseHelper.buildResponse(menus);
}
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY) @PersonIdentify
@RequestMapping(value = "/companyTreeByUserCurrent", method = RequestMethod.GET) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据登录人获取当前公司部门树", notes = "根据登录人获取当前公司部门树") @RequestMapping(value = "/companyTreeByUserCurrent", method = RequestMethod.GET)
public ResponseModel<List<OrgMenuDto>> companyTreeByUser() { @ApiOperation(httpMethod = "GET", value = "根据登录人获取当前公司部门树", notes = "根据登录人获取当前公司部门树")
// 获取登陆人角色 public ResponseModel<List<OrgMenuDto>> companyTreeByUser() {
ReginParams reginParams = getSelectedOrgInfo(); // 获取登陆人角色
List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUser(reginParams); ReginParams reginParams = getSelectedOrgInfo();
return ResponseHelper.buildResponse(menus); List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUser(reginParams);
} return ResponseHelper.buildResponse(menus);
}
/**
* 获取单位部门树 /**
* * 获取单位部门树
* @param *
* @return * @param
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/companyUserTreeByUser", method = RequestMethod.GET) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门用户树", notes = "根据登陆人获取单位部门用户树") @RequestMapping(value = "/companyUserTreeByUser", method = RequestMethod.GET)
public ResponseModel<List<OrgMenuDto>> companyUserTreeByUser() { @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门用户树", notes = "根据登陆人获取单位部门用户树")
// 获取登陆人角色 public ResponseModel<List<OrgMenuDto>> companyUserTreeByUser() {
AgencyUserModel user = getUserInfo(); // 获取登陆人角色
List<OrgMenuDto> menus = iOrgUsrService.companyUserTreeByUser(user); AgencyUserModel user = getUserInfo();
return ResponseHelper.buildResponse(menus); List<OrgMenuDto> menus = iOrgUsrService.companyUserTreeByUser(user);
} return ResponseHelper.buildResponse(menus);
}
/**
* 获取单位列表 /**
* * 获取单位列表
* @param *
* @return * @param
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/companyListByUser", method = RequestMethod.GET) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表") @RequestMapping(value = "/companyListByUser", method = RequestMethod.GET)
public ResponseModel<List<CheckObjectDto>> companyListByUser() { @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表")
// 获取登陆人角色 public ResponseModel<List<CheckObjectDto>> companyListByUser() {
AgencyUserModel user = getUserInfo(); // 获取登陆人角色
List<CheckObjectDto> menus = iOrgUsrService.companyListByUser(user); AgencyUserModel user = getUserInfo();
return ResponseHelper.buildResponse(menus); List<CheckObjectDto> menus = iOrgUsrService.companyListByUser(user);
} return ResponseHelper.buildResponse(menus);
}
/** /**
* 获取用户单位归属 * 获取用户单位归属
* *
* @param userId * @param userId
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{userId}/userUnit", method = RequestMethod.GET) @RequestMapping(value = "/{userId}/userUnit", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取用户单位归属", notes = "获取用户单位归属") @ApiOperation(httpMethod = "GET", value = "获取用户单位归属", notes = "获取用户单位归属")
public ResponseModel<UserUnitDto> getUserUnit(@PathVariable String userId) { public ResponseModel<UserUnitDto> getUserUnit(@PathVariable String userId) {
return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(userId)); return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(userId));
} }
/** /**
* 获取用户信息 * 获取用户信息
* *
* @param userId * @param userId
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{userId}/userInfo", method = RequestMethod.GET) @RequestMapping(value = "/{userId}/userInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取用户信息", notes = "获取用户信息") @ApiOperation(httpMethod = "GET", value = "获取用户信息", notes = "获取用户信息")
public ResponseModel<List<UserDto>> getUserInfo(@PathVariable String userId) { public ResponseModel<List<UserDto>> getUserInfo(@PathVariable String userId) {
return ResponseHelper.buildResponse(iOrgUsrService.getUserInfo(userId)); return ResponseHelper.buildResponse(iOrgUsrService.getUserInfo(userId));
} }
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{userId}/getUserParentInfo", method = RequestMethod.GET) @RequestMapping(value = "/{userId}/getUserParentInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取用户本级及父级信息", notes = "获取用户本级及父级信息") @ApiOperation(httpMethod = "GET", value = "获取用户本级及父级信息", notes = "获取用户本级及父级信息")
public UserDto getUserParentInfo(@PathVariable String userId) { public UserDto getUserParentInfo(@PathVariable String userId) {
return orgUsrService.getUserParentInfo(userId); return orgUsrService.getUserParentInfo(userId);
} }
/** /**
* 获取登陆人绑定的人员关系 * 获取登陆人绑定的人员关系
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = {"/getLoginUserDetails/{userId}", "/getLoginUserDetails"}, method = RequestMethod.GET) @RequestMapping(value = { "/getLoginUserDetails/{userId}", "/getLoginUserDetails" }, method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系") @ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@PathVariable(required = false) String userId) { public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@PathVariable(required = false) String userId) {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
String userIds = userId; String userIds = userId;
if (StringUtils.isEmpty(userIds)) { if (StringUtils.isEmpty(userIds)) {
userIds = user.getUserId(); userIds = user.getUserId();
} }
List<Map<String, Object>> loginUserDetails = iOrgUsrService.getLoginUserDetails(userIds, user); List<Map<String, Object>> loginUserDetails = iOrgUsrService.getLoginUserDetails(userIds, user);
return ResponseHelper.buildResponse(loginUserDetails); return ResponseHelper.buildResponse(loginUserDetails);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getParentBuilding/{id}", method = RequestMethod.GET) @RequestMapping(value = "/getParentBuilding/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取最上级station", notes = "获取最上级建筑信息") @ApiOperation(httpMethod = "GET", value = "获取最上级station", notes = "获取最上级建筑信息")
public ResponseModel<JSONObject> getBuliding(@PathVariable Long id) { public ResponseModel<JSONObject> getBuliding(@PathVariable Long id) {
JSONObject equipjSONObject = this.getBulid(id); JSONObject equipjSONObject = this.getBulid(id);
return ResponseHelper.buildResponse(equipjSONObject); return ResponseHelper.buildResponse(equipjSONObject);
} }
public JSONObject getBulid(Long id) { public JSONObject getBulid(Long id) {
ResponseModel<Object> equipObj = equipFeignClient.getOne(id); ResponseModel<Object> equipObj = equipFeignClient.getOne(id);
JSONObject equipjSONObject = JSONObject.parseObject(JSONObject.toJSONString(equipObj.getResult())); JSONObject equipjSONObject = JSONObject.parseObject(JSONObject.toJSONString(equipObj.getResult()));
if (!equipjSONObject.containsKey("parentId")) { if (!equipjSONObject.containsKey("parentId")) {
return null; return null;
} }
if (!"0".equals(equipjSONObject.getString("parentId"))) { if (!"0".equals(equipjSONObject.getString("parentId"))) {
String parentId = equipjSONObject.getString("parentId"); String parentId = equipjSONObject.getString("parentId");
if (StringUtils.isNotBlank(parentId)) { if (StringUtils.isNotBlank(parentId)) {
return getBulid(Long.parseLong(parentId)); return getBulid(Long.parseLong(parentId));
} }
} }
return equipjSONObject; return equipjSONObject;
} }
/** /**
* 判断关联账户是否已关联 * 判断关联账户是否已关联
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getAmosId/{amosId}", method = RequestMethod.GET) @RequestMapping(value = "/getAmosId/{amosId}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联") @ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联")
public ResponseModel<Object> getAmosId(@PathVariable String amosId) { public ResponseModel<Object> getAmosId(@PathVariable String amosId) {
return ResponseHelper.buildResponse(iOrgUsrService.amosIdExist(amosId)); return ResponseHelper.buildResponse(iOrgUsrService.amosIdExist(amosId));
} }
/** /**
* 判断关联账户是否已关联-队伍 * 判断关联账户是否已关联-队伍
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getAmosIdTeam/{amosId}", method = RequestMethod.GET) @RequestMapping(value = "/getAmosIdTeam/{amosId}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联") @ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联")
public ResponseModel<Object> getAmosIdTeam(@PathVariable String amosId) { public ResponseModel<Object> getAmosIdTeam(@PathVariable String amosId) {
return ResponseHelper.buildResponse(iOrgUsrService.amosIdExistTeam(amosId)); return ResponseHelper.buildResponse(iOrgUsrService.amosIdExistTeam(amosId));
} }
/** /**
* 根据机场人员id获取amos平台人员id * 根据机场人员id获取amos平台人员id
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据机场人员id获取amos平台人员信息", notes = "根据机场人员id获取amos平台人员信息") @ApiOperation(httpMethod = "GET", value = "根据机场人员id获取amos平台人员信息", notes = "根据机场人员id获取amos平台人员信息")
@GetMapping(value = "/amos/{orgUserId}") @GetMapping(value = "/amos/{orgUserId}")
public ResponseModel<AgencyUserModel> getAmosIdByOrgUserId(@PathVariable String orgUserId) throws Exception { public ResponseModel<AgencyUserModel> getAmosIdByOrgUserId(@PathVariable String orgUserId) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getAmosIdByOrgUserId(orgUserId)); return ResponseHelper.buildResponse(iOrgUsrService.getAmosIdByOrgUserId(orgUserId));
} }
/** /**
* 根据机场人员id(逗号分割)获取amos平台人员id列表 * 根据机场人员id(逗号分割)获取amos平台人员id列表
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据机场人员id(逗号分割)获取amos平台人员id列表", notes = "根据机场人员id(逗号分割)获取amos平台人员id列表") @ApiOperation(httpMethod = "GET", value = "根据机场人员id(逗号分割)获取amos平台人员id列表", notes = "根据机场人员id(逗号分割)获取amos平台人员id列表")
@GetMapping(value = "/amos/orgUserIds") @GetMapping(value = "/amos/orgUserIds")
public ResponseModel<List<String>> getAmosIdListByOrgUserId(@RequestParam String orgUserIds) throws Exception { public ResponseModel<List<String>> getAmosIdListByOrgUserId(@RequestParam String orgUserIds) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getAmosIdListByOrgUserId(orgUserIds)); return ResponseHelper.buildResponse(iOrgUsrService.getAmosIdListByOrgUserId(orgUserIds));
} }
/** /**
* 根据单位id列表或未同步的机场单位列表 * 根据单位id列表或未同步的机场单位列表
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/unSync/orgCompany") @GetMapping(value = "/unSync/orgCompany")
@ApiOperation(httpMethod = "GET", value = "将所有机场单位数据同步到消防监督服务p_point表", notes = "将所有机场单位数据同步到消防监督服务p_point表") @ApiOperation(httpMethod = "GET", value = "将所有机场单位数据同步到消防监督服务p_point表", notes = "将所有机场单位数据同步到消防监督服务p_point表")
public ResponseModel getUnSyncOrgCompanyList(@RequestParam List<Long> companyIdList) { public ResponseModel getUnSyncOrgCompanyList(@RequestParam List<Long> companyIdList) {
return ResponseHelper.buildResponse(iOrgUsrService.getUnSyncOrgCompanyList(companyIdList)); return ResponseHelper.buildResponse(iOrgUsrService.getUnSyncOrgCompanyList(companyIdList));
} }
/** /**
* 根据机场单位id获取各单位下部门数量 * 根据机场单位id获取各单位下部门数量
* *
* @param * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据机场单位id获取各单位下部门数量", notes = "根据机场单位id获取各单位下部门数量") @ApiOperation(httpMethod = "GET", value = "根据机场单位id获取各单位下部门数量", notes = "根据机场单位id获取各单位下部门数量")
@GetMapping(value = "/amos/companyIds") @GetMapping(value = "/amos/companyIds")
public ResponseModel<Map<String, Integer>> getDeptCountByCompanyIds(@RequestParam List<String> companyIdList) throws Exception { public ResponseModel<Map<String, Integer>> getDeptCountByCompanyIds(@RequestParam List<String> companyIdList)
return ResponseHelper.buildResponse(iOrgUsrService.getDeptCountByCompanyIds(companyIdList)); throws Exception {
} return ResponseHelper.buildResponse(iOrgUsrService.getDeptCountByCompanyIds(companyIdList));
}
/**
* 根据机场人员ids获取amos平台人员列表 /**
* * 根据机场人员ids获取amos平台人员列表
* @param *
* @return * @param
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@ApiOperation(httpMethod = "GET", value = "根据机场人员ids获取amos平台人员列表", notes = "根据机场人员ids获取amos平台人员列表") @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/amos/list/{orgUserId}") @ApiOperation(httpMethod = "GET", value = "根据机场人员ids获取amos平台人员列表", notes = "根据机场人员ids获取amos平台人员列表")
public ResponseModel<List<AgencyUserModel>> getAmosUserByOrgUser(@PathVariable String orgUserId) throws Exception { @GetMapping(value = "/amos/list/{orgUserId}")
return ResponseHelper.buildResponse(iOrgUsrService.getAmosUserByOrgUser(orgUserId)); public ResponseModel<List<AgencyUserModel>> getAmosUserByOrgUser(@PathVariable String orgUserId) throws Exception {
} return ResponseHelper.buildResponse(iOrgUsrService.getAmosUserByOrgUser(orgUserId));
}
/**
* 根据机场单位id获取单位人员列表 /**
* * 根据机场单位id获取单位人员列表
* @param *
* @return * @param
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@ApiOperation(httpMethod = "GET", value = "根据机场单位id获取单位人员列表", notes = "根据机场单位id获取单位人员列表") @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{companyId}/person/list") @ApiOperation(httpMethod = "GET", value = "根据机场单位id获取单位人员列表", notes = "根据机场单位id获取单位人员列表")
public ResponseModel<List<OrgUsr>> getPersonListByCompanyId(@PathVariable String companyId) { @GetMapping(value = "/{companyId}/person/list")
return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId)); public ResponseModel<List<OrgUsr>> getPersonListByCompanyId(@PathVariable String companyId) {
} return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId));
}
/**
* 根据id获取单位人员列表 /**
* * 根据机场单位id获取单位人员列表
* @param amosUserId *
* @return * @param
*/ * @return
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/getOrgUser/byAmosUserId", method = RequestMethod.GET) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据amos userid模糊匹配获取对应机场单位人员信息列表", notes = "根据amos userid模糊匹配获取对应机场单位人员信息列表") @ApiOperation(httpMethod = "GET", value = "当前角色为单位防火监督检查负责人 --下的-- 根据机场单位id获取单位人员列表", notes = "当前角色为单位防火监督检查负责人 --下的--根据机场单位id获取单位人员列表")
public ResponseModel<Object> getOrgUserByAmosUserId(@RequestParam String amosUserId) throws Exception { @GetMapping(value = "/{companyId}/person/newList")
return ResponseHelper.buildResponse(iOrgUsrService.getOrgUserByAmosUserId(amosUserId)); public ResponseModel<List<OrgUsr>> getNewPersonListByCompanyId(@PathVariable String companyId) {
} ReginParams reginParams = getSelectedOrgInfo();
String roleNameString = reginParams.getRole().getRoleName();
String currentCompanyId = getCompanyId(reginParams);
/** if (companyId.equals(currentCompanyId) && roleNameString.contains("Person_charge_unit_fire_protection_supervision_inspection")) {//单位防火监督检查负责人
* 根据机构类型和登陆人bizOrgCode获取列表不分页 return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId));
* }
* @param orgTypes 机构类型（逗号分割） return null;
* @return list不分页 }
*/
@PersonIdentify /**
@TycloudOperation(ApiLevel = UserType.AGENCY) * 根据id获取单位人员列表
@ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页") *
@GetMapping(value = "/amos/getListByBizOrgTypesCode") * @param amosUserId
public ResponseModel<List<OrgUsr>> getListByBizOrgTypeCode(@RequestParam(required = false) String orgTypes) { * @return
ReginParams reginParams = getSelectedOrgInfo(); */
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity(); @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
String bizOrgCode = personIdentity.getBizOrgCode(); @RequestMapping(value = "/getOrgUser/byAmosUserId", method = RequestMethod.GET)
return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode)); @ApiOperation(httpMethod = "GET", value = "根据amos userid模糊匹配获取对应机场单位人员信息列表", notes = "根据amos userid模糊匹配获取对应机场单位人员信息列表")
} public ResponseModel<Object> getOrgUserByAmosUserId(@RequestParam String amosUserId) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getOrgUserByAmosUserId(amosUserId));
}
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY) /**
@ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页") * 根据机构类型和登陆人bizOrgCode获取列表不分页
@GetMapping(value = "/{authKey}/listWithAuth") *
public ResponseModel<List<OrgUsr>> getListWithAuth( * @param orgTypes 机构类型（逗号分割）
@RequestParam(required = false) String orgTypes, * @return list不分页
@PathVariable String authKey) { */
ReginParams reginParams = getSelectedOrgInfo(); @PersonIdentify
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity(); @TycloudOperation(ApiLevel = UserType.AGENCY)
String bizOrgCode = personIdentity.getBizOrgCode(); @ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页")
// 权限处理 @GetMapping(value = "/amos/getListByBizOrgTypesCode")
PermissionInterceptorContext.setDataAuthRule(authKey); public ResponseModel<List<OrgUsr>> getListByBizOrgTypeCode(@RequestParam(required = false) String orgTypes) {
return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode)); ReginParams reginParams = getSelectedOrgInfo();
} ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
String bizOrgCode = personIdentity.getBizOrgCode();
@PersonIdentify return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode));
@TycloudOperation(ApiLevel = UserType.AGENCY) }
@RequestMapping(value = "/{authKey}/treeWithAuth", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据权限查询公司部门树", notes = "根据权限查询公司部门树") @PersonIdentify
public ResponseModel<List<OrgMenuDto>> getCompanyTreeWithAuth( @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestParam(required = false) String orgType, @ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页")
@PathVariable String authKey) { @GetMapping(value = "/{authKey}/listWithAuth")
// 获取登陆人角色 public ResponseModel<List<OrgUsr>> getListWithAuth(@RequestParam(required = false) String orgTypes,
ReginParams reginParams = getSelectedOrgInfo(); @PathVariable String authKey) {
// 权限处理 ReginParams reginParams = getSelectedOrgInfo();
PermissionInterceptorContext.setDataAuthRule(authKey); ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, orgType); String bizOrgCode = personIdentity.getBizOrgCode();
return ResponseHelper.buildResponse(menus); // 权限处理
} PermissionInterceptorContext.setDataAuthRule(authKey);
return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode));
/** }
* 查询多个组织机构下面的所有人员列表信息
* @PersonIdentify
* @param @TycloudOperation(ApiLevel = UserType.AGENCY)
* @return @RequestMapping(value = "/{authKey}/treeWithAuth", method = RequestMethod.GET)
*/ @ApiOperation(httpMethod = "GET", value = "根据权限查询公司部门树", notes = "根据权限查询公司部门树")
@TycloudOperation(ApiLevel = UserType.AGENCY) public ResponseModel<List<OrgMenuDto>> getCompanyTreeWithAuth(@RequestParam(required = false) String orgType,
@ApiOperation(httpMethod = "GET", value = "查询多个组织机构下面的所有人员列表信息", notes = "查询多个组织机构下面的所有人员列表信息") @PathVariable String authKey) {
@GetMapping(value = "/company/person/list") // 获取登陆人角色
public ResponseModel<List<OrgUsr>> getPersonListByCompanyIdList(@RequestParam String companyIds) { ReginParams reginParams = getSelectedOrgInfo();
List<OrgUsr> orgUserList = Lists.newArrayList(); // 权限处理
if (!ValidationUtil.isEmpty(companyIds)) { PermissionInterceptorContext.setDataAuthRule(authKey);
List<String> companyIdList = Lists.newArrayList(companyIds.split(",")); List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, orgType);
orgUserList = iOrgUsrService.getPersonListByCompanyIdList(companyIdList); return ResponseHelper.buildResponse(menus);
} }
return ResponseHelper.buildResponse(orgUserList);
} /**
* 查询多个组织机构下面的所有人员列表信息
/** *
* 查询多个组织机构下面的所有人员列表信息 * @param
* * @return
* @param */
* @return @TycloudOperation(ApiLevel = UserType.AGENCY)
*/ @ApiOperation(httpMethod = "GET", value = "查询多个组织机构下面的所有人员列表信息", notes = "查询多个组织机构下面的所有人员列表信息")
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/company/person/list")
@ApiOperation(httpMethod = "GET", value = "查询上级单位", notes = "查询上级单位") public ResponseModel<List<OrgUsr>> getPersonListByCompanyIdList(@RequestParam String companyIds) {
@GetMapping(value = "/company/bizOrgCode/list") List<OrgUsr> orgUserList = Lists.newArrayList();
public ResponseModel<OrgUsrDto> getCompanyByBizOrgCodeList(@RequestParam String bizOrgCode) { if (!ValidationUtil.isEmpty(companyIds)) {
if (ValidationUtil.isEmpty(bizOrgCode)) { List<String> companyIdList = Lists.newArrayList(companyIds.split(","));
return ResponseHelper.buildResponse(new OrgUsrDto()); orgUserList = iOrgUsrService.getPersonListByCompanyIdList(companyIdList);
} }
return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByBizOrgCodeList(bizOrgCode)); return ResponseHelper.buildResponse(orgUserList);
} }
/**
/** * 查询多个组织机构下面的所有人员列表信息
* 查询多个组织机构下面的所有人员列表信息 *
* * @param
* @param * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @ApiOperation(httpMethod = "GET", value = "查询上级单位", notes = "查询上级单位")
@ApiOperation(httpMethod = "GET", value = "查询当前人员所属的第一级公司", notes = "查询当前人员所属的第一级公司") @GetMapping(value = "/company/bizOrgCode/list")
@GetMapping(value = "find/getCompanyByUserId") public ResponseModel<OrgUsrDto> getCompanyByBizOrgCodeList(@RequestParam String bizOrgCode) {
public ResponseModel<Object> getCompanyByUserId(@RequestParam Long userId) { if (ValidationUtil.isEmpty(bizOrgCode)) {
return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByUserId(userId)); return ResponseHelper.buildResponse(new OrgUsrDto());
} }
return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByBizOrgCodeList(bizOrgCode));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询当前人员的身份证号码", notes = "查询当前人员的身份证号码") /**
@GetMapping(value = "find/getIdNumberByAmosId") * 查询多个组织机构下面的所有人员列表信息
public ResponseModel<String> getIdNumberByAmosId(@RequestParam String amosId) { *
return ResponseHelper.buildResponse(iOrgUsrService.getIdNumberByAmosId(amosId)); * @param
} * @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @ApiOperation(httpMethod = "GET", value = "查询当前人员所属的第一级公司", notes = "查询当前人员所属的第一级公司")
@ApiOperation(httpMethod = "GET", value = "根据平台Id查询人员", notes = "根据平台Id查询人员") @GetMapping(value = "find/getCompanyByUserId")
@GetMapping(value = "find/getByAmosId") public ResponseModel<Object> getCompanyByUserId(@RequestParam Long userId) {
public ResponseModel<List<OrgUsr>> getByAmosId(@RequestParam List<String> amosIds) { return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByUserId(userId));
return ResponseHelper.buildResponse(iOrgUsrService.getByAmosId(amosIds)); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询当前人员的身份证号码", notes = "查询当前人员的身份证号码")
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "find/getIdNumberByAmosId")
@ApiOperation(httpMethod = "GET", value = "根据bizOrgCode查询公司部门 非树", notes = "根据bizOrgCode查询公司部门 非树") public ResponseModel<String> getIdNumberByAmosId(@RequestParam String amosId) {
@GetMapping(value = "find/getByOrgCode") return ResponseHelper.buildResponse(iOrgUsrService.getIdNumberByAmosId(amosId));
public ResponseModel<Object> getByOrgCode(@RequestParam String bizOrgCode) { }
return ResponseHelper.buildResponse(iOrgUsrService.getByOrgCode(bizOrgCode));
} @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据平台Id查询人员", notes = "根据平台Id查询人员")
@GetMapping(value = "find/getByAmosId")
public ResponseModel<List<OrgUsr>> getByAmosId(@RequestParam List<String> amosIds) {
return ResponseHelper.buildResponse(iOrgUsrService.getByAmosId(amosIds));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据bizOrgCode查询公司部门 非树", notes = "根据bizOrgCode查询公司部门 非树")
@GetMapping(value = "find/getByOrgCode")
public ResponseModel<Object> getByOrgCode(@RequestParam String bizOrgCode) {
return ResponseHelper.buildResponse(iOrgUsrService.getByOrgCode(bizOrgCode));
}
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/MaintenanceResourceDataMapper.java
View file @ 77df8035
...@@ -32,6 +32,8 @@ public interface MaintenanceResourceDataMapper extends BaseMapper<MaintenanceRes ...@@ -32,6 +32,8 @@ public interface MaintenanceResourceDataMapper extends BaseMapper<MaintenanceRes
*/ */
public List<MaintenanceResourceData> selectMaintenanceResourceDataList(MaintenanceResourceData maintenanceResourceData); public List<MaintenanceResourceData> selectMaintenanceResourceDataList(MaintenanceResourceData maintenanceResourceData);
public List<MaintenanceResourceData> selectMaintenanceResourceDataListByclassifyId();
/** /**
* 新增消防设施资源数据 * 新增消防设施资源数据
* *
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/MaintenanceResourceMapper.java
View file @ 77df8035
...@@ -59,6 +59,8 @@ public interface MaintenanceResourceMapper extends BaseMapper<MaintenanceResourc ...@@ -59,6 +59,8 @@ public interface MaintenanceResourceMapper extends BaseMapper<MaintenanceResourc
*/ */
public int deleteMaintenanceResourceById(Long id); public int deleteMaintenanceResourceById(Long id);
/** /**
* 批量删除维保设施资源树 * 批量删除维保设施资源树
* *
...@@ -71,6 +73,8 @@ public interface MaintenanceResourceMapper extends BaseMapper<MaintenanceResourc ...@@ -71,6 +73,8 @@ public interface MaintenanceResourceMapper extends BaseMapper<MaintenanceResourc
List<MaintenanceResourceDto> selectAll(); List<MaintenanceResourceDto> selectAll();
List<MaintenanceResourceDto> selectAllType();
List<MaintenanceResourceDataVo> findByIds(@Param("list") List<Long> ids); List<MaintenanceResourceDataVo> findByIds(@Param("list") List<Long> ids);
List<MaintenanceResourceDto> findTreeById(Long id); List<MaintenanceResourceDto> findTreeById(Long id);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MaintenanceResourceServiceImpl.java
View file @ 77df8035
...@@ -120,11 +120,27 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou ...@@ -120,11 +120,27 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
@Override @Override
public List<MaintenanceResourceDto> getMaintenanceResourceTree(String appKey, String product, String token) { public List<MaintenanceResourceDto> getMaintenanceResourceTree(String appKey, String product, String token) {
List<MaintenanceResourceDto> list = this.selectAll(); //从维保设施资源表中获取所有资源
List<MaintenanceResourceData> maintenanceResourceData = maintenanceResourceDataMapper.selectMaintenanceResourceDataListByclassifyId();
//获取第三层分类节点
List<MaintenanceResourceDto> maintenanceResourceDtos = this.baseMapper.selectAllType();
List<MaintenanceResourceDto> list = new ArrayList<>();
maintenanceResourceData.stream().forEach(e-> {
MaintenanceResourceDto e1 = new MaintenanceResourceDto();
e1.setId(e.getClassifyId().toString());
e1.setName(e.getClassifyName());
e1.setCompanyId(e.getMaintenanceCompanyId().toString());
e1.setType(MaintenanceResourceEnum.CLASSIFY.getValue());
e1.setParentId(e.getFireFightSysId().toString());
e1.setCode(e.getClassifyCode());
list.add(e1);
});
// List<MaintenanceResourceDto> list = this.selectAll();
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
//获取维保单位和业主单位
List<MaintenanceResourceDto> companyTree = getCompanyList(appKey, product, token); List<MaintenanceResourceDto> companyTree = getCompanyList(appKey, product, token);
if (!CollectionUtils.isEmpty(companyTree)) { if (!CollectionUtils.isEmpty(companyTree)) {
List<MaintenanceResourceDto> result = new ArrayList<>(); /* List<MaintenanceResourceDto> result = new ArrayList<>();
result.addAll(list); result.addAll(list);
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
for (int j = 0; j < companyTree.size(); j++) { for (int j = 0; j < companyTree.size(); j++) {
...@@ -132,9 +148,8 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou ...@@ -132,9 +148,8 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
result.remove(list.get(i)); result.remove(list.get(i));
} }
} }
} }*/
/* result.addAll(companyTree);
result.addAll(companyTree);
result.forEach(e->{if (e.getContractId() == null){ result.forEach(e->{if (e.getContractId() == null){
e.setContractId(QRCodeUtil.generateQRCode()); e.setContractId(QRCodeUtil.generateQRCode());
} }
...@@ -145,9 +160,11 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou ...@@ -145,9 +160,11 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
entry.getValue().ifPresent(v -> { entry.getValue().ifPresent(v -> {
dataList.add(v); dataList.add(v);
}); });
}); });*/
list.addAll(companyTree);
return TreeNodeUtil.assembleTree(dataList); list.addAll(maintenanceResourceDtos);
//避免造成其他代码bug,替换新的组装树
return TreeNodeUtil.assembleTreeTs(list);
} }
return TreeNodeUtil.assembleTree(list); return TreeNodeUtil.assembleTree(list);
} else { } else {
......
amos-boot-system-equip/src/main/resources/mapper/MaintenanceResourceDataMapper.xml
View file @ 77df8035
...@@ -32,6 +32,36 @@ ...@@ -32,6 +32,36 @@
select id, maintenance_company_id, maintenance_company_code, maintenance_company_name, owner_unit_id, owner_unit_code, owner_unit_name, fire_fight_sys_id, fire_fight_sys_code, fire_fight_sys_name, classify_id, classify_code, classify_name, classify_type, fire_facility_id, fire_facility_code, fire_facility_name, fire_facility_type, maintenance_expiration_time, maintenance_time, maintenance_cycle, create_date from mt_maintenance_resource_data select id, maintenance_company_id, maintenance_company_code, maintenance_company_name, owner_unit_id, owner_unit_code, owner_unit_name, fire_fight_sys_id, fire_fight_sys_code, fire_fight_sys_name, classify_id, classify_code, classify_name, classify_type, fire_facility_id, fire_facility_code, fire_facility_name, fire_facility_type, maintenance_expiration_time, maintenance_time, maintenance_cycle, create_date from mt_maintenance_resource_data
</sql> </sql>
<select id="selectMaintenanceResourceDataListByclassifyId" parameterType="com.yeejoin.equipmanage.common.entity.MaintenanceResourceData"
resultMap="MaintenanceResourceDataResult">
SELECT
id,
maintenance_company_id,
maintenance_company_code,
maintenance_company_name,
owner_unit_id,
owner_unit_code,
owner_unit_name,
fire_fight_sys_id,
fire_fight_sys_code,
fire_fight_sys_name,
classify_id,
classify_code,
classify_name,
classify_type,
fire_facility_id,
fire_facility_code,
fire_facility_name,
fire_facility_type,
maintenance_expiration_time,
maintenance_time,
maintenance_cycle,
create_date
FROM
mt_maintenance_resource_data
GROUP BY classify_id
</select>
<select id="selectMaintenanceResourceDataList" <select id="selectMaintenanceResourceDataList"
parameterType="com.yeejoin.equipmanage.common.entity.MaintenanceResourceData" parameterType="com.yeejoin.equipmanage.common.entity.MaintenanceResourceData"
resultMap="MaintenanceResourceDataResult"> resultMap="MaintenanceResourceDataResult">
......
amos-boot-system-equip/src/main/resources/mapper/MaintenanceResourceMapper.xml
View file @ 77df8035
...@@ -124,6 +124,23 @@ ...@@ -124,6 +124,23 @@
`mt_maintenance_resource` m `mt_maintenance_resource` m
]]> ]]>
</select> </select>
<select id="selectAllType" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDto">
<![CDATA[
SELECT
maintenance_company_id as companyId,
fire_fight_sys_id AS id,
fire_fight_sys_name name ,
owner_unit_id as parentId,
IFNULL(classify_type,3)
FROM
`mt_maintenance_resource_data`
GROUP BY
owner_unit_id,
maintenance_company_id,
fire_fight_sys_id
]]>
</select>
<select id="findTreeById" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDto"> <select id="findTreeById" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDto">
<![CDATA[ <![CDATA[
SELECT SELECT
......
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