From b0557ec16d28e7cf423a0d25365c5bb9ec727760 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Jul 2025 11:06:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E7=BB=87=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=88=B0=E7=8B=AC=E7=AB=8Bjar?= =?UTF-8?q?=E5=8C=85-organization?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrganizationInfoController.java | 37 ----- .../feishu/mapper/OrganizationInfoMapper.java | 45 ------ .../service/OrganizationInfoService.java | 37 ----- .../impl/OrganizationInfoServiceImpl.java | 150 ------------------ .../mapper/OrganizationInfoMapper.xml | 25 --- 5 files changed, 294 deletions(-) delete mode 100644 src/main/java/com/weaver/seconddev/feishu/controller/OrganizationInfoController.java delete mode 100644 src/main/java/com/weaver/seconddev/feishu/mapper/OrganizationInfoMapper.java delete mode 100644 src/main/java/com/weaver/seconddev/feishu/service/OrganizationInfoService.java delete mode 100644 src/main/java/com/weaver/seconddev/feishu/service/impl/OrganizationInfoServiceImpl.java delete mode 100644 src/main/resources/mapper/OrganizationInfoMapper.xml diff --git a/src/main/java/com/weaver/seconddev/feishu/controller/OrganizationInfoController.java b/src/main/java/com/weaver/seconddev/feishu/controller/OrganizationInfoController.java deleted file mode 100644 index 012e7a6..0000000 --- a/src/main/java/com/weaver/seconddev/feishu/controller/OrganizationInfoController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.weaver.seconddev.feishu.controller; - -import com.weaver.common.authority.annotation.WeaPermission; -import com.weaver.seconddev.feishu.service.OrganizationInfoService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author:dxfeng - * @createTime: 2025/07/17 - * @version: 1.0 - */ -@Slf4j -@RestController -@RequestMapping("/api/secondev/org/info") -@WeaPermission(publicPermission = true) -public class OrganizationInfoController { - @Autowired - OrganizationInfoService organizationInfoService; - - @GetMapping("/getDepartmentInfo") - public Object getDepartmentInfo(@RequestParam(name = "code", required = false) String code, - @RequestParam(name = "oId", required = false) String oId) { - log.error("code=={},oId=={}", code, oId); - Map params = new HashMap<>(); - params.put("code", code); - params.put("oId", oId); - return organizationInfoService.getDepartmentInfo(params); - } -} diff --git a/src/main/java/com/weaver/seconddev/feishu/mapper/OrganizationInfoMapper.java b/src/main/java/com/weaver/seconddev/feishu/mapper/OrganizationInfoMapper.java deleted file mode 100644 index 8dcd19c..0000000 --- a/src/main/java/com/weaver/seconddev/feishu/mapper/OrganizationInfoMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.weaver.seconddev.feishu.mapper; - -import com.weaver.seconddev.portal.entity.param.BaseParam; -import org.apache.ibatis.annotations.MapKey; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Map; - -/** - * @author:dxfeng - * @createTime: 2025/07/17 - * @version: 1.0 - */ -@Mapper -public interface OrganizationInfoMapper { - - /** - * 根据oId获取部门Id - * - * @param param - * @param oId - * @return - */ - Long getDepartmentIdByOId(@Param("param") BaseParam param, @Param("oId") String oId); - - /** - * 根据oId获取部门Code - * - * @param param - * @param id - * @return - */ - String getDepartmentCodeById(@Param("param") BaseParam param, @Param("id") Long id); - - /** - * 查询部门自定义表数据 - * - * @param param - * @param id - * @return - */ - @MapKey("departmentId") - Map getDepartmentCustomData(@Param("param") BaseParam param, @Param("id") Long id); -} diff --git a/src/main/java/com/weaver/seconddev/feishu/service/OrganizationInfoService.java b/src/main/java/com/weaver/seconddev/feishu/service/OrganizationInfoService.java deleted file mode 100644 index bf2a4f1..0000000 --- a/src/main/java/com/weaver/seconddev/feishu/service/OrganizationInfoService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.weaver.seconddev.feishu.service; - -import com.weaver.common.base.entity.result.WeaResult; - -import java.util.Map; - -/** - * @author:dxfeng - * @createTime: 2025/07/17 - * @version: 1.0 - */ -public interface OrganizationInfoService { - - /** - * 获取部门信息 - * - * @param params - * @return - */ - WeaResult> getDepartmentInfo(Map params); - - /** - * 获取岗位信息 - * - * @param params - * @return - */ - WeaResult> getPositionInfo(Map params); - - /** - * 获取员工信息 - * - * @param params - * @return - */ - WeaResult> getEmployeeInfo(Map params); -} diff --git a/src/main/java/com/weaver/seconddev/feishu/service/impl/OrganizationInfoServiceImpl.java b/src/main/java/com/weaver/seconddev/feishu/service/impl/OrganizationInfoServiceImpl.java deleted file mode 100644 index 6d1f241..0000000 --- a/src/main/java/com/weaver/seconddev/feishu/service/impl/OrganizationInfoServiceImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.weaver.seconddev.feishu.service.impl; - -import com.weaver.common.base.entity.result.WeaResult; -import com.weaver.common.form.datasource.FormdataTemplateDetails; -import com.weaver.common.form.metadata.field.FormField; -import com.weaver.common.hr.util.Util; -import com.weaver.common.hrm.dao.HrmCommonDepartmentDao; -import com.weaver.common.hrm.dao.HrmCommonEmployeeDao; -import com.weaver.seconddev.feishu.mapper.OrganizationInfoMapper; -import com.weaver.seconddev.feishu.service.OrganizationInfoService; -import com.weaver.seconddev.portal.entity.param.BaseParam; -import com.weaver.seconddev.portal.mapper.EbuilderBaseMapper; -import com.weaver.seconddev.portal.mapper.EteamsBaseMapper; -import com.weaver.teams.domain.department.SimpleDepartment; -import com.weaver.teams.domain.user.SimpleEmployee; -import com.weaver.workflow.common.cfg.org.service.DepartMentService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @author:dxfeng - * @createTime: 2025/07/17 - * @version: 1.0 - */ -@Slf4j -@Service -public class OrganizationInfoServiceImpl implements OrganizationInfoService { - - @Autowired - DepartMentService departMentService; - - @Autowired - HrmCommonDepartmentDao hrmCommonDepartmentDao; - - @Autowired - HrmCommonEmployeeDao hrmCommonEmployeeDao; - - @Autowired - OrganizationInfoMapper organizationInfoMapper; - - @Autowired - EteamsBaseMapper eteamsBaseMapper; - - @Autowired - EbuilderBaseMapper ebuilderBaseMapper; - - - @Override - public WeaResult> getDepartmentInfo(Map params) { - BaseParam param = new BaseParam(); - String code = Util.null2String(params.get("code")); - String oId = Util.null2String(params.get("oId")); - SimpleDepartment department = null; - if (StringUtils.isNotBlank(oId)) { - Long departmentId = organizationInfoMapper.getDepartmentIdByOId(param, oId); - if (null != departmentId) { - code = organizationInfoMapper.getDepartmentCodeById(param, departmentId); - } - } - - // 查询部门信息 - if (StringUtils.isNotBlank(code)) { - department = hrmCommonDepartmentDao.getByCode(code, param.getTenantKey()); - } - if (null == department) { - return WeaResult.fail("部门不存在", true); - } - // 查询部门自定义表数据 - Map departmentCustomData = organizationInfoMapper.getDepartmentCustomData(param, department.getId()); - Map returnMap = new HashMap<>(); - - long formId = eteamsBaseMapper.getFormIdByTableName(param, param.getTable_dept_cus()); - FormField formField = eteamsBaseMapper.getFormFieldByFieldName(param, formId, "sqcj"); - List templateDetails = ebuilderBaseMapper.getFormdataTemplateDetails(param, formField.getDataTemplateId()); - Map sqcjMap = templateDetails.stream().collect(Collectors.toMap(FormdataTemplateDetails::getValueKey, FormdataTemplateDetails::getName)); - - - if (departmentCustomData != null && !departmentCustomData.isEmpty()) { - returnMap.put("oId", departmentCustomData.get("oid")); - returnMap.put("poId", departmentCustomData.get("poid")); - returnMap.put("sqcj", sqcjMap.get(Util.null2String(departmentCustomData.get("sqcj")))); - - String jobNum = ""; - String bmfzr = Util.null2String(departmentCustomData.get("bmfzr")); - if (StringUtils.isNotBlank(bmfzr)) { - SimpleEmployee byId = hrmCommonEmployeeDao.getById(Long.parseLong(bmfzr)); - if (null != byId) { - jobNum = byId.getJobNum(); - } - } - returnMap.put("bmfzr", jobNum); - - String hrbp = Util.null2String(departmentCustomData.get("hrbp")); - String hrbpxm = ""; - String hrbpgh = ""; - if (StringUtils.isNotBlank(hrbp)) { - SimpleEmployee byId = hrmCommonEmployeeDao.getById(Long.parseLong(hrbp)); - if (null != byId) { - hrbpxm = byId.getUsername(); - hrbpgh = byId.getJobNum(); - } - } - returnMap.put("hrbpxm", hrbpxm); - returnMap.put("hrbpgh", hrbpgh); - } - - returnMap.put("code", department.getCode()); - returnMap.put("name", department.getName()); - returnMap.put("dataRank", department.getDatarank()); - returnMap.put("status", department.isStatus() ? "1" : "0"); - List allDepartmentList = new ArrayList<>(); - getParentDeptList(department, allDepartmentList); - - String pathCode = allDepartmentList.stream().map(SimpleDepartment::getCode).collect(Collectors.joining("/")); - String pathName = allDepartmentList.stream().map(SimpleDepartment::getName).collect(Collectors.joining("/")); - - returnMap.put("pathCode", pathCode); - returnMap.put("pathName", pathName); - - - return WeaResult.success(returnMap); - } - - @Override - public WeaResult> getPositionInfo(Map params) { - return null; - } - - @Override - public WeaResult> getEmployeeInfo(Map params) { - return null; - } - - private void getParentDeptList(SimpleDepartment department, List parentDeptList) { - parentDeptList.add(department); - if (department.getParent() != null) { - getParentDeptList(department.getParent(), parentDeptList); - } - } - - -} diff --git a/src/main/resources/mapper/OrganizationInfoMapper.xml b/src/main/resources/mapper/OrganizationInfoMapper.xml deleted file mode 100644 index 5a6b593..0000000 --- a/src/main/resources/mapper/OrganizationInfoMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - -