From fc4d1e17b9ed87e34835316d0e8b89feebe32be6 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 11 九月 2023 17:54:29 +0800 Subject: [PATCH] 人员组织结构申请接口开发 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 285 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java index fd19302..58a119c 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java @@ -352,14 +352,23 @@ */ @Override public ResultOrgData syncDataForPerson(PersonData personData) { + boolean isUsedFlag= personAndDeptConfig.isUsedFlag(); ResultOrgData resultOrgData=new ResultOrgData(); + + boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode(); + String systemCode=personData.getSystemCode(); List<ResultMdMapping> resultMdMappingList=new ArrayList<>(); boolean success=true; String message=""; if(isUsedFlag){ - List<PersonMasterData> masterDataList = personData.getMasterData(); + List<PersonMasterData> masterDataList=new ArrayList<>(); + List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields()); try { + if(personData==null){ + throw new Throwable("浼犲叆鍙傛暟涓簄ull"); + } + masterDataList = personData.getMasterData(); String personLibrary = personAndDeptConfig.getPersonLibrary(); if (StringUtils.isBlank(personLibrary)) { success=false; @@ -400,15 +409,31 @@ object.setEditor(personMasterData.getModifier());//淇敼鑰� object.setId(personMasterData.getId());//涓婚敭 object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂� - Map<String,String> dataMap= VciBaseUtil.objectToMapString(personMasterData); List<ProppertyVO> proppertyVOList=new ArrayList<>(); + /*** + * 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊� + */ + fields.stream().forEach(field->{ + if(dataMap.containsKey(field)){ + String enumFiled= dataMap.get(field); + EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class); + String enumCode=enumerableData.getCode(); + //String enumCodeValue=enumerableData.getName(); + ProppertyVO proppertyVO=new ProppertyVO(); + proppertyVO.setKey(field); + proppertyVO.setValue(enumCode); + proppertyVOList.add(proppertyVO); + dataMap.remove(field); + } + }); dataMap.forEach((key,vaule)->{ ProppertyVO proppertyVO=new ProppertyVO(); proppertyVO.setKey(key); proppertyVO.setValue(vaule); proppertyVOList.add(proppertyVO); }); + object.setProp(proppertyVOList); if(personMasterData.getDr()==1){ object.setOperate("delete");//鎿嶄綔绫诲瀷 @@ -470,7 +495,7 @@ LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>(); if(editDatasVO.getObject()!=null&&editDatasVO.getObject().size()>0){ DataObjectVO dataObjectVO = new DataObjectVO(); - this.getConfigDatas("ERP", personLibrary, editDatasVO, attrVOS, dataObjectVO); + this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO); log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�"); boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode(); mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode); @@ -478,7 +503,7 @@ } if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) { DataObjectVO dataObjectVO = new DataObjectVO(); - this.getConfigDatas("ERP", personLibrary, editDatasVO, attrVOS, dataObjectVO); + this.getConfigDatas(systemCode, personLibrary, applyDatasVO, attrVOS, dataObjectVO); CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid()); CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo); @@ -492,6 +517,7 @@ CodeOrderDTO orderDTO = new CodeOrderDTO(); List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>(); orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭 + orderDTO.setTemplateOid(templateVO.getOid()); if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) { ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> { if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁 @@ -503,6 +529,7 @@ } }); } + orderDTO.setCodeRuleOid(ruleVO.getOid()); orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜 orderDTO.setData(rowData.getFiledValue()); engineService.addSaveCode(orderDTO); @@ -533,6 +560,11 @@ resultMdMappingList.add(resultMdMapping); }); log.info("end锛氱敵璇疯幏鍙栧畬姣�"); + //濡傛灉鏈夌敵璇峰氨鍘昏皟鐢ㄧ敵璇烽泦鍥㈢爜 + if(isPersonApplyGroupCode){ + List<String> oidList=new ArrayList<>(); + mdmIOService.sendApplyGroupcode(oidList,templateVO.getBtmTypeId(),sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue()); + } } }catch (Throwable e){ success=false; @@ -554,10 +586,17 @@ resultOrgData.setSuccess(success); resultOrgData.setMdMappings(resultMdMappingList); Object object = JSONObject.toJSON(resultOrgData); - return resultOrgData; + } + String resultStr = JSONObject.toJSONString(resultOrgData); + String data = JSONObject.toJSONString(personData); + try { + //璁板綍鏃ュ織 + this.saveLogs(systemCode, systemCode, data, resultStr, success, msg, "syncDataForPerson"); + }catch (Throwable e){ + e.printStackTrace(); } } - Object object = JSONObject.toJSON(resultOrgData); + return resultOrgData; } /**** @@ -568,7 +607,246 @@ */ @Override public ResultOrgData syncDataForOrg(OrgData orgData) { - return null; + boolean isUsedFlag= personAndDeptConfig.isUsedFlag(); + ResultOrgData resultOrgData=new ResultOrgData(); + + boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode(); + List<ResultMdMapping> resultMdMappingList=new ArrayList<>(); + boolean success=true; + String message=""; + String systemCode=""; + if(isUsedFlag){ + List<OrgMasterData> orgMasterDataList=new ArrayList<>(); + List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields()); + try { + if(orgData==null){ + throw new Throwable("浼犲叆鍙傛暟涓簄ull"); + } + systemCode=orgData.getSystemCode(); + orgMasterDataList = orgData.getMasterData(); + String personLibrary = personAndDeptConfig.getPersonLibrary(); + if (StringUtils.isBlank(personLibrary)) { + success=false; + log.info("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary); + throw new Throwable("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary); + } + String personClassCode = personAndDeptConfig.getPersonClassCode(); + ClassfyVO classfyVO = new ClassfyVO(); + classfyVO.setLibrary(personLibrary); + classfyVO.setClassCode(personClassCode); + CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary); + log.info("end锛氬垎绫绘煡璇㈠畬姣�"); + //鑾峰彇鍒嗙被妯℃澘淇℃伅 + if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){ + success=false; + throw new Throwable ("鏍规嵁閰嶇疆鍒嗙被鐨勫垎绫荤紪鍙凤紝鏈幏鍙栧埌鍒嗙被淇℃伅"); + } + CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid()); + if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){ + success=false; + throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�"); + } + + List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag()) + ).collect(Collectors.toList()); + List<Map> dataList=new ArrayList<>(); + List<String> codeList=new ArrayList<>(); + List<ApplyDataVO> applyDataVOList=new ArrayList<>(); + List<ApplyDataVO> deleteDataVOList=new ArrayList<>(); + orgMasterDataList.stream().forEach(personMasterData -> { + ApplyDataVO object=new ApplyDataVO(); + object.setCode(personMasterData.getMdm_code());//缂栫爜 + object.setCreator(personMasterData.getCreator());//鍒涘缓鑰� + object.setEditor(personMasterData.getModifier());//淇敼鑰� + object.setId(personMasterData.getPk_mdm());//涓婚敭 + object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂� + Map<String,String> dataMap= VciBaseUtil.objectToMapString(personMasterData); + List<ProppertyVO> proppertyVOList=new ArrayList<>(); + /*** + * 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊� + */ + fields.stream().forEach(field->{ + if(dataMap.containsKey(field)){ + String enumFiled= dataMap.get(field); + EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class); + String enumCode=enumerableData.getCode(); + //String enumCodeValue=enumerableData.getName(); + ProppertyVO proppertyVO=new ProppertyVO(); + proppertyVO.setKey(field); + proppertyVO.setValue(enumCode); + proppertyVOList.add(proppertyVO); + dataMap.remove(field); + } + }); + dataMap.forEach((key,vaule)->{ + ProppertyVO proppertyVO=new ProppertyVO(); + proppertyVO.setKey(key); + proppertyVO.setValue(vaule); + proppertyVOList.add(proppertyVO); + }); + + object.setProp(proppertyVOList); + if(personMasterData.getDr()==1){ + object.setOperate("delete");//鎿嶄綔绫诲瀷 + deleteDataVOList.add(object); + }else{ + codeList.add(personMasterData.getMdm_code()); + object.setOperate("create"); + applyDataVOList.add(object); + } + }); + + R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId()); + if(!r.isSuccess()) { + throw new Throwable(r.getMsg()); + } + BtmTypeVO btmTypeVO = r.getData(); + if (btmTypeVO == null) { + throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�"); + } + String tableName = btmTypeVO.getTableName(); + if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) { + throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�"); + } + StringBuffer sb=new StringBuffer(); + sb.append(" select * from "); + sb.append(tableName); + sb.append(" where 1=1 "); + sb.append(" and lastr=1 and lastv=1" ); + sb.append(" and id in ("); + sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0]))); + sb.append(")"); + List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString()); + List<ClientBusinessObject> cboList= ChangeMapTOClientBusinessObjects(dataMapList); + ApplyDatasVO applyDatasVO=new ApplyDatasVO(); + ApplyDatasVO editDatasVO=new ApplyDatasVO(); + if(!CollectionUtils.isEmpty(cboList)){ + Map<String,ClientBusinessObject> oldpplyDataVOMap= cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t)); + //鏁版嵁搴撲笉瀛樺湪鐨� + List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> { + String code =cbo.getCode(); + return !oldpplyDataVOMap.containsKey(code); + }).collect(Collectors.toList()); + applyDatasVO.setObject(applyApplyDataVOList); + //鏁版嵁搴撳瓨鍦ㄧ殑 + List<ApplyDataVO> editApplyDataVOList = applyDataVOList.stream().filter(cbo -> { + String code =cbo.getCode(); + if(oldpplyDataVOMap.containsKey(code)){ + cbo.setOperate("update"); + } + return oldpplyDataVOMap.containsKey(code); + }).collect(Collectors.toList()); + editApplyDataVOList.addAll(deleteDataVOList); + editDatasVO.setObject(editApplyDataVOList); + }else{ + applyDatasVO.setObject(applyDataVOList); + } + + LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>(); + if(editDatasVO.getObject()!=null&&editDatasVO.getObject().size()>0){ + DataObjectVO dataObjectVO = new DataObjectVO(); + this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO); + log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�"); + boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode(); + mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode); + log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�"); + } + if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) { + DataObjectVO dataObjectVO = new DataObjectVO(); + this.getConfigDatas(systemCode, personLibrary, applyDatasVO, attrVOS, dataObjectVO); + + CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid()); + CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo); + if(ruleVO==null||"".equals(ruleVO.getOid())){ + throw new Throwable("缂栫爜瑙勫垯"); + } + List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>(); + dataObjectVO.getRowData().parallelStream().forEach(rowData->{ + String mesg=""; + try { + CodeOrderDTO orderDTO = new CodeOrderDTO(); + List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>(); + orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭 + orderDTO.setTemplateOid(templateVO.getOid()); + if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) { + ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> { + if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁 + CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO(); + CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid()); + CodeOrderSecDTO.setSecValue(rowData.getCode()); + codeOrderSecDTOList.add(CodeOrderSecDTO); + + } + }); + } + orderDTO.setCodeRuleOid(ruleVO.getOid()); + orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜 + orderDTO.setData(rowData.getFiledValue()); + engineService.addSaveCode(orderDTO); + } catch (Exception e) { + mesg=e.getMessage(); + e.getMessage(); + e.printStackTrace(); + }finally { + XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO(); + x.setId(rowData.getOid()); + x.setCode(rowData.getCode()); + x.setMsg(mesg); + x.setErrorid("1"); + xDOs.add(x); + } + }); + resultDataObjectDetailDOs.addAll(xDOs); + boolean finalSuccess1 = success; + String finalMessage1 = message; + resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{ + ResultMdMapping resultMdMapping=new ResultMdMapping(); + resultMdMapping.setBusiDataId(resultDataObjectDetailDO.getId()); + resultMdMapping.setSuccess(finalSuccess1); + resultMdMapping.setEntityCode(" "); + resultMdMapping.setMdmCode(resultDataObjectDetailDO.getCode()); + resultMdMapping.setMessage(finalMessage1); + resultMdMapping.setSubMdMappings(null); + resultMdMappingList.add(resultMdMapping); + }); + log.info("end锛氱敵璇疯幏鍙栧畬姣�"); + //濡傛灉鏈夌敵璇峰氨鍘昏皟鐢ㄧ敵璇烽泦鍥㈢爜 + if(isPersonApplyGroupCode){ + List<String> oidList=new ArrayList<>(); + mdmIOService.sendApplyGroupcode(oidList,templateVO.getBtmTypeId(),sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue()); + } + } + }catch (Throwable e){ + success=false; + message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage(); + //缁勭粐杩斿洖缁撴灉 + boolean finalSuccess = success; + String finalMessage = message; + orgMasterDataList.stream().forEach(masterData -> { + ResultMdMapping resultMdMapping=new ResultMdMapping(); + resultMdMapping.setBusiDataId(masterData.getPk_mdm()); + resultMdMapping.setSuccess(finalSuccess); + resultMdMapping.setEntityCode(" "); + resultMdMapping.setMdmCode(masterData.getMdm_code()); + resultMdMapping.setMessage(finalMessage); + resultMdMapping.setSubMdMappings(null); + }); + }finally { + resultOrgData.setMessage(message); + resultOrgData.setSuccess(success); + resultOrgData.setMdMappings(resultMdMappingList); + Object object = JSONObject.toJSON(resultOrgData); + } + String resultStr = JSONObject.toJSONString(resultOrgData); + String data = JSONObject.toJSONString(orgData); + try { + //璁板綍鏃ュ織 + this.saveLogs(systemCode, systemCode, data, resultStr, success, msg, "syncDataForOrg"); + }catch (Throwable e){ + e.printStackTrace(); + } + } + return resultOrgData; } /*** * 缁熶竴鏇存柊鎺ュ彛锛堟洿鏀圭姸鎬侊紝鏇存敼灞炴�т俊鎭級鎺ュ彛 -- Gitblit v1.9.3