diff --git a/src/com/api/organization/web/CompanyController.java b/src/com/api/organization/web/GroupController.java similarity index 69% rename from src/com/api/organization/web/CompanyController.java rename to src/com/api/organization/web/GroupController.java index 99315b08..fe147c93 100644 --- a/src/com/api/organization/web/CompanyController.java +++ b/src/com/api/organization/web/GroupController.java @@ -10,6 +10,6 @@ import javax.ws.rs.Path; * @version: 1.0 */ @Path("/bs/hrmorganization/group") -public class CompanyController extends com.engine.organization.web.CompanyController { +public class GroupController extends com.engine.organization.web.GroupController { } diff --git a/src/com/engine/organization/service/CompanyService.java b/src/com/engine/organization/service/GroupService.java similarity index 80% rename from src/com/engine/organization/service/CompanyService.java rename to src/com/engine/organization/service/GroupService.java index 3c4761d8..fb704c21 100644 --- a/src/com/engine/organization/service/CompanyService.java +++ b/src/com/engine/organization/service/GroupService.java @@ -8,14 +8,14 @@ import java.util.Map; * @createTime: 2022/05/16 * @version: 1.0 */ -public interface CompanyService { +public interface GroupService { /** * 新增、编辑表单 * * @param params * @return */ - Map getCompanyFormField(Map params); + Map getGroupFormField(Map params); /** * 获取列表页面按钮信息 diff --git a/src/com/engine/organization/service/impl/CompanyServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java similarity index 94% rename from src/com/engine/organization/service/impl/CompanyServiceImpl.java rename to src/com/engine/organization/service/impl/GroupServiceImpl.java index 24ee0e34..fb431936 100644 --- a/src/com/engine/organization/service/impl/CompanyServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -4,7 +4,7 @@ import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.engine.core.impl.Service; import com.engine.organization.entity.TopTab; -import com.engine.organization.service.CompanyService; +import com.engine.organization.service.GroupService; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationFormItemUtil; import weaver.conn.RecordSet; @@ -22,9 +22,9 @@ import java.util.Map; * @createTime: 2022/05/16 * @version: 1.0 */ -public class CompanyServiceImpl extends Service implements CompanyService { +public class GroupServiceImpl extends Service implements GroupService { @Override - public Map getCompanyFormField(Map params) { + public Map getGroupFormField(Map params) { Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); diff --git a/src/com/engine/organization/web/CompanyController.java b/src/com/engine/organization/web/GroupController.java similarity index 75% rename from src/com/engine/organization/web/CompanyController.java rename to src/com/engine/organization/web/GroupController.java index 213d406a..8a4abdf4 100644 --- a/src/com/engine/organization/web/CompanyController.java +++ b/src/com/engine/organization/web/GroupController.java @@ -3,7 +3,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.util.response.ReturnResult; -import com.engine.organization.wrapper.CompanyWrapper; +import com.engine.organization.wrapper.GroupWrapper; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -22,9 +22,9 @@ import java.util.Map; * @createTime: 2022/05/16 * @version: 1.0 */ -public class CompanyController { - public CompanyWrapper getCompanyWrapper(User user) { - return ServiceUtil.getService(CompanyWrapper.class, user); +public class GroupController { + public GroupWrapper getGroupWrapper(User user) { + return ServiceUtil.getService(GroupWrapper.class, user); } /** @@ -35,13 +35,13 @@ public class CompanyController { * @return */ @GET - @Path("/getCompanyFormField") + @Path("/getGroupFormField") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult getCompanyFormField(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public ReturnResult getGroupFormField(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getCompanyWrapper(user).getCompanyFormField(map)); + return ReturnResult.successed(getGroupWrapper(user).getGroupFormField(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } @@ -60,7 +60,7 @@ public class CompanyController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompanyWrapper(user).getHasRight()); + return ReturnResult.successed(getGroupWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } @@ -72,7 +72,7 @@ public class CompanyController { public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompanyWrapper(user).getTabInfo()); + return ReturnResult.successed(getGroupWrapper(user).getTabInfo()); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/CompanyWrapper.java b/src/com/engine/organization/wrapper/GroupWrapper.java similarity index 52% rename from src/com/engine/organization/wrapper/CompanyWrapper.java rename to src/com/engine/organization/wrapper/GroupWrapper.java index b8310aab..2c9bd5c0 100644 --- a/src/com/engine/organization/wrapper/CompanyWrapper.java +++ b/src/com/engine/organization/wrapper/GroupWrapper.java @@ -2,8 +2,8 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.service.CompanyService; -import com.engine.organization.service.impl.CompanyServiceImpl; +import com.engine.organization.service.GroupService; +import com.engine.organization.service.impl.GroupServiceImpl; import weaver.hrm.User; import java.util.Map; @@ -14,9 +14,9 @@ import java.util.Map; * @createTime: 2022/05/16 * @version: 1.0 */ -public class CompanyWrapper extends Service { - private CompanyService getCompanyService(User user) { - return ServiceUtil.getService(CompanyServiceImpl.class, user); +public class GroupWrapper extends Service { + private GroupService getGroupService(User user) { + return ServiceUtil.getService(GroupServiceImpl.class, user); } @@ -26,8 +26,8 @@ public class CompanyWrapper extends Service { * @param params * @return */ - public Map getCompanyFormField(Map params) { - return getCompanyService(user).getCompanyFormField(params); + public Map getGroupFormField(Map params) { + return getGroupService(user).getGroupFormField(params); } /** @@ -36,7 +36,7 @@ public class CompanyWrapper extends Service { * @return */ public Map getHasRight() { - return getCompanyService(user).getHasRight(); + return getGroupService(user).getHasRight(); } /** @@ -45,6 +45,6 @@ public class CompanyWrapper extends Service { * @return */ public Map getTabInfo() { - return getCompanyService(user).getTabInfo(); + return getGroupService(user).getTabInfo(); } }