From df53f952456eae54dfc2bb05a173709cb26ca65f Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 18 Dec 2024 09:08:39 +0700 Subject: [PATCH] Update controller Clean code --- .../CssdDecontaminasiController.java | 81 +++--- .../controller/CssdDistribusiController.java | 104 ++++---- .../CssdMonitoringEoController.java | 88 +++---- .../CssdMonitoringSteamController.java | 89 +++---- .../controller/CssdPengemasanController.java | 88 +++---- .../controller/CssdPengeringanController.java | 70 ----- .../controller/CssdPenyimpananController.java | 88 +++---- .../controller/CssdReturController.java | 101 +++---- .../controller/CssdSterilController.java | 88 +++---- .../controller/CssdSterilisasiController.java | 247 ++++++------------ .../controller/CssdUjiSwapController.java | 94 +++---- .../controller/DaftarKegiatanController.java | 244 +++++------------ .../DaftarKendaraanDinasController.java | 125 ++++----- .../DaftarMappingCycleController.java | 55 ---- .../DaftarOrderAmbulanceController.java | 125 +++------ ...tarOrderPemakaianRuangRapatController.java | 99 +++---- .../DaftarPemakaianRumahDukaController.java | 98 ++++--- .../DaftarPemulasaraanJenazahController.java | 168 ++++-------- 18 files changed, 750 insertions(+), 1302 deletions(-) delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengeringanController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarMappingCycleController.java diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java index 7c7127c2..2490a8ae 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java @@ -1,70 +1,65 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdDecontaminasiService; +import com.jasamedika.medifirst2000.vo.CssdDecontaminasiVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; 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.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdDecontaminasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdDecontaminasiVO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-decontaminasi") -public class CssdDecontaminasiController extends LocaleController { - - @Autowired - private CssdDecontaminasiService cssdDecontaminasiService; - +public class CssdDecontaminasiController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdDecontaminasiController.class); - @RequestMapping(value = "/save-decontaminasi/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDecontaminasi(@Valid @RequestBody CssdDecontaminasiVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdDecontaminasiService cssdDecontaminasiService; + + @RequestMapping(value = "/save-decontaminasi/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDecontaminasi(@Valid @RequestBody CssdDecontaminasiVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdDecontaminasiService.saveDecontaminasi(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Decontaminasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDecontaminasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save Decontaminasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDecontaminasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-decontaminasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailDecontaminasi(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdDecontaminasiService.detailDecontaminasi(strukPelayananId); - return result; - } - - + @RequestMapping(value = "/detail-decontaminasi", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailDecontaminasi(@RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdDecontaminasiService.detailDecontaminasi(strukPelayananId); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java index 18e9e734..bfcedf23 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java @@ -1,80 +1,70 @@ package com.jasamedika.medifirst2000.controller; -import java.util.HashMap; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdDistribusiService; +import com.jasamedika.medifirst2000.vo.CssdDistribusiVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.HashMap; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdDistribusiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdDistribusiVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-distribusi") -public class CssdDistribusiController extends LocaleController { - - @Autowired - private CssdDistribusiService cssdDistribusiService; - +public class CssdDistribusiController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdDistribusiController.class); - @RequestMapping(value = "/save-distribusi/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDistribusi(@Valid @RequestBody CssdDistribusiVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdDistribusiService cssdDistribusiService; + + @RequestMapping(value = "/save-distribusi/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDistribusi(@Valid @RequestBody CssdDistribusiVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdDistribusiService.saveDistribusi(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Distribusi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDistribusi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save Distribusi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDistribusi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-distribusi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailDistribusi(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdDistribusiService.detailDistribusi(strukPelayananId); - return result; - } - - @RequestMapping(value = "/get-no-kirim", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getNoOrder() { + @RequestMapping(value = "/detail-distribusi", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailDistribusi(@RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdDistribusiService.detailDistribusi(strukPelayananId); + } - Map result = new HashMap(); - result.put("noKirim", cssdDistribusiService.preFormatNoUrut("Penerimaan Supplier", "PNB")); - return result; - } - - - + @RequestMapping(value = "/get-no-kirim", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getNoOrder() { + Map result = new HashMap<>(); + result.put("noKirim", cssdDistribusiService.preFormatNoUrut("Penerimaan Supplier", "PNB")); + return result; + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java index 0d6893be..7c0aace4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java @@ -1,70 +1,62 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdMonitoringEoService; +import com.jasamedika.medifirst2000.vo.CssdMonitoringEoVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdMonitoringEoService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdMonitoringEoVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-monitoring-eo") -public class CssdMonitoringEoController extends LocaleController { - - @Autowired - private CssdMonitoringEoService cssdMonitoringEoService; - +public class CssdMonitoringEoController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdMonitoringEoController.class); - @RequestMapping(value = "/save-monitoring-eo/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveMoioringEo(@Valid @RequestBody CssdMonitoringEoVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdMonitoringEoService cssdMonitoringEoService; + + @RequestMapping(value = "/save-monitoring-eo/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveMoioringEo(@Valid @RequestBody CssdMonitoringEoVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdMonitoringEoService.saveMonitoringEo(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save MonitoringEo", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMonitoringEo", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save MonitoringEo", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMonitoringEo", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-monitoring-eo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailMonitoringEo(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdMonitoringEoService.detailMonitoringEo(strukPelayananId); - return result; - } - - + @RequestMapping(value = "/detail-monitoring-eo", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailMonitoringEo(@RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdMonitoringEoService.detailMonitoringEo(strukPelayananId); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java index ba00dd10..374cf5d2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java @@ -1,70 +1,63 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdMonitoringSteamService; +import com.jasamedika.medifirst2000.vo.CssdMonitoringSteamVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdMonitoringSteamService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdMonitoringSteamVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-monitoring-steam") -public class CssdMonitoringSteamController extends LocaleController { - - @Autowired - private CssdMonitoringSteamService cssdMonitoringSteamService; - +public class CssdMonitoringSteamController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdMonitoringSteamController.class); - @RequestMapping(value = "/save-monitoring-steam/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveMoioringEo(@Valid @RequestBody CssdMonitoringSteamVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdMonitoringSteamService cssdMonitoringSteamService; + + @RequestMapping(value = "/save-monitoring-steam/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveMoioringEo(@Valid @RequestBody CssdMonitoringSteamVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdMonitoringSteamService.saveMonitoringSteam(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save MonitoringSteam", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMonitoringSteam", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save MonitoringSteam", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMonitoringSteam", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-monitoring-steam", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailMonitoringSteam(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdMonitoringSteamService.detailMonitoringSteam(strukPelayananId); - return result; - } - - + @RequestMapping(value = "/detail-monitoring-steam", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailMonitoringSteam( + @RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdMonitoringSteamService.detailMonitoringSteam(strukPelayananId); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java index 59a121f3..5f0ad6b0 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java @@ -1,70 +1,62 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdPengemasanService; +import com.jasamedika.medifirst2000.vo.CssdPengemasanVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdPengemasanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdPengemasanVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-pengemasan") -public class CssdPengemasanController extends LocaleController { - - @Autowired - private CssdPengemasanService cssdPengemasanService; - +public class CssdPengemasanController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdPengemasanController.class); - @RequestMapping(value = "/save-pengemasan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengemasan(@Valid @RequestBody CssdPengemasanVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdPengemasanService cssdPengemasanService; + + @RequestMapping(value = "/save-pengemasan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePengemasan(@Valid @RequestBody CssdPengemasanVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdPengemasanService.savePengemasan(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pengemasan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePengemasan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save Pengemasan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePengemasan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-pengemasan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailPengemasan(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdPengemasanService.detailPengemasan(strukPelayananId); - return result; - } - - + @RequestMapping(value = "/detail-pengemasan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailPengemasan(@RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdPengemasanService.detailPengemasan(strukPelayananId); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengeringanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengeringanController.java deleted file mode 100644 index 764bf77b..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengeringanController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdPengeringanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdPengeringanVO; - -@RestController -@RequestMapping("/cssd-pengeringan") -public class CssdPengeringanController extends LocaleController { - - @Autowired - private CssdPengeringanService cssdPengeringanService; - - private static final Logger LOGGER = LoggerFactory.getLogger(CssdPengeringanController.class); - - @RequestMapping(value = "/save-pengeringan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengeringan(@Valid @RequestBody CssdPengeringanVO vo,HttpServletRequest request,HttpServletResponse response) { - - try { - Map result = cssdPengeringanService.savePengeringan(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pengeringan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save Pengeringan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-pengeringan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailPengeringan(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdPengeringanService.detailPengeringan(strukPelayananId); - - return result; - } - - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java index d6881de5..1e8dd2b6 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java @@ -1,70 +1,62 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdPenyimpananService; +import com.jasamedika.medifirst2000.vo.CssdPenyimpananVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdPenyimpananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdPenyimpananVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-penyimpanan") -public class CssdPenyimpananController extends LocaleController { - - @Autowired - private CssdPenyimpananService cssdPenyimpananService; - +public class CssdPenyimpananController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdPenyimpananController.class); - @RequestMapping(value = "/save-penyimpanan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePenyimpanan(@Valid @RequestBody CssdPenyimpananVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdPenyimpananService cssdPenyimpananService; + + @RequestMapping(value = "/save-penyimpanan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePenyimpanan(@Valid @RequestBody CssdPenyimpananVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdPenyimpananService.savePenyimpanan(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Penyimpanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePenyimpanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save Penyimpanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePenyimpanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-penyimpanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailPenyimpanan(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdPenyimpananService.detailPenyimpanan(strukPelayananId); - return result; - } - - + @RequestMapping(value = "/detail-penyimpanan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailPenyimpanan(@RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdPenyimpananService.detailPenyimpanan(strukPelayananId); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java index 15cfaea7..b45bea33 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java @@ -1,84 +1,64 @@ package com.jasamedika.medifirst2000.controller; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdReturService; +import com.jasamedika.medifirst2000.vo.ReturCssdVO; +import com.jasamedika.medifirst2000.vo.StrukPelayananDetailVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdReturService; -import com.jasamedika.medifirst2000.service.StrukPelayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ReturCssdVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/retur-cssd") -public class CssdReturController extends LocaleController{ - +public class CssdReturController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdReturController.class); - + @Autowired private CssdReturService cssdReturService; - - // save kartu Pengendali - @RequestMapping(value = "/save-retur-cssd", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-retur-cssd", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveReturCssd(@Valid @RequestBody ReturCssdVO vo, HttpServletRequest request) { try { Map result = cssdReturService.saveReturCssd(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Retur Cssd", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveReturCssd", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Retur Cssd", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveReturCssd", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - - @RequestMapping(value = "/get-order-sterilisasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getDetailPenerimaanBarang( - @RequestParam(value = "noRec", required = true) String noRec) { - Map result = cssdReturService.getOrderSterilisasi(noRec); - - return result; - } - - @RequestMapping(value = "/get-no-retur", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getNoOrder() { - - Map result = new HashMap(); - result.put("noKirim", cssdReturService.formatNoUrut("Struk Retur", "RRS")); - return result; } - @SuppressWarnings("unchecked") + @RequestMapping(value = "/get-order-sterilisasi/", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getDetailPenerimaanBarang(@RequestParam(value = "noRec") String noRec) { + return cssdReturService.getOrderSterilisasi(noRec); + } + @RequestMapping(value = "/list-retur-cssd") @ResponseBody public Map listReturSupplier( @@ -92,11 +72,8 @@ public class CssdReturController extends LocaleController{ @RequestParam(value = "jenisProdukId", required = false) Integer jenisProdukId, @RequestParam(value = "kelompokProdukId", required = false) Integer kelompokProdukId, @RequestParam(value = "supplierId", required = false) Integer supplierId) { - - Map resultPageMap = cssdReturService.listReturCssd(page, limit, sort, dir, tanggalAwal,tanggalAhir,produkId,jenisProdukId,kelompokProdukId,supplierId); - - return resultPageMap; + return cssdReturService.listReturCssd(page, limit, sort, dir, tanggalAwal, tanggalAhir, produkId, jenisProdukId, + kelompokProdukId, supplierId); } - - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java index 123732a3..b6fad484 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java @@ -1,70 +1,62 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdSterilService; +import com.jasamedika.medifirst2000.vo.CssdSterilVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdSterilService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdSterilVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-steril") -public class CssdSterilController extends LocaleController { - - @Autowired - private CssdSterilService cssdSterilService; - +public class CssdSterilController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdSterilController.class); - @RequestMapping(value = "/save-steril/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveSteril(@Valid @RequestBody CssdSterilVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdSterilService cssdSterilService; + + @RequestMapping(value = "/save-steril/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveSteril(@Valid @RequestBody CssdSterilVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdSterilService.saveSteril(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Steril", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveSteril", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save Steril", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveSteril", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-steril", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailSteril(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdSterilService.detailSteril(strukPelayananId); - return result; - } - - + @RequestMapping(value = "/detail-steril", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailSteril(@RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdSterilService.detailSteril(strukPelayananId); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java index 4cb5efba..4de4bdf0 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java @@ -1,102 +1,88 @@ package com.jasamedika.medifirst2000.controller; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.dto.MapPaketToProdukDto; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdSterilisasiService; +import com.jasamedika.medifirst2000.vo.CssdSterilisasiVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dto.MapPaketToProdukDto; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdBmhpService; -import com.jasamedika.medifirst2000.service.CssdSterilisasiService; -import com.jasamedika.medifirst2000.service.StokProdukGlobalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO; -import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO; -import com.jasamedika.medifirst2000.vo.CssdSterilisasiVO; -import com.jasamedika.medifirst2000.vo.PermintaanPerbaikanVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-sterilisasi") -public class CssdSterilisasiController extends LocaleController { - - @Autowired - private CssdSterilisasiService cssdSterilisasiService; - +public class CssdSterilisasiController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdSterilisasiController.class); - @RequestMapping(value = "/save-cssd-sterilisasi/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveCssdSterilisasi(@Valid @RequestBody CssdSterilisasiVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdSterilisasiService cssdSterilisasiService; + + @RequestMapping(value = "/save-cssd-sterilisasi/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveCssdSterilisasi(@Valid @RequestBody CssdSterilisasiVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdSterilisasiService.saveSterilisasi(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Sterilisasi Alat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveSterilisasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Sterilisasi Alat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveSterilisasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } + } - } - - @RequestMapping(value = "/get-paket", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-paket", method = GET, produces = APPLICATION_JSON_VALUE) public Map getPaket() { - Map data = cssdSterilisasiService.getPaket(); - return data; + return cssdSterilisasiService.getPaket(); } - - @RequestMapping(value = "/get-no-urut", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-no-urut", method = GET, produces = APPLICATION_JSON_VALUE) public Map getNoUrut() { - Map data = cssdSterilisasiService.getNoUrut(); - return data; + return cssdSterilisasiService.getNoUrut(); } - - @RequestMapping(value = "/get-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getByIdProduk(@RequestParam(value = "paketId", required = true) Integer paketId, @RequestParam(value = "produkId", required = true) Integer produkId) { - Map data = cssdSterilisasiService.getByIdProduk(paketId, produkId); - return data; + + @RequestMapping(value = "/get-produk", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getByIdProduk(@RequestParam(value = "paketId") Integer paketId, + @RequestParam(value = "produkId") Integer produkId) { + return cssdSterilisasiService.getByIdProduk(paketId, produkId); } - - @RequestMapping(value = "/get-produk-by-paket", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getProdukByPaket(@RequestParam(value = "paketId", required = true) Integer paketId) { - Map data = cssdSterilisasiService.getProdukByPaket(paketId); - return data; + + @RequestMapping(value = "/get-produk-by-paket", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProdukByPaket(@RequestParam(value = "paketId") Integer paketId) { + return cssdSterilisasiService.getProdukByPaket(paketId); } - - @RequestMapping(value = "/get-produk-non-paket", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-produk-non-paket", method = GET, produces = APPLICATION_JSON_VALUE) public Map getProdukNonPaket() { - Map data = cssdSterilisasiService.getProdukNonPaket(); - return data; + return cssdSterilisasiService.getProdukNonPaket(); } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/list-sterilisasi") @ResponseBody public Map listSterilisasi( @@ -108,115 +94,54 @@ public class CssdSterilisasiController extends LocaleController { @RequestParam(value = "tanggalAhir", required = false) String tanggalAhir, @RequestParam(value = "noOrder", required = false) String noOrder, @RequestParam(value = "jenisCustomer", required = false) String jenisCustomer) { - - Map resultPageMap = cssdSterilisasiService.listSterilisasi(page,limit,sort,dir,tanggalAwal,tanggalAhir,noOrder,jenisCustomer); - - return resultPageMap; + return cssdSterilisasiService.listSterilisasi(page, limit, sort, dir, tanggalAwal, tanggalAhir, noOrder, + jenisCustomer); } - - @RequestMapping(value = "/get-no-order", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getNoOrder() { - Map result = new HashMap(); + @RequestMapping(value = "/get-no-order", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getNoOrder() { + Map result = new HashMap<>(); result.put("noOrderPerbaikan", cssdSterilisasiService.preFormatNoUrut("Penerimaan Supplier", "PNB")); return result; } - - @RequestMapping(value = "/cetak-sterilisasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map cetakSterilisasi( - @RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdSterilisasiService.cetakSterilisasi(strukPelayananId); - return result; - } - - @RequestMapping(value = "/cetak-bukti-sterilisasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map cetakBuktiSterilisasi( - @RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdSterilisasiService.cetakBuktiSterilisasi(strukPelayananId); - - String data=(String)result.get("status"); - if(data.equalsIgnoreCase("error")){ - return result; - }else{ - return result; - } - - } - - @RequestMapping(value = "/get-jenis-paket", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getjenisPaket() { - - Map result = new HashMap(); + @RequestMapping(value = "/get-jenis-paket", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getjenisPaket() { + Map result = new HashMap<>(); result.put("noOrderPerbaikan", cssdSterilisasiService.getJenisPaket()); return result; } - - @RequestMapping(value = "/get-paket-by-jenis-paket", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getPaketByJenisPaket( - @RequestParam(value = "idJenisPaket", required = true) Integer idJenisPaket) { - Map result = cssdSterilisasiService.getPaketByJenisPaket(idJenisPaket); - return result; + @RequestMapping(value = "/get-paket-by-jenis-paket", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getPaketByJenisPaket(@RequestParam(value = "idJenisPaket") Integer idJenisPaket) { + return cssdSterilisasiService.getPaketByJenisPaket(idJenisPaket); } - - @RequestMapping(value = "/get-map-paket-to-produk", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getMapProdukByPaket( - @RequestParam(value = "idPaket", required = true) Integer idPaket) { - Map result = cssdSterilisasiService.getMapPaketToProduk(idPaket); - return result; + @RequestMapping(value = "/get-map-paket-to-produk", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getMapProdukByPaket(@RequestParam(value = "idPaket") Integer idPaket) { + return cssdSterilisasiService.getMapPaketToProduk(idPaket); } - - - - @RequestMapping(value="/save-all-map-paket-to-produk", - method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> saveAllMapPaketToProduk( - @RequestBody List dto, + + @RequestMapping(value = "/save-all-map-paket-to-produk", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> saveAllMapPaketToProduk(@RequestBody List dto, HttpServletRequest request) { - List> result = cssdSterilisasiService.saveMapPaketToProduk(dto); + List> result = cssdSterilisasiService.saveMapPaketToProduk(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/list-map-paket-to-produk") - @ResponseBody - public Map getListMapPaketToProduk( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10000000") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @RequestParam(value = "namaPaket", required = false, defaultValue = "") String namaPaket) { - Map resultPageMap = - cssdSterilisasiService.getListMapPaketToProduk(page,limit,sort,dir,namaPaket); - - return resultPageMap; - } - - - @RequestMapping(value="/unmapping-paket-to-produk", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> unmappingPaketToProduk( - @RequestBody MapPaketToProdukDto dto, HttpServletRequest request){ + @RequestMapping(value = "/unmapping-paket-to-produk", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> unmappingPaketToProduk(@RequestBody MapPaketToProdukDto dto, + HttpServletRequest request) { Map result = cssdSterilisasiService.unmappingPaketToProduk(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java index 60a863c3..84343cd0 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java @@ -1,76 +1,62 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdUjiSwapService; +import com.jasamedika.medifirst2000.vo.CssdUjiSwapVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdBmhpService; -import com.jasamedika.medifirst2000.service.CssdUjiSwapService; -import com.jasamedika.medifirst2000.service.StokProdukGlobalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO; -import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO; -import com.jasamedika.medifirst2000.vo.CssdUjiSwapVO; -import com.jasamedika.medifirst2000.vo.PermintaanPerbaikanVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-uji-swap") -public class CssdUjiSwapController extends LocaleController { - - @Autowired - private CssdUjiSwapService cssdUjiSwapService; - +public class CssdUjiSwapController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdUjiSwapController.class); - @RequestMapping(value = "/save-uji-swap/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveCssdBmhp(@Valid @RequestBody CssdUjiSwapVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdUjiSwapService cssdUjiSwapService; + + @RequestMapping(value = "/save-uji-swap/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveCssdBmhp(@Valid @RequestBody CssdUjiSwapVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdUjiSwapService.saveUjiSwap(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Uji Swap", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveUjiSwap", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save save Uji Swap", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveUjiSwap", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-uji-swap", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailUjiSwap(@RequestParam(value = "strukPelayananId", required = true) String strukPelayananId) { - Map result = cssdUjiSwapService.detailUjiSwap(strukPelayananId); - return result; - } - - + @RequestMapping(value = "/detail-uji-swap", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailUjiSwap(@RequestParam(value = "strukPelayananId") String strukPelayananId) { + return cssdUjiSwapService.detailUjiSwap(strukPelayananId); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java index d4814190..bc749ca1 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java @@ -1,223 +1,115 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.UnitCostService; +import com.jasamedika.medifirst2000.vo.UnitCostVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; -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.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.entities.UnitCost; -import com.jasamedika.medifirst2000.entities.UnitCostDetail; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.UnitCostService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.UnitCostDetailVO; -import com.jasamedika.medifirst2000.vo.UnitCostVO; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.web.bind.annotation.RequestMethod.GET; @RestController @RequestMapping("/unit-cost") -public class DaftarKegiatanController extends LocaleController { - - @Autowired - private UnitCostService unitCostService; - +public class DaftarKegiatanController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(DaftarKegiatanController.class); - - @RequestMapping(value = "/detail-unit-cost", method = RequestMethod.GET) - public ResponseEntity< Map> findAllDepartemenById5And6( + + @Autowired + private UnitCostService unitCostService; + + @RequestMapping(value = "/detail-unit-cost", method = GET) + public ResponseEntity> findAllDepartemenById5And6( @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idInstalasiDepartemen", required = false) Integer idInstalasiDepartemen, @RequestParam(value = "idLayanan", required = false) Integer idLayanan, @RequestParam(value = "periodeAwal", required = false) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = false) String periodeAkhir, - HttpServletRequest request) { + @RequestParam(value = "periodeAkhir", required = false) String periodeAkhir, HttpServletRequest request) { try { - //String idRuangan, String idInstalasiDepartemen, Date periodeAwal, Date periodeAkhir,String idLayanan - Map listDepartemen = unitCostService.findDetailCostUnit(idRuangan,idInstalasiDepartemen,periodeAwal,periodeAkhir,idLayanan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(listDepartemen, HttpStatus.OK,mapHeaderMessage); + Map listDepartemen = unitCostService.findDetailCostUnit(idRuangan, idInstalasiDepartemen, + periodeAwal, periodeAkhir, idLayanan); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listDepartemen, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findDetailCostUnit", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findDetailCostUnit", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-pelayanan", method = RequestMethod.GET) - public ResponseEntity< Map> findListPelayanan( - @RequestParam(value = "idRuangan", required = false) Integer idRuangan, - HttpServletRequest request) { + + @RequestMapping(value = "/get-list-unit-cost-jenis", method = GET) + public ResponseEntity> findUnitCostJenis(HttpServletRequest request) { try { - - Map listPelayanan = unitCostService.findListPelayanan(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(listPelayanan, HttpStatus.OK,mapHeaderMessage); + Map mapResult = unitCostService.getListJenisUnitCost(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(mapResult, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListJenisUnitCost", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListJenisUnitCost", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - //Simpan data unit cost - @RequestMapping(value = "/save-unit-cost", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDaftarKerja( @RequestBody UnitCostVO vo, - HttpServletRequest request) throws ParseException { - try { - - UnitCostVO result = (UnitCostVO) unitCostService.add(vo); - Map mapResult= new HashMap<>(); - mapResult.put("data", result); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(mapResult, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - @RequestMapping(value = "/get-list-unit-cost-jenis", method = RequestMethod.GET) - public ResponseEntity> findUnitCostJenis(HttpServletRequest request) throws ParseException { - try { - Map mapResult= unitCostService.getListJenisUnitCost(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(mapResult, HttpStatus.CREATED, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - @RequestMapping(value = "/get-list-unit-cost-jenis-detail", method = RequestMethod.GET) + @RequestMapping(value = "/get-list-unit-cost-jenis-detail", method = GET) public ResponseEntity> findUnitCostJenisDetail( @RequestParam(value = "idUnitCostJenis", required = false) Integer idUnitCostJenis, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - Map mapResult= unitCostService.getListDetailJenisUnitCost(idUnitCostJenis); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(mapResult, HttpStatus.CREATED, mapHeaderMessage); - + Map mapResult = unitCostService.getListDetailJenisUnitCost(idUnitCostJenis); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(mapResult, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListDetailJenisUnitCost", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListDetailJenisUnitCost", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-unit-cost", method = RequestMethod.GET) + + @RequestMapping(value = "/get-list-unit-cost", method = GET) public ResponseEntity> findUnitCost( @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idInstalasi", required = false) Integer idInstalasi, - @RequestParam(value = "namaKegiatan", required = false) String namaKegiatan, - HttpServletRequest request) throws ParseException { + @RequestParam(value = "namaKegiatan", required = false) String namaKegiatan, HttpServletRequest request) { try { - Map mapResult= unitCostService.getListUnitCost(idRuangan,idInstalasi,namaKegiatan); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(mapResult, HttpStatus.OK, mapHeaderMessage); - + Map mapResult = unitCostService.getListUnitCost(idRuangan, idInstalasi, namaKegiatan); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(mapResult, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListUnitCost", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - jse.printStackTrace(); - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListUnitCost", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-unit-cost-by-id", method = RequestMethod.GET) - public ResponseEntity findUnitCost( - @RequestParam(value = "idUnitCost", required = false) Integer idUnitCost, - - HttpServletRequest request) throws ParseException { - try { - UnitCost mapResult= unitCostService.findbyUnitCostId(idUnitCost); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(mapResult, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - jse.printStackTrace(); - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - @RequestMapping(value = "/get-unit-cost-detail-by-unit-cost-id", method = RequestMethod.GET) - public ResponseEntity> findUnitCostDetailByUnitCostId( - @RequestParam(value = "idUnitCost", required = false) Integer idUnitCost, - - HttpServletRequest request) throws ParseException { - try { - List mapResult= unitCostService.findUnitCostDetailByUnitCostId(idUnitCost); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(mapResult, HttpStatus.OK, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - jse.printStackTrace(); - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java index abeafb4c..48c653d5 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java @@ -1,120 +1,105 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.DaftarKendaraanDinasService; +import com.jasamedika.medifirst2000.vo.OrderKendaraanDinasVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.DaftarKendaraanDinasService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.OrderKendaraanDinasVO; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; @RestController @RequestMapping("/daftar-kendaraan-dinas") public class DaftarKendaraanDinasController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(DaftarKendaraanDinasController.class); + @Autowired private DaftarKendaraanDinasService daftarKendaraanDinasService; - private static final Logger LOGGER = LoggerFactory.getLogger(DaftarKendaraanDinasController.class); - - @RequestMapping(value = "/find-by-periode/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-periode/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findDaftarKendaraanDinasByPeriode( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { - Map result = null; + @RequestParam(value = "periodeAwal") String periodeAwal, + @RequestParam(value = "periodeAkhir") String periodeAkhir, HttpServletRequest request) { try { - result = daftarKendaraanDinasService.findDaftarKendaraanDinasByPeriode(periodeAwal, periodeAkhir); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - + Map result = daftarKendaraanDinasService.findDaftarKendaraanDinasByPeriode(periodeAwal, + periodeAkhir); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/find-by-no-rec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoRec(@RequestParam(value = "noRec", required = true) String noRec, - HttpServletRequest request) { - Map result = daftarKendaraanDinasService.findByNoRec(noRec); - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/find-penggunaan-kendaraan-dinas-by-no-rec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findPenggunaanKendaraanDinasByNoRec(@RequestParam(value = "noRec", required = true) String noRec, - HttpServletRequest request) { + @RequestMapping(value = "/find-penggunaan-kendaraan-dinas-by-no-rec/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> findPenggunaanKendaraanDinasByNoRec( + @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { Map result = daftarKendaraanDinasService.getPenggunaanKendaranDinasByNoRec(noRec); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/find-pengembalian-kendaraan-dinas-by-no-rec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-pengembalian-kendaraan-dinas-by-no-rec/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findPengembalianKendaraanDinasByNoRec( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { - - //Map result = daftarKendaraanDinasService.findPengembalianKendaraanDinasByNoRec(noRec); + @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { Map result = this.daftarKendaraanDinasService.getPengembalianKendaraanDinasByNoRec(noRec); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/get-all-kendaraan-dinas-dan-pejabat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-kendaraan-dinas-dan-pejabat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllKendaraanDinasDanPejabat(HttpServletRequest request) { - try { Map result = daftarKendaraanDinasService.getAllKendaraanDinasDanPejabat(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get All Kendaraan Dinas dan Pejabat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllKendaraanDinasDanPejabat", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get All Kendaraan Dinas dan Pejabat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllKendaraanDinasDanPejabat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/get-all-pengembalian-kendaraan-dinas/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-all-pengembalian-kendaraan-dinas/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllPengembalianKendaraanDinas( - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value="endDate", required=true)String endDate, HttpServletRequest request) { - - Map result = this.daftarKendaraanDinasService.getAllPengembalianKendaraanDinas(startDate, endDate); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, + HttpServletRequest request) { + Map result = this.daftarKendaraanDinasService.getAllPengembalianKendaraanDinas(startDate, + endDate); + return getJsonResponse(result, OK); } - - @RequestMapping(value = "/get-detail-pengembalian-kendaraan-dinas-by-norec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDetailPengembalianKendaraanDinasByNoRec( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { + @RequestMapping(value = "/get-detail-pengembalian-kendaraan-dinas-by-norec/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getDetailPengembalianKendaraanDinasByNoRec( + @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { Map result = this.daftarKendaraanDinasService.getPengembalianKendaraanDetailByNoRec(noRec); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarMappingCycleController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarMappingCycleController.java deleted file mode 100644 index ff445b66..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarMappingCycleController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -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.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dto.DaftarMappingCycleDto; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.DaftarMappingCycleService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.MappingCycleLaundryVO; - -@RestController -@RequestMapping("/daftar-mapping-cycle-laundry") -public class DaftarMappingCycleController extends LocaleController { - - @Autowired - private DaftarMappingCycleService daftarMappingCycleService; - - private static final Logger LOGGER = LoggerFactory.getLogger(DaftarMappingCycleController.class); - - @RequestMapping(value = "/find-mapping-cycle-laundry/", method = RequestMethod.GET) - public ResponseEntity> findMappingCycleLaundry(HttpServletRequest request) { - try { - List listMappingCycleVO = daftarMappingCycleService.findMappingCycleLaundry(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listMappingCycleVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when Find Mapping Cycle Laundry", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when Find Mapping Cycle Laundry", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java index 41522c3c..e8e95405 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java @@ -1,127 +1,84 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.DaftarOrderAmbulanceService; +import com.jasamedika.medifirst2000.vo.OrderPelayananVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.DaftarOrderAmbulanceService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.OrderPelayananVO; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; @RestController @RequestMapping("/daftar-order-ambulance") public class DaftarOrderAmbulanceController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(DaftarOrderAmbulanceController.class); + @Autowired private DaftarOrderAmbulanceService daftarOrderAmbulanceService; - private static final Logger LOGGER = LoggerFactory.getLogger(DaftarOrderAmbulanceController.class); - - @RequestMapping(value = "/find-by-periode/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-periode/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findDaftarOrderAmbulanceByPeriode( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { - + @RequestParam(value = "periodeAwal") String periodeAwal, + @RequestParam(value = "periodeAkhir") String periodeAkhir, HttpServletRequest request) { Map result = daftarOrderAmbulanceService.findDaftarOrderAmbulanceByPeriode(periodeAwal, periodeAkhir); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - - @RequestMapping(value = "/find-by-no-rec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/find-by-no-rec/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findDaftarOrderAmbulanceByNoRec( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { - + @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { Map result = daftarOrderAmbulanceService.findDaftarOrderAmbulanceByNoRec(noRec); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/find-by-no-order/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findDaftarOrderAmbulanceByNoOrder( - @RequestParam(value = "noOrder", required = true) String noOrder, HttpServletRequest request) { - - Map result = daftarOrderAmbulanceService.findDaftarOrderAmbulanceByNoOrder(noOrder); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/find-by-periode-dan-no-order/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByPeriodeDanNoOrder( - @RequestParam(value = "noOrder", required = true) String noOrder, - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { - - Map result = daftarOrderAmbulanceService.findByPeriodeDanNoOrder(noOrder, periodeAwal, - periodeAkhir); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-all-daftar-order-ambulance/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-daftar-order-ambulance/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllDaftarOrderAmbulance(HttpServletRequest request) { - try { Map result = daftarOrderAmbulanceService.getAllDaftarOrderAmbulance(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get All Daftar Order Ambulance", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllDaftarOrderAmbulance", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get All Daftar Order Ambulance", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllDaftarOrderAmbulance", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java index 81525c50..cc27f1e3 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java @@ -1,101 +1,86 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.DaftarOrderPemakaianRuangRapatService; +import com.jasamedika.medifirst2000.vo.OrderPemakaianRuangRapatVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; 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.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.DaftarOrderPemakaianRuangRapatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.OrderPemakaianRuangRapatVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/daftar-order-pemakaian-ruang-rapat") public class DaftarOrderPemakaianRuangRapatController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(DaftarOrderPemakaianRuangRapatController.class); + @Autowired private DaftarOrderPemakaianRuangRapatService daftarOrderPemakaianRuangRapatService; - private static final Logger LOGGER = LoggerFactory.getLogger(DaftarOrderPemakaianRuangRapatController.class); - - @RequestMapping(value = "/find-by-periode/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-periode/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findDaftarOrderPemakaianRuangRapatByPeriode( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { - + @RequestParam(value = "periodeAwal") String periodeAwal, + @RequestParam(value = "periodeAkhir") String periodeAkhir, HttpServletRequest request) { Map result = daftarOrderPemakaianRuangRapatService .findDaftarOrderPemakaianRuangRapatByPeriode(periodeAwal, periodeAkhir); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/find-by-no-rec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findDaftarOrderPemakaianRuangRapatNoRec( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { - Map result = daftarOrderPemakaianRuangRapatService - .findDaftarOrderPemakaianRuangRapatNoRec(noRec); - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/save-status-pemakaian-ruang-rapat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveStatusRuangRapat( - @RequestParam(value = "noRec", required = true) String noRec, + @RequestMapping(value = "/save-status-pemakaian-ruang-rapat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveStatusRuangRapat(@RequestParam(value = "noRec") String noRec, @Valid @RequestBody OrderPemakaianRuangRapatVO vo, HttpServletRequest request) { try { Map result = daftarOrderPemakaianRuangRapatService.saveStatusRuangRapat(noRec, vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveStatusPemakaianRuangRapat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveStatusRuangRapat", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveStatusPemakaianRuangRapat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveStatusRuangRapat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-order-ruang-rapat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-order-ruang-rapat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllOrderRuangRapat(HttpServletRequest request) { - try { Map result = daftarOrderPemakaianRuangRapatService.getAllOrderRuangRapat(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllDaftarOrderRuangRapat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllOrderRuangRapat", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllDaftarOrderRuangRapat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllOrderRuangRapat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java index 1417a5c8..e656b7b9 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java @@ -1,99 +1,93 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.DaftarPemakaianRumahDukaService; +import com.jasamedika.medifirst2000.vo.PemakaianRumahDukaVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; 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.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.DaftarPemakaianRumahDukaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PemakaianRumahDukaVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/daftar-pemakaian-rumah-duka") public class DaftarPemakaianRumahDukaController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPemakaianRumahDukaController.class); + @Autowired private DaftarPemakaianRumahDukaService daftarPemakaianRumahDukaService; - private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPemakaianRumahDukaController.class); - - @RequestMapping(value = "/find-by-periode/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-periode/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findDaftarPemakaianRumahDukaByPeriode( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { + @RequestParam(value = "periodeAwal") String periodeAwal, + @RequestParam(value = "periodeAkhir") String periodeAkhir, HttpServletRequest request) { Map result = daftarPemakaianRumahDukaService.findDaftarPemakaianRumahDukaByPeriode(periodeAwal, periodeAkhir); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/find-by-no-rec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoRec(@RequestParam(value = "noRec", required = true) String noRec, + @RequestMapping(value = "/find-by-no-rec/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> findByNoRec(@RequestParam(value = "noRec") String noRec, HttpServletRequest request) { Map result = daftarPemakaianRumahDukaService.findByNoRec(noRec); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/save-status-pemakaian-rumah-duka/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveStatusRumahDuka( - @RequestParam(value = "noRec", required = true) String noRec, @Valid @RequestBody PemakaianRumahDukaVO vo, - HttpServletRequest request) { + @RequestMapping(value = "/save-status-pemakaian-rumah-duka/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveStatusRumahDuka(@RequestParam(value = "noRec") String noRec, + @Valid @RequestBody PemakaianRumahDukaVO vo, HttpServletRequest request) { try { Map result = daftarPemakaianRumahDukaService.saveStatusRumahDuka(noRec, vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Status Pemakaian Rumah Duka", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveStatusRumahDuka", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Status Pemakaian Rumah Duka", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveStatusRumahDuka", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-daftar-pemakaian-rumah-duka/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-daftar-pemakaian-rumah-duka/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllDaftarPemakaianRumahDuka(HttpServletRequest request) { - try { Map result = daftarPemakaianRumahDukaService.getAllDaftarPemakaianRumahDuka(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllDaftarPemakaianRumahDuka", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllDaftarPemakaianRumahDuka", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllDaftarPemakaianRumahDuka", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllDaftarPemakaianRumahDuka", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java index 4d6960e1..a7d6f486 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java @@ -1,164 +1,90 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.DaftarPemulasaraanJenazahService; +import com.jasamedika.medifirst2000.vo.OrderPelayananVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.DaftarPemulasaraanJenazahService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.OrderPelayananVO; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; @RestController @RequestMapping("/daftar-pemulasaraan-jenazah") public class DaftarPemulasaraanJenazahController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPemulasaraanJenazahController.class); + @Autowired private DaftarPemulasaraanJenazahService daftarPemulasaraanJenazahService; - private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPemulasaraanJenazahController.class); - - @RequestMapping(value = "/find-by-periode/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findDaftarPemulasaraanJenazahByPeriode( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { - - Map result = daftarPemulasaraanJenazahService - .findDaftarPemulasaraanJenazahByPeriode(periodeAwal, periodeAkhir); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/find-by-no-rec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoRec(@RequestParam(value = "noRec", required = true) String noRec, + @RequestMapping(value = "/find-by-no-rec/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> findByNoRec(@RequestParam(value = "noRec") String noRec, HttpServletRequest request) { - Map result = daftarPemulasaraanJenazahService.findDaftarPemulasaraanJenazahByNoRec(noRec); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/find-by-periode-dan-no-order/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByPeriodeDanNoOrder( - @RequestParam(value = "noOrder", required = true) String noOrder, - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { - - Map result = daftarPemulasaraanJenazahService.findByPeriodeDanNoOrder(noOrder, periodeAwal, - periodeAkhir); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-all-daftar-pemulasaraan-jenazah/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-daftar-pemulasaraan-jenazah/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllDaftarPemulasaraanJenazah(HttpServletRequest request) { - try { Map result = daftarPemulasaraanJenazahService.getAllDaftarPemulasaraanJenazah(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get All Daftar Pemulasaraan Jenazah", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllDaftarPemulasaraanJenazah", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get All Daftar Pemulasaraan Jenazah", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllDaftarPemulasaraanJenazah", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/get-all-daftar-pemulasaraan-jenazah-rev-1/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllDaftarPemulasaraanJenazahRev1(HttpServletRequest request) { + @RequestMapping(value = "/get-pemulasaraan-jenazah-external/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPemulasaraanJenazahExternal( + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, + HttpServletRequest request) { try { - Map result = daftarPemulasaraanJenazahService.getAllDaftarPemulasaraanJenazahRev1(); + Map result = daftarPemulasaraanJenazahService.getDaftarPemulasaranJenazahExternal(startDate, + endDate); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get All Daftar Pemulasaraan Jenazah", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getDaftarPemulasaranJenazahExternal", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get All Daftar Pemulasaraan Jenazah", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getDaftarPemulasaranJenazahExternal", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - - @RequestMapping(value = "/get-pemulasaraan-jenazah-external/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPemulasaraanJenazahExternal(@RequestParam(value="startDate")String startDate, - @RequestParam(value="endDate")String endDate,HttpServletRequest request) { - - try { - Map result = daftarPemulasaraanJenazahService.getDaftarPemulasaranJenazahExternal(startDate, endDate); - - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get All Daftar Pemulasaraan Jenazah External", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get All Daftar Pemulasaraan Jenazah External", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-pemulasaraan-jenazah-external-detail-by-norec/", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getPemulasaraanJenazahExternal( - @RequestParam(value = "noRec") String noRec) { - Map result = this.daftarPemulasaraanJenazahService.getPemulasaranJenazahExternalDetailByNoRec(noRec); - return result; } }