From d63522730ae8f362147226f49c2ac1e5fae17908 Mon Sep 17 00:00:00 2001 From: swetatech24 Date: Fri, 14 Jul 2023 17:41:05 +0530 Subject: [PATCH 1/2] API Cleanup --- .../common/controller/cti/CTIController.java | 2 +- .../NHMDashboardController.java | 2 +- .../QuestionTypeController.java | 16 +- .../QuestionnaireController.java | 38 +- .../controller/scheme/SchemeController.java | 75 ++- .../secondaryReport/CRMSecondaryReports.java | 494 +++++++++--------- .../services/CategoryController.java | 22 +- .../controller/services/CommonController.java | 118 +++-- .../services/ServiceController.java | 69 --- .../common/controller/sms/SMSController.java | 157 +++--- .../controller/snomedct/SnomedController.java | 7 +- .../controller/swaasa/SwaasaController.java | 27 +- ...java => UPTechnicalSupportController.java} | 9 +- .../users/EmployeeSignatureController.java | 35 +- .../controller/users/IEMRAdminController.java | 167 +++--- .../controller/version/VersionController.java | 42 +- 16 files changed, 553 insertions(+), 727 deletions(-) rename src/main/java/com/iemr/common/controller/{nhm_dashboard => nhmdashboard}/NHMDashboardController.java (98%) delete mode 100644 src/main/java/com/iemr/common/controller/services/ServiceController.java rename src/main/java/com/iemr/common/controller/uptsu/{UptsuController.java => UPTechnicalSupportController.java} (92%) diff --git a/src/main/java/com/iemr/common/controller/cti/CTIController.java b/src/main/java/com/iemr/common/controller/cti/CTIController.java index 5be9477b..388e84bd 100644 --- a/src/main/java/com/iemr/common/controller/cti/CTIController.java +++ b/src/main/java/com/iemr/common/controller/cti/CTIController.java @@ -142,7 +142,7 @@ public String getCampaignNames( } @CrossOrigin() - @ApiOperation(value = "get login key") + @ApiOperation(value = "Get login key") @RequestMapping(value = "/getLoginKey", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getLoginKey( @ApiParam("{\"username\":\"String: user name\", \"password\":\"String: password\"}") @RequestBody String request, diff --git a/src/main/java/com/iemr/common/controller/nhm_dashboard/NHMDashboardController.java b/src/main/java/com/iemr/common/controller/nhmdashboard/NHMDashboardController.java similarity index 98% rename from src/main/java/com/iemr/common/controller/nhm_dashboard/NHMDashboardController.java rename to src/main/java/com/iemr/common/controller/nhmdashboard/NHMDashboardController.java index 02e0de26..641d83c3 100644 --- a/src/main/java/com/iemr/common/controller/nhm_dashboard/NHMDashboardController.java +++ b/src/main/java/com/iemr/common/controller/nhmdashboard/NHMDashboardController.java @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see https://www.gnu.org/licenses/. */ -package com.iemr.common.controller.nhm_dashboard; +package com.iemr.common.controller.nhmdashboard; import java.util.Arrays; diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java index c9390814..34197318 100644 --- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java +++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java @@ -35,6 +35,7 @@ import com.iemr.common.service.questionconfig.QuestionTypeService; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @RestController @@ -57,14 +58,11 @@ public void setQuestionTypeService(QuestionTypeService questionTypeService) { this.questionTypeService = questionTypeService; } - /** - * - * @param request - * @return - */ @CrossOrigin() + @ApiOperation(value = "Put question type") @RequestMapping(value = "/put/questionType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String createQuestionType(@ApiParam(value="{\\\"questionType\\\":\\\"String\\\",\\\"questionTypeDesc\\\":\\\"String\\\"}\"")@RequestBody String request) { + public String createQuestionType( + @ApiParam(value = "{\\\"questionType\\\":\\\"String\\\",\\\"questionTypeDesc\\\":\\\"String\\\"}\"") @RequestBody String request) { OutputResponse response = new OutputResponse(); try { response.setResponse(questionTypeService.createQuestionType(request)); @@ -76,12 +74,8 @@ public String createQuestionType(@ApiParam(value="{\\\"questionType\\\":\\\"Stri return response.toString(); } - /** - * - * @param request - * @return - */ @CrossOrigin() + @ApiOperation(value = "Get question type list") @RequestMapping(value = "/get/questionTypeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String questionTypeList() { OutputResponse response = new OutputResponse(); diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java index 9690c0a5..30109337 100644 --- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java +++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java @@ -34,10 +34,11 @@ import com.iemr.common.service.questionconfig.QuestionnaireService; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; + @RestController @RequestMapping("/questionnaireController") -public class QuestionnaireController -{ +public class QuestionnaireController { final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @@ -49,27 +50,19 @@ public class QuestionnaireController /** * Inject Question Type Repository */ - public void setQuestionnaireService(QuestionnaireService questionnaireService) - { + public void setQuestionnaireService(QuestionnaireService questionnaireService) { this.questionnaireService = questionnaireService; } - /** - * - * @param request - * @return - */ @CrossOrigin() + @ApiOperation(value = "Put questionnaire") @RequestMapping(value = "/put/questionnaire", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String createQuestionnaire(@RequestBody String request) - { + public String createQuestionnaire(@RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { + try { response.setResponse(questionnaireService.createQuestionnaire(request)); - } catch (Exception e) - { + } catch (Exception e) { logger.error("put-questionnaire failed with error " + e.getMessage(), e); response.setError(e); } @@ -77,21 +70,14 @@ public String createQuestionnaire(@RequestBody String request) return response.toString(); } - /** - * - * @param request - * @return - */ @CrossOrigin() + @ApiOperation(value = "Get questionnaire list") @RequestMapping(value = "/get/questionnaireList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String questionTypeList() - { + public String questionTypeList() { OutputResponse response = new OutputResponse(); - try - { + try { response.setResponse(questionnaireService.getQuestionnaireList()); - } catch (Exception e) - { + } catch (Exception e) { logger.error("get-questionnaire failed with error " + e.getMessage(), e); response.setError(e); } diff --git a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java index 4cf5e7c9..7f6cb097 100644 --- a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java +++ b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java @@ -43,8 +43,7 @@ @RequestMapping(value = "/beneficiary") @RestController -public class SchemeController -{ +public class SchemeController { InputMapper inputMapper = new InputMapper(); private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @@ -54,30 +53,24 @@ public class SchemeController InputMapper mapper = new InputMapper(); @CrossOrigin - @ApiOperation(value = "stores scheme data", consumes = "application/json", produces = "application/json") - @RequestMapping( - value = "/save/schemeDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") - public String saveSchemeDetails( - @ApiParam( - value = "{\"providerServiceMapID\": \"integer-provider service map id\", " - + "\"schemeName\": \"Name of Scheme\", " + "\"schemeDesc\": \"Description of Scheme\", " - + "\"createdBy\": \"User name of the supervisor creating scheme\", " - + "\"kmFileManager\":{\"fileName\":\"String: name of file\", " + "\"fileExtension\":\"String: file extension\", " - + "\"providerServiceMapID\":\"Integer: service provider map ID\", " - + "\"userID\":\"Integer: user ID of the supervisor\", " - + "\"fileContent\":\"String: base64encoded binary file content\", " - + "\"createdBy\":\"String: username of supervisor\"}}") @RequestBody String request) - { + @ApiOperation(value = "Stores scheme data", consumes = "application/json", produces = "application/json") + @RequestMapping(value = "/save/schemeDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") + public String saveSchemeDetails(@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", " + + "\"schemeName\": \"Name of Scheme\", " + "\"schemeDesc\": \"Description of Scheme\", " + + "\"createdBy\": \"User name of the supervisor creating scheme\", " + + "\"kmFileManager\":{\"fileName\":\"String: name of file\", " + + "\"fileExtension\":\"String: file extension\", " + + "\"providerServiceMapID\":\"Integer: service provider map ID\", " + + "\"userID\":\"Integer: user ID of the supervisor\", " + + "\"fileContent\":\"String: base64encoded binary file content\", " + + "\"createdBy\":\"String: username of supervisor\"}}") @RequestBody String request) { OutputResponse output = new OutputResponse(); - try - { + try { Scheme scheme = inputMapper.gson().fromJson(request, Scheme.class); Scheme schemeNew; schemeNew = schemeServiceImpl.save(scheme); output.setResponse(schemeNew.toString()); - } catch (Exception e) - { + } catch (Exception e) { logger.error("saveSchemeDetails failed with error " + e.getMessage(), e); output.setError(e); } @@ -86,28 +79,23 @@ public String saveSchemeDetails( } @CrossOrigin - @RequestMapping( - value = "/get/schemeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") - public String getSchemeList(@ApiParam(value = "{\"providerServiceMapID\":\"Integer\"}") @RequestBody String createRequest) - { + @ApiOperation(value = "Get scheme list") + @RequestMapping(value = "/get/schemeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") + public String getSchemeList( + @ApiParam(value = "{\"providerServiceMapID\":\"Integer\"}") @RequestBody String createRequest) { logger.info("getSchemeList request " + createRequest); OutputResponse output = new OutputResponse(); - try - { + try { Scheme m_scheme = mapper.gson().fromJson(createRequest, Scheme.class); List schemes = null; schemes = schemeServiceImpl.getSchemeList(m_scheme.getProviderServiceMapID()); - if (schemes != null) - { + if (schemes != null) { output.setResponse(schemes.toString()); - } else - { + } else { output.setError(5000, "No schemes available"); } - } catch (Exception e) - { + } catch (Exception e) { logger.error("getSchemeList failed with error " + e.getMessage(), e); output.setError(e); } @@ -116,27 +104,24 @@ public String getSchemeList(@ApiParam(value = "{\"providerServiceMapID\":\"Integ } @CrossOrigin - @RequestMapping(value = "/scheme/deleteScheme", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes=MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") - public String deleteScheme(@ApiParam(value = "{\"schemeID\":\"Integer\",\"deleted\":\"Boolean\"}") @RequestBody String createRequest) - { + @ApiOperation(value = "Delete scheme") + @RequestMapping(value = "/scheme/deleteScheme", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") + public String deleteScheme( + @ApiParam(value = "{\"schemeID\":\"Integer\",\"deleted\":\"Boolean\"}") @RequestBody String createRequest) { logger.info("delete scheme request " + createRequest); OutputResponse output = new OutputResponse(); - try - { + try { Scheme m_scheme = mapper.gson().fromJson(createRequest, Scheme.class); Scheme scheme = null; scheme = schemeServiceImpl.getSchemeByID(m_scheme.getSchemeID()); - if (scheme != null) - { + if (scheme != null) { scheme.setDeleted(m_scheme.getDeleted()); output.setResponse(schemeServiceImpl.deletedata(scheme)); - } else - { + } else { output.setError(5000, "No schemes available"); } - } catch (Exception e) - { + } catch (Exception e) { logger.error("getSchemeList failed with error " + e.getMessage(), e); output.setError(e); } diff --git a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java b/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java index 2b4fbdad..c9171bd1 100644 --- a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java +++ b/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java @@ -21,16 +21,12 @@ */ package com.iemr.common.controller.secondaryReport; -import java.sql.Timestamp; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; import javax.servlet.http.HttpServletRequest; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.InputStreamResource; -import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -40,17 +36,16 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.ApiParam; - import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.iemr.common.data.report.CallDetailsReport; import com.iemr.common.data.report.CallQualityReport; -import com.iemr.common.model.reports.Report1097RequestModel; import com.iemr.common.service.reportSecondary.SecondaryReportService; import com.iemr.common.utils.mapper.InputMapper; -import com.iemr.common.utils.response.OutputResponse; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; + @CrossOrigin @RequestMapping({ "/crmReports" }) @RestController @@ -58,7 +53,9 @@ public class CRMSecondaryReports { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Autowired private SecondaryReportService secondaryReportService; + @CrossOrigin() + @ApiOperation(value = "Get quality report") @RequestMapping(value = "/getQualityReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getQualityReport( @ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\"," @@ -66,26 +63,25 @@ public ResponseEntity getQualityReport( + "\\\"roleName\\\":\\\"String\\\",\\\"reportTypeID\\\":\\\"Integer\\\",\\\"reportType\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) { - String filename = getFileName(jsonRequest,"104QAReport"); - InputStreamResource file=null; - try - { - file = new InputStreamResource(secondaryReportService.getQualityReport(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx")) - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + String filename = getFileName(jsonRequest, "104QAReport"); + InputStreamResource file = null; + try { + file = new InputStreamResource(secondaryReportService.getQualityReport(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } + @CrossOrigin() + @ApiOperation(value = "Get complaint detail report") @RequestMapping(value = "/getComplaintDetailReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getComplaintDetailReport( @ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\"," @@ -93,26 +89,26 @@ public ResponseEntity getComplaintDetailReport( + "\\\"roleName\\\":\\\"String\\\",\\\"reportTypeID\\\":\\\"Integer\\\",\\\"reportType\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) { - String filename ="Grievance_Details.xlsx"; + String filename = "Grievance_Details.xlsx"; + + InputStreamResource file = null; + try { + file = new InputStreamResource( + secondaryReportService.getComplaintDetailReport(jsonRequest, "Grievance_Details")); + return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } + } - InputStreamResource file=null; - try - { - file = new InputStreamResource(secondaryReportService.getComplaintDetailReport(jsonRequest,"Grievance_Details")); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename) - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } - }@CrossOrigin() + @CrossOrigin() + @ApiOperation(value = "Get call summary report") @RequestMapping(value = "/getCallSummaryReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getCallSummaryReport( @ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\"," @@ -121,264 +117,262 @@ public ResponseEntity getCallSummaryReport( + "\\\"callTypeName\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) { - String filename = getFileName(jsonRequest,"Call_Summary_Report"); - InputStreamResource file=null; - - try - { - file = new InputStreamResource(secondaryReportService.getCallSummaryReport(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + String filename = getFileName(jsonRequest, "Call_Summary_Report"); + InputStreamResource file = null; + + try { + file = new InputStreamResource(secondaryReportService.getCallSummaryReport(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } - + @CrossOrigin() + @ApiOperation(value = "Get all by sexual orientation") @RequestMapping(value = "/getAllBySexualOrientation", method = RequestMethod.POST, headers = "Authorization") - public ResponseEntity getAllBySexualOrientation( + public ResponseEntity getAllBySexualOrientation( @ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\"," - +"\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"," - +"\\\"beneficiarySexualOrientation\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\" }\"") @RequestBody String jsonRequest) { - String filename = getFileName(jsonRequest,"Sexual_Orientation_Report"); - InputStreamResource file=null; - try - { - file = new InputStreamResource(secondaryReportService.getAllBySexualOrientationReport(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } - - + + "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"," + + "\\\"beneficiarySexualOrientation\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\" }\"") @RequestBody String jsonRequest) { + String filename = getFileName(jsonRequest, "Sexual_Orientation_Report"); + InputStreamResource file = null; + try { + file = new InputStreamResource( + secondaryReportService.getAllBySexualOrientationReport(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } + } - + @CrossOrigin + @ApiOperation(value = "Get district wise call report") @RequestMapping(value = "/getDistrictWiseCallReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getDistrictWiseCallReport( @ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\"," + "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"districtID\\\":\\\"Integer\\\",\\\"district\\\":\\\"String\\\",\\\"subdistrictID\\\":\\\"Integer\\\",\\\"villageID\\\":\\\"Integer\\\"," - + "\\\"locationID\\\":\\\"Integer\\\",\\\"roleID\\\":\\\"Integer\\\"}\"") @RequestBody String jsonRequest) - { - String filename = getFileName(jsonRequest,"District_Wise_Call_Volume_Report"); - InputStreamResource file=null; - - try - { - file = new InputStreamResource(secondaryReportService.getDistrictWiseCallReport(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + + "\\\"locationID\\\":\\\"Integer\\\",\\\"roleID\\\":\\\"Integer\\\"}\"") @RequestBody String jsonRequest) { + String filename = getFileName(jsonRequest, "District_Wise_Call_Volume_Report"); + InputStreamResource file = null; + + try { + file = new InputStreamResource(secondaryReportService.getDistrictWiseCallReport(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } - + @CrossOrigin + @ApiOperation(value = "Get unblocked user report") @RequestMapping(value = "/getUnblockedUserReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getUnblockedUserReport( @ApiParam(value = "\"{\\\"blockStartDate\\\":\\\"Timestamp\\\",\\\"blockEndDate\\\":\\\"Timestamp\\\"," + "\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"") @RequestBody String jsonRequest, HttpServletRequest httpRequest) { - String filename = getFileName(jsonRequest,"Unblock_User_Report"); - InputStreamResource file=null; - try - { - file = new InputStreamResource(secondaryReportService.getUnblockedUserReport(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + String filename = getFileName(jsonRequest, "Unblock_User_Report"); + InputStreamResource file = null; + try { + file = new InputStreamResource(secondaryReportService.getUnblockedUserReport(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } - + @CrossOrigin + @ApiOperation(value = "Get call quality report") @RequestMapping(value = "/getCallQualityReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getCallQualityReport( @ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\"," + "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"searchCriteria\\\":\\\"String\\\"," - +"\\\"workingLocationID\\\":\\\"Integer\\\",\\\"filename\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest, + + "\\\"workingLocationID\\\":\\\"Integer\\\",\\\"filename\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest, HttpServletRequest httpRequest) { String filename = null; - InputStreamResource file=null; - try - { - CallQualityReport callQualityReport = InputMapper.gson().fromJson(jsonRequest, - CallQualityReport.class); - filename = getFileName(jsonRequest,callQualityReport.getFileName()); - file = new InputStreamResource(secondaryReportService.getCallQualityReport(callQualityReport,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + InputStreamResource file = null; + try { + CallQualityReport callQualityReport = InputMapper.gson().fromJson(jsonRequest, CallQualityReport.class); + filename = getFileName(jsonRequest, callQualityReport.getFileName()); + file = new InputStreamResource(secondaryReportService.getCallQualityReport(callQualityReport, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } - - + @CrossOrigin() + @ApiOperation(value = "Get counts by preferred language") @RequestMapping(value = "/getCountsByPreferredLanguage", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getCountsByPreferredLanguage( @ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\"," + "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\"," - + "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest,HttpServletRequest httpRequest) { + + "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest, + HttpServletRequest httpRequest) { String filename = null; - InputStreamResource file=null; + InputStreamResource file = null; try { - - filename = getFileName(jsonRequest,"Language_Distribution_Report"); - file = new InputStreamResource(secondaryReportService.getCountsByPrefferedLanguage(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + + filename = getFileName(jsonRequest, "Language_Distribution_Report"); + file = new InputStreamResource(secondaryReportService.getCountsByPrefferedLanguage(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } @CrossOrigin + @ApiOperation(value = "Get all by age group") @RequestMapping(value = "/getAllByAgeGroup", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getAllByAgeGroup( @ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"maxAge\\\":\\\"Integer\\\",\\\"minAge\\\":\\\"Integer\\\",\\\"startTimestamp\\\":\\\"Timestamp\\\"," - + "\\\"endTimestamp\\\":\\\"Timestamp\\\",\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest, HttpServletRequest httpRequest) { + + "\\\"endTimestamp\\\":\\\"Timestamp\\\",\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest, + HttpServletRequest httpRequest) { - String filename = getFileName(jsonRequest,"Caller_Age_Group_Report"); - InputStreamResource file=null; - try - { - file = new InputStreamResource(secondaryReportService.getAllByAgeGroup(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + String filename = getFileName(jsonRequest, "Caller_Age_Group_Report"); + InputStreamResource file = null; + try { + file = new InputStreamResource(secondaryReportService.getAllByAgeGroup(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); } + } @CrossOrigin() + @ApiOperation(value = "Get all reports by date") @RequestMapping(value = "/getAllReportsByDate", method = RequestMethod.POST, headers = "Authorization") - public ResponseEntity getAllReportsByDate(@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\"," - + "\\\"beneficiaryCallType\\\":\\\"String\\\",\\\"beneficiaryCallSubType\\\":\\\"String\\\"," - + "\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\"," - + "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\",\\\"gender\\\":\\\"String\\\"," - + "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"beneficiarySexualOrientation\\\":\\\"String\\\"}\"") - @RequestBody String jsonRequest) { - String filename = getFileName(jsonRequest,"Call_Type_Report"); - InputStreamResource file=null; - - try - { - file = new InputStreamResource(secondaryReportService.getAllReportsByDate(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); - } - catch(Exception e) - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + public ResponseEntity getAllReportsByDate( + @ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\"," + + "\\\"beneficiaryCallType\\\":\\\"String\\\",\\\"beneficiaryCallSubType\\\":\\\"String\\\"," + + "\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\"," + + "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\",\\\"gender\\\":\\\"String\\\"," + + "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"beneficiarySexualOrientation\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) { + String filename = getFileName(jsonRequest, "Call_Type_Report"); + InputStreamResource file = null; + + try { + file = new InputStreamResource(secondaryReportService.getAllReportsByDate(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); + } catch (Exception e) { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } - + @CrossOrigin() + @ApiOperation(value = "Get all by gender") @RequestMapping(value = "/getAllByGender", method = RequestMethod.POST, headers = "Authorization") - public ResponseEntity getAllByGender(@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\"," - + "\\\"gender\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\"," - + "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") - @RequestBody String jsonRequest) { - String filename = getFileName(jsonRequest,"Gender_Distribution_Report"); - InputStreamResource file=null; - - try - { - file = new InputStreamResource(secondaryReportService.getAllByGender(jsonRequest,filename)); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function - .contentType(MediaType.parseMediaType("application/vnd.ms-excel")) - .body(file); + public ResponseEntity getAllByGender( + @ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\"," + + "\\\"gender\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\"," + + "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) { + String filename = getFileName(jsonRequest, "Gender_Distribution_Report"); + InputStreamResource file = null; - } - catch(Exception e) + try { + file = new InputStreamResource(secondaryReportService.getAllByGender(jsonRequest, filename)); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add + // generic + // function + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); - { - logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage()); - if(e.getMessage().equalsIgnoreCase("No data found")) - return ResponseEntity.status(500).body(e.getMessage()); - else - return ResponseEntity.status(5000).body(e.getMessage()); - } + } catch (Exception e) + + { + logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " + + e.getMessage()); + if (e.getMessage().equalsIgnoreCase("No data found")) + return ResponseEntity.status(500).body(e.getMessage()); + else + return ResponseEntity.status(5000).body(e.getMessage()); + } } - - public String getFileName(String jsonRequest,String name) - { - String fileName=null; + + public String getFileName(String jsonRequest, String name) { + String fileName = null; JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(jsonRequest); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null && jsnOBJ.has("fileName")) - { - fileName=jsnOBJ.get("fileName").getAsString(); + if (jsnOBJ != null && jsnOBJ.has("fileName")) { + fileName = jsnOBJ.get("fileName").getAsString(); } - if(fileName !=null) - return fileName; + if (fileName != null) + return fileName; else return name; } diff --git a/src/main/java/com/iemr/common/controller/services/CategoryController.java b/src/main/java/com/iemr/common/controller/services/CategoryController.java index 42e92f4e..4765ca09 100644 --- a/src/main/java/com/iemr/common/controller/services/CategoryController.java +++ b/src/main/java/com/iemr/common/controller/services/CategoryController.java @@ -41,33 +41,32 @@ import com.iemr.common.utils.mapper.InputMapper; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; + @RestController @RequestMapping(value = "/category") -public class CategoryController -{ +public class CategoryController { InputMapper inputMapper = new InputMapper(); final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @CrossOrigin() + @ApiOperation(value = "Get all categries") @RequestMapping(value = "/categories", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAllCategries( - @Param("{\"providerServiceMapID\":\"Integer\", " + "\"subServiceID\":\"subServiceID\", " + "\"feedbackNatureID\":\"feedbackNatureID\"}") @RequestBody String request) - { + @Param("{\"providerServiceMapID\":\"Integer\", " + "\"subServiceID\":\"subServiceID\", " + + "\"feedbackNatureID\":\"feedbackNatureID\"}") @RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { + try { List categoryList = new ArrayList(); categoryList = categoryService.getAllCategories(request); response.setResponse(categoryList.toString()); - } catch (Exception e) - { + } catch (Exception e) { logger.error("", e); response.setError(e); } return response.toString(); - } - + } /** * Category srvice @@ -78,8 +77,7 @@ public String getAllCategries( * Inject category service */ @Autowired - public void setCategoryService(CategoryService categoryService) - { + public void setCategoryService(CategoryService categoryService) { this.categoryService = categoryService; } } diff --git a/src/main/java/com/iemr/common/controller/services/CommonController.java b/src/main/java/com/iemr/common/controller/services/CommonController.java index a105e580..0244072f 100644 --- a/src/main/java/com/iemr/common/controller/services/CommonController.java +++ b/src/main/java/com/iemr/common/controller/services/CommonController.java @@ -33,86 +33,74 @@ import org.springframework.web.bind.annotation.RestController; import com.iemr.common.service.services.CommonService; +import com.iemr.common.service.services.Services; +import com.iemr.common.service.services.ServicesImpl; import com.iemr.common.utils.mapper.InputMapper; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @RestController @RequestMapping(value = "/service") -public class CommonController -{ +public class CommonController { InputMapper inputMapper = new InputMapper(); final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @CrossOrigin() - @RequestMapping(value = "/category", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") + @ApiOperation(value = "Get category") + @RequestMapping(value = "/category", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") // public Iterable getCategories(){ public String getCategories(@ApiParam("{\"providerServiceMapID\":\"Integer\", " - + "\"subServiceID\":\"subServiceID\"}") @RequestBody String request) - { + + "\"subServiceID\":\"subServiceID\"}") @RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { + try { response.setResponse(commonService.getCategories(request).toString()); - } catch (Exception e) - { + } catch (Exception e) { response.setError(e); } return response.toString(); } @CrossOrigin() - @RequestMapping(value = "/subcategory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String getSubcategories(@ApiParam("{\"categoryID\":\"Integer\"}") @RequestBody String request) - { + @ApiOperation(value = "Get sub categories") + @RequestMapping(value = "/subcategory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getSubcategories(@ApiParam("{\"categoryID\":\"Integer\"}") @RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { + try { response.setResponse(commonService.getSubCategories(request).toString()); - } catch (Exception e) - { + } catch (Exception e) { logger.error("", e); response.setError(e); } return response.toString(); } - // getSubCategoryFiles @CrossOrigin() - @RequestMapping(value = "/getSubCategoryFiles", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") + @ApiOperation(value = "Get sub category files") + @RequestMapping(value = "/getSubCategoryFiles", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSubCategoryFiles(@ApiParam("{\"categoryID\":\"Integer\", \"providerServiceMapID\":\"Integer\", " - + "\"subCategoryID\":\"Integer\"}") @RequestBody String request) - { + + "\"subCategoryID\":\"Integer\"}") @RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { + try { response.setResponse(commonService.getSubCategoryFiles(request).toString()); - } catch (Exception e) - { + } catch (Exception e) { logger.error("", e); response.setError(e); } return response.toString(); } - // getSubCategoryFiles @CrossOrigin() - @RequestMapping(value = "/getSubCategoryFilesWithURL", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String - getSubCategoryFilesWithURL(@ApiParam("{\"categoryID\":\"Integer\", \"providerServiceMapID\":\"Integer\", " - + "\"subCategoryID\":\"Integer\"}") @RequestBody String request) - { + @ApiOperation(value = "Get sub category files with URL") + @RequestMapping(value = "/getSubCategoryFilesWithURL", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getSubCategoryFilesWithURL( + @ApiParam("{\"categoryID\":\"Integer\", \"providerServiceMapID\":\"Integer\", " + + "\"subCategoryID\":\"Integer\"}") @RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { + try { response.setResponse(commonService.getSubCategoryFilesWithURL(request).toString()); - } catch (Exception e) - { + } catch (Exception e) { logger.error("", e); response.setError(e); } @@ -120,20 +108,16 @@ public String getSubCategoryFiles(@ApiParam("{\"categoryID\":\"Integer\", \"prov } @CrossOrigin() - @RequestMapping(value = "/categoryByID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String getcategoriesById(@ApiParam(value="\"{\\\"subServiceID\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\"}\"") - @RequestBody String request) - { + @ApiOperation(value = "Category by id") + @RequestMapping(value = "/categoryByID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getcategoriesById( + @ApiParam(value = "\"{\\\"subServiceID\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\"}\"") @RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { - // SubService subService = inputMapper.gson().fromJson(request, SubService.class); + try { response.setResponse(commonService.getCategories(request).toString()); } catch ( - Exception e) - { + Exception e) { logger.error("", e); response.setError(e); } @@ -141,16 +125,13 @@ public String getcategoriesById(@ApiParam(value="\"{\\\"subServiceID\\\":\\\"Str } @CrossOrigin() - @RequestMapping(value = "/servicetypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String getservicetypes(@ApiParam("{\"providerServiceMapID\":\"Integer\"}") @RequestBody String request) - { + @ApiOperation(value = "Service types") + @RequestMapping(value = "/servicetypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getservicetypes(@ApiParam("{\"providerServiceMapID\":\"Integer\"}") @RequestBody String request) { OutputResponse response = new OutputResponse(); - try - { + try { response.setResponse(commonService.getActiveServiceTypes(request).toString()); - } catch (Exception e) - { + } catch (Exception e) { logger.error("", e); response.setError(e); } @@ -161,10 +142,31 @@ public String getservicetypes(@ApiParam("{\"providerServiceMapID\":\"Integer\"}" * Designation Service */ private CommonService commonService; + private Services services; @Autowired - public void setCommonService(CommonService commonService) - { + public void setCommonService(CommonService commonService) { this.commonService = commonService; } + + @Autowired + public void setServices(ServicesImpl services) { + this.services = services; + } + + @CrossOrigin() + @ApiOperation(value = "Service list") + @RequestMapping(value = "/serviceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String serviceList(@RequestBody String request) { + OutputResponse response = new OutputResponse(); + logger.info("serviceList request: " + request); + try { + response.setResponse(services.servicesList().toString()); + } catch (Exception e) { + logger.error("serviceList failed with error " + e.getMessage(), e); + response.setError(e); + } + logger.info("serviceList response: " + response.toString()); + return response.toString(); + } } diff --git a/src/main/java/com/iemr/common/controller/services/ServiceController.java b/src/main/java/com/iemr/common/controller/services/ServiceController.java deleted file mode 100644 index b0db3efd..00000000 --- a/src/main/java/com/iemr/common/controller/services/ServiceController.java +++ /dev/null @@ -1,69 +0,0 @@ -/* -* AMRIT – Accessible Medical Records via Integrated Technology -* Integrated EHR (Electronic Health Records) Solution -* -* Copyright (C) "Piramal Swasthya Management and Research Institute" -* -* This file is part of AMRIT. -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see https://www.gnu.org/licenses/. -*/ -package com.iemr.common.controller.services; - -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.iemr.common.service.services.Services; -import com.iemr.common.service.services.ServicesImpl; -import com.iemr.common.utils.response.OutputResponse; - -@RequestMapping({ "/service" }) -@RestController -public class ServiceController -{ - final private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - private Services services; - - @Autowired - public void setServices(ServicesImpl services) - { - this.services = services; - } - - @CrossOrigin() - @RequestMapping(value = "/serviceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String serviceList(@RequestBody String request) - { - OutputResponse response = new OutputResponse(); - logger.info("serviceList request: " + request); - try - { - response.setResponse(services.servicesList().toString()); - } catch (Exception e) - { - logger.error("serviceList failed with error " + e.getMessage(), e); - response.setError(e); - } - logger.info("serviceList response: " + response.toString()); - return response.toString(); - } -} diff --git a/src/main/java/com/iemr/common/controller/sms/SMSController.java b/src/main/java/com/iemr/common/controller/sms/SMSController.java index ce2f36d8..6826cd8a 100644 --- a/src/main/java/com/iemr/common/controller/sms/SMSController.java +++ b/src/main/java/com/iemr/common/controller/sms/SMSController.java @@ -45,102 +45,93 @@ import com.iemr.common.utils.mapper.OutputMapper; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @RestController @RequestMapping(value = "/sms") -public class SMSController -{ +public class SMSController { final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Autowired SMSService smsService; - - InputMapper inputMapper= new InputMapper(); + + InputMapper inputMapper = new InputMapper(); @CrossOrigin() - @RequestMapping(value = "/getSMSTemplates", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String getSMSTemplates(@ApiParam(value="\"{\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"")@RequestBody SMSRequest request, HttpServletRequest serverRequest) - { + @ApiOperation(value = "Get SMS templates") + @RequestMapping(value = "/getSMSTemplates", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getSMSTemplates( + @ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"") @RequestBody SMSRequest request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); logger.info("getSMSTemplates received request"); logger.debug("getSMSTemplates received a request " + OutputMapper.gson().toJson(request)); - try - { + try { response.setResponse(smsService.getSMSTemplates(request)); - } catch (Exception e) - { + } catch (Exception e) { logger.error("getSMSTemplates failed with error " + e.getMessage(), e); response.setError(e); } logger.debug("getSMSTemplates sending response " + response); -// logger.info("getSMSTemplates sending response"); return response.toString(); } @CrossOrigin() - @RequestMapping(value = "/getFullSMSTemplate", method = { RequestMethod.POST }, - produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String getFullSMSTemplate(@ApiParam(value="\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateID\\\":\\\"Integer\\\"}\"") - @RequestBody SMSRequest request, HttpServletRequest serverRequest) - { + @ApiOperation(value = "Get full SMS template") + @RequestMapping(value = "/getFullSMSTemplate", method = { + RequestMethod.POST }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getFullSMSTemplate( + @ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateID\\\":\\\"Integer\\\"}\"") @RequestBody SMSRequest request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); logger.info("getFullSMSTemplate received request"); logger.debug("getFullSMSTemplate received a request " + OutputMapper.gson().toJson(request)); - try - { + try { response.setResponse(smsService.getFullSMSTemplate(request)); - } catch (Exception e) - { + } catch (Exception e) { logger.error("getFullSMSTemplate failed with error " + e.getMessage(), e); response.setError(e); } logger.debug("getFullSMSTemplate sending response " + response); -// logger.info("getFullSMSTemplate sending response"); return response.toString(); } @CrossOrigin() - @RequestMapping(value = "/saveSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String saveSMSTemplate(@ApiParam(value="\"{\\\"createdBy\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\",\\\"smsParameterMaps\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTypeID\\\":\\\"Integer\\\"}\"") - @RequestBody CreateSMSRequest request, HttpServletRequest serverRequest) - { + @ApiOperation(value = "Save SMS template") + @RequestMapping(value = "/saveSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String saveSMSTemplate( + @ApiParam(value = "\"{\\\"createdBy\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\",\\\"smsParameterMaps\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTypeID\\\":\\\"Integer\\\"}\"") @RequestBody CreateSMSRequest request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); logger.info("saveSMSTemplate received request"); logger.debug("saveSMSTemplate received a request " + OutputMapper.gson().toJson(request)); - try - { + try { response.setResponse(smsService.saveSMSTemplate(request)); - } catch (Exception e) - { + } catch (Exception e) { logger.error("saveSMSTemplate failed with error " + e.getMessage(), e); response.setError(e); } logger.debug("saveSMSTemplate sending response " + response); -// logger.info("saveSMSTemplate sending response"); return response.toString(); } @CrossOrigin() - @RequestMapping(value = "/updateSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String updateSMSTemplate(@ApiParam(value="\"{\\\"smsTemplateID\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\"," - + "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsType\\\":{\\\"smsTypeID\\\":\\\"Integer\\\",\\\"smsType\\\":\\\"String\\\"," - + "\\\"description\\\":\\\"String\\\",\\\"serviceID\\\":\\\"Integer\\\",\\\"deleted\\\":\\\"Boolean\\\"}," - + "\\\"deleted\\\":\\\"Boolean\\\",\\\"createdBy\\\":\\\"String\\\"," - + "\\\"createdDate\\\":\\\"Timestamp\\\",\\\"lastModDate\\\":\\\"Timestamp\\\",\\\"modifiedBy\\\":\\\"String\\\"}\"") - @RequestBody UpdateSMSRequest request, HttpServletRequest serverRequest) - { + @ApiOperation(value = "Update SMS template") + @RequestMapping(value = "/updateSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String updateSMSTemplate( + @ApiParam(value = "\"{\\\"smsTemplateID\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\"," + + "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsType\\\":{\\\"smsTypeID\\\":\\\"Integer\\\",\\\"smsType\\\":\\\"String\\\"," + + "\\\"description\\\":\\\"String\\\",\\\"serviceID\\\":\\\"Integer\\\",\\\"deleted\\\":\\\"Boolean\\\"}," + + "\\\"deleted\\\":\\\"Boolean\\\",\\\"createdBy\\\":\\\"String\\\"," + + "\\\"createdDate\\\":\\\"Timestamp\\\",\\\"lastModDate\\\":\\\"Timestamp\\\",\\\"modifiedBy\\\":\\\"String\\\"}\"") @RequestBody UpdateSMSRequest request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); logger.info("updateSMSTemplate received request"); logger.debug("updateSMSTemplate received a request " + OutputMapper.gson().toJson(request)); - try - { + try { response.setResponse(smsService.updateSMSTemplate(request)); - } catch (Exception e) - { + } catch (Exception e) { logger.error("updateSMSTemplate failed with error " + e.getMessage(), e); response.setError(e); } @@ -150,19 +141,17 @@ public String updateSMSTemplate(@ApiParam(value="\"{\\\"smsTemplateID\\\":\\\"St } @CrossOrigin() - @RequestMapping(value = "/getSMSTypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String getSMSTypes(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer\\\"}\"") - @RequestBody SMSTypeModel request, HttpServletRequest serverRequest) - { + @ApiOperation(value = "Get SMS types") + @RequestMapping(value = "/getSMSTypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getSMSTypes( + @ApiParam(value = "\"{\\\"serviceID\\\":\\\"Integer\\\"}\"") @RequestBody SMSTypeModel request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); logger.info("getSMSTypes received request"); logger.debug("getSMSTypes received a request " + OutputMapper.gson().toJson(request)); - try - { + try { response.setResponse(smsService.getSMSTypes(request)); - } catch (Exception e) - { + } catch (Exception e) { logger.error("getSMSTypes failed with error " + e.getMessage(), e); response.setError(e); } @@ -172,19 +161,17 @@ public String getSMSTypes(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer\\\"} } @CrossOrigin() - @RequestMapping(value = "/getSMSParameters", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String getSMSParameters(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer\\\"}\"") - @RequestBody SMSParameterModel request, HttpServletRequest serverRequest) - { + @ApiOperation(value = "Get SMS parameters") + @RequestMapping(value = "/getSMSParameters", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String getSMSParameters( + @ApiParam(value = "\"{\\\"serviceID\\\":\\\"Integer\\\"}\"") @RequestBody SMSParameterModel request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); logger.info("getSMSParameters received request"); logger.debug("getSMSParameters received a request " + OutputMapper.gson().toJson(request)); - try - { + try { response.setResponse(smsService.getSMSParameters(request)); - } catch (Exception e) - { + } catch (Exception e) { logger.error("getSMSParameters failed with error " + e.getMessage(), e); response.setError(e); } @@ -194,31 +181,29 @@ public String getSMSParameters(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer } @CrossOrigin() - @RequestMapping(value = "/sendSMS", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, - headers = "Authorization") - public String sendSMS(@ApiParam(value="\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateTypeID\\\":\\\"Integer\\\"," - + "\\\"smsTemplateID\\\":\\\"Integer\\\",\\\"beneficiaryRegID\\\":\\\"Long\\\",\\\"stateID\\\":\\\"Integer\\\"," - + "\\\"districtID\\\":\\\"Integer\\\",\\\"blockID\\\":\\\"Integer\\\",\\\"is1097\\\":\\\"Boolean\\\"," - + "\\\"userID\\\":\\\"Long\\\",\\\"InstituteID\\\":\\\"Integer\\\",\\\"feedbackID\\\":\\\"Long\\\"," - + "\\\"createdBy\\\":\\\"String\\\",\\\"alternateNo\\\":\\\"String\\\",\\\"smsText\\\":\\\"String\\\"," - + "\\\"prescribedDrugID\\\":\\\"Long\\\",\\\"bloodReqID\\\":\\\"Long\\\",\\\"directoryServiceID\\\":\\\"Long\\\"," - + "\\\"fSComplaintID\\\":\\\"Long\\\",\\\"requestID\\\":\\\"String\\\",\\\"outbreakComplaintID\\\":\\\"Long\\\"," - + "\\\"obCallID\\\":\\\"Long\\\",\\\"isBloodBankSMS\\\":\\\"Boolean\\\",\\\"moAdvice\\\":\\\"String\\\"," - + "\\\"organDonationID\\\":\\\"Long\\\",\\\"requestedBloodBankID\\\":\\\"Long\\\",\\\"requestedInstitutionID\\\":\\\"Long\\\"," - + "\\\"specializationID\\\":\\\"Integer\\\",\\\"smsTypeTM\\\":\\\"String\\\",\\\"tcDate\\\":\\\"String\\\"," - + "\\\"tcPreviousDate\\\":\\\"String\\\",\\\"presObj\\\":\\\"String\\\",\\\"diagnosis\\\":\\\"List\\\",\\\"benHistoryID\\\":\\\"Long\\\",\\\"imrDate\\\":\\\"String\\\"," - + "\\\"imrID\\\":\\\"String\\\",\\\"nodalNumber\\\":\\\"String\\\",\\\"informerName\\\":\\\"String\\\"}\"") - @RequestBody String request, HttpServletRequest serverRequest) - { + @ApiOperation(value = "Send SMS") + @RequestMapping(value = "/sendSMS", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") + public String sendSMS( + @ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateTypeID\\\":\\\"Integer\\\"," + + "\\\"smsTemplateID\\\":\\\"Integer\\\",\\\"beneficiaryRegID\\\":\\\"Long\\\",\\\"stateID\\\":\\\"Integer\\\"," + + "\\\"districtID\\\":\\\"Integer\\\",\\\"blockID\\\":\\\"Integer\\\",\\\"is1097\\\":\\\"Boolean\\\"," + + "\\\"userID\\\":\\\"Long\\\",\\\"InstituteID\\\":\\\"Integer\\\",\\\"feedbackID\\\":\\\"Long\\\"," + + "\\\"createdBy\\\":\\\"String\\\",\\\"alternateNo\\\":\\\"String\\\",\\\"smsText\\\":\\\"String\\\"," + + "\\\"prescribedDrugID\\\":\\\"Long\\\",\\\"bloodReqID\\\":\\\"Long\\\",\\\"directoryServiceID\\\":\\\"Long\\\"," + + "\\\"fSComplaintID\\\":\\\"Long\\\",\\\"requestID\\\":\\\"String\\\",\\\"outbreakComplaintID\\\":\\\"Long\\\"," + + "\\\"obCallID\\\":\\\"Long\\\",\\\"isBloodBankSMS\\\":\\\"Boolean\\\",\\\"moAdvice\\\":\\\"String\\\"," + + "\\\"organDonationID\\\":\\\"Long\\\",\\\"requestedBloodBankID\\\":\\\"Long\\\",\\\"requestedInstitutionID\\\":\\\"Long\\\"," + + "\\\"specializationID\\\":\\\"Integer\\\",\\\"smsTypeTM\\\":\\\"String\\\",\\\"tcDate\\\":\\\"String\\\"," + + "\\\"tcPreviousDate\\\":\\\"String\\\",\\\"presObj\\\":\\\"String\\\",\\\"diagnosis\\\":\\\"List\\\",\\\"benHistoryID\\\":\\\"Long\\\",\\\"imrDate\\\":\\\"String\\\"," + + "\\\"imrID\\\":\\\"String\\\",\\\"nodalNumber\\\":\\\"String\\\",\\\"informerName\\\":\\\"String\\\"}\"") @RequestBody String request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); logger.info("sendSMS received request"); logger.debug("sendSMS received a request " + OutputMapper.gson().toJson(request)); - SMSRequest[] requests = inputMapper.gson().fromJson(request,SMSRequest[].class); - try - { - response.setResponse(smsService.sendSMS(Arrays.asList(requests) , serverRequest.getHeader("Authorization"))); - } catch (Exception e) - { + SMSRequest[] requests = inputMapper.gson().fromJson(request, SMSRequest[].class); + try { + response.setResponse(smsService.sendSMS(Arrays.asList(requests), serverRequest.getHeader("Authorization"))); + } catch (Exception e) { logger.error("sendSMS failed with error " + e.getMessage(), e); response.setError(e); } diff --git a/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java b/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java index 60b2cf0d..66328800 100644 --- a/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java +++ b/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java @@ -32,7 +32,6 @@ import com.google.gson.Gson; import com.iemr.common.data.snomedct.SCTDescription; - import com.iemr.common.service.snomedct.SnomedService; import com.iemr.common.utils.mapper.InputMapper; import com.iemr.common.utils.response.OutputResponse; @@ -53,7 +52,7 @@ public void setSnomedService(SnomedService snomedService) { } @CrossOrigin - @ApiOperation(value = "retrives SnomedCT Record (Entire term case insensitive)", consumes = "application/json", produces = "application/json") + @ApiOperation(value = "Retrives snomed CT record", consumes = "application/json", produces = "application/json") @RequestMapping(value = "/getSnomedCTRecord", method = RequestMethod.POST, headers = "Authorization") public String getSnomedCTRecord(@ApiParam(value = "{\"term\":\"String\"}") @RequestBody String request) { OutputResponse output = new OutputResponse(); @@ -79,7 +78,7 @@ public String getSnomedCTRecord(@ApiParam(value = "{\"term\":\"String\"}") @Requ } @CrossOrigin - @ApiOperation(value = "retrives SnomedCT Record list (Entire term case insensitive)", consumes = "application/json", produces = "application/json") + @ApiOperation(value = "Retrives snomed CT record list", consumes = "application/json", produces = "application/json") @RequestMapping(value = "/getSnomedCTRecordList", method = RequestMethod.POST, headers = "Authorization") public String getSnomedCTRecordList(@ApiParam(value = "{\"term\":\"String\"}") @RequestBody String request) { OutputResponse output = new OutputResponse(); @@ -89,7 +88,6 @@ public String getSnomedCTRecordList(@ApiParam(value = "{\"term\":\"String\"}") @ logger.info("getSnomedCTRecord request " + sctdescription.toString()); - String sctList = snomedService.findSnomedCTRecordList(sctdescription); if (sctList != null) @@ -106,4 +104,3 @@ public String getSnomedCTRecordList(@ApiParam(value = "{\"term\":\"String\"}") @ } } - diff --git a/src/main/java/com/iemr/common/controller/swaasa/SwaasaController.java b/src/main/java/com/iemr/common/controller/swaasa/SwaasaController.java index 3c1714ee..30c490a3 100644 --- a/src/main/java/com/iemr/common/controller/swaasa/SwaasaController.java +++ b/src/main/java/com/iemr/common/controller/swaasa/SwaasaController.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,6 +35,8 @@ import com.iemr.common.service.swaasa.SwaasaService; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; + @RequestMapping(value = "/swaasa") @RestController public class SwaasaController { @@ -45,28 +46,8 @@ public class SwaasaController { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @Deprecated - @CrossOrigin() - @RequestMapping(value = "/validateCough", method = RequestMethod.POST, headers = "Authorization") - public String getAdminLogin(@RequestParam("file") MultipartFile file) { - OutputResponse output = new OutputResponse(); - try { - - Boolean res = swaasaService.verifyCough(file, null, null); - if (res) - output.setResponse("pass"); - else - output.setResponse("fail"); - - logger.info("get verify cough response: " + output); - } catch (Exception e) { - logger.error("sawassa failed with error " + e.getMessage(), e); - output.setError(e); - } - return output.toString(); - } - @CrossOrigin() + @ApiOperation(value = "Start assesment") @RequestMapping(value = "/startAssesment", method = RequestMethod.POST, headers = "Authorization") public String startAssesment(@RequestParam("file") MultipartFile file, @RequestParam("request") String request) { OutputResponse output = new OutputResponse(); @@ -84,6 +65,7 @@ public String startAssesment(@RequestParam("file") MultipartFile file, @RequestP } @CrossOrigin() + @ApiOperation(value = "Get assesment") @RequestMapping(value = "/getAssesment/{assessmentId}", method = RequestMethod.GET, headers = "Authorization") public String getAssessment(@PathVariable("assessmentId") String assessmentId) { OutputResponse output = new OutputResponse(); @@ -101,6 +83,7 @@ public String getAssessment(@PathVariable("assessmentId") String assessmentId) { } @CrossOrigin() + @ApiOperation(value = "Get assesment details") @RequestMapping(value = "/getAssesmentDetails/{patientId}", method = RequestMethod.GET, headers = "Authorization") public String getAssessmentDetails(@PathVariable("patientId") Long patientId) { OutputResponse output = new OutputResponse(); diff --git a/src/main/java/com/iemr/common/controller/uptsu/UptsuController.java b/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java similarity index 92% rename from src/main/java/com/iemr/common/controller/uptsu/UptsuController.java rename to src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java index d77ac16c..d73a34a5 100644 --- a/src/main/java/com/iemr/common/controller/uptsu/UptsuController.java +++ b/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java @@ -37,15 +37,18 @@ import com.iemr.common.service.uptsu.UptsuService; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; + @RequestMapping({ "/uptsu" }) @RestController -public class UptsuController { +public class UPTechnicalSupportController { @Autowired private UptsuService uptsuService; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @CrossOrigin + @ApiOperation(value = "Get facility master") @RequestMapping(value = "/get/facilityMaster/{providerServiceMapID}/{blockName}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFacility(@PathVariable Integer providerServiceMapID, @PathVariable String blockName) { OutputResponse response = new OutputResponse(); @@ -62,8 +65,10 @@ public String getFacility(@PathVariable Integer providerServiceMapID, @PathVaria } @CrossOrigin + @ApiOperation(value = "Save appointment details") @RequestMapping(value = "/save/appointment-details", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String saveAppointmentDetails(@RequestBody String request, @RequestHeader(value = "Authorization") String Authorization) { + public String saveAppointmentDetails(@RequestBody String request, + @RequestHeader(value = "Authorization") String Authorization) { OutputResponse response = new OutputResponse(); try { diff --git a/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java b/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java index 4088fe65..a1dbc2cf 100644 --- a/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java +++ b/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java @@ -40,6 +40,8 @@ import com.iemr.common.utils.mapper.InputMapper; import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; + @PropertySource("classpath:application.properties") @RestController @@ -54,6 +56,7 @@ public class EmployeeSignatureController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); @CrossOrigin() + @ApiOperation(value = "Fetch file") @RequestMapping(value = "/{userID}", headers = "Authorization", method = { RequestMethod.GET }) public ResponseEntity fetchFile(@PathVariable("userID") Long userID) throws Exception { OutputResponse response = new OutputResponse(); @@ -62,27 +65,20 @@ public ResponseEntity fetchFile(@PathVariable("userID") Long userID) thr try { EmployeeSignature userSignID = employeeSignatureServiceImpl.fetchSignature(userID); -// logger.debug("response" + Arrays.toString(userSignID.getSignature())); -// return ResponseEntity.ok().contentType(MediaType.parseMediaType(userSignID.getFileType())) - .header(HttpHeaders.CONTENT_DISPOSITION, - "inline; filename=\"" + userSignID.getFileName() + "\"") + .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + userSignID.getFileName() + "\"") .body(userSignID.getSignature()); } catch (Exception e) { logger.error("File download for userID failed with exception " + e.getMessage(), e); -// throw new Exception("Error while downloading file. Please contact administrator.."); - } return ResponseEntity.badRequest().body(new byte[] {}); - /** - * sending the response... - */ } - + @CrossOrigin() + @ApiOperation(value = "Fetch file from central") @RequestMapping(value = "/getSignClass/{userID}", headers = "Authorization", method = { RequestMethod.GET }) public String fetchFileFromCentral(@PathVariable("userID") Long userID) throws Exception { OutputResponse response = new OutputResponse(); @@ -91,24 +87,20 @@ public String fetchFileFromCentral(@PathVariable("userID") Long userID) throws E try { EmployeeSignature userSignID = employeeSignatureServiceImpl.fetchSignature(userID); -// logger.debug("response" + Arrays.toString(userSignID.getSignature())); -// - if(userSignID != null) + if (userSignID != null) response.setResponse(new Gson().toJson(userSignID)); else - response.setError(5000,"No record found"); + response.setError(5000, "No record found"); } catch (Exception e) { - response.setError(5000,e.getMessage()); + response.setError(5000, e.getMessage()); logger.error("File download for userID failed with exception " + e.getMessage(), e); -// throw new Exception("Error while downloading file. Please contact administrator.."); - } return response.toString(); } - - + @CrossOrigin() + @ApiOperation(value = "Download file based on userID") @RequestMapping(value = "/signexist/{userID}", headers = "Authorization", method = { RequestMethod.GET }) public String existFile(@PathVariable("userID") Long userID) throws Exception { OutputResponse response = new OutputResponse(); @@ -117,8 +109,6 @@ public String existFile(@PathVariable("userID") Long userID) throws Exception { try { Boolean userSignID = employeeSignatureServiceImpl.existSignature(userID); -// logger.debug("response" + Arrays.toString(userSignID.getSignature())); -// response.setResponse(userSignID.toString()); } catch (Exception e) { @@ -126,9 +116,6 @@ public String existFile(@PathVariable("userID") Long userID) throws Exception { response.setError(e); } - /** - * sending the response... - */ logger.debug("response" + response); return response.toString(); } diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index 444ebdc0..78777a3c 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -68,7 +68,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -// @CrossOrigin() @RequestMapping("/user") @RestController public class IEMRAdminController { @@ -76,12 +75,12 @@ public class IEMRAdminController { private InputMapper inputMapper = new InputMapper(); private IEMRAdminUserService iemrAdminUserServiceImpl; - + private AESUtil aesUtil; @Autowired public void setAesUtil(AESUtil aesUtil) { - this.aesUtil = aesUtil; + this.aesUtil = aesUtil; } @Autowired @@ -100,6 +99,7 @@ public void setSessionObject(SessionObject sessionObject) { SecurePassword securePassword; @CrossOrigin() + @ApiOperation(value = "New user authentication") @RequestMapping(value = "/userAuthenticateNew", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticateNew( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) { @@ -114,6 +114,7 @@ public String userAuthenticateNew( } @CrossOrigin() + @ApiOperation(value = "User authentication") @RequestMapping(value = "/userAuthenticate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticate( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel m_User, @@ -129,18 +130,14 @@ public String userAuthenticate( JSONObject serviceRoleMap = new JSONObject(); JSONArray serviceRoleList = new JSONArray(); JSONObject previlegeObj = new JSONObject(); - //condition added to check for concurrent login - if(m_User.getUserName() !=null && (m_User.getDoLogout() ==null || m_User.getDoLogout() == false)) - { - String tokenFromRedis=getConcurrentCheckSessionObjectAgainstUser(m_User.getUserName().trim().toLowerCase()); - if (tokenFromRedis !=null) - { - //response.setError(5005, "You are already logged in,please confirm to logout from other device and login again"); - throw new IEMRException("You are already logged in,please confirm to logout from other device and login again"); + if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)) { + String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser( + m_User.getUserName().trim().toLowerCase()); + if (tokenFromRedis != null) { + throw new IEMRException( + "You are already logged in,please confirm to logout from other device and login again"); } - } - else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.getDoLogout() == true) - { + } else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) { deleteSessionObject(m_User.getUserName().trim().toLowerCase()); } if (mUser.size() == 1) { @@ -171,8 +168,9 @@ else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.get logger.info("userAuthenticate response " + response.toString()); return response.toString(); } - + @CrossOrigin() + @ApiOperation(value = "Log out user from concurrent session") @RequestMapping(value = "/logOutUserFromConcurrentSession", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String logOutUserFromConcurrentSession( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel m_User, @@ -180,8 +178,7 @@ public String logOutUserFromConcurrentSession( OutputResponse response = new OutputResponse(); logger.info("logOutUserFromConcurrentSession request - " + m_User); try { - if(m_User!= null && m_User.getUserName() !=null) - { + if (m_User != null && m_User.getUserName() != null) { List mUsers = iemrAdminUserServiceImpl.userExitsCheck(m_User.getUserName()); if (mUsers == null || mUsers.size() <= 0) { @@ -189,22 +186,19 @@ public String logOutUserFromConcurrentSession( } else if (mUsers.size() > 1) throw new IEMRException("More than 1 user found, please contact administrator"); else if (mUsers.size() == 1) { - String previousTokenFromRedis = sessionObject + String previousTokenFromRedis = sessionObject .getSessionObject((mUsers.get(0).getUserName().toString().trim().toLowerCase())); - if (previousTokenFromRedis != null) { - deleteSessionObjectByGettingSessionDetails(previousTokenFromRedis); - sessionObject.deleteSessionObject(previousTokenFromRedis); - response.setResponse("User successfully logged out"); + if (previousTokenFromRedis != null) { + deleteSessionObjectByGettingSessionDetails(previousTokenFromRedis); + sessionObject.deleteSessionObject(previousTokenFromRedis); + response.setResponse("User successfully logged out"); + } else + throw new IEMRException("Unable to fetch session from redis"); } - else - throw new IEMRException("Unable to fetch session from redis"); - } - } - else - { + } else { throw new IEMRException("Invalid request object"); } - + } catch (Exception e) { logger.error("logOutUserFromConcurrentSession failed with error " + e.getMessage(), e); response.setError(e); @@ -215,29 +209,23 @@ else if (mUsers.size() == 1) { /** * - * @param SH20094090,19-04-2022 * function to return session object against userName */ - private String getConcurrentCheckSessionObjectAgainstUser(String userName) - { - String response=null; - try - { - response= sessionObject - .getSessionObject(userName); - } - catch(Exception e) - { + private String getConcurrentCheckSessionObjectAgainstUser(String userName) { + String response = null; + try { + response = sessionObject.getSessionObject(userName); + } catch (Exception e) { logger.error(e.getMessage()); } return response; } + private void createUserMapping(User mUser, JSONObject resMap, JSONObject serviceRoleMultiMap, JSONObject serviceRoleMap, JSONArray serviceRoleList, JSONObject previlegeObj) { String fName = mUser.getFirstName(); String lName = mUser.getLastName(); String mName = mUser.getMiddleName(); -// mName = mName == null ? "" : mName; String uName = (fName == null ? "" : fName) + " " + (mName == null ? "" : mName) + " " + (lName == null ? "" : lName); resMap.put("userID", mUser.getUserID()); @@ -252,10 +240,6 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service if (mUser.getDesignation() != null) { resMap.put("designation", new JSONObject(mUser.getDesignation().toString())); } - // User userData; - // for (Iterator localIterator1 = mUser.iterator(); localIterator1.hasNext();) - // { - // userData = (User) localIterator1.next(); for (UserServiceRoleMapping m_UserServiceRoleMapping : mUser.getM_UserServiceRoleMapping()) { serviceRoleMultiMap.put( m_UserServiceRoleMapping.getM_ProviderServiceMapping().getM_ServiceMaster().getServiceName(), @@ -280,7 +264,6 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service JSONArray roles = previlegeObj.getJSONObject(serv).getJSONArray("roles"); roles.put(new JSONObject(m_UserServiceRoleMapping.getM_Role().toString())); } - // } Iterator keySet = serviceRoleMultiMap.keys(); while (keySet.hasNext()) { String s = keySet.next(); @@ -302,7 +285,7 @@ public String superUserAuthenticate( OutputResponse response = new OutputResponse(); logger.info("userAuthenticate request "); try { - + if (!m_User.getUserName().equalsIgnoreCase("SuperAdmin")) { throw new IEMRException("Please log with admin credentials"); } @@ -310,27 +293,17 @@ public String superUserAuthenticate( User mUser = iemrAdminUserServiceImpl.superUserAuthenticate(m_User.getUserName(), decryptPassword); JSONObject resMap = new JSONObject(); JSONObject previlegeObj = new JSONObject(); - //condition added to check for concurrent login - if(m_User.getUserName() !=null && (m_User.getDoLogout() ==null || m_User.getDoLogout() == false)) - { - String tokenFromRedis=getConcurrentCheckSessionObjectAgainstUser(m_User.getUserName().trim().toLowerCase()); - if (tokenFromRedis !=null) - { - //response.setError(5005, "You are already logged in,please confirm to logout from other device and login again"); - throw new IEMRException("You are already logged in,please confirm to logout from other device and login again"); + if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)) { + String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser( + m_User.getUserName().trim().toLowerCase()); + if (tokenFromRedis != null) { + throw new IEMRException( + "You are already logged in,please confirm to logout from other device and login again"); } - } - else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.getDoLogout() == true) - { + } else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) { deleteSessionObject(m_User.getUserName().trim().toLowerCase()); } if (mUser != null) { -// String fName = mUser.getFirstName(); -// String lName = mUser.getLastName(); -// String mName = mUser.getMiddleName(); -// mName = mName == null ? "" : mName; -// String uName = (fName == null ? "" : fName) + " " + (mName == null ? "" : mName) + " " -// + (lName == null ? "" : lName); resMap.put("userID", mUser.getUserID()); resMap.put("isAuthenticated", /* Boolean.valueOf(true) */true); resMap.put("userName", mUser.getUserName()); @@ -362,6 +335,7 @@ else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.get } @CrossOrigin() + @ApiOperation(value = "User authentication V1") @RequestMapping(value = "/userAuthenticateV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticateV1( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel loginRequest, @@ -376,8 +350,6 @@ public String userAuthenticateV1( } LoginResponseModel resp = iemrAdminUserServiceImpl.userAuthenticateV1(loginRequest, remoteAddress, request.getRemoteHost()); - // logger.info("Login response is before redis " + - // OutputMapper.gsonWithoutExposeRestriction().toJson(resp)); JSONObject responseObj = new JSONObject(OutputMapper.gsonWithoutExposeRestriction().toJson(resp)); responseObj = iemrAdminUserServiceImpl.generateKeyAndValidateIP(responseObj, remoteAddress, request.getRemoteHost()); @@ -391,6 +363,7 @@ public String userAuthenticateV1( } @CrossOrigin() + @ApiOperation(value = "Get login response") @RequestMapping(value = "/getLoginResponse", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getLoginResponse(HttpServletRequest request) { OutputResponse response = new OutputResponse(); @@ -406,6 +379,7 @@ public String getLoginResponse(HttpServletRequest request) { * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = * RequestMethod.POST */) + @ApiOperation(value = "Forget password") @RequestMapping(value = "/forgetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String forgetPassword( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\"}\"") @RequestBody ChangePasswordModel m_User) { @@ -432,8 +406,6 @@ else if (mUsers.size() == 1) { quesAnsList.add(quesAnsMap); } - // unnecessary code, remove in next build, return list of questionaries, - // quesAnsList resMap.put("SecurityQuesAns", quesAnsList); } response.setResponse(OutputMapper.gsonWithoutExposeRestriction().toJson(resMap)); @@ -447,6 +419,7 @@ else if (mUsers.size() == 1) { } @CrossOrigin() + @ApiOperation(value = "Set forget password") @RequestMapping(value = "/setForgetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String setPassword( @ApiParam(value = "\"{\"userName\":\"String\",\"password\":\"String\",\"transactionId\":\"String\"}\"") @RequestBody ChangePasswordModel m_user) { @@ -463,7 +436,7 @@ public String setPassword( String setStatus; String decryptPassword = aesUtil.decrypt("Piramal12Piramal", m_user.getPassword()); noOfRowModified = iemrAdminUserServiceImpl.setForgetPassword(mUser, decryptPassword, - m_user.getTransactionId(), m_user.getIsAdmin()); + m_user.getTransactionId(), m_user.getIsAdmin()); if (noOfRowModified > 0) { setStatus = "Password Changed"; } else { @@ -485,6 +458,7 @@ public String setPassword( } @CrossOrigin() + @ApiOperation(value = "Change password") @RequestMapping(value = "/changePassword", method = RequestMethod.POST, produces = "application/json") public String changePassword( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\",\\\"transactionId\\\":\\\"String\\\"}\"") @RequestBody ChangePasswordModel changePassword) { @@ -506,7 +480,7 @@ public String changePassword( } User mUser = mUsers.get(0); noOfRowUpdated = iemrAdminUserServiceImpl.setForgetPassword(mUser, changePassword.getNewPassword(), - changePassword.getTransactionId(),changePassword.getIsAdmin()); + changePassword.getTransactionId(), changePassword.getIsAdmin()); if (noOfRowUpdated > 0) { changeReqResult = "Password SuccessFully Change"; } else { @@ -520,9 +494,9 @@ public String changePassword( logger.info("changePassword response " + response.toString()); return response.toString(); } - @CrossOrigin() + @ApiOperation(value = "Save user security questions & answers") @RequestMapping(value = "/saveUserSecurityQuesAns", method = RequestMethod.POST, produces = "application/json") public String saveUserSecurityQuesAns( @ApiParam(value = "\"[{\\\"userID\\\":\\\"Integer\\\",\\\"questionID\\\":\\\"Integer\\\",\\\"answers\\\":\\\"String\\\"," @@ -548,6 +522,7 @@ public String saveUserSecurityQuesAns( * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = * RequestMethod.GET */) + @ApiOperation(value = "Get security quetions") @RequestMapping(value = "/getsecurityquetions", method = RequestMethod.GET) public String getSecurityts() { OutputResponse response = new OutputResponse(); @@ -567,6 +542,7 @@ public String getSecurityts() { * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = * RequestMethod.POST */) + @ApiOperation(value = "Get roles by provider id") @RequestMapping(value = "/getRolesByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getRolesByProviderID( @ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\"}") @RequestBody String request) { @@ -586,6 +562,7 @@ public String getRolesByProviderID( * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = * RequestMethod.POST */) + @ApiOperation(value = "Get role screen mapping by provider id") @RequestMapping(value = "/getRoleScreenMappingByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getRoleScreenMappingByProviderID( @ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\"}") @RequestBody String request) { @@ -613,6 +590,7 @@ public String getRoleScreenMappingByProviderID( * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = * RequestMethod.POST */) + @ApiOperation(value = "Get users by provider id") @RequestMapping(value = "/getUsersByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getUsersByProviderID( @ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", " @@ -634,6 +612,7 @@ public String getUsersByProviderID( * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = * RequestMethod.POST */) + @ApiOperation(value = "Get user service point van details") @RequestMapping(value = "/getUserServicePointVanDetails", method = RequestMethod.POST, produces = "application/json", headers = "Authorization") public String getUserServicePointVanDetails( @ApiParam(value = "\"{\\\"userID\\\":\\\"Integer\\\",\"providerServiceMapID\":\"Integer\"}\"") @RequestBody String comingRequest) { @@ -645,7 +624,6 @@ public String getUserServicePointVanDetails( String responseData = iemrAdminUserServiceImpl.getUserServicePointVanDetails(obj.getInt("userID")); response.setResponse(responseData); } catch (Exception e) { - // e.printStackTrace(); response.setError(e); logger.error("get User SP and van details failed with " + e.getMessage(), e); @@ -655,6 +633,7 @@ public String getUserServicePointVanDetails( } @CrossOrigin() + @ApiOperation(value = "Get service point villages") @RequestMapping(value = "/getServicepointVillages", method = RequestMethod.POST, produces = "application/json", headers = "Authorization") public String getServicepointVillages( @ApiParam(value = "\"{\\\"servicePointID\\\":\\\"Integer\\\"}\"") @RequestBody String comingRequest) { @@ -666,7 +645,6 @@ public String getServicepointVillages( String responseData = iemrAdminUserServiceImpl.getServicepointVillages(obj.getInt("servicePointID")); response.setResponse(responseData); } catch (Exception e) { - // e.printStackTrace(); response.setError(e); logger.error("get villages with servicepoint failed with " + e.getMessage(), e); @@ -676,6 +654,7 @@ public String getServicepointVillages( } @CrossOrigin() + @ApiOperation(value = "Get locations by provider id") @RequestMapping(value = "/getLocationsByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getLocationsByProviderID( @ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", " @@ -693,6 +672,7 @@ public String getLocationsByProviderID( } @CrossOrigin() + @ApiOperation(value = "User log out") @RequestMapping(value = "/userLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String userLogout(HttpServletRequest request) { OutputResponse response = new OutputResponse(); @@ -712,41 +692,35 @@ public String userLogout(HttpServletRequest request) { * @param request * @return */ - private void deleteSessionObjectByGettingSessionDetails(String key) - { - String sessionDetails=null; + private void deleteSessionObjectByGettingSessionDetails(String key) { + String sessionDetails = null; try { - logger.info("inside delete child:"+key); - sessionDetails=sessionObject.getSessionObject(key); - logger.info("isessionDetails:"+sessionDetails); + logger.info("inside delete child:" + key); + sessionDetails = sessionObject.getSessionObject(key); + logger.info("isessionDetails:" + sessionDetails); JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(sessionDetails); jsnOBJ = jsnElmnt.getAsJsonObject(); - if(jsnOBJ.has("userName") && jsnOBJ.get("userName") !=null) - { - logger.info("deleting key:"+jsnOBJ.get("userName").getAsString().trim().toLowerCase()); + if (jsnOBJ.has("userName") && jsnOBJ.get("userName") != null) { + logger.info("deleting key:" + jsnOBJ.get("userName").getAsString().trim().toLowerCase()); sessionObject.deleteSessionObject(jsnOBJ.get("userName").getAsString().trim().toLowerCase()); } - } - catch(Exception e) - { + } catch (Exception e) { logger.error(e.getMessage()); } } - private void deleteSessionObject(String key) - { - try - { + + private void deleteSessionObject(String key) { + try { sessionObject.deleteSessionObject(key); - } - catch(Exception e) - { + } catch (Exception e) { logger.error(e.getMessage()); } } - + @CrossOrigin() + @ApiOperation(value = "Force log out") @RequestMapping(value = "/forceLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String forceLogout(@ApiParam(value = "{\"userName\":\"String user name to force logout\", " + "\"providerServiceMapID\":\"Integer service provider ID\"}") @RequestBody ForceLogoutRequestModel request) { @@ -761,6 +735,7 @@ public String forceLogout(@ApiParam(value = "{\"userName\":\"String user name to } @CrossOrigin() + @ApiOperation(value = "User force log out") @RequestMapping(value = "/userForceLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String userForceLogout( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\"}\"") @RequestBody ForceLogoutRequestModel request) { @@ -775,6 +750,7 @@ public String userForceLogout( } @CrossOrigin() + @ApiOperation(value = "Get agent by role id") @RequestMapping(value = "/getAgentByRoleID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAgentByRoleID(@ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", " + "\"RoleID\":\"Optional: Integer - role ID to be filtered\"}") @RequestBody String request) { @@ -791,6 +767,7 @@ public String getAgentByRoleID(@ApiParam(value = "{\"providerServiceMapID\":\"In } @CrossOrigin() + @ApiOperation(value = "User authenticate by encryption") @RequestMapping(value = "/userAuthenticateByEncryption", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticateByEncryption( @ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody String req, @@ -835,6 +812,7 @@ public String userAuthenticateByEncryption( } @CrossOrigin() + @ApiOperation(value = "Get role wrap up time") @RequestMapping(value = "/role/{roleID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getrolewrapuptime(@PathVariable("roleID") Integer roleID) { @@ -848,13 +826,10 @@ public String getrolewrapuptime(@PathVariable("roleID") Integer roleID) { } catch (Exception e) { response.setError(e); } -// logger.info("response is " + response.toStringWithSerialization()); return response.toString(); -// return test.toString(); } /** - * @author DE40034072 Date 23-03-2022 * @param request * @return transaction Id for password change */ diff --git a/src/main/java/com/iemr/common/controller/version/VersionController.java b/src/main/java/com/iemr/common/controller/version/VersionController.java index 13b76a59..64d8e43b 100644 --- a/src/main/java/com/iemr/common/controller/version/VersionController.java +++ b/src/main/java/com/iemr/common/controller/version/VersionController.java @@ -35,40 +35,44 @@ import com.iemr.common.utils.response.OutputResponse; +import io.swagger.annotations.ApiOperation; + @RestController public class VersionController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - + @CrossOrigin() + @ApiOperation(value = "Get version") @RequestMapping(value = "/version", method = { RequestMethod.GET }) public String versionInformation() { OutputResponse output = new OutputResponse(); try { logger.info("version Controller Start"); output.setResponse(readGitProperties()); - } catch (Exception e) { - output.setError(e); - } - + } catch (Exception e) { + output.setError(e); + } + logger.info("version Controller End"); return output.toString(); } + private String readGitProperties() throws Exception { - ClassLoader classLoader = getClass().getClassLoader(); - InputStream inputStream = classLoader.getResourceAsStream("git.properties"); - - return readFromInputStream(inputStream); + ClassLoader classLoader = getClass().getClassLoader(); + InputStream inputStream = classLoader.getResourceAsStream("git.properties"); + + return readFromInputStream(inputStream); } - private String readFromInputStream(InputStream inputStream) - throws IOException { - StringBuilder resultStringBuilder = new StringBuilder(); - try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) { - String line; - while ((line = br.readLine()) != null) { - resultStringBuilder.append(line).append("\n"); - } - } - return resultStringBuilder.toString(); + + private String readFromInputStream(InputStream inputStream) throws IOException { + StringBuilder resultStringBuilder = new StringBuilder(); + try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) { + String line; + while ((line = br.readLine()) != null) { + resultStringBuilder.append(line).append("\n"); + } + } + return resultStringBuilder.toString(); } } From d102aa2814092fb09789aa552470fe3033336e2b Mon Sep 17 00:00:00 2001 From: swetatech24 Date: Fri, 14 Jul 2023 19:40:12 +0530 Subject: [PATCH 2/2] API Cleanup --- .../QuestionTypeController.java | 2 +- .../QuestionnaireController.java | 2 +- .../controller/scheme/SchemeController.java | 2 +- .../secondaryReport/CRMSecondaryReports.java | 47 ++++++++----------- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java index 34197318..f25451f9 100644 --- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java +++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java @@ -59,7 +59,7 @@ public void setQuestionTypeService(QuestionTypeService questionTypeService) { } @CrossOrigin() - @ApiOperation(value = "Put question type") + @ApiOperation(value = "Create question type") @RequestMapping(value = "/put/questionType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String createQuestionType( @ApiParam(value = "{\\\"questionType\\\":\\\"String\\\",\\\"questionTypeDesc\\\":\\\"String\\\"}\"") @RequestBody String request) { diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java index 30109337..0060e840 100644 --- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java +++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java @@ -56,7 +56,7 @@ public void setQuestionnaireService(QuestionnaireService questionnaireService) { } @CrossOrigin() - @ApiOperation(value = "Put questionnaire") + @ApiOperation(value = "Create questionnaire") @RequestMapping(value = "/put/questionnaire", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String createQuestionnaire(@RequestBody String request) { OutputResponse response = new OutputResponse(); diff --git a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java index 7f6cb097..cbdfc1f0 100644 --- a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java +++ b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java @@ -53,7 +53,7 @@ public class SchemeController { InputMapper mapper = new InputMapper(); @CrossOrigin - @ApiOperation(value = "Stores scheme data", consumes = "application/json", produces = "application/json") + @ApiOperation(value = "Save scheme details", consumes = "application/json", produces = "application/json") @RequestMapping(value = "/save/schemeDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveSchemeDetails(@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", " + "\"schemeName\": \"Name of Scheme\", " + "\"schemeDesc\": \"Description of Scheme\", " diff --git a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java b/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java index c9171bd1..5df0eb6f 100644 --- a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java +++ b/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java @@ -123,9 +123,8 @@ public ResponseEntity getCallSummaryReport( try { file = new InputStreamResource(secondaryReportService.getCallSummaryReport(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -150,9 +149,8 @@ public ResponseEntity getAllBySexualOrientation( file = new InputStreamResource( secondaryReportService.getAllBySexualOrientationReport(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -178,9 +176,8 @@ public ResponseEntity getDistrictWiseCallReport( try { file = new InputStreamResource(secondaryReportService.getDistrictWiseCallReport(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -204,9 +201,8 @@ public ResponseEntity getUnblockedUserReport( try { file = new InputStreamResource(secondaryReportService.getUnblockedUserReport(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -233,9 +229,8 @@ public ResponseEntity getCallQualityReport( filename = getFileName(jsonRequest, callQualityReport.getFileName()); file = new InputStreamResource(secondaryReportService.getCallQualityReport(callQualityReport, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -262,9 +257,8 @@ public ResponseEntity getCountsByPreferredLanguage( filename = getFileName(jsonRequest, "Language_Distribution_Report"); file = new InputStreamResource(secondaryReportService.getCountsByPrefferedLanguage(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -277,7 +271,7 @@ public ResponseEntity getCountsByPreferredLanguage( } @CrossOrigin - @ApiOperation(value = "Get all by age group") + @ApiOperation(value = "Get caller by age group") @RequestMapping(value = "/getAllByAgeGroup", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getAllByAgeGroup( @ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"maxAge\\\":\\\"Integer\\\",\\\"minAge\\\":\\\"Integer\\\",\\\"startTimestamp\\\":\\\"Timestamp\\\"," @@ -289,9 +283,8 @@ public ResponseEntity getAllByAgeGroup( try { file = new InputStreamResource(secondaryReportService.getAllByAgeGroup(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -318,9 +311,8 @@ public ResponseEntity getAllReportsByDate( try { file = new InputStreamResource(secondaryReportService.getAllReportsByDate(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e) { logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: " @@ -345,9 +337,8 @@ public ResponseEntity getAllByGender( try { file = new InputStreamResource(secondaryReportService.getAllByGender(jsonRequest, filename)); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))// add - // generic - // function + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx")) + .contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file); } catch (Exception e)