diff --git a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java index b10fb705..ad241164 100644 --- a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java +++ b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java @@ -520,7 +520,7 @@ public String updateBenefciaryCommunityorEducation( public String getBeneficiaryIDs( @ApiParam("{\"benIDRequired\":\"Integer\",\"vanID\":\"Integer\"}") @RequestBody String request, HttpServletRequest httpRequest) { - logger.info("generateBeneficiaryIDs request " + request.toString()); + logger.info("generateBeneficiaryIDs request " + request); OutputResponse response = new OutputResponse(); try { diff --git a/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java b/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java index 82226a25..164b2131 100644 --- a/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java +++ b/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java @@ -7,18 +7,14 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.PostMapping; 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.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.iemr.common.service.brd.BRDIntegrationService; import com.iemr.common.utils.response.OutputResponse; - @RestController @RequestMapping("/brd") @CrossOrigin() @@ -44,7 +40,6 @@ public String getDetails(@RequestBody String request) { logger.error("Error while getching BRD Integration data :" + e); response.setError(5000, "Unable to get BRD data"); } - System.out.println(response.toStringWithSerializeNulls()); return response.toStringWithSerializeNulls(); } diff --git a/src/main/java/com/iemr/common/controller/callhandling/CallController.java b/src/main/java/com/iemr/common/controller/callhandling/CallController.java index f8cfe334..38fddb87 100644 --- a/src/main/java/com/iemr/common/controller/callhandling/CallController.java +++ b/src/main/java/com/iemr/common/controller/callhandling/CallController.java @@ -35,6 +35,8 @@ public class CallController { InputMapper inputMapper = new InputMapper(); final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + private static final String XFORWARDEDFOR = "X-FORWARDED-FOR"; + private static final String AUTHORIZATION = "authorization"; private CalltypeServiceImpl calltypeServiceImpl; @Autowired @@ -95,7 +97,7 @@ public String startCall( HttpServletRequest fromRequest) { OutputResponse response = new OutputResponse(); try { - String remoteAddress = fromRequest.getHeader("X-FORWARDED-FOR"); + String remoteAddress = fromRequest.getHeader(XFORWARDEDFOR); if (remoteAddress == null || remoteAddress.trim().length() == 0) { remoteAddress = fromRequest.getRemoteAddr(); } @@ -145,14 +147,13 @@ public String closeCall( + "\"agentIPAddress\":\"Optional String - agent IP address\", " + "\"agentID\":\"Optional String - agentID\", \"isSelf\":\"Optional boolean\", " + "\"isFeedback\":\"optional Boolean true if IVRS feedback to be taken\", " - + "\"isTransfered\":\"Boolean - transfer call or not\"" - + "}") @RequestBody String request, + + "\"isTransfered\":\"Boolean - transfer call or not\"" + "}") @RequestBody String request, HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); try { logger.info("closeCallReqObj " + request); JSONObject requestObject = new JSONObject(request); - String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR"); + String remoteAddress = serverRequest.getHeader(XFORWARDEDFOR); if (remoteAddress == null || remoteAddress.trim().length() == 0) { remoteAddress = serverRequest.getRemoteAddr(); } @@ -188,7 +189,7 @@ public String closeCallV1( OutputResponse response = new OutputResponse(); try { JSONObject requestObject = new JSONObject(request); - String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR"); + String remoteAddress = serverRequest.getHeader(XFORWARDEDFOR); if (remoteAddress == null || remoteAddress.trim().length() == 0) { remoteAddress = serverRequest.getRemoteAddr(); } @@ -215,7 +216,7 @@ public String outboundCallList(@ApiParam(value = "{\"providerServiceMapID\":\" c + "\"filterStartDate\":\"JSON date\", " + "\"filterEndDate\":\"JSON Date\"}") @RequestBody String request, HttpServletRequest httpRequest) { OutputResponse response = new OutputResponse(); - String auth = httpRequest.getHeader("authorization"); + String auth = httpRequest.getHeader(AUTHORIZATION); try { response.setResponse(beneficiaryCallService.outboundCallList(request, auth)); } catch (Exception e) { @@ -254,7 +255,7 @@ public String filterCallList( + "\"is1097\" : \"boolean true for 1097\"}") @RequestBody String request, HttpServletRequest httpRequest) { OutputResponse response = new OutputResponse(); - String auth = httpRequest.getHeader("authorization"); + String auth = httpRequest.getHeader(AUTHORIZATION); try { response.setResponse(beneficiaryCallService.filterCallList(request, auth)); } catch (Exception e) { @@ -274,7 +275,7 @@ public String filterCallListPaginated(@ApiParam(value = "{\"calledServiceID\":\" + "\"is1097\" : \"boolean true for 1097\", \"pageNo\\\":\"optional page no\", , \"pageSize\":\"optional page size\" }") @RequestBody String request, HttpServletRequest httpRequest) { OutputResponse response = new OutputResponse(); - String auth = httpRequest.getHeader("authorization"); + String auth = httpRequest.getHeader(AUTHORIZATION); try { response.setResponse(beneficiaryCallService.filterCallListWithPagination(request, auth)); } catch (Exception e) { @@ -469,14 +470,8 @@ public String nueisanceCallHistory( HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); try { - String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR"); - if (remoteAddress == null || remoteAddress.trim().length() == 0) { - remoteAddress = serverRequest.getRemoteAddr(); - } - String auth = serverRequest.getHeader("authorization"); + String auth = serverRequest.getHeader(AUTHORIZATION); response.setResponse(beneficiaryCallService.nueisanceCallHistory(request, auth).toString()); - // response.setResponse(beneficiaryCallService.filterCallList(request, - // auth).toString()); } catch (Exception e) { logger.error("outboundCallList failed with error " + e.getMessage(), e); response.setError(e); @@ -487,7 +482,8 @@ public String nueisanceCallHistory( @CrossOrigin() @RequestMapping(value = "/beneficiaryByCallID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String beneficiaryByCallID(@ApiParam("{\"callID\":\"String\"}") @RequestBody CallRequestByIDModel request, HttpServletRequest serverRequest) { + public String beneficiaryByCallID(@ApiParam("{\"callID\":\"String\"}") @RequestBody CallRequestByIDModel request, + HttpServletRequest serverRequest) { OutputResponse response = new OutputResponse(); try { BeneficiaryCallModel callData = beneficiaryCallService.beneficiaryByCallID(request, @@ -585,10 +581,10 @@ public String checkAutoPreviewDialing( @CrossOrigin() @RequestMapping(value = "/getFilePathCTI", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public String getFilePathCTI(@ApiParam("{\"agentID\":\"String\",\"callID\":\"String\"}") @RequestBody String request) { + public String getFilePathCTI( + @ApiParam("{\"agentID\":\"String\",\"callID\":\"String\"}") @RequestBody String request) { OutputResponse response = new OutputResponse(); try { -// response.setResponse(beneficiaryCallService.CTIFilePath(request)); String pathResponse = beneficiaryCallService.cTIFilePathNew(request); if (pathResponse != null) response.setResponse(pathResponse); diff --git a/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java b/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java index c7cd3d6a..d753391a 100644 --- a/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java +++ b/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java @@ -25,13 +25,11 @@ @PropertySource("classpath:myapp.properties") @RestController @RequestMapping(value = "/carestream") -public class CareStreamCreateOrderController -{ +public class CareStreamCreateOrderController { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); private static final char END_OF_BLOCK = '\u001c'; private static final char START_OF_BLOCK = '\u000b'; private static final char CARRIAGE_RETURN = 13; - private static final int MAX_BYTES = 1024; @Value("${carestream_socket_ip}") private String carestreamSocketIP; @@ -40,33 +38,25 @@ public class CareStreamCreateOrderController private int carestreamSocketPort; @CrossOrigin() - @RequestMapping(value = "/createOrder", headers = "Authorization", method = { RequestMethod.POST }, - produces = - { "application/json" }) + @RequestMapping(value = "/createOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = { + "application/json" }) public String createOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"String\",\"LastName\":\"String\"," - + "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String createOrder) throws UnknownHostException, IOException - { - // JSONObject requestOBJ = new JSONObject(providerBlocking); + + "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String createOrder) + throws UnknownHostException, IOException { OutputResponse response = new OutputResponse(); Socket socket = null; - try - { + try { CreateOrderData benificiaryDetails = InputMapper.gson().fromJson(createOrder, CreateOrderData.class); - // public static void main(String[] args) { - String firstName = benificiaryDetails.getFirstName(); - String lastName = benificiaryDetails.getLastName(); String patientID = benificiaryDetails.getPatientID(); String dob = benificiaryDetails.getDob(); String gender = benificiaryDetails.getGender(); String acc = benificiaryDetails.getAcc(); - // Socket socket = new Socket("192.168.1.101", 1235); socket = new Socket(carestreamSocketIP, carestreamSocketPort); - // System.out.println("Connected to Server"); StringBuffer testHL7MassageToTransmit = new StringBuffer(); testHL7MassageToTransmit.append(START_OF_BLOCK) @@ -83,97 +73,45 @@ public String createOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\" InputStream in = socket.getInputStream(); OutputStream out = socket.getOutputStream(); - // Send the MLLP -wrapped HL7 message to the server out.write(testHL7MassageToTransmit.toString().getBytes()); - // byte[] byteBuffer = new byte[MAX_BYTES]; - // StringBuilder resultCS = new StringBuilder(); - // String responseFromCS = ""; - // int numBytes = 0; - // do { - // numBytes = in.read(byteBuffer); - // resultCS.append(new String(byteBuffer).trim()); - // } while (!(numBytes 0) { - // response.setResponse("Order successfully created"); - // } else { - // response.setResponse("Error in order creation"); - // } - // byte[] byteBuffer = new byte[50]; - if(in.read(byteBuffer)>0){ - //in.read(byteBuffer); - - String resultCS = new String(byteBuffer); - if (resultCS != null && resultCS.length() > 0) - { - response.setResponse("Order successfully created"); - } else - { - response.setResponse("Error in order creation"); + if (in.read(byteBuffer) > 0) { + + String resultCS = new String(byteBuffer); + if (resultCS != null && resultCS.length() > 0) { + response.setResponse("Order successfully created"); + } else { + response.setResponse("Error in order creation"); + } } - } - - // String s = new Gson().toJson(byteBuffer); - // System.out.println("Receiver from server: "+ new - // String(byteBuffer)); - - // Close the socket and its streams - - // socket.close(); - - // socket.getInputStream(); - - /* - * String ip = "localhost"; int port = 8082; - * - * String testMassage = "This is the test Massage that the client will transmit"; byte[] byteBuffer1 = - * testMassage.getBytes(); Socket socket1 = new Socket(ip, port); System.out.println( - * "connected to the Server"); InputStream in1 = socket.getInputStream(); OutputStream out1 = - * socket.getOutputStream(); - * - * // Send the Massage to the server out1.write(byteBuffer); in1.read(byteBuffer); // Close the socket and - * its Streams System.out.println("Massage received form Server11" + new String(byteBuffer)); - */ - } catch (Exception e) - { + } catch (Exception e) { logger.error(e.getMessage()); response.setError(e); - } finally - { + } finally { if (socket != null) socket.close(); } - /** - * sending the response... - */ return response.toString(); } @CrossOrigin() - @RequestMapping(value = "/UpdateOrder", headers = "Authorization", method = { RequestMethod.POST }, - produces = - { "application/json" }) + @RequestMapping(value = "/UpdateOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = { + "application/json" }) public String updateOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"String\",\"LastName\":\"String\"," - + "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String UpdateOrder) throws UnknownHostException, IOException - { - // JSONObject requestOBJ = new JSONObject(providerBlocking); + + "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String UpdateOrder) + throws UnknownHostException, IOException { OutputResponse response = new OutputResponse(); Socket socket = null; - try - { + try { CreateOrderData benificiaryDetails = InputMapper.gson().fromJson(UpdateOrder, CreateOrderData.class); - // public static void main(String[] args) { - String firstName = benificiaryDetails.getFirstName(); - String middleName = benificiaryDetails.getMiddleName(); String lastName = benificiaryDetails.getLastName(); String patientID = benificiaryDetails.getPatientID(); String dob = benificiaryDetails.getDob(); @@ -181,7 +119,6 @@ public String updateOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\" String acc = benificiaryDetails.getAcc(); socket = new Socket("192.168.1.101", 1235); -// System.out.println("Connected to Server"); StringBuffer testHL7MassageToTransmit = new StringBuffer(); testHL7MassageToTransmit.append(START_OF_BLOCK) @@ -202,60 +139,46 @@ public String updateOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\" out.write(testHL7MassageToTransmit.toString().getBytes()); byte[] byteBuffer = new byte[200]; - if(in.read(byteBuffer)>0) { - //in.read(byteBuffer); - // System.out.println("Receiver from server: "+ new - // String(byteBuffer)); + if (in.read(byteBuffer) > 0) { - response.setResponse("Receiver from server: " + new String(byteBuffer)); - // Close the socket and its streams + response.setResponse("Receiver from server: " + new String(byteBuffer)); + // Close the socket and its streams - socket.close(); + socket.close(); } - } catch (Exception e) - { + } catch (Exception e) { logger.error(e.getMessage()); response.setError(e); - }finally { - if(socket!=null) - socket.close(); + } finally { + if (socket != null) + socket.close(); } - /** - * sending the response... - */ return response.toString(); } @CrossOrigin() - @RequestMapping(value = "/deleteOrder", headers = "Authorization", method = { RequestMethod.POST }, - produces = - { "application/json" }) + @RequestMapping(value = "/deleteOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = { + "application/json" }) public String deleteOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"String\",\"LastName\":\"String\"," - + "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String deleteOrder) throws UnknownHostException, IOException - { - // JSONObject requestOBJ = new JSONObject(providerBlocking); + + "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String deleteOrder) + throws UnknownHostException, IOException { OutputResponse response = new OutputResponse(); Socket socket = null; - try - { + try { CreateOrderData benificiaryDetails = InputMapper.gson().fromJson(deleteOrder, CreateOrderData.class); - // public static void main(String[] args) { - String firstName = benificiaryDetails.getFirstName(); - String middleName = benificiaryDetails.getMiddleName(); String lastName = benificiaryDetails.getLastName(); String patientID = benificiaryDetails.getPatientID(); String dob = benificiaryDetails.getDob(); String gender = benificiaryDetails.getGender(); String acc = benificiaryDetails.getAcc(); - socket = new Socket("192.168.1.101", 1235); -// System.out.println("Connected to Server"); + socket = new Socket("192.168.1.101", 1235); StringBuffer testHL7MassageToTransmit = new StringBuffer(); testHL7MassageToTransmit.append(START_OF_BLOCK) @@ -276,30 +199,21 @@ public String deleteOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\" out.write(testHL7MassageToTransmit.toString().getBytes()); byte[] byteBuffer = new byte[200]; - if(in.read(byteBuffer)>0) { - //in.read(byteBuffer); - // System.out.println("Receiver from server: "+ new - // String(byteBuffer)); + if (in.read(byteBuffer) > 0) { - response.setResponse("Receiver from server: " + new String(byteBuffer)); - // Close the socket and its streams + response.setResponse("Receiver from server: " + new String(byteBuffer)); - //socket.close(); } - } catch (Exception e) - { + } catch (Exception e) { logger.error(e.getMessage()); response.setError(e); - }finally { - if(socket!=null) - socket.close(); + } finally { + if (socket != null) + socket.close(); } - /** - * sending the response... - */ return response.toString(); } diff --git a/src/main/java/com/iemr/common/utils/mapper/InputMapper.java b/src/main/java/com/iemr/common/utils/mapper/InputMapper.java index 48bfb8c5..d2998efd 100644 --- a/src/main/java/com/iemr/common/utils/mapper/InputMapper.java +++ b/src/main/java/com/iemr/common/utils/mapper/InputMapper.java @@ -6,44 +6,25 @@ import com.google.gson.ExclusionStrategy; import com.google.gson.GsonBuilder; -import com.iemr.common.utils.exception.IEMRException; -/** - * @author VI314759 - * - */ @Service -public class InputMapper -{ +public class InputMapper { static GsonBuilder builder; ExclusionStrategy strategy; Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - public InputMapper() - { - if (builder == null) - { + public InputMapper() { + if (builder == null) { builder = new GsonBuilder(); builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); } } - /** - * @return - */ - public static InputMapper gson() - { + public static InputMapper gson() { return new InputMapper(); } - /** - * @param json - * @param classOfT - * @return - * @throws IEMRException - */ - public T fromJson(String json, Class classOfT) - { + public T fromJson(String json, Class classOfT) { return builder.create().fromJson(json, classOfT); } } \ No newline at end of file