diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKelahiranYangLaluController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKelahiranYangLaluController.java deleted file mode 100644 index ab8d1716..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKelahiranYangLaluController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -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.RestController; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -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.RiwayatKelahiranYangLaluService; -import com.jasamedika.medifirst2000.service.ThtService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatKelahiranYangLaluVO; - -/** - * Controller class for Pengakjian Awal RiwayatKelahiranYangLaluController - * - * @author Askur - */ -@RestController -@RequestMapping("/riwayat-kelahiran-yang-lalu") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RiwayatKelahiranYangLaluController extends LocaleController implements - IBaseRestController { - - private static final Logger LOGGER = LoggerFactory.getLogger(RiwayatKelahiranYangLaluController.class); - - @Autowired - private RiwayatKelahiranYangLaluService riwayatKelahiranYangLaluService; - - @Autowired - private ThtService thtService; - - @RequestMapping(value = "/save-riwayat-kelahiran-yang-lalu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody RiwayatKelahiranYangLaluVO vo,HttpServletRequest request) { - try { - Map result = riwayatKelahiranYangLaluService.addRiwayatKelahiranYangLalu(vo); - - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - result.put("message", "Berhasil"); - }else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - result.put("message", "Gagal"); - } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(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.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RiwayatKelahiranYangLaluVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RiwayatKelahiranYangLaluVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java index c39b701b..4ebfc4f4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java @@ -1,69 +1,64 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.RiwayatKesehatanService; +import com.jasamedika.medifirst2000.vo.RiwayatKesehatanVO; 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.RestController; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -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.RiwayatKesehatanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatKesehatanVO; +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.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; /****************** * @author Shakato ******************/ @RestController @RequestMapping("/riwayat-kesehatan") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RiwayatKesehatanController extends LocaleController{ - +@JsonIgnoreProperties(ignoreUnknown = true) +public class RiwayatKesehatanController extends LocaleController { + + private static final Logger LOGGER = getLogger(RiwayatKesehatanController.class); + @Autowired private RiwayatKesehatanService riwayatKesehatanService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RiwayatKesehatanController.class); - - @RequestMapping(value = "/save-riwayat-kesehatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity saveRiwayatKesehatan(@Valid @RequestBody RiwayatKesehatanVO vo, HttpServletRequest request) throws ParseException { + + @RequestMapping(value = "/save-riwayat-kesehatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity saveRiwayatKesehatan(@Valid @RequestBody RiwayatKesehatanVO vo, + HttpServletRequest request) { try { -// SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss.SSS"); -// vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - Map result = riwayatKesehatanService.saveRiwayatKesehatanService(vo); + Map result = riwayatKesehatanService.saveRiwayatKesehatanService(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - RestUtil.getJsonHttpStatus(HttpStatus.CREATED); - SaveLog("Riwayat Kesehatan", "Pemeriksaan",request); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + getJsonHttpStatus(CREATED); + SaveLog("Riwayat Kesehatan", "Pemeriksaan", request); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Riwayat Kesehatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRiwayatKesehatanService", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Riwayat Kesehatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRiwayatKesehatanService", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatMasaKehamilanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatMasaKehamilanController.java deleted file mode 100644 index 1ed20a21..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatMasaKehamilanController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -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.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -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.RiwayatMasaKehamilanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatMasaKehamilanVO; - -@RestController -@RequestMapping("/riwayat-masa-kehamilan") -public class RiwayatMasaKehamilanController extends LocaleController implements -IBaseRestController { - - @Autowired - private RiwayatMasaKehamilanService riwayatMasaKehamilanService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RiwayatMasaKehamilanController.class); - - @RequestMapping(value = "/save-riwayat-masa-kehamilan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody RiwayatMasaKehamilanVO vo, HttpServletRequest request) { - - try { - Map result=riwayatMasaKehamilanService.addRiwayatMasaKehamilan(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 add Riwayat Masa Kehamilan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Masa Kehamilan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-riwayat-masa-kehamilan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody RiwayatMasaKehamilanVO vo, HttpServletRequest request) { - - try { - Map result=riwayatMasaKehamilanService.updateRiwayatMasaKehamilan(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 update Riwayat Masa Kehamilan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Riwayat Masa Kehamilan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RiwayatMasaKehamilanVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RiwayatMasaKehamilanVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPascaLahirController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPascaLahirController.java deleted file mode 100644 index f5450fec..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPascaLahirController.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -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.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -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.RiwayatPascaLahirService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatPascaLahirVO; - -@RestController -@RequestMapping("/riwayat-pasca-lahir") -public class RiwayatPascaLahirController extends LocaleController implements -IBaseRestController { - - @Autowired - private RiwayatPascaLahirService riwayatPascaLahirService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RiwayatPascaLahirController.class); - - - @RequestMapping(value = "/save-riwayat-pasca-lahir/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody RiwayatPascaLahirVO vo, HttpServletRequest request) { - - try { - Map result=riwayatPascaLahirService.addRiwayatPascaLahir(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 add Riwayat Pasca Lahir", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-riwayat-pasca-lahir/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody RiwayatPascaLahirVO vo, HttpServletRequest request) { - - try { - Map result=riwayatPascaLahirService.updateRiwayatPascaLahir(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 add Riwayat Pasca Lahir", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RiwayatPascaLahirVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RiwayatPascaLahirVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPekerjaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPekerjaanController.java deleted file mode 100644 index 489f3d9d..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPekerjaanController.java +++ /dev/null @@ -1,102 +0,0 @@ - package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -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.RestController; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -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.RiwayatPekerjaanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatPekerjaanVO; - -/** - * - * - * @author Roberto - */ -@RestController -@RequestMapping("/riwayat-pekerjaan") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RiwayatPekerjaanController extends LocaleController implements IBaseRestController { - - @Autowired - private RiwayatPekerjaanService riwayatPekerjaanService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RiwayatPekerjaanController.class); - - @RequestMapping(value = "/save-riwayat-pekerjaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity saveRiwayatPekerjaan(@Valid @RequestBody RiwayatPekerjaanVO vo,HttpServletRequest request) { - try { - RiwayatPekerjaanVO result = riwayatPekerjaanService.add(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - RestUtil.getJsonHttpStatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RiwayatPekerjaanVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RiwayatPekerjaanVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPelatihanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPelatihanController.java deleted file mode 100644 index a1d2bda9..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPelatihanController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -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.RestController; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -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.RiwayatPelatihanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatPelatihanVO; - - -/****************** - * @author Shakato - ******************/ -@RestController -@RequestMapping("/riwayat-pelatihan") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RiwayatPelatihanController extends LocaleController implements IBaseRestController { - - @Autowired - private RiwayatPelatihanService riwayatPelatihanService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RiwayatPelatihanController.class); - - @RequestMapping(value = "/save-riwayat-pelatihan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity saveRiwayatPelatihan(@Valid @RequestBody RiwayatPelatihanVO vo,HttpServletRequest request) { - try { - RiwayatPelatihanVO result = riwayatPelatihanService.add(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - RestUtil.getJsonHttpStatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RiwayatPelatihanVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RiwayatPelatihanVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - - - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java index 069a820a..a5bce026 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java @@ -1,101 +1,61 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.RiwayatPendidikanService; +import com.jasamedika.medifirst2000.vo.RiwayatPendidikanVO; 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.RestController; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -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.RiwayatPendidikanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatPendidikanVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +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.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; /****************** * @author Shakato ******************/ @RestController @RequestMapping("/riwayat-pendidikan") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RiwayatPendidikanController extends LocaleController implements IBaseRestController { - +@JsonIgnoreProperties(ignoreUnknown = true) +public class RiwayatPendidikanController extends LocaleController { + + private static final Logger LOGGER = getLogger(RiwayatPendidikanController.class); + @Autowired private RiwayatPendidikanService riwayatPendidikanService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RiwayatPendidikanController.class); - - @RequestMapping(value = "/save-riwayat-pendidikan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity saveRiwayatPendidikan(@Valid @RequestBody RiwayatPendidikanVO vo,HttpServletRequest request) { + + @RequestMapping(value = "/save-riwayat-pendidikan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity saveRiwayatPendidikan(@Valid @RequestBody RiwayatPendidikanVO vo, + HttpServletRequest request) { try { RiwayatPendidikanVO result = riwayatPendidikanService.add(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - RestUtil.getJsonHttpStatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatPendidikanService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatPendidikanService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; } - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RiwayatPendidikanVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RiwayatPendidikanVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - - - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenghargaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenghargaanController.java deleted file mode 100644 index a01dd9d1..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenghargaanController.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -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.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PathVariable; -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.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.service.RiwayatPenghargaanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatPenghargaanVO; - -@RestController -@RequestMapping("/riwayat-penghargaan") -public class RiwayatPenghargaanController extends LocaleController implements IBaseRestController { - - @Autowired - private RiwayatPenghargaanService riwayatPenghargaanService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RiwayatPenghargaanController.class); - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RiwayatPenghargaanVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RiwayatPenghargaanVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value = "/get-riwayat-penghargaan-by-dokter/{dokterId}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findPenghargaanByIdDokter(@PathVariable("dokterId") Integer dokterId, HttpServletRequest request) { - Map result = null; - try{ - result = riwayatPenghargaanService.findPenghargaanByIdDokter(dokterId); - 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 )); - } - }catch (Exception e){ - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-nama-riwayat-penghargaan-by-dokter/{dokterId}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findNamaPenghargaanByIdDokter(@PathVariable("dokterId") Integer dokterId, HttpServletRequest request) { - Map result = null; - try{ - result = riwayatPenghargaanService.findNamaPenghargaanByIdDokter(dokterId); - 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 )); - } - }catch (Exception e){ - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java index e0a8a61c..305674d4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java @@ -1,76 +1,72 @@ package com.jasamedika.medifirst2000.controller; -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.RiwayatPenyakitPengobatanService; +import com.jasamedika.medifirst2000.vo.RiwayatPenyakitPengobatanVO; 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.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.RiwayatPenyakitPengobatanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RiwayatPenyakitPengobatanVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; +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.slf4j.LoggerFactory.getLogger; +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("/riwayat-penyakit-pengobatan") public class RiwayatPenyakitPengobatanController extends LocaleController { - - @Autowired - private RiwayatPenyakitPengobatanService service; - - private static final Logger LOGGER = LoggerFactory.getLogger(RiwayatPenyakitPengobatanController.class); - - @RequestMapping(value = "/save-riwayat-penyakit-pengobatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRiwayatPenyakitPengobatan(@Valid @RequestBody List vo,HttpServletRequest request) { - try { - Map result = service.saveRiwayatPenyakitPengobatan(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + private static final Logger LOGGER = getLogger(RiwayatPenyakitPengobatanController.class); + + @Autowired + private RiwayatPenyakitPengobatanService service; + + @RequestMapping(value = "/save-riwayat-penyakit-pengobatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRiwayatPenyakitPengobatan( + @Valid @RequestBody List vo, HttpServletRequest request) { + try { + Map result = service.saveRiwayatPenyakitPengobatan(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveRiwayatPenyakitPengobatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRiwayatPenyakitPengobatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveRiwayatPenyakitPengobatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRiwayatPenyakitPengobatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-riwayat-penyakit-pengobatan/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-riwayat-penyakit-pengobatan/{noCm}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getTindakanByIdUserAndPeriod(@PathVariable("noCm") String noCm, HttpServletRequest request) { - List> result = null; try { - - result = service.getRiwayatPenyakitPengobatan(noCm); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = service.getRiwayatPenyakitPengobatan(noCm); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPerkembanganPsikomotorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPerkembanganPsikomotorController.java deleted file mode 100644 index 1ef5d3a3..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPerkembanganPsikomotorController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -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.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.RiwayatPerkembanganPsikomotorService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.KelahiranVO; -import com.jasamedika.medifirst2000.vo.RiwayatPerkembanganPsikomotorVO; - -/** - * @author Teguh - */ - -@RestController -@RequestMapping("/riwayat-perkembangan-psikomotor") -public class RiwayatPerkembanganPsikomotorController extends LocaleController { - - @Autowired - private RiwayatPerkembanganPsikomotorService riwayatPerkembanganPsikomotorService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RiwayatPerkembanganPsikomotorController.class); - - @RequestMapping(value = "/save-riwayat-perkembangan-psikomotor/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody RiwayatPerkembanganPsikomotorVO vo,HttpServletRequest request) { - - try{ - Map result = riwayatPerkembanganPsikomotorService.addRiwayatPerkembanganPskomotor(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 add riwayat perkembangan psikomotor", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add riwayat perkembangan psikomotor", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-riwayat-perkembangan-psikomotor/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody RiwayatPerkembanganPsikomotorVO vo,HttpServletRequest request) { - - try{ - Map result = riwayatPerkembanganPsikomotorService.addRiwayatPerkembanganPskomotor(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 update riwayat perkembangan psikomotor", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update riwayat perkembangan psikomotor", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java index 8fdf3f7f..6dfb9321 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java @@ -1,189 +1,107 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.data.jpa.domain.Specification; -import org.springframework.data.jpa.domain.Specifications; -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.PathVariable; -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.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dao.RuanganDao; import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RuanganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.RuanganVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import net.kaczmarzyk.spring.data.jpa.domain.DateBetween; -import net.kaczmarzyk.spring.data.jpa.domain.GreaterThanOrEqual; -import net.kaczmarzyk.spring.data.jpa.domain.In; -import net.kaczmarzyk.spring.data.jpa.domain.LessThanOrEqual; -import net.kaczmarzyk.spring.data.jpa.domain.Like; -import net.kaczmarzyk.spring.data.jpa.web.annotation.And; -import net.kaczmarzyk.spring.data.jpa.web.annotation.JoinFetch; -import net.kaczmarzyk.spring.data.jpa.web.annotation.Or; -import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +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.slf4j.LoggerFactory.getLogger; +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("/ruangan") -public class RuanganController extends LocaleController implements IBaseRestController { +public class RuanganController extends LocaleController { + + private static final Logger LOGGER = getLogger(RuanganController.class); @Autowired - private RuanganService ruanganService; + private RuanganService ruanganService; - @Autowired - private RuanganDao ruanganDao; - - private static final Logger LOGGER = LoggerFactory.getLogger(RuanganController.class); - - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(@PathVariable("id") Integer id) { - return null; - } - - @RequestMapping(value = "/save-ruangan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-ruangan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody RuanganVO vo, HttpServletRequest request) { try { - RuanganVO result = (RuanganVO) ruanganService.add(vo); - + RuanganVO result = ruanganService.add(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse("", HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when ruanganService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when ruanganService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/update-ruangan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-ruangan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity editVO(@Valid @RequestBody RuanganVO vo) { try { - RuanganVO result = (RuanganVO) ruanganService.update(vo); - + RuanganVO result = ruanganService.update(vo); if (null != result) - return RestUtil.getJsonResponse("", HttpStatus.OK); + return getJsonResponse("", OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when ruanganService.update", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when ruanganService.update", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - @RequestMapping(value = "/delete-ruangan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deleteVO(Integer id) { - - try { - - if (ruanganService.delete(id) == true) - return RestUtil.getJsonResponse("", HttpStatus.OK); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } catch (DataIntegrityViolationException ex) { - - LOGGER.error("Got exception {} when delete Ruangan", ex.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ex.getMessage()); - } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); - - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @Override - public ResponseEntity addVO(RuanganVO vo) { - return null; - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-ruangan-laboratorium", method = RequestMethod.GET) - public ResponseEntity> getAllRuanganLaboratorium(HttpServletRequest request) { - Collection resultPageMap = ruanganService.findRuanganLaboratorium(); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-ruangan-rawat-inap", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-ruangan-rawat-inap", method = GET) public ResponseEntity> getAllRuanganRawatInap(HttpServletRequest request) { Collection resultPageMap = ruanganService.findRuanganRanap(); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); + return getJsonResponse(resultPageMap, OK); } - @RequestMapping(value = "/get-all-ruangan-rawat-jalan", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-ruangan-rawat-jalan", method = GET) public ResponseEntity> getAllRuanganRawatJalan(HttpServletRequest request) { Collection resultPageMap = ruanganService.findRuanganJalan(); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); + return getJsonResponse(resultPageMap, OK); } - - @RequestMapping(value = "/get-all-ruangan-penunjang", method = RequestMethod.GET) + + @RequestMapping(value = "/get-all-ruangan-penunjang", method = GET) public ResponseEntity> getAllRuanganPenunjang(HttpServletRequest request) { Collection resultPageMap = ruanganService.findRuanganJalan(); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); + return getJsonResponse(resultPageMap, OK); } - - @RequestMapping(value = "/get-all-ruangan-operator", method = RequestMethod.GET) + + @RequestMapping(value = "/get-all-ruangan-operator", method = GET) public ResponseEntity> getAllRuanganOperator(HttpServletRequest request) { Collection resultPageMap = ruanganService.findRuanganOperator(); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); + return getJsonResponse(resultPageMap, OK); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/search-ruangan-by-name", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryString( + @RequestMapping(value = "/search-ruangan-by-name", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @@ -191,288 +109,32 @@ public class RuanganController extends LocaleController implements IB @RequestParam(value = "nama", required = false) String nama, @RequestParam(value = "kdRuangan", required = false) String kdRuangan) { Map resultPageMap = ruanganService.findByName(page, limit, sort, dir, nama, kdRuangan); - return constructListPageResult(resultPageMap); } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/multipleCondition") - @ResponseBody - public ResponseEntity> multipleCondition( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "qRuangan", params = "qRuangan", spec = In.class) Specification noRuangan, - @Or({ @Spec(params = "namaRuangan", path = "namaRuangan", spec = Like.class), - @Spec(params = "kdRuangan", path = "kdRuangan", spec = Like.class) }) Specification nameSpec) { - - Specification spec = Specifications.where(noRuangan).and(nameSpec); - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/orCondition") - @ResponseBody - public ResponseEntity> orCondition( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Or({ @Spec(path = "namaRuangan", spec = Like.class), - @Spec(path = "kdRuangan", spec = Like.class) }) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/andCondition") - @ResponseBody - public ResponseEntity> andCondition( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @And({ @Spec(path = "namaRuangan", spec = Like.class), - @Spec(path = "kdRuangan", spec = Like.class) }) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/joinCondition") - public ResponseEntity> joinCondition( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @JoinFetch(paths = { "departemen" }) - @Spec(path="departemen.namaDepartemen", params="namaDepartemen", spec=Like.class) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/dateBetweenCondition") - @ResponseBody - public ResponseEntity> findRuangansByRegistrationDate( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "tanggal", params = {"dateStart", "dateEnd"}, config = "yyyy-MM-dd", spec = DateBetween.class) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/dateBefore") - @ResponseBody - public ResponseEntity> dateBefore( - - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "tanggal", params = "tanggal", config = "yyyy-MM-dd", spec = LessThanOrEqual.class) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/dateAfter") - @ResponseBody - public ResponseEntity> dateAfter( - - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "tanggal", params = "tanggal", config = "yyyy-MM-dd", spec = GreaterThanOrEqual.class) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/greaterThan") - @ResponseBody - public ResponseEntity> greaterThan( - - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "noCounter", params = "noCounter", spec = GreaterThanOrEqual.class) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - - - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/lessThan") - @ResponseBody - public ResponseEntity> lessThan( - - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "noCounter", params = "noCounter", spec = LessThanOrEqual.class) Specification spec) { - - Map resultPageMap = ruanganService.ruanganPaging(page,limit,sort,dir,spec); - - return constructListPageResult(resultPageMap); - } - - @RequestMapping(value = "/get-list-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getJadwalKerja( - HttpServletRequest request) { - List> result = null; - try { - - result = ruanganService.findRuangan(); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - @RequestMapping(value = "/get-all-ruangan-for-tagihan", method = RequestMethod.GET) - public ResponseEntity< Map> findAllDepartemenById5And6( - @RequestParam(value = "instalasiId", required = false) Integer instalasiId, - HttpServletRequest request) { - try { - - Map listPegawaiVo = ruanganService.findAllRuanganForTagihan( instalasiId); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.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.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-all-unit-kerja", method = RequestMethod.GET) - public ResponseEntity>> findAllUnitKerja( - HttpServletRequest request) { - try { - - List> listUnitKerja = ruanganService.findRuanganUnitKerja(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(listUnitKerja, HttpStatus.OK,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all unit kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all unit kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - - /* - * Author Iwan Kasan - */ - @RequestMapping( - value = "/get-all-ruangan-by-id-dept", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-ruangan-by-id-dept", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRuanganByIdDep(final HttpServletRequest request) { - Map result = this.ruanganService.getRuanganByIdDep(); - - 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(LABEL_SUCCESS, getMessage(MessageResource.LABEL_ERROR, request)); } - else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - - /* - * Author Iwan Kasan - */ - @RequestMapping( - value = "/get-jml-tempattidur-ruangan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getJmlTempatTidur(final HttpServletRequest request) { - - Map result = this.ruanganService.getJmlTempatTidur(); - - 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_SUCCESS, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - /* - * Author Iwan Kasan - */ - @RequestMapping( - value = "/get-jml-tempattidur-byruangan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-jml-tempattidur-byruangan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJmlTempatTidurByIdRuangan( @RequestParam(value = "idRuangan", required = false) Integer idRuangan, final HttpServletRequest request) { - Map result = this.ruanganService.getJmlTempatTidurByIdRuangan(idRuangan); - - 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(LABEL_SUCCESS, getMessage(MessageResource.LABEL_ERROR, request)); } - else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganMController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganMController.java deleted file mode 100644 index 5f46a26a..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganMController.java +++ /dev/null @@ -1,135 +0,0 @@ -/*package com.jasamedika.medifirst2000.controller; - -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -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.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.util.UriComponentsBuilder; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.entities.AgamaM; -import com.jasamedika.medifirst2000.entities.KelasM; -import com.jasamedika.medifirst2000.entities.PurchasedTest; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ModelService; -import com.jasamedika.medifirst2000.service.RuanganMService; -import com.jasamedika.medifirst2000.service.KelasMService; -import com.jasamedika.medifirst2000.service.TestService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ModelVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.RuanganMVO; -import com.jasamedika.medifirst2000.vo.ModelVO; -import com.jasamedika.medifirst2000.vo.KelasMVO; - -*//** - * Controller class for KelasM Business - * - * @author Roberto - *//* -@RestController -@RequestMapping("/ruanganM") -public class RuanganMController extends LocaleController implements IBaseRestController { - - @Autowired - private TestService testService; - - @Autowired - private RuanganMService ruanganMService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(KelasMController.class); - - @Override - public ResponseEntity> getAllVOWithQueryString(Integer page, Integer limit, String sort, - String dir) { - return null; - } - - @Override - public ResponseEntity getVO(String id) { - return null; - } - - @RequestMapping(value = "/save-ruangan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity addVO(@Valid @RequestBody RuanganMVO vo) { - try { - RuanganMVO result = ruanganMService.add(vo); - - if (null != result) - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,""); - RestUtil.getJsonHttptatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse(vo.getId().toString(), HttpStatus.CREATED); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add RuanganM", 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 RuanganM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - - - } - - @RequestMapping(value = "/list-ruangan", method = RequestMethod.GET) - public ResponseEntity> listRuangan() { - List listRuanganMVO = ruanganMService.findAll(); - return RestUtil.getJsonResponse(listRuanganMVO, HttpStatus.OK,mapHeaderMessage); - - } - - @Override - public ResponseEntity editVO(KelasMVO vo) { - return null; - } - - @Override - protected List getAllVOFromService() { - return null; - } - - @Override - public ResponseEntity addVO(KelasMVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - - - -} -*/ \ No newline at end of file diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RunningNumberController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RunningNumberController.java deleted file mode 100644 index d8b7695b..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RunningNumberController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Map; - -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.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.RunningNumberService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; - -@RestController -@RequestMapping("/pasien-daftar-setting") -public class RunningNumberController extends LocaleController{ - - @Autowired - private RunningNumberService service; - - private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsDataAlatController.class); - - @RequestMapping(value = "/update-nocm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOneRegistrasiAset( - @RequestParam(value = "noCm", required = true) String noCm, HttpServletRequest request) { - try { - Map result = service.saveNoCmPasien(noCm); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getOneRegistrasiAset", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getOneRegistrasiAset", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java index b9a24791..0301d682 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java @@ -1,142 +1,123 @@ 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.SanitasiKesehatanLingkunganService; +import com.jasamedika.medifirst2000.vo.SanitasiKesehatanLingkunganVO; 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.SanitasiKesehatanLingkunganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.SanitasiKesehatanLingkunganVO; +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.slf4j.LoggerFactory.getLogger; +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("/sanitasi-kesehatan-lingkungan") -public class SanitasiKesehatanLingkunganController extends LocaleController{ +public class SanitasiKesehatanLingkunganController extends LocaleController { + + private static final Logger LOGGER = getLogger(SanitasiKesehatanLingkunganController.class); @Autowired private SanitasiKesehatanLingkunganService service; - - private static final Logger LOGGER = LoggerFactory.getLogger(SanitasiKesehatanLingkunganController.class); - - @RequestMapping(value = "/get-unit-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getUnitRuangan(HttpServletRequest request) { - try { - Map result = service.getUnitRuangan(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-user-login", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-user-login", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getUserLogin(HttpServletRequest request) { try { - Map result = service.getUserLogin(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = service.getUserLogin(); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getUserLogin", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getUserLogin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getUserLogin", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getUserLogin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-parameter-sanitasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-parameter-sanitasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getParameterSanitasi(HttpServletRequest request) { try { - Map result = service.getParameterSanitasi(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = service.getParameterSanitasi(); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getParameterSanitasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getParameterSanitasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getParameterSanitasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getParameterSanitasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-petugas-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPjRuangan( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { - try { - Map result = service.getPjRuangan(ruanganId); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getPjRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPjRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-sanitasi-kesehatan-lingkungan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveSanitasiKesehatanLingkungan(@Valid @RequestBody SanitasiKesehatanLingkunganVO vo, HttpServletRequest request) { - try { - Map result = service.saveSanitasiKesehatanLingkungan(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + @RequestMapping(value = "/get-petugas-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPjRuangan( + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { + try { + Map result = service.getPjRuangan(ruanganId); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); + } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveSanitasiKesehatanLingkungan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPjRuangan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveSanitasiKesehatanLingkungan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPjRuangan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } + + @RequestMapping(value = "/save-sanitasi-kesehatan-lingkungan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveSanitasiKesehatanLingkungan( + @Valid @RequestBody SanitasiKesehatanLingkunganVO vo, HttpServletRequest request) { + try { + Map result = service.saveSanitasiKesehatanLingkungan(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when saveSanitasiKesehatanLingkungan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when saveSanitasiKesehatanLingkungan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + }