From abb3d04953d7e02c69cb17df92597943e878e589 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 1 Feb 2023 11:27:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BA=AF=E4=BA=BA=E5=91=98=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E5=9B=BE=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/DanikorResourceBackService.java | 3 ++- .../impl/DanikorResourceBackServiceImpl.java | 7 +++-- .../web/DanikorResourceBackController.java | 27 ++++++++++++++----- .../wrapper/DanikorResourceBackWrapper.java | 3 ++- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/com/engine/organization/service/DanikorResourceBackService.java b/src/com/engine/organization/service/DanikorResourceBackService.java index 9676d850..8e805aaf 100644 --- a/src/com/engine/organization/service/DanikorResourceBackService.java +++ b/src/com/engine/organization/service/DanikorResourceBackService.java @@ -1,5 +1,6 @@ package com.engine.organization.service; +import com.engine.organization.entity.danikor.param.ChartParam; import com.engine.organization.util.MenuBtn; import javax.servlet.http.HttpServletRequest; @@ -57,5 +58,5 @@ public interface DanikorResourceBackService { * @param params * @return */ - String getResourceChartData(Map params); + List getResourceChartData(Map params); } diff --git a/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java b/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java index d9d7138f..292ef85a 100644 --- a/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java +++ b/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java @@ -1,6 +1,5 @@ package com.engine.organization.service.impl; -import com.alibaba.fastjson.JSON; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.constant.WeaBoolAttr; @@ -243,7 +242,7 @@ public class DanikorResourceBackServiceImpl extends Service implements DanikorRe } @Override - public String getResourceChartData(Map params) { + public List getResourceChartData(Map params) { String syncDate = Util.null2String(params.get("date")); List chartParamList = new ArrayList<>(); // 查询安全级别大于等于40的人员 @@ -264,7 +263,7 @@ public class DanikorResourceBackServiceImpl extends Service implements DanikorRe ChartParam chartParam = new ChartParam(); chartParam.setId(rs.getString("id")); chartParam.setPid(managerId); - chartParam.setType(StringUtils.isBlank(managerId) ? "company" : "subcompany"); + chartParam.setType((StringUtils.isBlank(managerId) || "0".equals(managerId)) ? "company" : "subcompany"); chartParam.setName(StringUtils.isBlank(jobTitleName) ? lastName : lastName + "(" + jobTitleName + ")"); chartParam.setTitle(chartParam.getName()); chartParam.setNum("0"); @@ -279,7 +278,7 @@ public class DanikorResourceBackServiceImpl extends Service implements DanikorRe chartParamList.add(chartParam); } - return JSON.toJSONString(chartParamList); + return chartParamList; } } diff --git a/src/com/engine/organization/web/DanikorResourceBackController.java b/src/com/engine/organization/web/DanikorResourceBackController.java index 9a0a3daa..437ca3c5 100644 --- a/src/com/engine/organization/web/DanikorResourceBackController.java +++ b/src/com/engine/organization/web/DanikorResourceBackController.java @@ -1,9 +1,12 @@ package com.engine.organization.web; +import com.alibaba.fastjson.JSON; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; +import com.engine.organization.entity.danikor.param.ChartParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.DanikorResourceBackWrapper; +import org.apache.commons.collections.CollectionUtils; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -15,6 +18,8 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -88,26 +93,36 @@ public class DanikorResourceBackController { @POST @Path("/getOrgChartData") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult getOrgChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public Map getOrgChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + Map returnMap = new HashMap<>(); try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getDanikorResourceBackWrapper(user).getOrgChartData(request, map)); + String orgChartData = getDanikorResourceBackWrapper(user).getOrgChartData(request, map); + returnMap.put("data", orgChartData); + returnMap.put("status", "1"); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + returnMap.put("status", "-1"); + returnMap.put("message", "发生未知错误，请与管理员联系"); } + return returnMap; } @POST @Path("/getResourceChartData") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult getResourceChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public Map getResourceChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + Map returnMap = new HashMap<>(); try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getDanikorResourceBackWrapper(user).getResourceChartData(map)); + List resourceChartData = getDanikorResourceBackWrapper(user).getResourceChartData(map); + returnMap.put("data", CollectionUtils.isEmpty(resourceChartData) ? null : JSON.toJSONString(resourceChartData)); + returnMap.put("status", "1"); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + returnMap.put("status", "-1"); + returnMap.put("message", "发生未知错误，请与管理员联系"); } + return returnMap; } } diff --git a/src/com/engine/organization/wrapper/DanikorResourceBackWrapper.java b/src/com/engine/organization/wrapper/DanikorResourceBackWrapper.java index d6aec89b..8baad644 100644 --- a/src/com/engine/organization/wrapper/DanikorResourceBackWrapper.java +++ b/src/com/engine/organization/wrapper/DanikorResourceBackWrapper.java @@ -1,6 +1,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; +import com.engine.organization.entity.danikor.param.ChartParam; import com.engine.organization.service.DanikorResourceBackService; import com.engine.organization.service.impl.DanikorResourceBackServiceImpl; import com.engine.organization.util.MenuBtn; @@ -42,7 +43,7 @@ public class DanikorResourceBackWrapper extends OrganizationWrapper { return getDanikorResourceBackService(user).getOrgChartData(request, params); } - public String getResourceChartData(Map params) { + public List getResourceChartData(Map params) { return getDanikorResourceBackService(user).getResourceChartData(params); } }