diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java index 343dd980..8441b35e 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java @@ -62,8 +62,7 @@ * */ @Service -public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService -{ +public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService { @Autowired CommonIdentityMapper identityMapper; @@ -75,7 +74,7 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic @Autowired Validator validator; - + @Autowired OutboundHistoryRepository outboundHistoryRepository; @@ -87,175 +86,54 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic /** * Inject IemrUserRegisterRepository */ - // @Autowired - // public void setBeneficiaryRepository(BeneficiaryRepository - // benificiaryRepository) { - // - // this.benificiaryRepository = benificiaryRepository; - // } - - // private BeneficiaryDemographicsRepository beneficiaryDemographicsRepository; - - // @Autowired - // public void setBeneficiaryDemographicsRepository( - // BeneficiaryDemographicsRepository beneficiaryDemographicsRepository) { - // this.beneficiaryDemographicsRepository = beneficiaryDemographicsRepository; - // } - - // private BenPhoneMapRepository benPhoneMapRepository; - - // @Autowired - // public void setBenPhoneMapRepository(BenPhoneMapRepository - // benPhoneMapRepository) { - // this.benPhoneMapRepository = benPhoneMapRepository; - // } private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Override - public Beneficiary save(Beneficiary benificiaryDetails) - { + public Beneficiary save(Beneficiary benificiaryDetails) { logger.info("benificiaryDetails: " + benificiaryDetails); - // CommonIdentityDTO identityDTO = - // identityMapper.BeneficiaryModelCommonIdentityDTO(benificiaryDetails); - // logger.info("identityDTO: "+identityDTO); - // commented below code as beneficiary has been removed from iemr - // Beneficiary savedBenificiaryDetails = - // benificiaryRepository.save(benificiaryDetails); - // if (benificiaryDetails.getI_bendemographics() != null) { - // benificiaryDetails.getI_bendemographics().setCreatedBy(savedBenificiaryDetails.getCreatedBy()); - // benificiaryDetails.getI_bendemographics() - // .setBeneficiaryRegID(savedBenificiaryDetails.getBeneficiaryRegID()); - // beneficiaryDemographicsRepository.save(benificiaryDetails.getI_bendemographics()); - // } - // if (benificiaryDetails.getBenPhoneMaps() != null) { - // for (int idx = 0; idx < benificiaryDetails.getBenPhoneMaps().size(); idx++) { - // benificiaryDetails.getBenPhoneMaps().get(idx) - // .setBenificiaryRegID(savedBenificiaryDetails.getBeneficiaryRegID()); - // if (benificiaryDetails.getBenPhoneMaps().get(idx).getParentBenRegID() == - // null) { - // benificiaryDetails.getBenPhoneMaps().get(idx) - // .setParentBenRegID(savedBenificiaryDetails.getBeneficiaryRegID()); - // } - // } - // benPhoneMapRepository.save(benificiaryDetails.getBenPhoneMaps()); - // } - // benificiaryRepository.addBeneficiaryID(savedBenificiaryDetails.getBeneficiaryRegID() - // + "", - // savedBenificiaryDetails.getBeneficiaryRegID()); - // updateBeneficiaryID(savedBenificiaryDetails.getBeneficiaryRegID() + "", - // savedBenificiaryDetails.getBeneficiaryRegID()); + return new Beneficiary(); // savedBenificiaryDetails; } @Async - private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID) - { - try - { + private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID) { + try { // benificiaryRepository.addBeneficiaryID(beneficiaryID, beneficiaryRegID); - } catch (Exception e) - { + } catch (Exception e) { logger.error("updateBeneficiaryID failed with error " + e.getMessage(), e); } } @Async @Override - public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException - { + public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException { Integer updatedRows = 0; - // try - // { - //// updatedRows = benificiaryRepository.updateDetailsbyID(benificiaryDetails.getTitleId(), - //// benificiaryDetails.getFirstName(), benificiaryDetails.getMiddleName(), - //// benificiaryDetails.getLastName(), benificiaryDetails.getStatusID(), - //// benificiaryDetails.getGenderID(), benificiaryDetails.getMaritalStatusID(), - //// benificiaryDetails.getdOB(), benificiaryDetails.getFatherName(), benificiaryDetails.getSpouseName(), - //// benificiaryDetails.getGovtIdentityNo(), benificiaryDetails.getGovtIdentityTypeID(), - //// benificiaryDetails.getRegisteredServiceID(), benificiaryDetails.isDeleted(), - //// benificiaryDetails.getBeneficiaryRegID(), benificiaryDetails.getSexualOrientationId(), - //// benificiaryDetails.getIsHIVPos(), benificiaryDetails.getPlaceOfWork(), - //// benificiaryDetails.getRemarks(), benificiaryDetails.getSourceOfInformation()); - // if (benificiaryDetails.getI_bendemographics() != null) - // { - // updatedRows = updateDemographics(benificiaryDetails.getI_bendemographics()); - // } - // if (benificiaryDetails.getBenPhoneMaps() != null) - // { - // List benPhoneMaps = benificiaryDetails.getBenPhoneMaps(); - //// for (BenPhoneMap benPhoneMap : benPhoneMaps) - //// { - //// logger.debug(benPhoneMap.toString()); - //// if (benPhoneMap.getBenPhMapID() != null) - //// { - //// benPhoneMapRepository.update(benPhoneMap.getBenPhMapID(), benPhoneMap.getBenificiaryRegID(), - //// benPhoneMap.getParentBenRegID(), benPhoneMap.getBenRelationshipID(), - //// benPhoneMap.getPhoneNo(), benPhoneMap.getPhoneTypeID(), benPhoneMap.getDeleted()); - //// } else - //// { - //// benPhoneMapRepository.save(new Gson().fromJson(benPhoneMap.toString(), BenPhoneMap.class)); - //// } - //// } - // } - // } catch (Exception e) - // { - // logger.error("updateBenificiary failed with error " + e.getMessage(), e); - // } - IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); if (benificiaryDetails.getBeneficiaryIdentities() != null - && benificiaryDetails.getBeneficiaryIdentities().size() > 0) - { + && benificiaryDetails.getBeneficiaryIdentities().size() > 0) { identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(), benificiaryDetails.getCreatedBy())); } identityEditDTO.setDob(benificiaryDetails.getDOB()); // String jsoninput=new Gson().toJson(identityEditDTO); - updatedRows = - identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth, benificiaryDetails.getIs1097()); - // updateBeneficiaryPreferredLanguage(identityEditDTO, auth); - - // updateMCTSRecord(benificiaryDetails); - + updatedRows = identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth, + benificiaryDetails.getIs1097()); + return updatedRows; } - private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) - { + private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) { int updatedRows = 0; System.out.println(i_BenDemographics); - // if - // (beneficiaryDemographicsRepository.getBeneficiaryDemograhics(i_BenDemographics.getBeneficiaryRegID()) - // .size() > 0) { - // updatedRows = - // beneficiaryDemographicsRepository.update(i_BenDemographics.getBeneficiaryRegID(), - // i_BenDemographics.getEducationID(), i_BenDemographics.getOccupationID(), - // i_BenDemographics.getIncomeStatusID(), i_BenDemographics.getCommunityID(), - // i_BenDemographics.getPreferredLangID(), i_BenDemographics.getReligionID(), - // i_BenDemographics.getIsPhoto(), i_BenDemographics.getPhotoFilePath(), - // i_BenDemographics.getIsBiometric(), i_BenDemographics.getBiometricFilePath(), - // i_BenDemographics.getAddressLine1(), i_BenDemographics.getAddressLine2(), - // i_BenDemographics.getAddressLine3(), i_BenDemographics.getAddressLine4(), - // i_BenDemographics.getAddressLine5(), i_BenDemographics.getCityID(), - // i_BenDemographics.getStateID(), - // i_BenDemographics.getCountryID(), i_BenDemographics.getPinCode(), - // i_BenDemographics.getIsAddPresent(), i_BenDemographics.getIsAddPermanent(), - // i_BenDemographics.getDeleted(), i_BenDemographics.getDistrictBranchID(), - // i_BenDemographics.getBlockID(), i_BenDemographics.getDistrictID()); - // } else { - // i_BenDemographics.setCreatedBy("updateProcess"); - // beneficiaryDemographicsRepository.save(i_BenDemographics); - // updatedRows++; - // } + return updatedRows; } @Override - public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception - { + public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception { // logger.info("benificiaryDetails: " + beneficiaryModel); @@ -265,128 +143,106 @@ public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servlet .setBenFamilyDTOs(identityMapper.benPhoneMapListToBenFamilyDTOList(beneficiaryModel.getBenPhoneMaps())); String request = InputMapper.getInstance().gson().toJson(identityDTO).toString(); + if (beneficiaryModel.getIs1097() == null) + beneficiaryModel.setIs1097(false); + String identityResponse = identityBeneficiaryService.getIdentityResponse(request, servletRequest.getHeader("authorization"), beneficiaryModel.getIs1097()); JSONObject responseObj = new JSONObject(identityResponse); BeneficiaryModel beneficiary = new BeneficiaryModel(); - if (responseObj.has("response")) - { + if (responseObj.has("response")) { OutputResponse response = InputMapper.getInstance() .fromJson(responseObj.getJSONObject("response").toString(), OutputResponse.class); - if (response.isSuccess()) - { - BeneficiariesDTO createdBen = - InputMapper.getInstance().fromJson(response.getData(), BeneficiariesDTO.class); + if (response.isSuccess()) { + BeneficiariesDTO createdBen = InputMapper.getInstance().fromJson(response.getData(), + BeneficiariesDTO.class); beneficiaryModel.setBeneficiaryRegID(Long.parseLong(createdBen.getBenRegId().toString())); beneficiaryModel.setBeneficiaryID(createdBen.getBenId().toString()); beneficiary = beneficiaryModel; - } - else - { - return response.toString(); + } else { + return response.toString(); } } return OutputMapper.gsonWithoutExposeRestriction().toJson(beneficiary); } + @Override - public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException{ + public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException { IdentityEditDTO identityEditDTO = new IdentityEditDTO(); - identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID()+"")); - if(benificiaryDetails.getI_bendemographics()!=null){ + identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID() + "")); + if (benificiaryDetails.getI_bendemographics() != null) { identityEditDTO.setCommunityId(benificiaryDetails.getI_bendemographics().getCommunityID()); identityEditDTO.setEducationId(benificiaryDetails.getI_bendemographics().getEducationID()); } - -//// identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); -// if (benificiaryDetails.getBeneficiaryIdentities() != null -// && benificiaryDetails.getBeneficiaryIdentities().size() > 0) -// { -// identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(), -// benificiaryDetails.getCreatedBy())); -// } -// identityEditDTO.setDob(benificiaryDetails.getDOB()); - - Integer updatedRows=0; - updatedRows = - identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth, benificiaryDetails.getIs1097()); + + Integer updatedRows = 0; + updatedRows = identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth, + benificiaryDetails.getIs1097()); // updateBeneficiaryPreferredLanguage(identityEditDTO, auth); return updatedRows; } - - private void updateMCTSRecord(BeneficiaryModel beneficiaryModel) - { + private void updateMCTSRecord(BeneficiaryModel beneficiaryModel) { List mctsOutboundCallDetails = new ArrayList(); - + try { - - mctsOutboundCallDetails= outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID()); - - MctsOutboundCallDetail callDetail= mctsOutboundCallDetails.get(0); - - if(callDetail !=null && callDetail.getIsMother()!=null) - { - + + mctsOutboundCallDetails = outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID()); + + MctsOutboundCallDetail callDetail = mctsOutboundCallDetails.get(0); + + if (callDetail != null && callDetail.getIsMother() != null) { + String firstName = beneficiaryModel.getFirstName(); String lastName = beneficiaryModel.getLastName(); - String name= ""; - if(lastName!=null && !lastName.equalsIgnoreCase("")) - { - name= firstName +" "+ lastName; + String name = ""; + if (lastName != null && !lastName.equalsIgnoreCase("")) { + name = firstName + " " + lastName; + } else { + name = firstName; } - else - { - name= firstName; - } - + Integer age = beneficiaryModel.getAge(); - - String districtName= outboundHistoryRepository.getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID()); - String talukaName= outboundHistoryRepository.getBlockName(beneficiaryModel.getI_bendemographics().getBlockID()); - String villageName= outboundHistoryRepository.getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID()); - - String gender=null; - if(beneficiaryModel.getGenderID()==1) - { - gender ="Male"; - } - else if(beneficiaryModel.getGenderID()==2) - { - gender ="Female"; - } - else - { - gender="Transgender"; + + String districtName = outboundHistoryRepository + .getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID()); + String talukaName = outboundHistoryRepository + .getBlockName(beneficiaryModel.getI_bendemographics().getBlockID()); + String villageName = outboundHistoryRepository + .getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID()); + + String gender = null; + if (beneficiaryModel.getGenderID() == 1) { + gender = "Male"; + } else if (beneficiaryModel.getGenderID() == 2) { + gender = "Female"; + } else { + gender = "Transgender"; } - + Timestamp lastModDate = Timestamp.valueOf(LocalDateTime.now()); - if(callDetail.getIsMother()==true) - { - int updateRow= outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName, villageName, - lastModDate, beneficiaryModel.getBeneficiaryRegID()); - } - else - { - int updateRow= outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName, villageName, - lastModDate, beneficiaryModel.getBeneficiaryRegID()); + if (callDetail.getIsMother() == true) { + int updateRow = outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName, + villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID()); + } else { + int updateRow = outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName, + villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID()); } } } catch (Exception e) { } - - + } @Override - public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception - { + public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception { logger.info("request: " + request.toString()); List listBen = identityBeneficiaryService.generateBeneficiaryIDs(request, servletRequest.getHeader("authorization")); - + return listBen.toString(); } } diff --git a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java index e48f4262..f55052a3 100644 --- a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java +++ b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java @@ -52,8 +52,10 @@ public enum DataType { } private static final Logger logger = LoggerFactory.getLogger(AESUtil.class); - private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; - private static final String SECRET_KEY_ALGORITHM = "PBKDF2WithHmacSHA1"; + + // private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; + private static final String CIPHER_ALGORITHM = "AES/CBC/ISO10126Padding"; + private static final String SECRET_KEY_ALGORITHM = "PBKDF2WithHmacSHA512"; private static final String KEY_ALGORITHM = "AES"; private final int IV_SIZE = 128;