From 6500e1b44ee81e3bafc9f0f7ad43fc4a9e00fcb8 Mon Sep 17 00:00:00 2001 From: Karyamsetty Helen Grace Date: Tue, 25 Jul 2023 19:27:24 +0530 Subject: [PATCH 1/2] NHM dashboard scheduler changes --- src/main/environment/common_test.properties | 4 ++-- .../java/com/iemr/common/model/sms/SmsAPIRequestModel.java | 7 ++++++- .../service/nhm_dashboard/NHM_DashboardServiceImpl.java | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties index 1d5d0097..57e182b6 100644 --- a/src/main/environment/common_test.properties +++ b/src/main/environment/common_test.properties @@ -63,9 +63,9 @@ cron-scheduler-registration=0 34 19 * * ? * start-everwelldatasync-scheduler=false cron-scheduler-everwelldatasync=0 0/5 * * * ? * ##-----------------------------------------------#NHM data dashboard schedular---------------------------------------------------------------- -# run at everyday 11:59PM +# run at everyday 12:01AM start-nhmdashboard-scheduler=true -cron-scheduler-nhmdashboard=0 59 23 * * ? * +cron-scheduler-nhmdashboard=0 1 * * * ? * ##-------------------------------------------------### Redis IP-------------------------------------------------------------- diff --git a/src/main/java/com/iemr/common/model/sms/SmsAPIRequestModel.java b/src/main/java/com/iemr/common/model/sms/SmsAPIRequestModel.java index 3737ca4a..df6fbdb8 100644 --- a/src/main/java/com/iemr/common/model/sms/SmsAPIRequestModel.java +++ b/src/main/java/com/iemr/common/model/sms/SmsAPIRequestModel.java @@ -1,6 +1,11 @@ package com.iemr.common.model.sms; -public class SmsAPIRequestModel { +import java.io.Serializable; + +import lombok.Data; + +@Data +public class SmsAPIRequestModel implements Serializable{ private String customerId; private StringBuffer destinationAddress; diff --git a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java index 0d0780d9..a248170a 100644 --- a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java +++ b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java @@ -206,7 +206,7 @@ public List callAgentSummaryReportCTI_API() throws IEMRExcep String fromDate = null; LocalDateTime date = null; - date = LocalDateTime.now(); + date = LocalDateTime.now().minusDays(1); String[] dateArr = date.toString().split("T"); endDate = dateArr[0].concat(" 23:59:59"); fromDate = dateArr[0].concat(" 00:00:01"); @@ -251,7 +251,7 @@ public List callDetailedCallReportCTI_API() throws IEMRExcep String fromDate = null; LocalDateTime date = null; - date = LocalDateTime.now(); + date = LocalDateTime.now().minusDays(1); String[] dateArr = date.toString().split("T"); endDate = dateArr[0].concat(" 23:59:59"); fromDate = dateArr[0].concat(" 00:00:01"); From 8c45e4d98aa2e96be3bf5f6222639bd15949ab7f Mon Sep 17 00:00:00 2001 From: Karyamsetty Helen Grace Date: Wed, 26 Jul 2023 15:54:44 +0530 Subject: [PATCH 2/2] 1097 sms changes --- .../iemr/common/data/feedback/FeedbackDetails.java | 1 - .../com/iemr/common/data/institute/Institute.java | 4 ++++ .../beneficiary/IEMRSearchUserServiceImpl.java | 6 ++++++ .../com/iemr/common/service/sms/SMSServiceImpl.java | 13 ++++++++++--- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java b/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java index bb006fb6..29ce69a4 100644 --- a/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java +++ b/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java @@ -97,7 +97,6 @@ public class FeedbackDetails { private String instiName; @Transient - @Expose private String instituteName = ""; @Column(name = "DesignationID") diff --git a/src/main/java/com/iemr/common/data/institute/Institute.java b/src/main/java/com/iemr/common/data/institute/Institute.java index e2a7fb0c..210d2fd3 100644 --- a/src/main/java/com/iemr/common/data/institute/Institute.java +++ b/src/main/java/com/iemr/common/data/institute/Institute.java @@ -174,6 +174,10 @@ public class Institute protected Institute() { } + + public String getInstituteName() { + return institutionName; + } public Institute(Integer institutionID, String institutionName) { diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java index 5996b81d..159f2b1f 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java @@ -277,6 +277,12 @@ public String findBeneficiary(BeneficiaryModel i_beneficiary, String auth) throw BigInteger numBig = new BigInteger(i_beneficiary.getBeneficiaryID()); identitySearchDTO.setBeneficiaryId(numBig); } + + if(i_beneficiary.getIs1097() != null && i_beneficiary.getIs1097() == true) { + i_beneficiary.setIs1097(true); + }else { + i_beneficiary.setIs1097(false); + } Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create(); List listBen = identityBeneficiaryService diff --git a/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java b/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java index 57094af6..08b790ed 100644 --- a/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java +++ b/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java @@ -28,6 +28,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Base64; import java.util.Calendar; import java.util.List; import java.util.Map; @@ -937,13 +938,16 @@ public void publishSMS() { // for fetching dltTemplateId String dltTemplateId = smsTemplateRepository.findDLTTemplateID(sms.getSmsTemplateID()); + if(dltTemplateId == null) + throw new Exception("No dltTemplateId template ID mapped"); SmsAPIRequestModel smsAPICredentials104 = new SmsAPIRequestModel(senderName, phoneNo, - sms.getSms(), sourceAddress, dltTemplateId, smsMessageType, smsEntityID); + sms.getSms(), sourceAddress, smsMessageType, dltTemplateId, smsEntityID); MultiValueMap headersLogin = new LinkedMultiValueMap(); headersLogin.add("Content-Type", "application/json"); - headersLogin.add("AUTHORIZATION", senderName + ":" + senderPassword); + String auth=senderName + ":" + senderPassword; + headersLogin.add("Authorization", "Basic "+Base64.getEncoder().encodeToString(auth.getBytes())); // smsPublishURL = smsPublishURL.replace("SMS_TEXT", // URLEncoder.encode(sms.getSms(), "UTF-8")) @@ -958,7 +962,10 @@ public void publishSMS() { if (responseLogin.getStatusCodeValue() == 200 & responseLogin.hasBody()) { String smsResponse = responseLogin.getBody(); JSONObject obj = new JSONObject(smsResponse); - String messageRequestId = obj.getString("MessageRequestId"); + String messageRequestId = null; + if(obj !=null) + messageRequestId = obj.getString("messageRequestId"); +// String messageRequestId = obj.getString("MessageRequestId"); // logger.info("SMS Sent successfully by calling API " + smsPublishURL); sms.setTransactionError(null); sms.setTransactionID(messageRequestId);