diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanBiayaDiklatVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanBiayaDiklatVO.java index 634cde5e..a9b1d87c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanBiayaDiklatVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanBiayaDiklatVO.java @@ -1,8 +1,10 @@ package com.jasamedika.medifirst2000.vo; +import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; + import java.util.Date; -public class PelatihanBiayaDiklatVO { +public class PelatihanBiayaDiklatVO extends BaseTransactionVO { private ProdukVO komponen; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanPaketVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanPaketVO.java index f7551d08..34998599 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanPaketVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanPaketVO.java @@ -1,11 +1,12 @@ package com.jasamedika.medifirst2000.vo; +import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; + import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.Set; -public class PelatihanPaketVO { +public class PelatihanPaketVO extends BaseTransactionVO { private JenisPelatihanVO jenisPelatihan; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemakaianBarangHabisPakaiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemakaianBarangHabisPakaiVO.java index f801bbbf..dd2776c8 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemakaianBarangHabisPakaiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemakaianBarangHabisPakaiVO.java @@ -1,22 +1,19 @@ package com.jasamedika.medifirst2000.vo; +import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; +import com.jasamedika.medifirst2000.helper.Caption; + +import javax.persistence.OneToMany; import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; - -import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.helper.Caption; - /** * class Penerimaaan Barang VO * * @author Generator */ -public class PemakaianBarangHabisPakaiVO { +public class PemakaianBarangHabisPakaiVO extends BaseTransactionVO { @Caption(value="Tanggal Terima") diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java index bab1afcd..8142608d 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java @@ -1,64 +1,43 @@ package com.jasamedika.medifirst2000.controller; -import java.text.SimpleDateFormat; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.dao.MapJabatanToUraianTugasDao; +import com.jasamedika.medifirst2000.dao.MapUraianTugasToRincianKegiatanDao; +import com.jasamedika.medifirst2000.dto.EditPegawaiDTO; +import com.jasamedika.medifirst2000.entities.LoginUser; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.security.model.AppPermission; +import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; +import com.jasamedika.medifirst2000.service.*; +import com.jasamedika.medifirst2000.util.JsonUtil; +import com.jasamedika.medifirst2000.util.PasswordUtil; +import com.jasamedika.medifirst2000.vo.*; +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.security.core.Authentication; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import java.util.Collection; import java.util.HashMap; 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.security.core.Authentication; -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.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.MapJabatanToUraianTugasDao; -import com.jasamedika.medifirst2000.dao.MapUraianTugasToRincianKegiatanDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dto.EditPegawaiDTO; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.security.model.AppPermission; -import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; -import com.jasamedika.medifirst2000.service.KeluargaPegawaiService; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.PegawaiJadwalKerjaService; -import com.jasamedika.medifirst2000.service.PegawaiService; -import com.jasamedika.medifirst2000.service.RiwayatJabatanService; -import com.jasamedika.medifirst2000.service.RiwayatPekerjaanService; -import com.jasamedika.medifirst2000.service.RiwayatPelatihanService; -import com.jasamedika.medifirst2000.service.RiwayatPendidikanService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.util.PasswordUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPegawaiMobileVO; -import com.jasamedika.medifirst2000.vo.RekamDataPegawaiVO; -import com.jasamedika.medifirst2000.vo.RiwayatJabatanVO; -import com.jasamedika.medifirst2000.vo.RiwayatPekerjaanVO; -import com.jasamedika.medifirst2000.vo.RiwayatPelatihanVO; -import com.jasamedika.medifirst2000.vo.RiwayatPendidikanVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.CommonUtil.isNotNullOrEmpty; +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; /** * Controller class for Pasien Business @@ -67,25 +46,19 @@ import com.jasamedika.medifirst2000.vo.RiwayatPendidikanVO; */ @RestController @RequestMapping("/pegawai") -public class PegawaiController extends LocaleController implements IBaseRestController { - //Alter by Syamsu +public class PegawaiController extends LocaleController { + + private static final Logger LOGGER = getLogger(PegawaiController.class); + @Autowired private LoginUserService loginUserService; - + @Autowired private TokenAuthenticationService tokenAuthenticationService; - - //Alter by Syamsu - - @Autowired - private RiwayatPekerjaanService riwayatPekerjaanService; @Autowired private MapJabatanToUraianTugasDao mapUraianToJabatanDao; - @Autowired - private PegawaiDao pegawaiDao; - @Autowired private MapUraianTugasToRincianKegiatanDao mapUraianTugasToRincianKegiatanDao; @@ -98,1096 +71,657 @@ public class PegawaiController extends LocaleController implements IB @Autowired private RiwayatPendidikanService riwayatPendidikanService; - @Autowired - private RiwayatPelatihanService riwayatPelatihanService; - @Autowired private RiwayatJabatanService riwayatJabatanService; + @Autowired private PegawaiJadwalKerjaService pegawaiJadwalKerjaServices; - private static final Logger LOGGER = LoggerFactory.getLogger(PegawaiController.class); - - // for example - /* - * @RequestMapping(value = "/test-list", method = RequestMethod.GET) public - * ResponseEntity> testList() { List listPasienVO = - * testService.getAllPasienForContoh(); return - * RestUtil.getJsonResponse(listPasienVO, HttpStatus.OK); } - */ - - // for example - /* - * @RequestMapping(value = "/test-list2", method = RequestMethod.GET) public - * ResponseEntity> testList2() { try { LOGGER.info( - * "::Calling PasienController::"); List listPasienVO = - * testService.getAllPasienForContoh(); // add http header messages // - * locale ENGLISH addHeaderMessage( Constants.MessageInfo.INFO_MESSAGE, - * getMessage(MessageResource.LABEL_SUCCESS, Constants.Locale.EN)); // - * locale INDONESIA (default) - * addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - * getMessage(MessageResource.LABEL_ERROR)); - * - * return RestUtil.getJsonResponse(listPasienVO, HttpStatus.OK, - * mapHeaderMessage); - * - * } catch (Exception ex) { LOGGER.error("Got exception {}", - * ex.getMessage()); addHeaderMessage( Constants.MessageInfo.ERROR_MESSAGE, - * getMessage(MessageResource.LABEL_ERROR, Constants.Locale.EN)); return - * RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - * mapHeaderMessage); } } - */ - - // for example using EM - // @RequestMapping(value = "/test-em", method = RequestMethod.GET) - // public ResponseEntity> testPurchased() { - // List listVO = pasienService.getAllPurchasedContoh(); - // return RestUtil.getJsonResponse(listVO, HttpStatus.OK); - // } - // - // // for example using EM - // @RequestMapping(value = "/test-em/{customerId}", method = - // RequestMethod.GET) - // public ResponseEntity> testPurchasedByCustomer( - // @PathVariable("customerId") Long customerId) { - // List listVO = pasienService - // .getAllPurchasedByCustomer(customerId); - // return RestUtil.getJsonResponse(listVO, HttpStatus.OK); - // } - - @RequestMapping(value = "/get-all-dokter2", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-dokter2", method = GET) public ResponseEntity> getAllDokter2(HttpServletRequest request) { try { List listPegawaiVo = pegawaiService.getAllDokter(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when pegawaiService.getAllDokter", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.getAllDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - -// @RequestMapping(value = "/get-all-pegawai-mapping-jabatan", method = RequestMethod.GET) -// public ResponseEntity> getAllPegawaiForMapPegawaiJabatanToUnitKerja(HttpServletRequest request) { -// try { -// List listPegawaiVo = pegawaiService.findAllPegawaiForMapPegawaiJabatanToUnitKerja(); -// 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-pegawai-mapping-jabatan", e.getMessage()); -// addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); -// return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); -// } catch (JpaSystemException jse) { -// LOGGER.error("Got exception {} when get-all-pegawai-mapping-jabatanr", jse.getMessage()); -// addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); -// return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); -// } -// -// } - - @RequestMapping(value = "/get-all-dokter", method = RequestMethod.GET) - public ResponseEntity> getAllDokter( - @RequestParam(value = "kodeRuangan", required = false) String kodeRuangan, - @RequestParam(value = "tanggal", required = false) String tanggal, HttpServletRequest request) { - try { - - // long tgl=Date.parse(tanggal); - List listPegawaiVo = pegawaiService.getAllDokterByRuanganAndTanggal(kodeRuangan, - DateUtil.toDate(tanggal)); - 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-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity */Collection> getAllPegawai(/* - * HttpServletRequest - * request - */ + @RequestMapping(value = "/get-all-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllPegawai( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "20") Integer take, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "namaLengkap", required = false) String namaLengkap) { - Map result = new HashMap(); - result = pegawaiService.getAllPegawai(page, take, sort, dir, id, namaLengkap); + Map result = pegawaiService.getAllPegawai(page, take, sort, dir, id, namaLengkap); return constructListPageResult(result); } - @RequestMapping(value = "/get-by-satuan-kerja", method = RequestMethod.GET) - public ResponseEntity>> getAllBySatuanKerja( - @RequestParam(value = "satuankerjaId") Integer satuanKerjaId, HttpServletRequest request) { - try { - - // long tgl=Date.parse(tanggal); - List> listPegawaiVo = pegawaiService.getAllBySatuanKerja(satuanKerjaId); - 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-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai", method = GET) public ResponseEntity>> getAllPegawai( @RequestParam(value = "key", required = false) String key, @RequestParam(value = "tanggal", required = false) String tanggal, HttpServletRequest request) { try { - - // long tgl=Date.parse(tanggal); List> listPegawaiVo = pegawaiService.getAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when pegawaiService.getAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.getAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-perawat", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-perawat", method = GET) public ResponseEntity>> getAllPerawat( @RequestParam(value = "key", required = false) String key, @RequestParam(value = "tanggal", required = false) String tanggal, HttpServletRequest request) { try { - - // long tgl=Date.parse(tanggal); List> listPegawaiVo = pegawaiService .getAllByJenisPegawai(GetSettingDataFixed("KdJenisPegawaiParamedis"), key); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when pegawaiService.getAllByJenisPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.getAllByJenisPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @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 Riwayat Pekerjaan", 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 Pekerjaan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @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 Riwayat Pelatihan", 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 Pelatihan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-riwayat-pendidikan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @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)); + getJsonHttpStatus(CREATED); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Riwayat Pendidikan", 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 Riwayat Pendidikan", 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); } - } - @RequestMapping(value = "/save-riwayat-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-riwayat-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity saveRiwayatJabatan(@Valid @RequestBody RiwayatJabatanVO vo, HttpServletRequest request) { try { RiwayatJabatanVO result = riwayatJabatanService.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)); + getJsonHttpStatus(CREATED); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Riwayat Jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatJabatanService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatJabatanService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody PegawaiVO vo) { try { PegawaiVO result = pegawaiService.add(vo); - if (null != result) - return RestUtil.getJsonResponse("", HttpStatus.CREATED); - + return getJsonResponse("", CREATED); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pegawaiService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - /// Alter by Syamsu untuk edit data pegawai - @RequestMapping(value = "/update-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) @AppPermission(AppPermission.SPECIALS) - public ResponseEntity editVOWithPassword(@Valid @RequestBody EditPegawaiDTO vo, HttpServletRequest request) { - try{ + public ResponseEntity editVOWithPassword(@Valid @RequestBody EditPegawaiDTO vo, + HttpServletRequest request) { + try { Authentication authentication = tokenAuthenticationService.getAuthentication(request); - String namaUser = authentication.getName(); List loginUser = loginUserService.findByNamaUser(namaUser); - if (!loginUser.isEmpty()) { - LoginUser user = loginUser.get(0); - PasswordUtil passwordUtil = new PasswordUtil(); - - Boolean isValidPassword = passwordUtil.isPasswordEqual(vo.getPassword(), user.getKataSandi()); - + boolean isValidPassword = passwordUtil.isPasswordEqual(vo.getPassword(), user.getKataSandi()); if (isValidPassword) { PegawaiVO result = vo.getPegawaiVO(); - return editVO(result); - }else{ - LOGGER.error("Got exception {} when update Pegawai, password invalid"); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Password"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return editVO(result); + } else { + LOGGER.error("Got exception when isValidPassword is false"); + addHeaderMessage(ERROR_MESSAGE, "Invalid Password"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } else { - LOGGER.error("Got exception {} when update Pegawai"); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "User is unauthorized"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got exception when loginUser.isEmpty"); + addHeaderMessage(ERROR_MESSAGE, "User is unauthorized"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - }catch(Exception e){ - e.printStackTrace(); - LOGGER.error("Got exception {} when update Pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (Exception e) { + LOGGER.error("Got Exception {} when getAuthentication", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - } public ResponseEntity editVO(@Valid @RequestBody PegawaiVO vo) { try { PegawaiVO result = pegawaiService.update(vo); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS)); - return RestUtil.getJsonResponse("", HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS)); + return getJsonResponse("", OK, mapHeaderMessage); } } catch (ServiceVOException e) { - e.printStackTrace(); - LOGGER.error("Got exception {} when update Pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pegawaiService.update", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - jse.printStackTrace(); - LOGGER.error("Got exception {} when update Pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.update", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - public ResponseEntity getVO(@PathVariable("id") Integer id) { - PegawaiVO pegawaiVO = pegawaiService.findById(id); - - return RestUtil.getJsonResponse(pegawaiVO, HttpStatus.OK); - } - - @RequestMapping(value = "/get-pegawai-by-nik/{nik}", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-by-nik/{nik}", method = GET) public ResponseEntity> getAllVOWithQueryString(@PathVariable("nik") String nik, HttpServletRequest request) { try { List listPegawaiVO = pegawaiService.findByNik(nik); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVO, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVO, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Asal Rujukan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findByNik", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Asal Rujukan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findByNik", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - - @RequestMapping(value = "/get-pegawai-by-id/{id}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-id/{id}/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKelasByRuangan(@PathVariable("id") Integer id, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiById(id); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - + Map result = pegawaiService.findPegawaiById(id); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/get-pegawai-by-customs/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-customs/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getPegawaiById(@PathVariable("id") Integer id) { - // PegawaiVO pegawaiVO = pegawaiService.getPegawaiById(id); RekamDataPegawaiVO rekamDataPegawaiVO = pegawaiService.findRekamDataPegawaiById(id); - return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); + return getJsonResponse(rekamDataPegawaiVO, OK); } - @RequestMapping(value = "/get-pegawai-by-ruangan/{unitKerja}/{tahun}/{bulan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-ruangan/{unitKerja}/{tahun}/{bulan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByRuangan(@PathVariable("unitKerja") Integer unitKerja, @PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByRuangan(unitKerja, tahun, bulan); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - + Map result = pegawaiService.findPegawaiByRuangan(unitKerja, tahun, bulan); + 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); } - @RequestMapping(value = "/get-pegawai-by-jadwal/{tahun}/{bulan}/{pegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-jadwal/{tahun}/{bulan}/{pegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByJadwal(@PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByRuangan(0, tahun, bulan, pegawai); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - + Map result = pegawaiService.findPegawaiByRuangan(0, tahun, bulan, pegawai); + 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); } - // @RequestMapping(value = "/get-uraian/{jabatan}", method = - // RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - // public ResponseEntity> - // getUraian(@PathVariable("jabatan") Integer jabatan, - // - // HttpServletRequest request) { - // Map result = new HashMap<>(); - // try{ - // result.put("items", JsonUtil.ToMaps( - // mapUraianToJabatanDao.findByJabatan(jabatan))); - // - // 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-uraian/{jabatan}/{pegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-uraian/{jabatan}/{pegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getUraianPegawai(@PathVariable("jabatan") Integer jabatan, - @PathVariable("pegawai") Integer pegawai, - - HttpServletRequest request) { - Map result = new HashMap<>(); + @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { try { - Pegawai pegawaiModel = pegawaiDao.findOne(pegawai); + Map result = new HashMap<>(); result.put("items", JsonUtil.ToMaps(mapUraianTugasToRincianKegiatanDao .findByMapJabatanToUraianTugasId(mapUraianToJabatanDao.findByPegawaiId(pegawai).get(0).getId()))); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - + 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); } - @RequestMapping(value = "/get-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataPegawai(HttpServletRequest request) { - Map result = new HashMap<>(); try { - result = pegawaiService.dataAllPegawai(); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - + Map result = pegawaiService.dataAllPegawai(); + 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); } - @RequestMapping(value = "/get-pegawai-by-pelaksana", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPegawaiByPelaksana( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + @RequestMapping(value = "/get-pegawai-by-pelaksana", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPegawaiByPelaksana(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = pegawaiService.getPegawaiByPelaksana(id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getPegawaiByPelaksana", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPegawaiByPelaksana", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPegawaiByPelaksana", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPegawaiByPelaksana", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-no-paging/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-no-paging/", method = GET) public ResponseEntity> findAllPegwawaiNoPaging( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - - // long tgl=Date.parse(tanggal); Map listPegawaiVo = pegawaiService.findAllPegawaiNoPaging(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiNoPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-all-pegawai-lain-lain/", method = RequestMethod.GET) - public ResponseEntity> findAllPegwawaiLainLain( - @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { - try { - - // long tgl=Date.parse(tanggal); - Map listPegawaiVo = pegawaiService.findAllPegawaiLainLain(); - 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); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiNoPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-no-paging-search", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-no-paging-search", method = GET) public ResponseEntity> findAllPegawaiNoPagingSearch( @RequestParam(value = "namaPegawai") String namaPegawai, @RequestParam(value = "idJabatan") String idJabatan, - @RequestParam(value = "idSubUnitKerja") Integer idSubUnitKerja,HttpServletRequest request) { + @RequestParam(value = "idSubUnitKerja") Integer idSubUnitKerja, HttpServletRequest request) { try { - - Map listPegawaiVo = pegawaiService.findAllPegawaiNoPagingSearch(namaPegawai, idJabatan,idSubUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map listPegawaiVo = pegawaiService.findAllPegawaiNoPagingSearch(namaPegawai, idJabatan, + idSubUnitKerja); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiNoPagingSearch", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiNoPagingSearch", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-keluarga-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-keluarga-pegawai", method = GET) public ResponseEntity> getDataKeluargaPegawai(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { - Map listPegawaiVo = keluargaPegawaiService.findAllDataKeluargaPegawai(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when findAllDataKeluargaPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllDataKeluargaPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/find-pegawai-by-id-custom/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-pegawai-by-id-custom/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findpegawaiByIdCustom(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = pegawaiService.findPegawaiByIdCustom(idPegawai); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + Map result = pegawaiService.findPegawaiByIdCustom(idPegawai); + 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); } - @RequestMapping(value = "/get-pegawai-by-ruangan/{ruangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-ruangan/{ruangan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByRuangan(@PathVariable("ruangan") Integer ruangan, - HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByRuangan(ruangan); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - + Map result = pegawaiService.findPegawaiByRuangan(ruangan); + 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); } - @RequestMapping(value = "/save-all-jadwal-pegawai-rev2/", method = RequestMethod.POST) - public ResponseEntity> addAllVOPegawai( @RequestBody List vos, - HttpServletRequest request) { + @RequestMapping(value = "/save-all-jadwal-pegawai-rev2/", method = POST) + public ResponseEntity> addAllVOPegawai(@RequestBody List vos, + HttpServletRequest request) { try { - Map result = pegawaiJadwalKerjaServices.saveListJadwalPegawai(vos, false,false); + Map result = pegawaiJadwalKerjaServices.saveListJadwalPegawai(vos, false, false); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Catatan Perkembangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveListJadwalPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Catatan Perkembangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveListJadwalPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pegawai-by-ruangan-rev2/{subUnitKerja}/{tahun}/{bulan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPegawaiByRuanganrev2(@PathVariable("subUnitKerja") Integer subUnitKerja, - @PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, HttpServletRequest request) { - Map result = null; + @RequestMapping(value = "/get-pegawai-by-ruangan-rev2/{subUnitKerja}/{tahun}/{bulan}", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPegawaiByRuanganrev2( + @PathVariable("subUnitKerja") Integer subUnitKerja, @PathVariable("tahun") Integer tahun, + @PathVariable("bulan") Integer bulan, HttpServletRequest request) { try { - result = pegawaiService.findPegawaiByRuanganRev2(subUnitKerja, tahun, bulan); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - + Map result = pegawaiService.findPegawaiByRuanganRev2(subUnitKerja, tahun, bulan); + 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); } - @RequestMapping(value = "/get-all-pegawai-aktif-by-ruangan/", method = RequestMethod.GET) + + @RequestMapping(value = "/get-all-pegawai-aktif-by-ruangan/", method = GET) public ResponseEntity> getAllPegawaiAktifByRuangan( - @RequestParam(value = "idRuangan", required = false) Integer idRuangan, - HttpServletRequest request) { + @RequestParam(value = "idRuangan", required = false) Integer idRuangan, HttpServletRequest request) { try { - - // long tgl=Date.parse(tanggal); List listPegawaiVo = pegawaiService.findAllPegawaiAktifByRuangan(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiAktifByRuangan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - @RequestMapping(value = "/get-pegawai-by-id-mobile/{idPegawai}", method = RequestMethod.GET) - public ResponseEntity> getPegawaiByIdForMobile( - @PathVariable("idPegawai") Integer idPegawai, - HttpServletRequest request) { - try { - - Map pegawai = pegawaiService.getPegawaiByIdMobile(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawai, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", 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 getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-pegawai-with-username-by-id/{id}", method = RequestMethod.GET) - public ResponseEntity> getPegawaiWithNamaUserById(@PathVariable("id") Integer id, HttpServletRequest request) { - - try { - Map pegawai = pegawaiService.getPegawaiWithNamaUserById(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawai, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getPegawaiWithNamaUserById", 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 getPegawaiWithNamaUserById", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiAktifByRuangan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/save-registrasi-pegawai-mobile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity SaveRegistrasiPegawaiMobile(@RequestBody RegistrasiPegawaiMobileVO vo, - HttpServletRequest request) { + + @RequestMapping(value = "/get-tgl-pensiun/{tglLahir}/{idjabatan}", method = GET) + public ResponseEntity> getPegawaiByIdForMobile(@PathVariable("idjabatan") Integer idjabatan, + @PathVariable("tglLahir") String tglLahir, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - String result = pegawaiService.SaveRegistrasiPegawaiMobile(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + Map tglpensiun = pegawaiService.getTglpensiun(tglLahir, idjabatan); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(tglpensiun, OK, 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); + LOGGER.error("Got ServiceVOException {} when getTglpensiun", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getTglpensiun", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - - @RequestMapping(value = "/get-tgl-pensiun/{tglLahir}/{idjabatan}", method = RequestMethod.GET) - public ResponseEntity> getPegawaiByIdForMobile( - @PathVariable("idjabatan") Integer idjabatan,@PathVariable("tglLahir") String tglLahir, - HttpServletRequest request) { - try { - - Map tglpensiun = pegawaiService.getTglpensiun(tglLahir, idjabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(tglpensiun, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", 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 getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/non-aktif-pegawai-by-id/{id}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deletePegawai(@PathVariable("id") Integer id, + + @RequestMapping(value = "/non-aktif-pegawai-by-id/{id}/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> deletePegawai(@PathVariable("id") Integer id, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.nonAktifPegawai(id); - - if (CommonUtil.isNotNullOrEmpty(result)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + Map result = pegawaiService.nonAktifPegawai(id); + if (isNotNullOrEmpty(result)) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - - @RequestMapping(value = "/get-pegawai-pensiun/{startPeriode}/{endPeriode}", method = RequestMethod.GET) - public ResponseEntity>> getPegawaiPensiun( - @PathVariable("startPeriode") String startPeriode,@PathVariable("endPeriode") String endPeriode, + + @RequestMapping(value = "/get-pegawai-pensiun/{startPeriode}/{endPeriode}", method = GET) + public ResponseEntity>> getPegawaiPensiun( + @PathVariable("startPeriode") String startPeriode, @PathVariable("endPeriode") String endPeriode, HttpServletRequest request) { try { - - List> tglpensiun = pegawaiService.getPegawaiYgAkanPensiun(startPeriode, endPeriode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(tglpensiun, HttpStatus.OK, mapHeaderMessage); + List> tglpensiun = pegawaiService.getPegawaiYgAkanPensiun(startPeriode, endPeriode); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(tglpensiun, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPegawaiYgAkanPensiun", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPegawaiYgAkanPensiun", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-by-sub-Unit-kerja/{idSubUnitKerja}", method = RequestMethod.GET) - public ResponseEntity>> getPegawaiPensiun( - @PathVariable("idSubUnitKerja") Integer idSubUnitKerja, - HttpServletRequest request) { + + @RequestMapping(value = "/get-pegawai-str-expired", method = GET) + public ResponseEntity>> getPegawaiStrExpired(HttpServletRequest request) { try { - - List> tglpensiun = pegawaiService.getpegawaiByUnitkerja(idSubUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(tglpensiun, HttpStatus.OK, mapHeaderMessage); + List> pegawais = pegawaiService.getpegawaiStrExpired(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiStrExpired", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiStrExpired", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pegawai-str-expired", method = RequestMethod.GET) - public ResponseEntity>> getPegawaiStrExpired( - HttpServletRequest request) { + + @RequestMapping(value = "/get-pegawai-sip-expired", method = GET) + public ResponseEntity>> getPegawaiSipExpired(HttpServletRequest request) { try { - - List> pegawais = pegawaiService.getpegawaiStrExpired(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> pegawais = pegawaiService.getpegawaiSipExpired(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiSipExpired", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiSipExpired", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pegawai-sip-expired", method = RequestMethod.GET) - public ResponseEntity>> getPegawaiSipExpired( - HttpServletRequest request) { + + @RequestMapping(value = "/get-count-pegawai-by-unit-kerja", method = GET) + public ResponseEntity>> getCountPegawaiByUnitKerja(HttpServletRequest request) { try { - - List> pegawais = pegawaiService.getpegawaiSipExpired(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> pegawais = pegawaiService.getpegawaiByUnitKerja(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByUnitKerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByUnitKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-count-pegawai-by-unit-kerja", method = RequestMethod.GET) - public ResponseEntity>> getCountPegawaiByUnitKerja( - HttpServletRequest request) { + + @RequestMapping(value = "/get-count-pegawai-by-kelompok-jabatan", method = GET) + public ResponseEntity>> getCountPegawaiByKelompokJabatan(HttpServletRequest request) { try { - - List> pegawais = pegawaiService.getpegawaiByUnitKerja(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> pegawais = pegawaiService.getpegawaiByKelompokJabatan(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByKelompokJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByKelompokJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-count-pegawai-by-kelompok-jabatan", method = RequestMethod.GET) - public ResponseEntity>> getCountPegawaiByKelompokJabatan( - HttpServletRequest request) { + + @RequestMapping(value = "/get-count-pegawai-by-status-pegawai", method = GET) + public ResponseEntity>> getCountPegawaiByStatusPegawai(HttpServletRequest request) { try { - - List> pegawais = pegawaiService.getpegawaiByKelompokJabatan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> pegawais = pegawaiService.getpegawaiByStatusPegawai(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByStatusPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByStatusPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-count-pegawai-by-status-pegawai", method = RequestMethod.GET) - public ResponseEntity>> getCountPegawaiByStatusPegawai( - HttpServletRequest request) { + + @RequestMapping(value = "/get-count-pegawai-by-jk", method = GET) + public ResponseEntity>> getCountPegawaiByJK(HttpServletRequest request) { try { - - List> pegawais = pegawaiService.getpegawaiByStatusPegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> pegawais = pegawaiService.getpegawaiByJenisKelamin(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByJenisKelamin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByJenisKelamin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-count-pegawai-by-jk", method = RequestMethod.GET) - public ResponseEntity>> getCountPegawaiByJK( - HttpServletRequest request) { - try { - - List> pegawais = pegawaiService.getpegawaiByJenisKelamin(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", 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 getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-pegawai-meninggal-pindah-pensiun-no-paging/", method = RequestMethod.GET) + + @RequestMapping(value = "/get-pegawai-meninggal-pindah-pensiun-no-paging/", method = GET) public ResponseEntity> findPegawaiMeninggalPindahPensiunNoPaging( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - - // long tgl=Date.parse(tanggal); Map listPegawaiVo = pegawaiService.findPegawaiMeninggalPindahPensiunNoPaging(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when findPegawaiMeninggalPindahPensiunNoPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiMeninggalPindahPensiunNoPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pegawai-outsourcing/", method = RequestMethod.GET) + + @RequestMapping(value = "/get-pegawai-outsourcing/", method = GET) public ResponseEntity> findPegawaiOutSourcingNoPaging( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - - // long tgl=Date.parse(tanggal); Map listPegawaiVo = pegawaiService.findPegawaiOutSourcingNoPaging(); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when findPegawaiOutSourcingNoPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiOutSourcingNoPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-all-pegawai-custom/", method = RequestMethod.GET) + + @RequestMapping(value = "/get-all-pegawai-custom/", method = GET) public ResponseEntity>> findAllPegawaiCustom( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - - // long tgl=Date.parse(tanggal); List> listPegawaiVo = pegawaiService.getAllPegawaiCustom(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, 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); + LOGGER.error("Got ServiceVOException {} when getAllPegawaiCustom", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllPegawaiCustom", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-all-pegawai-kepala-ruangan", method = RequestMethod.GET) - public ResponseEntity>> findAllPegawaiKepalaRuangan( - HttpServletRequest request) { - try { - // long tgl=Date.parse(tanggal); + @RequestMapping(value = "/get-all-pegawai-kepala-ruangan", method = GET) + public ResponseEntity>> findAllPegawaiKepalaRuangan(HttpServletRequest request) { + try { List> listPegawai = pegawaiService.getAllKepalaRuangan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawai, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawai, 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); + LOGGER.error("Got ServiceVOException {} when getAllKepalaRuangan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllKepalaRuangan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java index c34b0c96..77c10d3e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java @@ -1,142 +1,57 @@ 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.PegawaiJadwalKerjaDokterdService; +import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaDokterDVO; 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.PegawaiJadwalKerjaDokterdService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaDokterDVO; + +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; @RestController @RequestMapping("/jadwal-kerja-dokter") -public class PegawaiJadwalKerjaDokterDController extends LocaleController{ +public class PegawaiJadwalKerjaDokterDController extends LocaleController { + + private static final Logger LOGGER = getLogger(PegawaiJadwalKerjaDokterDController.class); @Autowired private PegawaiJadwalKerjaDokterdService service; - - private static final Logger LOGGER = LoggerFactory.getLogger(PegawaiJadwalKerjaDokterDController.class); - - @RequestMapping(value = "/load-data-jadwal", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> loadDataJadwal(HttpServletRequest request) { - try { - Map result = service.loadDataJadwal(); - 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 loadDataJadwal", 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 loadDataJadwal", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-kamar-by-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getKamarByRuangan(@RequestParam(value="id",required = false) Integer id, HttpServletRequest request) { - try { - Map result = service.getKamarByRuangan(id); - 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 getKamarByRuangan", 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 getKamarByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-jadwal-kerja-dokter", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveJadwalKerjaDokter( - @Valid @RequestBody PegawaiJadwalKerjaDokterDVO vo, HttpServletRequest request) { + + @RequestMapping(value = "/save-jadwal-kerja-dokter", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveJadwalKerjaDokter(@Valid @RequestBody PegawaiJadwalKerjaDokterDVO vo, + HttpServletRequest request) { try { Map result = service.saveJadwalKerjaDokter(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when saveJadwalKerjaDokter", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when saveJadwalKerjaDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveJadwalKerjaDokter", 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 saveJadwalKerjaDokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-jadwal-kerja-dokter", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateJadwalKerjaDokter( - @Valid @RequestBody PegawaiJadwalKerjaDokterDVO vo, HttpServletRequest request) { - try { - Map result = service.updateJadwalKerjaDokter(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 updateJadwalKerjaDokter", 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 updateJadwalKerjaDokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/delete-jadwal-kerja-dokter", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deleteJadwalKerjaDokter( - @RequestParam(value="id",required = false) Integer id, HttpServletRequest request) { - try { - Map result = service.deleteJadwalKerjaDokter(id); - 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 deleteJadwalKerjaDokter", 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 deleteJadwalKerjaDokter", 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/PegawaiSkAsuransiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkAsuransiController.java index 4aa073b6..50625dae 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkAsuransiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkAsuransiController.java @@ -1,83 +1,66 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.PegawaiSkAsuransiDto; import com.jasamedika.medifirst2000.service.PegawaiSKAsuransiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiSKAsuransiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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(value="/pegawai-sk-asuransi") +@RequestMapping(value = "/pegawai-sk-asuransi") public class PegawaiSkAsuransiController extends LocaleController { - + @Autowired private PegawaiSKAsuransiService pegawaiSKAsuransiService; - @RequestMapping(value="/save-pegawai-sk-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody PegawaiSkAsuransiDto dto, - HttpServletRequest request) { - Map result = pegawaiSKAsuransiService.save(dto); + @RequestMapping(value = "/save-pegawai-sk-asuransi", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody PegawaiSkAsuransiDto dto, HttpServletRequest request) { + Map result = pegawaiSKAsuransiService.save(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - }else{ - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value="/get-pegawai-sk-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idPegawaiSkAsuransi", required = true) Integer idPegawaiSkAsuransi, - HttpServletRequest request) { - Map result = pegawaiSKAsuransiService.get(idPegawaiSkAsuransi); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-sk-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { + @RequestMapping(value = "/get-all-pegawai-sk-asuransi", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getAll(HttpServletRequest request) { List> result = pegawaiSKAsuransiService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKomponenHargaByJenis( - HttpServletRequest request) { - Integer idJenisKomponenHarga=9; + @RequestMapping(value = "/get-komponenharga-by-jenis", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getKomponenHargaByJenis(HttpServletRequest request) { + Integer idJenisKomponenHarga = 9; List> result = pegawaiSKAsuransiService.getKomponenHargaByJenis(idJenisKomponenHarga); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java index e2c114b0..bc12916c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java @@ -1,119 +1,64 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.PegawaiSkGajiDto; import com.jasamedika.medifirst2000.service.PegawaiSKGajiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiSKGajiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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(value="/pegawai-sk-gaji") +@RequestMapping(value = "/pegawai-sk-gaji") public class PegawaiSkGajiController extends LocaleController { - + @Autowired private PegawaiSKGajiService pegawaiSKGajiService; - @RequestMapping(value="/save-pegawai-sk-gaji", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody PegawaiSkGajiDto dto, - HttpServletRequest request) { - Map result = pegawaiSKGajiService.save(dto); + @RequestMapping(value = "/save-pegawai-sk-gaji", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody PegawaiSkGajiDto dto, HttpServletRequest request) { + Map result = pegawaiSKGajiService.save(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pegawai-sk-gaji", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idPegawaiSkGaji", required = true) Integer idPegawaiSkGaji, + @RequestMapping(value = "/get-pegawai-sk-gaji", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> get(@RequestParam(value = "idPegawaiSkGaji") Integer idPegawaiSkGaji, HttpServletRequest request) { Map result = pegawaiSKGajiService.get(idPegawaiSkGaji); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pegawai-sk-gaji-by-pegawai-id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-sk-gaji-by-pegawai-id", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getByPegawaiId( - @RequestParam(value="idPegawai", required = true) Integer idPegawai, - HttpServletRequest request) { + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { List> result = pegawaiSKGajiService.getByPegawaiId(idPegawai); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-sk-gaji", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { - List> result = pegawaiSKGajiService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllRuangan( - HttpServletRequest request) { - List> result = pegawaiSKGajiService.getAllRuangan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-aktif", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllPegawaiAktif( - HttpServletRequest request) { - List> result = pegawaiSKGajiService.getAllPegawaiAktif(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKomponenHargaByJenis( - HttpServletRequest request) { - Integer idJenisKomponenHarga=9; - List> result = pegawaiSKGajiService.getKomponenHargaByJenis(idJenisKomponenHarga); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java index 8538279d..3ca1bb5b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java @@ -1,116 +1,54 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.PegawaiSkPajakDto; import com.jasamedika.medifirst2000.service.PegawaiSKPajakService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiSKAsuransiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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(value="/pegawai-sk-pajak") +@RequestMapping(value = "/pegawai-sk-pajak") public class PegawaiSkPajakController extends LocaleController { - + @Autowired private PegawaiSKPajakService pegawaiSKPajakService; - @RequestMapping(value="/save-pegawai-sk-pajak", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody PegawaiSkPajakDto dto, - HttpServletRequest request) { - Map result = pegawaiSKPajakService.save(dto); + @RequestMapping(value = "/save-pegawai-sk-pajak", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody PegawaiSkPajakDto dto, HttpServletRequest request) { + Map result = pegawaiSKPajakService.save(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pegawai-sk-Pajak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idPegawaiSkPajak", required = true) Integer idPegawaiSkPajak, - HttpServletRequest request) { - Map result = pegawaiSKPajakService.get(idPegawaiSkPajak); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-sk-Pajak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { + @RequestMapping(value = "/get-all-pegawai-sk-Pajak", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getAll(HttpServletRequest request) { List> result = pegawaiSKPajakService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllRuangan( - HttpServletRequest request) { - List> result = pegawaiSKPajakService.getAllRuangan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-golongan-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllGolonganPegawai( - HttpServletRequest request) { - List> result = pegawaiSKPajakService.getAllGolonganPegawai(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-objek-pajak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllObjekPajak( - HttpServletRequest request) { - List> result = pegawaiSKPajakService.getAllObjekPajak(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - @RequestMapping(value="/get-all-range", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllRange( - HttpServletRequest request) { - List> result = pegawaiSKPajakService.getAllRange(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java index f7df793b..c3d07b71 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java @@ -1,94 +1,55 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.PegawaiStrukturGajiByJaDto; import com.jasamedika.medifirst2000.service.PegawaiStrukturGajiByJaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiSKGajiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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(value="/pegawai-ja") +@RequestMapping(value = "/pegawai-ja") public class PegawaiStrukturGajiByJaController extends LocaleController { - + @Autowired private PegawaiStrukturGajiByJaService pegawaiStrukturGajiByJaService; - @RequestMapping(value="/save-pegawai-ja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByJaDto dto, + @RequestMapping(value = "/save-pegawai-ja", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByJaDto dto, HttpServletRequest request) { - Map result = pegawaiStrukturGajiByJaService.save(dto); + Map result = pegawaiStrukturGajiByJaService.save(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pegawai-ja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idPegawaiSkGaji", required = true) Integer idPegawaiSkGaji, - HttpServletRequest request) { - Map result = pegawaiStrukturGajiByJaService.get(idPegawaiSkGaji); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-ja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { + @RequestMapping(value = "/get-all-pegawai-ja", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getAll(HttpServletRequest request) { List> result = pegawaiStrukturGajiByJaService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllDetailKategoriPegawai( - HttpServletRequest request) { - List> result = pegawaiStrukturGajiByJaService.getAllJabatan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKomponenHargaByJenis( - HttpServletRequest request) { - Integer idJenisKomponenHarga=9; - List> result = pegawaiStrukturGajiByJaService.getKomponenHargaByJenis(idJenisKomponenHarga); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java index 8b620d06..7573a270 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java @@ -1,106 +1,55 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.PegawaiStrukturGajiByJaPeDto; import com.jasamedika.medifirst2000.service.PegawaiStrukturGajiByJaPeService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiSKGajiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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(value="/pegawai-jape") +@RequestMapping(value = "/pegawai-jape") public class PegawaiStrukturGajiByJaPeController extends LocaleController { - + @Autowired private PegawaiStrukturGajiByJaPeService pegawaiStrukturGajiByJaPeService; - @RequestMapping(value="/save-pegawai-jape", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByJaPeDto dto, + @RequestMapping(value = "/save-pegawai-jape", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByJaPeDto dto, HttpServletRequest request) { - Map result = pegawaiStrukturGajiByJaPeService.save(dto); + Map result = pegawaiStrukturGajiByJaPeService.save(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pegawai-jape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idPegawaiSkGaji", required = true) Integer idPegawaiSkGaji, - HttpServletRequest request) { - Map result = pegawaiStrukturGajiByJaPeService.get(idPegawaiSkGaji); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-jape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { + @RequestMapping(value = "/get-all-pegawai-jape", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getAll(HttpServletRequest request) { List> result = pegawaiStrukturGajiByJaPeService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllJabatan( - HttpServletRequest request) { - List> result = pegawaiStrukturGajiByJaPeService.getAllJabatan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllPendidikan( - HttpServletRequest request) { - List> result = pegawaiStrukturGajiByJaPeService.getAllPendidikan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKomponenHargaByJenis( - HttpServletRequest request) { - Integer idJenisKomponenHarga=9; - List> result = pegawaiStrukturGajiByJaPeService.getKomponenHargaByJenis(idJenisKomponenHarga); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java index a2bf7780..f04a1c14 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java @@ -1,94 +1,55 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.PegawaiStrukturGajiByLTJaDto; import com.jasamedika.medifirst2000.service.PegawaiStrukturGajiByLTJaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiSKGajiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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(value="/pegawai-ltja") +@RequestMapping(value = "/pegawai-ltja") public class PegawaiStrukturGajiByLTJaController extends LocaleController { - + @Autowired private PegawaiStrukturGajiByLTJaService pegawaiStrukturGajiByLTJaService; - @RequestMapping(value="/save-pegawai-ltja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByLTJaDto dto, + @RequestMapping(value = "/save-pegawai-ltja", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByLTJaDto dto, HttpServletRequest request) { - Map result = pegawaiStrukturGajiByLTJaService.save(dto); + Map result = pegawaiStrukturGajiByLTJaService.save(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pegawai-ltja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idPegawaiSkGaji", required = true) Integer idPegawaiSkGaji, - HttpServletRequest request) { - Map result = pegawaiStrukturGajiByLTJaService.get(idPegawaiSkGaji); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-ltja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { + @RequestMapping(value = "/get-all-pegawai-ltja", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getAll(HttpServletRequest request) { List> result = pegawaiStrukturGajiByLTJaService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllDetailKategoriPegawai( - HttpServletRequest request) { - List> result = pegawaiStrukturGajiByLTJaService.getAllJabatan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKomponenHargaByJenis( - HttpServletRequest request) { - Integer idJenisKomponenHarga=9; - List> result = pegawaiStrukturGajiByLTJaService.getKomponenHargaByJenis(idJenisKomponenHarga); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java index 330e7025..93fb712c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java @@ -1,118 +1,55 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.PegawaiStrukturGajiByMaKaPeDto; import com.jasamedika.medifirst2000.service.PegawaiStrukturGajiByMaKaPeService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiSKGajiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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(value="/pegawai-makape") +@RequestMapping(value = "/pegawai-makape") public class PegawaiStrukturGajiByMaKaPeController extends LocaleController { - + @Autowired private PegawaiStrukturGajiByMaKaPeService pegawaiStrukturGajiByMaKaPeService; - @RequestMapping(value="/save-pegawai-makape", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByMaKaPeDto dto, + @RequestMapping(value = "/save-pegawai-makape", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody PegawaiStrukturGajiByMaKaPeDto dto, HttpServletRequest request) { - Map result = pegawaiStrukturGajiByMaKaPeService.save(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiStrukturGajiByMaKaPeService.save(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pegawai-makape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idPegawaiSkGaji", required = true) Integer idPegawaiSkGaji, - HttpServletRequest request) { - Map result = pegawaiStrukturGajiByMaKaPeService.get(idPegawaiSkGaji); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pegawai-makape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { + @RequestMapping(value = "/get-all-pegawai-makape", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getAll(HttpServletRequest request) { List> result = pegawaiStrukturGajiByMaKaPeService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-detail-kategori-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllDetailKategoriPegawai( - HttpServletRequest request) { - List> result = pegawaiStrukturGajiByMaKaPeService.getAllDetailKategoriPegawai(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-range-masa-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllRangeMasaKerja( - HttpServletRequest request) { - List> result = pegawaiStrukturGajiByMaKaPeService.getAllRangeMasaKerja(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllPendidikan( - HttpServletRequest request) { - List> result = pegawaiStrukturGajiByMaKaPeService.getAllPendidikan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKomponenHargaByJenis( - HttpServletRequest request) { - Integer idJenisKomponenHarga=9; - List> result = pegawaiStrukturGajiByMaKaPeService.getKomponenHargaByJenis(idJenisKomponenHarga); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java index 55015db3..45f8b857 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java @@ -1,52 +1,47 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -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.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.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.service.PekerjaanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PekerjaanVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +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("/pekerjaan") -public class PekerjaanController extends LocaleController{ - +public class PekerjaanController extends LocaleController { + @Autowired private PekerjaanService pekerjaanService; - - @RequestMapping(value="/save-pekerjaan", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePekerjaan( - @RequestBody PekerjaanVO vo, - HttpServletRequest request) { + + @RequestMapping(value = "/save-pekerjaan", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> savePekerjaan(@RequestBody PekerjaanVO vo, HttpServletRequest request) { Map result = this.pekerjaanService.savePekerjaan(vo); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/get-pekerjaan", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-pekerjaan", method = GET, produces = APPLICATION_JSON_VALUE) public Map getPekerjaan(HttpServletRequest request) { - Map result = this.pekerjaanService.getPekerjaan(); - return result; + return this.pekerjaanService.getPekerjaan(); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java index 226c272e..a07d9f66 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java @@ -1,56 +1,57 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PelaksanaService; +import com.jasamedika.medifirst2000.vo.PelaksanaVO; 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.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.PelaksanaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PelaksanaVO; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.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; @RestController @RequestMapping("/pelaksana") public class PelaksanaController extends LocaleController { - @Autowired - private PelaksanaService service; - - private static final Logger LOGGER = LoggerFactory.getLogger(PelaksanaController.class); + private static final Logger LOGGER = getLogger(PelaksanaController.class); - @RequestMapping(value = "/get-jenis-pelaksana", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @Autowired + private PelaksanaService service; + + @RequestMapping(value = "/get-jenis-pelaksana", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJenisPelaksan(HttpServletRequest request) { try { - Map result = service.getJenisPetugasPelaksana(); - 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.getJenisPetugasPelaksana(); + 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 getDataGrid", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getJenisPetugasPelaksana", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataGrid", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getJenisPetugasPelaksana", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java index 5e84c4f9..9a89b6da 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java @@ -1,64 +1,58 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PelatihanBiayaDiklatService; +import com.jasamedika.medifirst2000.vo.PelatihanBiayaDiklatVO; +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.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PelatihanBiayaDiklatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PelatihanBiayaDiklatVO; +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; @RestController @RequestMapping("/pelatihan-biaya-diklat") -public class PelatihanBiayaDiklatController extends LocaleController { - +public class PelatihanBiayaDiklatController extends LocaleController { + + private static final Logger LOGGER = getLogger(PelatihanBiayaDiklatController.class); + @Autowired private PelatihanBiayaDiklatService pelatihanBiayaDiklatService; - - private static final Logger LOGGER = LoggerFactory.getLogger(PelatihanBiayaDiklatController.class); - - @RequestMapping(value = "/save-biaya-diklat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveBiayaDiklat(@Valid @RequestBody PelatihanBiayaDiklatVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-biaya-diklat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveBiayaDiklat(@Valid @RequestBody PelatihanBiayaDiklatVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = pelatihanBiayaDiklatService.saveBiayaDiklat(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveBiayaDiklat", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveBiayaDiklat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/list-biaya-diklat") @ResponseBody public Map listBarangBmhp( @@ -66,18 +60,13 @@ public class PelatihanBiayaDiklatController extends LocaleController { @RequestParam(value = "take", required = false, defaultValue = "10000000") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) { - - Map resultPageMap = pelatihanBiayaDiklatService.listBiayaDiklat(page,limit,sort,dir); - - return resultPageMap; + return pelatihanBiayaDiklatService.listBiayaDiklat(page, limit, sort, dir); } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/daftar-komponen") @ResponseBody public Map daftarKomponen() { - Map resultPageMap = pelatihanBiayaDiklatService.daftarKomponen(); - return resultPageMap; + return pelatihanBiayaDiklatService.daftarKomponen(); } - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java index 107bf7b0..8da929da 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java @@ -1,73 +1,65 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PelatihanPaketService; +import com.jasamedika.medifirst2000.vo.PelatihanPaketVO; +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.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PelatihanPaketService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PelatihanPaketVO; +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("/pelatihan-paket") -public class PelatihanPaketController extends LocaleController { - +public class PelatihanPaketController extends LocaleController { + + private static final Logger LOGGER = getLogger(PelatihanPaketController.class); + @Autowired private PelatihanPaketService pelatihanPaketService; - - private static final Logger LOGGER = LoggerFactory.getLogger(CssdBmhpController.class); - - @RequestMapping(value = "/save-pelatihan-paket/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelatihanPaket(@Valid @RequestBody PelatihanPaketVO vo,HttpServletRequest request,HttpServletResponse response) { - + @RequestMapping(value = "/save-pelatihan-paket/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePelatihanPaket(@Valid @RequestBody PelatihanPaketVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = pelatihanPaketService.savePelatihanPaket(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePelatihanPaket", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePelatihanPaket", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/daftar-komponen") @ResponseBody public Map daftarKomponen() { - Map resultPageMap = pelatihanPaketService.daftarKomponen(); - return resultPageMap; + return pelatihanPaketService.daftarKomponen(); } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/list-pelatihan-paket") @ResponseBody public Map listBarangBmhp( @@ -77,22 +69,14 @@ public class PelatihanPaketController extends LocaleController { @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, @RequestParam(value = "tanggalAwal", required = false) String tanggalAwal, @RequestParam(value = "tanggalAhir", required = false) String tanggalAhir) { - - Map resultPageMap = pelatihanPaketService.listPelatihanPaket(page,limit,sort,dir,tanggalAwal,tanggalAhir); - - return resultPageMap; + return pelatihanPaketService.listPelatihanPaket(page, limit, sort, dir, tanggalAwal, tanggalAhir); } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-pelatihan-paket", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/detail-pelatihan-paket", method = GET, produces = APPLICATION_JSON_VALUE) public Map detailPelatihanPaket( - @RequestParam(value = "strukPlanningId", required = true) String strukPlanningId, - @RequestParam(value = "produkId", required = true) Integer produkId) { - Map result = pelatihanPaketService.detailPelatihanPaket(strukPlanningId,produkId); - - return result; + @RequestParam(value = "strukPlanningId") String strukPlanningId, + @RequestParam(value = "produkId") Integer produkId) { + return pelatihanPaketService.detailPelatihanPaket(strukPlanningId, produkId); } - - - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java index c3eafa53..abc1f2c8 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java @@ -1,127 +1,57 @@ 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 com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PelayananAdmixtureService; +import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; 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.PelayananAdmixtureService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; +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; @RestController @RequestMapping("/pelayanan-admixture") -public class PelayananAdmixtureController extends LocaleController implements -IBaseRestController { - +public class PelayananAdmixtureController extends LocaleController { + + private static final Logger LOGGER = getLogger(PelayananAdmixtureController.class); + @Autowired private PelayananAdmixtureService pelayananAdmixtureService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PelayananAdmixtureController.class); - - @RequestMapping(value = "/save-pelayanan-admixture/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody PelayananProduksiVO vo, HttpServletRequest request) { - + @RequestMapping(value = "/save-pelayanan-admixture/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody PelayananProduksiVO vo, + HttpServletRequest request) { try { - Map result=pelayananAdmixtureService.save(vo); + Map result = pelayananAdmixtureService.save(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pelayanan Admixture", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pelayananAdmixtureService.save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pelayanan Admixture", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pelayananAdmixtureService.save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-pelayanan-admixture/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> editVO(@Valid @RequestBody PelayananProduksiVO vo, HttpServletRequest request) { - - try { - Map result=pelayananAdmixtureService.edit(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 Pelayanan Admixture", 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 Pelayanan Admixture", 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(PelayananProduksiVO vo) { - return null; - } - - - @Override - public ResponseEntity editVO(PelayananProduksiVO 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/PelayananCytotoxicController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananCytotoxicController.java index 9b94a226..5d712dad 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananCytotoxicController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananCytotoxicController.java @@ -1,127 +1,57 @@ 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 com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PelayananCytotoxicService; +import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; 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.PelayananCytotoxicService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; +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; @RestController @RequestMapping("/pelayanan-cytotoxic") -public class PelayananCytotoxicController extends LocaleController implements -IBaseRestController { - +public class PelayananCytotoxicController extends LocaleController { + + private static final Logger LOGGER = getLogger(PelayananCytotoxicController.class); + @Autowired private PelayananCytotoxicService pelayananCytotoxicService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PelayananAdmixtureController.class); - - @RequestMapping(value = "/save-pelayanan-cytotoxic/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody PelayananProduksiVO vo, HttpServletRequest request) { - + @RequestMapping(value = "/save-pelayanan-cytotoxic/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody PelayananProduksiVO vo, + HttpServletRequest request) { try { - Map result=pelayananCytotoxicService.save(vo); + Map result = pelayananCytotoxicService.save(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pelayanan Cytotoxic", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pelayananCytotoxicService.save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pelayanan Cytotoxic", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pelayananCytotoxicService.save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-pelayanan-cytotoxic/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> editVO(@Valid @RequestBody PelayananProduksiVO vo, HttpServletRequest request) { - - try { - Map result=pelayananCytotoxicService.edit(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 Pelayanan Cytotoxic", 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 Pelayanan Cytotoxic", 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(PelayananProduksiVO vo) { - return null; - } - - - @Override - public ResponseEntity editVO(PelayananProduksiVO 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/PelayananPiutangRekananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananPiutangRekananController.java deleted file mode 100644 index 33a81347..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananPiutangRekananController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.HashMap; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -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.controller.base.LocaleController; -import com.jasamedika.medifirst2000.entities.AsalProduk; -import com.jasamedika.medifirst2000.entities.GolonganAsuransi; -import com.jasamedika.medifirst2000.entities.HubunganKeluarga; -import com.jasamedika.medifirst2000.entities.JenisTarif; -import com.jasamedika.medifirst2000.entities.Kelas; -import com.jasamedika.medifirst2000.entities.KelompokPasien; -import com.jasamedika.medifirst2000.entities.KomponenHarga; -import com.jasamedika.medifirst2000.entities.Paket; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.service.PelayananHargaStokDiskonService; -import com.jasamedika.medifirst2000.service.PelayananPiutangRekananService; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AssetVO; - -@RestController -@RequestMapping("/pelayanan-piutang-rekanan") -public class PelayananPiutangRekananController extends LocaleController { - @Autowired - private PelayananPiutangRekananService pelayananPiutangRekananService; - - private static final Logger LOGGER = LoggerFactory.getLogger(PelayananPiutangRekananController.class); - - @RequestMapping(value = "/get", method = RequestMethod.GET) - public ResponseEntity> getDataPiutangRekanan( - @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, - @RequestParam(value = "produkId", required = false) Integer produkId, - @RequestParam(value = "orderStok", required = false) Double orderStok, - @RequestParam(value = "cito", required = false) Integer cito) { - Map result = new HashMap(); - Produk produk=new Produk(); - produk.setId(produkId); - result=pelayananPiutangRekananService.getHargaPiutangRekananProfile(noRegistrasi, - produk, orderStok,cito); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java index 9784d7ca..95e161d4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java @@ -1,35 +1,33 @@ 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 com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.PelayananTpn; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PelayananTpnService; +import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; +import com.jasamedika.medifirst2000.vo.PelayananTpnVO; 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.PelayananTpnService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PelayananTpnVO; -import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; +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; /** * Controller class for Pengakjian Awal Gawat Darurat Business @@ -38,70 +36,31 @@ import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; */ @RestController @RequestMapping("/pelayanan-tpn") -@JsonIgnoreProperties(ignoreUnknown = true) -public class PelayananTpnController extends LocaleController implements - IBaseRestController { - - private static final Logger LOGGER = LoggerFactory.getLogger(PelayananTpnController.class); +@JsonIgnoreProperties(ignoreUnknown = true) +public class PelayananTpnController extends LocaleController { + + private static final Logger LOGGER = getLogger(PelayananTpnController.class); @Autowired - private PelayananTpnService pelayananTpnService; + private PelayananTpnService pelayananTpnService; - @RequestMapping(value = "/save-pelayanan-tpn", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody PelayananProduksiVO vo,HttpServletRequest request) { + @RequestMapping(value = "/save-pelayanan-tpn", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody PelayananProduksiVO vo, + HttpServletRequest request) { try { - Map result = pelayananTpnService.addPelayananTpn(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); - + Map result = pelayananTpnService.addPelayananTpn(vo); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + result.put("message", "Berhasil"); + return getJsonResponse(result, 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); + LOGGER.error("Got ServiceVOException {} when addPelayananTpn", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addPelayananTpn", 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(PelayananTpnVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(PelayananTpnVO 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/PemakaianAirBersihController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java index 0bba5b27..51172b2c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java @@ -1,193 +1,111 @@ 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.data.jpa.domain.Specification; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.entities.PemakaianAirBersih; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PemakaianAirBersihService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.PemakaianAirBersihVO; - import net.kaczmarzyk.spring.data.jpa.domain.DateBetween; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.jpa.domain.Specification; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; + +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("/pemakaian-air-bersih") -public class PemakaianAirBersihController extends LocaleController implements IBaseRestController { - +public class PemakaianAirBersihController extends LocaleController { + + private static final Logger LOGGER = getLogger(PemakaianAirBersihController.class); + @Autowired - private PemakaianAirBersihService pemakaianAirBersihService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PemakaianAirBersihController.class); - - @RequestMapping(value = "/save-pemakaian-air-bersih/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody PemakaianAirBersihVO vo,HttpServletRequest request) { - - try{ + private PemakaianAirBersihService pemakaianAirBersihService; + + @RequestMapping(value = "/save-pemakaian-air-bersih/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody PemakaianAirBersihVO vo, + HttpServletRequest request) { + try { Map result = pemakaianAirBersihService.addPemakaianAirBersih(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pemakaian air bersih", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when addPemakaianAirBersih", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pemakaian air bersih", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addPemakaianAirBersih", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/find-all-pemakaian-air-bersih/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVO(HttpServletRequest request) { + try { + Map result = pemakaianAirBersihService.findAllPemakaianAirBersih(); + 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 findAllPemakaianAirBersih", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when findAllPemakaianAirBersih", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-pemakaian-air-bersih/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody PemakaianAirBersihVO vo,HttpServletRequest request) { - - try{ - Map result = pemakaianAirBersihService.updatePemakaianAirBersih(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 Pemakaian air bersih", 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 Pemakaian air bersih", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-pemakaian-air-bersih/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=pemakaianAirBersihService.findAllPemakaianAirBersih(); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all Pemakaian air bersih", 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 Pemakaian air bersih", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - - @SuppressWarnings("unchecked") @RequestMapping(value = "/find-by-periode/") - @ResponseBody - public ResponseEntity>findByPeriode( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, + @ResponseBody + public ResponseEntity> findByPeriode( + @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "bulan", params = {"dateStart", "dateEnd"}, config = "yyyy-MM-dd", spec = DateBetween.class) Specification spec) { - - Map resultPageMap = pemakaianAirBersihService.pemakaianAirBersihPaging(page, limit, sort, dir, spec); - + @Spec(path = "bulan", params = { "dateStart", + "dateEnd" }, config = "yyyy-MM-dd", spec = DateBetween.class) Specification spec) { + Map resultPageMap = pemakaianAirBersihService.pemakaianAirBersihPaging(page, limit, sort, dir, + spec); return constructListPageResult(resultPageMap); - } - - @RequestMapping(value = "/delete-pemakaian-air-bersih", method = RequestMethod.GET) - public ResponseEntity deleteNamaBahan(@RequestParam(value = "noRec", required = true) String noRec) { - + } + + @RequestMapping(value = "/delete-pemakaian-air-bersih", method = GET) + public ResponseEntity deleteNamaBahan(@RequestParam(value = "noRec") String noRec) { try { - if (pemakaianAirBersihService.deletePemakaianAirBersih(noRec) == true) - return RestUtil.getJsonResponse(noRec +" Dihapus", HttpStatus.CREATED); - + if (pemakaianAirBersihService.deletePemakaianAirBersih(noRec)) + return getJsonResponse(noRec + " Dihapus", CREATED); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete Pemakaian air bersih", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when deletePemakaianAirBersih", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete Pemakaian air bersih", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when deletePemakaianAirBersih", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); - } - - - @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(PemakaianAirBersihVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(PemakaianAirBersihVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; + return getJsonHttpStatus(NOT_ACCEPTABLE); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java index 9b87e529..e30bee54 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java @@ -1,67 +1,58 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.StrukPelayanan; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.StrukPelayananService; +import com.jasamedika.medifirst2000.vo.PemakaianBarangHabisPakaiVO; +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.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.StrukPelayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PemakaianBarangHabisPakaiVO; +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; @RestController @RequestMapping("/pemakain-barang") -public class PemakaianBarangHabisPakaiController extends LocaleController{ - - private static final Logger LOGGER = LoggerFactory.getLogger(PemakaianBarangHabisPakaiController.class); - - @Autowired - private StrukPelayananService strukPelayananService; - +public class PemakaianBarangHabisPakaiController extends LocaleController { - - // save kartu Pengendali - @RequestMapping(value = "/save-pemakaian-barang", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + private static final Logger LOGGER = getLogger(PemakaianBarangHabisPakaiController.class); + + @Autowired + private StrukPelayananService strukPelayananService; + + @RequestMapping(value = "/save-pemakaian-barang", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveReturRuangan(@Valid @RequestBody PemakaianBarangHabisPakaiVO vo, HttpServletRequest request) { try { Map result = strukPelayananService.savePemakaianBarangHabisPakai(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pemakaian Barang habis Pakai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemakaianBarangHabisPakai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pemakaian Barang habis Pakai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemakaianBarangHabisPakai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") @RequestMapping(value = "/list-pemakaian") @ResponseBody public Map lisPemakaian( @@ -74,26 +65,8 @@ public class PemakaianBarangHabisPakaiController extends LocaleController{ @RequestParam(value = "kelompokProdukId", required = false) Integer kelompokProdukId, @RequestParam(value = "jenisProdukId", required = false) Integer jenisProdukId, @RequestParam(value = "produkId", required = false) Integer produkId) { - - Map resultPageMap = strukPelayananService.listPemakaian(page, limit, sort, dir, tanggalAwal, tanggalAhir, kelompokProdukId, jenisProdukId, produkId); - - return resultPageMap; + return strukPelayananService.listPemakaian(page, limit, sort, dir, tanggalAwal, tanggalAhir, kelompokProdukId, + jenisProdukId, produkId); } - - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/cetak-list-pemakaian") - @ResponseBody - public Map cetakLisPemakaian( - @RequestParam(value = "tanggalAwal", required = false) String tanggalAwal, - @RequestParam(value = "tanggalAhir", required = false) String tanggalAhir, - @RequestParam(value = "kelompokProdukId", required = false) Integer kelompokProdukId, - @RequestParam(value = "jenisProdukId", required = false) Integer jenisProdukId, - @RequestParam(value = "produkId", required = false) Integer produkId) { - - Map resultPageMap = strukPelayananService.cetakListPemakaian(tanggalAwal, tanggalAhir, kelompokProdukId, jenisProdukId, produkId); - - return resultPageMap; - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java index 9a09b3a6..84f82a5f 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java @@ -1,103 +1,97 @@ 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.dto.AsetDto; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PemakaianKendaraanDinasService; +import com.jasamedika.medifirst2000.vo.PegawaiVO; +import com.jasamedika.medifirst2000.vo.PemakaianKendaraanDinasVO; 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.dto.AsetDto; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PemakaianKendaraanDinasService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PemakaianKendaraanDinasVO; +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("/pemakaian-kendaraan-dinas") public class PemakaianKendaraanDinasController extends LocaleController { + private static final Logger LOGGER = getLogger(PemakaianKendaraanDinasController.class); + @Autowired private PemakaianKendaraanDinasService pemakaianKendaraanDinasService; - private static final Logger LOGGER = LoggerFactory.getLogger(PemakaianKendaraanDinasController.class); - - @RequestMapping(value = "/save-pemakaian-kendaraan-dinas/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pemakaian-kendaraan-dinas/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePemakaianKendaraanDinas( @Valid @RequestBody PemakaianKendaraanDinasVO vo, @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { try { Map result = pemakaianKendaraanDinasService.savePemakaianKendaraanDinas(vo, noRec); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pemakaian Kendaraan Dinas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemakaianKendaraanDinas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pemakaian Kendaraan Dinas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemakaianKendaraanDinas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/find-asset-kendaraan-dinas/", method = RequestMethod.GET) + @RequestMapping(value = "/find-asset-kendaraan-dinas/", method = GET) public ResponseEntity> findAssetKendaraanDinas(HttpServletRequest request) { try { List listAssetVO = pemakaianKendaraanDinasService.findAssetKendaraanDinas(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listAssetVO, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listAssetVO, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when Find Aset Kendaraan Dinas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAssetKendaraanDinas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when Find Aset Kendaraan Dinas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAssetKendaraanDinas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-supir-kendaraan-dinas/", method = RequestMethod.GET) + @RequestMapping(value = "/get-supir-kendaraan-dinas/", method = GET) public ResponseEntity> getSupirKendaraanDinas(HttpServletRequest request) { try { List listAssetVO = pemakaianKendaraanDinasService.getSupirKendaraanDinas(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listAssetVO, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listAssetVO, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get All Supir Kendaraan Dinas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getSupirKendaraanDinas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get All Supir Kendaraan Dinas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getSupirKendaraanDinas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java index b80e4e78..7cc00bd1 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java @@ -1,159 +1,110 @@ package com.jasamedika.medifirst2000.controller; -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.data.jpa.domain.Specification; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.entities.PemakaianMesin; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PemakaianMesinService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.PemakaianMesinVO; - import net.kaczmarzyk.spring.data.jpa.domain.DateBetween; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.jpa.domain.Specification; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; + +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("/pemakaian-mesin") -public class PemakaianMesinController extends LocaleController{ +public class PemakaianMesinController extends LocaleController { + + private static final Logger LOGGER = getLogger(PemakaianMesinController.class); @Autowired - private PemakaianMesinService pemakaianMesinService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PemakaianMesinController.class); - - @RequestMapping(value = "/save-pemakaian-mesin/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody PemakaianMesinVO vo,HttpServletRequest request) { - - try{ - Map result = pemakaianMesinService.addPemakaianMesin(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 Pemakaian mesin", 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 Pemakaian mesin", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-pemakaian-mesin/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody PemakaianMesinVO vo,HttpServletRequest request) { - - try{ - Map result = pemakaianMesinService.addPemakaianMesin(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 Pemakaian mesin", 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 Pemakaian mesin", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-pemakaian-mesin/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=pemakaianMesinService.findAllPemakaianMesin(); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all Pemakaian mesin", 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 Pemakaian mesin", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/delete-pemakaian-mesin", method = RequestMethod.GET) - public ResponseEntity deleteNamaBahan(@RequestParam(value = "noRec", required = true) String noRec) { - + private PemakaianMesinService pemakaianMesinService; + + @RequestMapping(value = "/save-pemakaian-mesin/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody PemakaianMesinVO vo, + HttpServletRequest request) { try { - if (pemakaianMesinService.deletePemakaianMesin(noRec) == true) - return RestUtil.getJsonResponse(noRec +" Dihapus", HttpStatus.CREATED); - + Map result = pemakaianMesinService.addPemakaianMesin(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 delete Pemakaian mesin", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when addPemakaianMesin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete Pemakaian mesin", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addPemakaianMesin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); } - - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/find-all-pemakaian-mesin/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVO(HttpServletRequest request) { + try { + Map result = pemakaianMesinService.findAllPemakaianMesin(); + 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 findAllPemakaianMesin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when findAllPemakaianMesin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/delete-pemakaian-mesin", method = GET) + public ResponseEntity deleteNamaBahan(@RequestParam(value = "noRec") String noRec) { + try { + if (pemakaianMesinService.deletePemakaianMesin(noRec)) + return getJsonResponse(noRec + " Dihapus", CREATED); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when deletePemakaianMesin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when deletePemakaianMesin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + return getJsonHttpStatus(NOT_ACCEPTABLE); + } + @RequestMapping(value = "/find-by-periode") - @ResponseBody - public ResponseEntity> findByPeriode( - - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, + @ResponseBody + public ResponseEntity> findByPeriode( + @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "100") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "tanggal") 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 = pemakaianMesinService.pemakaianMesinPaging(page,limit,sort,dir,spec); - + @Spec(path = "tanggal", params = { "dateStart", + "dateEnd" }, config = "yyyy-MM-dd", spec = DateBetween.class) Specification spec) { + Map resultPageMap = pemakaianMesinService.pemakaianMesinPaging(page, limit, sort, dir, spec); return constructListPageResult(resultPageMap); - } + } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java index 7487b01f..92c50199 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java @@ -1,76 +1,58 @@ 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.dao.PemakaianRuangRapatService; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.vo.PemakaianRuangRapatVO; 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.dao.PemakaianRuangRapatService; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PemakaianRuangRapatVO; +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; @RestController @RequestMapping("/pemakaian-ruang-rapat") public class PemakaianRuangRapatController extends LocaleController { + private static final Logger LOGGER = getLogger(PemakaianRuangRapatController.class); + @Autowired private PemakaianRuangRapatService pemakaianRuangRapatService; - private static final Logger LOGGER = LoggerFactory.getLogger(PemakaianRuangRapatController.class); - - @RequestMapping(value = "/save-pemakaian-ruang-rapat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pemakaian-ruang-rapat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePemakaianRuangRapat(@Valid @RequestBody PemakaianRuangRapatVO vo, @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { try { Map result = pemakaianRuangRapatService.savePemakaianRuangRapat(vo, noRec); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pemakaian Ruang Rapat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemakaianRuangRapat", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pemakaian Ruang Rapat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemakaianRuangRapat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - - @RequestMapping(value = "/find-by-no-order/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoOrder( - @RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) { - Map result = pemakaianRuangRapatService.findByNoOrder(noOrder); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java index 5044dbb0..673aa698 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java @@ -1,100 +1,94 @@ 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.dto.PemakaianRumahDukaDto; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PemakaianRumahDukaService; +import com.jasamedika.medifirst2000.vo.PemakaianRumahDukaVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dto.PemakaianRumahDukaDto; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PemakaianRumahDukaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PemakaianRumahDukaVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.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("/pemakaian-rumah-duka") public class PemakaianRumahDukaController extends LocaleController { + private static final Logger LOGGER = getLogger(PemakaianRumahDukaController.class); + @Autowired private PemakaianRumahDukaService pemakaianRumahDukaService; - private static final Logger LOGGER = LoggerFactory.getLogger(PemakaianRumahDukaController.class); - - @RequestMapping(value = "/save-pemakaian-rumah-duka/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pemakaian-rumah-duka/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePemakaianRumahDuka(@Valid @RequestBody PemakaianRumahDukaVO vo, HttpServletRequest request) { try { Map result = pemakaianRumahDukaService.savePemakaianRumahDuka(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when savePemakaianRumahDuka", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemakaianRumahDuka", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePemakaianRumahDuka", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemakaianRumahDuka", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/find-produk-rumah-duka/", method = RequestMethod.GET) + @RequestMapping(value = "/find-produk-rumah-duka/", method = GET) public ResponseEntity> findProdukRumahDuka(HttpServletRequest request) { try { List listProdukVO = pemakaianRumahDukaService.findProdukRumahDuka(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listProdukVO, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listProdukVO, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when FindProdukRumahDuka", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when FindProdukRumahDuka", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when FindProdukRumahDuka", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when FindProdukRumahDuka", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/find-kamar-rumah-duka/", method = RequestMethod.GET) + @RequestMapping(value = "/find-kamar-rumah-duka/", method = GET) public ResponseEntity> findKamarRumahDuka(HttpServletRequest request) { try { Map listKamarVO = pemakaianRumahDukaService.findKamarRumahDuka(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listKamarVO, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listKamarVO, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when FindKamarRumahDuka", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when FindKamarRumahDuka", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when FindKamarRumahDuka", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when FindKamarRumahDuka", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java index b41aed1c..df899b1c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java @@ -1,202 +1,138 @@ 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.PemantauanAnestesiLokalService; +import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO; +import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperatifVO; 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.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PemantauanAnestesiLokalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO; -import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperatifVO; +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("/pemantauan-anestesi-lokal") public class PemantauanAnestesiLokalController extends LocaleController { - private static final Logger LOGGER = LoggerFactory.getLogger(PemantauanAnestesiLokalController.class); - + + private static final Logger LOGGER = getLogger(PemantauanAnestesiLokalController.class); + @Autowired private PemantauanAnestesiLokalService pemantauanAnestesiLokalService; - - @RequestMapping( - value = "/get-pemantauan-anestesi", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-pemantauan-anestesi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPemantauanAnestesi(HttpServletRequest request) { try { Map result = this.pemantauanAnestesiLokalService.getPemantauanAnestesiLokal(); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } - - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPemantauanAnestesi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when getPemantauanAnestesiLokal", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping( - value = "/save-pemantauan-anestesi", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/save-pemantauan-anestesi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePemantauanAnestesi( @Valid @RequestBody AsuhanKeperawatanPeriOperasiHeaderVO vo, HttpServletRequest request) { - try { Map result = this.pemantauanAnestesiLokalService.savePemantauanAnestesi(vo); - if (result != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - - LOGGER.error("Got exception {} when savePemantauanAnestesi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when savePemantauanAnestesi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - - LOGGER.error("Got exception {} when savePemantauanAnestesi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } + LOGGER.error("Got JpaSystemException {} when savePemantauanAnestesi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } } - - @RequestMapping( - value = "/get-list-by-notrans", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getLoadDataByNoTrans( - @RequestParam(value = "notrans", required = true) String notrans, HttpServletRequest request) { + @RequestMapping(value = "/get-list-by-notrans", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getLoadDataByNoTrans(@RequestParam(value = "notrans") String notrans, + HttpServletRequest request) { try { Map result = this.pemantauanAnestesiLokalService.getPemantauanAnestesi(notrans); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getLoadDataByNoTrans", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getPemantauanAnestesi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadDataByNoTrans", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getPemantauanAnestesi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping( - value = "get-pasien-operasi", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPasienDaftarOperasi( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { + + @RequestMapping(value = "/get-pasien-operasi", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPasienDaftarOperasi(@RequestParam(value = "noRec") String noRec, + HttpServletRequest request) { try { Map result = this.pemantauanAnestesiLokalService.getPasienDaftarOperasi(noRec); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getPasienDaftarOperasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getPasienDaftarOperasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPasienDaftarOperasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getPasienDaftarOperasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping( - value = "/get-pemantauan-anestesi-table", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPemantauanAnestesiTable(HttpServletRequest request) { - try { - Map result = this.pemantauanAnestesiLokalService.getPemantauanAnestesiLokalTable(); - 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 (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPemantauanAnestesiTable", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - - } - } - - @RequestMapping( - value = "/get-tanda-vital", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-tanda-vital", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getTandaVital(HttpServletRequest request) { try { Map result = this.pemantauanAnestesiLokalService.getTandaVital(); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } - - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getTandaVital", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when getTandaVital", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java index 1109e122..d225f45b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java @@ -1,140 +1,121 @@ 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.PemantauanKinerjaPihakKetigaService; +import com.jasamedika.medifirst2000.vo.PemantauanKinerjaPihakKetigaVO; 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.PemantauanKinerjaPihakKetigaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PemantauanKinerjaPihakKetigaVO; +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("/pemantauan-kinerja-kesling") -public class PemantauanKinerjaPihakKetigaController extends LocaleController{ +public class PemantauanKinerjaPihakKetigaController extends LocaleController { + + private static final Logger LOGGER = getLogger(PemantauanKinerjaPihakKetigaController.class); @Autowired private PemantauanKinerjaPihakKetigaService service; - - private static final Logger LOGGER = LoggerFactory.getLogger(PemantauanKinerjaPihakKetigaController.class); - - @RequestMapping(value = "/save-pemantauan-kinerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePemantauanKinerjaPihakKetiga(@Valid @RequestBody PemantauanKinerjaPihakKetigaVO vo, HttpServletRequest request) { - try { - Map result = service.savePemantauanKinerjaPihakKetiga(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + @RequestMapping(value = "/save-pemantauan-kinerja", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePemantauanKinerjaPihakKetiga( + @Valid @RequestBody PemantauanKinerjaPihakKetigaVO vo, HttpServletRequest request) { + try { + Map result = service.savePemantauanKinerjaPihakKetiga(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 savePemantauanKinerjaPihakKetiga", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemantauanKinerjaPihakKetiga", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePemantauanKinerjaPihakKetiga", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemantauanKinerjaPihakKetiga", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pemantauan-kinerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-pemantauan-kinerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRekananMaintenance(HttpServletRequest request) { try { - Map result = service.getPemantauanKinerjaPihakKetiga(); - 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.getPemantauanKinerjaPihakKetiga(); + 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 getPemantauanKinerjaPihakKetiga", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPemantauanKinerjaPihakKetiga", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPemantauanKinerjaPihakKetiga", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPemantauanKinerjaPihakKetiga", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-pemantauan-kinerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity updatePemantauanKinerjaPihakKetiga(@Valid @RequestBody PemantauanKinerjaPihakKetigaVO vo, HttpServletRequest request) { - try { - Boolean result = service.updatePemantauanKinerjaPihakKetiga(vo); - if (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 updatePemantauanKinerjaPihakKetiga", 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 updatePemantauanKinerjaPihakKetiga", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/delete-pemantauan-kinerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deletePemantauanKinerjaPihakKetiga( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + @RequestMapping(value = "/delete-pemantauan-kinerja", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity deletePemantauanKinerjaPihakKetiga(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Boolean result = service.deletePemantauanKinerjaPihakKetiga(id); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when deletePemantauanKinerjaPihakKetiga", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when deletePemantauanKinerjaPihakKetiga", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when deletePemantauanKinerjaPihakKetiga", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when deletePemantauanKinerjaPihakKetiga", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/download-hasil-pemantauan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> downloadHasilPemantauan( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + + @RequestMapping(value = "/download-hasil-pemantauan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> downloadHasilPemantauan(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { - Map result = service.downloadHasilPemantauan(id); - 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.downloadHasilPemantauan(id); + 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 downloadHasilPemantauan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when downloadHasilPemantauan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when downloadHasilPemantauan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when downloadHasilPemantauan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - + } + }