diff --git a/src/com/api/organization/web/ImportCommonController.java b/src/com/api/organization/web/ImportCommonController.java new file mode 100644 index 00000000..141fe6d3 --- /dev/null +++ b/src/com/api/organization/web/ImportCommonController.java @@ -0,0 +1,12 @@ +package com.api.organization.web; + +import javax.ws.rs.Path; + +/** + * @author:dxfeng + * @createTime: 2022/06/29 + * @version: 1.0 + */ +@Path("/bs/hrmorganization/commonimport") +public class ImportCommonController extends com.engine.organization.web.ImportCommonController { +} diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index 5fd0df7e..5c0193b3 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -3,7 +3,6 @@ package com.engine.organization.service; import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; -import javax.servlet.http.HttpServletRequest; import java.util.Map; /** @@ -74,6 +73,4 @@ public interface HrmResourceService { * @return */ Map getHasRight(); - - Map saveImportResource(Map params, HttpServletRequest request); } diff --git a/src/com/engine/organization/service/ImportCommonService.java b/src/com/engine/organization/service/ImportCommonService.java new file mode 100644 index 00000000..7925b451 --- /dev/null +++ b/src/com/engine/organization/service/ImportCommonService.java @@ -0,0 +1,20 @@ +package com.engine.organization.service; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/06/29 + * @version: 1.0 + */ +public interface ImportCommonService { + /** + * 人员导入 + * + * @param params + * @param request + * @return + */ + Map saveImportResource(Map params, HttpServletRequest request); +} diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 9adfc849..5586877b 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -12,7 +12,6 @@ import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.extend.po.ExtendTitlePO; -import com.engine.organization.entity.hrmresource.param.HrmResourceImportParam; import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; import com.engine.organization.entity.job.bo.JobBO; @@ -24,8 +23,6 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.ExtService; -import com.engine.organization.service.HrmResourceImportAdaptService; -import com.engine.organization.service.HrmResourceImportProcessService; import com.engine.organization.service.HrmResourceService; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; @@ -36,12 +33,10 @@ import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; -import weaver.file.FileUploadToPath; import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.User; -import javax.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; @@ -250,47 +245,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return btnDatas; } - @Override - public Map saveImportResource(Map params, HttpServletRequest request) { - - Map retmap = new HashMap(); - try { - /*综合考虑多数据源后，实现通过配置文件配置适配器和解析类*/ - List lsErrorInfo = new ArrayList(); - - HrmResourceImportAdaptService importAdapt = (HrmResourceImportAdaptService) Class.forName("com.engine.organization.service.impl.HrmResourceImportAdaptServiceImpl").newInstance(); - - FileUploadToPath fu = new FileUploadToPath(request); - - int language = this.user.getLanguage(); - importAdapt.setUserlanguage(language); - List errorInfo = importAdapt.creatImportMap(fu); - - //如果读取数据和验证模板没有发生错误 - if (errorInfo.isEmpty()) { - Map hrMap = importAdapt.getHrmImportMap(); - HrmResourceImportProcessService importProcess = (HrmResourceImportProcessService) Class.forName("com.engine.organization.service.impl.HrmResourceImportProcessServiceImpl").newInstance(); - importProcess.init(request); - importProcess.processMap(hrMap); - } else { - if (errorInfo != null && !errorInfo.isEmpty()) { - Map error; - for (int i = 0; i < errorInfo.size(); i++) { - error = new HashMap<>(); - error.put("message", Util.null2String(errorInfo.get(i))); - lsErrorInfo.add(error); - } - } - } - retmap.put("errorInfo", lsErrorInfo); - retmap.put("status", "1"); - } catch (Exception e) { - retmap.put("status", "-1"); - retmap.put("message", e.getMessage()); - } - return retmap; - } - /** * 查询条件 * diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java new file mode 100644 index 00000000..45767118 --- /dev/null +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -0,0 +1,64 @@ +package com.engine.organization.service.impl; + +import com.engine.core.impl.Service; +import com.engine.organization.entity.hrmresource.param.HrmResourceImportParam; +import com.engine.organization.service.HrmResourceImportAdaptService; +import com.engine.organization.service.HrmResourceImportProcessService; +import com.engine.organization.service.ImportCommonService; +import weaver.file.FileUploadToPath; +import weaver.general.Util; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/06/29 + * @version: 1.0 + */ +public class ImportCommonServiceImpl extends Service implements ImportCommonService { + + @Override + public Map saveImportResource(Map params, HttpServletRequest request) { + + Map retmap = new HashMap(); + try { + /*综合考虑多数据源后，实现通过配置文件配置适配器和解析类*/ + List lsErrorInfo = new ArrayList(); + + HrmResourceImportAdaptService importAdapt = (HrmResourceImportAdaptService) Class.forName("com.engine.organization.service.impl.HrmResourceImportAdaptServiceImpl").newInstance(); + + FileUploadToPath fu = new FileUploadToPath(request); + + int language = this.user.getLanguage(); + importAdapt.setUserlanguage(language); + List errorInfo = importAdapt.creatImportMap(fu); + + //如果读取数据和验证模板没有发生错误 + if (errorInfo.isEmpty()) { + Map hrMap = importAdapt.getHrmImportMap(); + HrmResourceImportProcessService importProcess = (HrmResourceImportProcessService) Class.forName("com.engine.organization.service.impl.HrmResourceImportProcessServiceImpl").newInstance(); + importProcess.init(request); + importProcess.processMap(hrMap); + } else { + if (errorInfo != null && !errorInfo.isEmpty()) { + Map error; + for (int i = 0; i < errorInfo.size(); i++) { + error = new HashMap<>(); + error.put("message", Util.null2String(errorInfo.get(i))); + lsErrorInfo.add(error); + } + } + } + retmap.put("errorInfo", lsErrorInfo); + retmap.put("status", "1"); + } catch (Exception e) { + retmap.put("status", "-1"); + retmap.put("message", e.getMessage()); + } + return retmap; + } +} diff --git a/src/com/engine/organization/util/excel/ExcelParseHelper.java b/src/com/engine/organization/util/excel/ExcelParseHelper.java index 9c7f2d57..6a4bd001 100644 --- a/src/com/engine/organization/util/excel/ExcelParseHelper.java +++ b/src/com/engine/organization/util/excel/ExcelParseHelper.java @@ -1,8 +1,5 @@ package com.engine.organization.util.excel; -import com.engine.salary.util.excel.ExcelParseException; -import com.engine.salary.util.excel.ExcelProperty; -import com.engine.salary.util.excel.ExcelSupport; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.exception.ContextedRuntimeException; @@ -14,7 +11,7 @@ import java.lang.reflect.Field; import java.math.BigDecimal; import java.util.*; -import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; +import static com.engine.organization.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; /** * Excel 解析工具类 diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index db1f325e..b3c5e9ac 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -187,18 +187,4 @@ public class HrmResourceController { return ReturnResult.exceptionHandle(e.getMessage()); } } - - - @POST - @Path("/saveImportResource") - @Produces(MediaType.APPLICATION_JSON) - public ReturnResult saveImportResource(@Context HttpServletRequest request, @Context HttpServletResponse response) { - try { - User user = HrmUserVarify.getUser(request, response); - Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getHrmResourceWrapper(user).saveImportResource(map, request)); - } catch (Exception e) { - return ReturnResult.exceptionHandle(e.getMessage()); - } - } } diff --git a/src/com/engine/organization/web/ImportCommonController.java b/src/com/engine/organization/web/ImportCommonController.java new file mode 100644 index 00000000..1780e17b --- /dev/null +++ b/src/com/engine/organization/web/ImportCommonController.java @@ -0,0 +1,42 @@ +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.ImportCommonWrapper; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.POST; +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.Map; + +/** + * @author:dxfeng + * @createTime: 2022/06/29 + * @version: 1.0 + */ +public class ImportCommonController { + + private ImportCommonWrapper getImportCommonWrapper(User user) { + return ServiceUtil.getService(ImportCommonWrapper.class, user); + } + + @POST + @Path("/saveImportResource") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult saveImportResource(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getImportCommonWrapper(user).saveImportResource(map, request)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } +} diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java index 26f38310..ea57986b 100644 --- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -8,7 +8,6 @@ import com.engine.organization.service.HrmResourceService; import com.engine.organization.service.impl.HrmResourceServiceImpl; import weaver.hrm.User; -import javax.servlet.http.HttpServletRequest; import java.util.Map; /** @@ -54,7 +53,5 @@ public class HrmResourceWrapper extends Service { return getHrmResourceService(user).getHasRight(); } - public Map saveImportResource(Map params, HttpServletRequest request) { - return getHrmResourceService(user).saveImportResource(params, request); - } + } diff --git a/src/com/engine/organization/wrapper/ImportCommonWrapper.java b/src/com/engine/organization/wrapper/ImportCommonWrapper.java new file mode 100644 index 00000000..2a5d99c5 --- /dev/null +++ b/src/com/engine/organization/wrapper/ImportCommonWrapper.java @@ -0,0 +1,26 @@ +package com.engine.organization.wrapper; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.organization.service.ImportCommonService; +import com.engine.organization.service.impl.ImportCommonServiceImpl; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/06/29 + * @version: 1.0 + */ +public class ImportCommonWrapper extends Service { + + private ImportCommonService getImportCommonService(User user) { + return ServiceUtil.getService(ImportCommonServiceImpl.class, user); + } + + public Map saveImportResource(Map params, HttpServletRequest request) { + return getImportCommonService(user).saveImportResource(params, request); + } +}